Merge remote-tracking branch 'origin/pet' into pet
limingyu
commit
281062cb8a
|
|
@ -1058,7 +1058,37 @@ export default {
|
|||
},
|
||||
// 移除选中项时触发的事件
|
||||
handleRemove(selectedItems) {
|
||||
this.form.USER_ID = []
|
||||
console.log(this.form.USER_ID)
|
||||
const currentUserId = this.form.USER_ID
|
||||
requestFN(
|
||||
'/user/listUserByCorp',
|
||||
{
|
||||
DEPARTMENT_ID: selectedItems.id
|
||||
}
|
||||
).then((data) => {
|
||||
const userList = data.userList
|
||||
if (userList) {
|
||||
for (let i = 0; i < userList.length; i++) {
|
||||
for (let j = 0; j < this.form.USER_ID.length; j++) {
|
||||
if (userList[i].USER_ID === this.form.USER_ID[j]) {
|
||||
for (let k = 0; k < currentUserId.length; k++) {
|
||||
if (this.form.USER_ID[j] === currentUserId[k]) {
|
||||
console.log(this.form.USER_ID[j])
|
||||
currentUserId.splice(k, 1)
|
||||
break
|
||||
}
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
this.listLoading = false
|
||||
// this.peopleList = data.userList
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
})
|
||||
this.form.USER_ID = currentUserId
|
||||
// 移除选中项时同时移除全部子节点
|
||||
if (this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.id)) {
|
||||
this.form.INVOLVING_CORPS_DEPART_ID.splice(this.form.INVOLVING_CORPS_DEPART_ID.indexOf(selectedItems.id), 1)
|
||||
|
|
|
|||
|
|
@ -104,7 +104,8 @@ export default {
|
|||
rules: {
|
||||
FIRE_REGION_NAME: [{ required: true, message: '消防区域不为空', trigger: 'blur' }],
|
||||
DEPARTMENT_ID: [{ required: true, message: '负责部门不为空', trigger: 'blur' }],
|
||||
FIRE_REGION_CODE: [{ required: true, message: '区域编码不为空', trigger: 'blur' }]
|
||||
FIRE_REGION_CODE: [{ required: true, message: '区域编码不为空', trigger: 'blur' }],
|
||||
PHOTO_UPLOAD_METHOD: [{ required: true, message: '区域编码不为空', trigger: 'blur' }]
|
||||
},
|
||||
formLabelWidth: '120px',
|
||||
OTHERLEVELID: '',
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
<tr :key="index">
|
||||
<td class="bbg">分析结果/%</td>
|
||||
<td>{{ item.ANALYZE_RESULT }}</td>
|
||||
<td class="bbg">分析人</td>
|
||||
<td class="bbg">气体分析单位负责人</td>
|
||||
<td>{{ item.ANALYZE_USER }}</td>
|
||||
</tr>
|
||||
</template>
|
||||
|
|
@ -167,7 +167,7 @@
|
|||
</tr>
|
||||
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
|
||||
<td colspan="6">
|
||||
<div>所在单位意见：{{ pd.LEADER_CONTENT }}</div>
|
||||
<div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
|
||||
<div style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@
|
|||
<el-table-column prop="CHECK_NO" label="编号" />
|
||||
<el-table-column prop="WORK_LEVEL" label="作业级别" />
|
||||
<el-table-column prop="APPLY_USER_NAME" label="申请人" />
|
||||
<el-table-column prop="ANALYZE_USER_NAME" label="分析人" />
|
||||
<el-table-column prop="ANALYZE_USER_NAME" label="气体分析单位负责人" />
|
||||
<el-table-column prop="CONFIRM_USER_NAME" label="作业负责人" />
|
||||
<el-table-column prop="LEADER_USER_NAME" label="所在单位负责人" />
|
||||
<el-table-column prop="LEADER_USER_NAME" label="属地监管单位负责人" />
|
||||
<el-table-column prop="AUDIT_USER_NAME" label="安全管理部门负责人" show-overflow-tooltip >
|
||||
<template slot-scope="{row}">
|
||||
{{ row.AUDIT_USER_NAME || ' 已跳过' }}
|
||||
|
|
@ -51,14 +51,14 @@
|
|||
<template slot-scope="{row}">
|
||||
<span v-if="row.APPLY_STATUS==0">动火作业待提交</span>
|
||||
<span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
|
||||
<span v-else-if="row.APPLY_STATUS==2">所在单位待审核</span>
|
||||
<span v-else-if="row.APPLY_STATUS==2">属地监管单位待审核</span>
|
||||
<span v-else-if="row.APPLY_STATUS==4">安全管理部门待审核</span>
|
||||
<span v-else-if="row.APPLY_STATUS==5">动火审批人待审核</span>
|
||||
<span v-else-if="row.APPLY_STATUS==6">班长待验票</span>
|
||||
<span v-else-if="row.APPLY_STATUS==7">待验收</span>
|
||||
<span v-else-if="row.APPLY_STATUS==8">验收归档</span>
|
||||
<span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
|
||||
<span v-else-if="row.APPLY_STATUS==-4">所在单位审核打回</span>
|
||||
<span v-else-if="row.APPLY_STATUS==-4">属地监管单位审核打回</span>
|
||||
<span v-else-if="row.APPLY_STATUS==-5">安全管理部门审核打回</span>
|
||||
<span v-else-if="row.APPLY_STATUS==-6">动火审批人审核打回</span>
|
||||
<span v-else-if="row.APPLY_STATUS==-7">班长验票打回</span>
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
<div>{{ pd.CONFIRM_USER_SIGNER_TIME }}</div>
|
||||
</template>
|
||||
</el-step>
|
||||
<el-step title="所在单位意见">
|
||||
<el-step title="属地监管单位意见">
|
||||
<template slot="description">
|
||||
<div>{{ pd.LEADER_USER_NAME }}</div>
|
||||
<div>{{ pd.LEADER_USER_SIGNER_TIME }}</div>
|
||||
|
|
@ -209,14 +209,14 @@ export default {
|
|||
{ ID: '', NAME: '请选择' },
|
||||
{ ID: '0', NAME: '动火作业待提交' },
|
||||
{ ID: '1', NAME: '作业负责人待审核' },
|
||||
{ ID: '2', NAME: '所在单位待审核' },
|
||||
{ ID: '2', NAME: '属地监管单位待审核' },
|
||||
{ ID: '4', NAME: '安全管理部门待审核' },
|
||||
{ ID: '5', NAME: '动火审批人待审核' },
|
||||
{ ID: '6', NAME: '班长待验票' },
|
||||
{ ID: '7', NAME: '待验收' },
|
||||
{ ID: '8', NAME: '验收归档' },
|
||||
{ ID: '-2', NAME: '作业负责人审核打回' },
|
||||
{ ID: '-4', NAME: '所在单位审核打回' },
|
||||
{ ID: '-4', NAME: '属地监管单位审核打回' },
|
||||
{ ID: '-5', NAME: '安全管理部门审核打回' },
|
||||
{ ID: '-6', NAME: '动火审批人审核打回' },
|
||||
{ ID: '-7', NAME: '班长验票打回' },
|
||||
|
|
@ -334,7 +334,7 @@ export default {
|
|||
}
|
||||
if (this.pd.APPLY_STATUS == '-4') {
|
||||
obj = {
|
||||
title: '所在单位审核打回',
|
||||
title: '属地监管单位审核打回',
|
||||
USER_NAME: this.pd.LEADER_USER_NAME,
|
||||
OPERATTIME: this.pd.OPERATTIME
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue