合并分支 'dev_third_stage' 到 'master'
Dev third stage 查看合并请求 laws-nio/laws-weilai!83
This commit is contained in:
肖文钰
@@ -96,6 +96,31 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 默认值-->
|
||||
<div v-if='detailDate.controlType === "11"' class='add_flex'>
|
||||
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
|
||||
<div v-if='item.type==="text"'>
|
||||
<!-- 文本校验 分情况-->
|
||||
<!-- 1 无-->
|
||||
<!-- 2 中文-->
|
||||
<!-- 3 正整数-->
|
||||
<!-- 4 政府点数-->
|
||||
<!-- 5 证书或小数-->
|
||||
<!-- 6 一位小数-->
|
||||
<!-- 7 两位小数-->
|
||||
<!-- 8 三位小数-->
|
||||
<!-- 9 四为小数-->
|
||||
<!-- 无 -->
|
||||
<div>
|
||||
<a-input class="box-input inputWid"
|
||||
:maxLength="1000"
|
||||
:disabled="item.isLock == '1' ? true: false"
|
||||
:placeholder="$t('pleaseEnter')"
|
||||
v-model="item.dataValue"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 纯下拉单选-->
|
||||
<div v-else-if='detailDate.controlType === "2"' class='add_flex'>
|
||||
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
|
||||
|
||||
@@ -120,7 +120,7 @@
|
||||
})
|
||||
} else {
|
||||
if (this.isTrue) {
|
||||
this.$emit('getList')
|
||||
this.$emit('getList',info.file.response.result)
|
||||
} else {
|
||||
eventBUs.$emit('searchReset')
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
<span
|
||||
v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>
|
||||
<span
|
||||
@click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
|
||||
@click='areaOfResponsibility(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
|
||||
</span>
|
||||
<span v-else>
|
||||
<span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
|
||||
@@ -41,6 +41,23 @@
|
||||
<span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
|
||||
</span>
|
||||
</span>
|
||||
<span slot="operationzr" slot-scope="record">
|
||||
<span v-if='currentPersonRole === "homo"'>
|
||||
<!-- 认证工程师 -->
|
||||
<span
|
||||
v-if='record.state == "待发起收集" || record.state == "工程接口人退回"'>
|
||||
<span :title='record.dataValue'
|
||||
@click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
|
||||
</span>
|
||||
<span v-else>
|
||||
<span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
|
||||
</span>
|
||||
</span>
|
||||
<span v-else>
|
||||
<span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
|
||||
</span>
|
||||
</span>
|
||||
|
||||
<span slot="detailClick" slot-scope="text,record">
|
||||
<collection-type :detailDate='text'/>
|
||||
</span>
|
||||
@@ -95,6 +112,46 @@
|
||||
</div>
|
||||
</div>
|
||||
</a-modal>
|
||||
<!-- 修改责任领域--->
|
||||
<a-modal v-model="areaVisiblezr" :title="$t('areaOfResponsibility')" width='620px' :footer="null"
|
||||
@cancel="cancel">
|
||||
<a-form-model
|
||||
class='tag-module'
|
||||
ref='ruleForm'
|
||||
:model='Dateline'
|
||||
:rules='rules'
|
||||
:label-col='labelCol'
|
||||
:wrapper-col='wrapperCol'
|
||||
|
||||
>
|
||||
<a-row :gutter='24'>
|
||||
<a-col :span='24'>
|
||||
<a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='queryzr'>
|
||||
<!-- <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
|
||||
<!-- v-model="Dateline.querySdt">-->
|
||||
<!-- <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
|
||||
<!-- <span style="display: inline-block;width: 100%" :title=" item.label ">-->
|
||||
<!-- {{ item.label }}-->
|
||||
<!-- </span>-->
|
||||
<!-- </a-select-option>-->
|
||||
<!-- </a-select>-->
|
||||
<j-dict-select-tag class="box-input" v-model="Dateline.queryzr"
|
||||
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
|
||||
:type="'select'"
|
||||
:triggerChange="false" :dictCode="'duty_territory'"/>
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form-model>
|
||||
<div class="imports-footer">
|
||||
<div class="imports-footer-wrap">
|
||||
|
||||
<a-button class="imports-btn imports-sub" type="primary" @click="handleSubmitzr">{{$t('preservation')}}
|
||||
</a-button>
|
||||
<a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button>
|
||||
</div>
|
||||
</div>
|
||||
</a-modal>
|
||||
<!-- 配置信息--->
|
||||
<a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
|
||||
<div class="content-text">
|
||||
@@ -161,6 +218,10 @@
|
||||
type: Object,
|
||||
default: true
|
||||
},
|
||||
queryParamQuery: {
|
||||
type: Object,
|
||||
default: true
|
||||
},
|
||||
currentPersonRole: {
|
||||
type: String,
|
||||
default: true
|
||||
@@ -232,6 +293,7 @@
|
||||
sdt: 0, // 工程接口人
|
||||
dre: 0, // 填写人
|
||||
areaVisible: false,
|
||||
areaVisiblezr:false,
|
||||
form: {},
|
||||
rules: {
|
||||
querySdt: [
|
||||
@@ -240,6 +302,13 @@
|
||||
message: this.$t('PleaseSelect') + this.$t('engineeringInterfacePerson'),
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
queryzr: [
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('PleaseSelect') + this.$t('areaOfResponsibility'),
|
||||
trigger: 'change'
|
||||
}
|
||||
]
|
||||
},
|
||||
wrapperCol: {
|
||||
@@ -342,6 +411,44 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
// 责任领域 保存
|
||||
handleSubmitzr(record) {
|
||||
let _this = this
|
||||
let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, }
|
||||
this.$refs.ruleForm.validate(valid => {
|
||||
if (valid) {
|
||||
axios({
|
||||
url: '/jero-boot/params/collectManifest/updateDutyTerritory',
|
||||
method: 'post',
|
||||
data: param,
|
||||
transformRequest: [function(data) {
|
||||
let ret = ''
|
||||
for (let it in data) {
|
||||
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
|
||||
}
|
||||
return ret
|
||||
}],
|
||||
headers: {
|
||||
'Content-Type': 'application/x-www-form-urlencoded',
|
||||
'X-Access-Token': _this.token
|
||||
}
|
||||
})
|
||||
.then((res) => {
|
||||
console.log(res)
|
||||
if (res.data.success) {
|
||||
_this.$message.success(_this.$t('OperationSuccessful'))
|
||||
_this.areaVisiblezr = false
|
||||
this.getLoginUserType()
|
||||
} else {
|
||||
_this.$message.warning(_this.$t('operationFailed'))
|
||||
}
|
||||
})
|
||||
.catch((error) => {
|
||||
console.log(error)
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
// 工程接口人 保存
|
||||
handleSubmit(record) {
|
||||
let _this = this
|
||||
@@ -385,8 +492,12 @@
|
||||
this.areaVisible = false
|
||||
this.$refs['ruleForm'].resetFields()
|
||||
},
|
||||
cancel(){
|
||||
this.areaVisiblezr = false
|
||||
this.$refs['ruleForm'].resetFields()
|
||||
},
|
||||
// 点击工程接口人的详情人员 有权限
|
||||
ondataValueTobeinitiated(record) {
|
||||
areaOfResponsibility(record) {
|
||||
this.areaVisible = true
|
||||
// this.$refs.ruleForm.clearValidate()
|
||||
this.$nextTick(() => {
|
||||
@@ -395,9 +506,22 @@
|
||||
this.$refs.ruleForm.clearValidate()
|
||||
})
|
||||
},
|
||||
// 点击责任领域的详情人员 有权限
|
||||
ondataValueTobe(record) {
|
||||
this.areaVisiblezr = true
|
||||
// this.$refs.ruleForm.clearValidate()
|
||||
this.$nextTick(() => {
|
||||
this.Dateline = { ...this.Dateline }
|
||||
this.getquerySdtId = record.id
|
||||
this.$refs.ruleForm.clearValidate()
|
||||
})
|
||||
},
|
||||
dataValueTobeinitiated() {
|
||||
this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission'))
|
||||
},
|
||||
dataValueTobe() {
|
||||
this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('toHavePermission'))
|
||||
},
|
||||
// 点击工程接口人的详情人员 无权限
|
||||
ondataValueNot() {
|
||||
this.$message.warning(this.$t('operatethisbutton'))
|
||||
@@ -487,9 +611,15 @@
|
||||
sorter: res.sort,
|
||||
width: 160
|
||||
})
|
||||
console.log(res)
|
||||
this.columns[index].scopedSlots = {
|
||||
customRender: 'titleName'
|
||||
}
|
||||
if(res.click1){
|
||||
this.columns[index].scopedSlots = {
|
||||
customRender: 'operationzr'
|
||||
}
|
||||
}
|
||||
if (res.click) {
|
||||
// 工程接口人列表修改
|
||||
this.columns[index].scopedSlots = {
|
||||
@@ -507,6 +637,7 @@
|
||||
console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii')
|
||||
},
|
||||
getTableListReset() {
|
||||
this.formInline = {}
|
||||
let params = {
|
||||
paramsManifestId: this.$route.query.id,
|
||||
pageNo: this.pageNo,
|
||||
@@ -591,7 +722,8 @@
|
||||
pageSize: this.pageSize,
|
||||
userTypes: this.currentPersonRole || currentPersonRole,
|
||||
paramsManifestId: paramsManifestid,
|
||||
...this.formInline
|
||||
...this.formInline,
|
||||
...currentPersonRole
|
||||
}
|
||||
this.loading = true
|
||||
getAction(url, params).then((res) => {
|
||||
|
||||
Reference in New Issue
Block a user