diff --git a/src/views/firefighting/checklist/components/edit.vue b/src/views/firefighting/checklist/components/edit.vue index 137f116..337fef5 100644 --- a/src/views/firefighting/checklist/components/edit.vue +++ b/src/views/firefighting/checklist/components/edit.vue @@ -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) diff --git a/src/views/firefighting/region/components/edit.vue b/src/views/firefighting/region/components/edit.vue index 2a2cb57..24c192a 100644 --- a/src/views/firefighting/region/components/edit.vue +++ b/src/views/firefighting/region/components/edit.vue @@ -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: '', diff --git a/src/views/hotwork_cfd/hotwork/components/detail.vue b/src/views/hotwork_cfd/hotwork/components/detail.vue index a972a71..28381d7 100644 --- a/src/views/hotwork_cfd/hotwork/components/detail.vue +++ b/src/views/hotwork_cfd/hotwork/components/detail.vue @@ -52,7 +52,7 @@ 分析结果/% {{ item.ANALYZE_RESULT }} - 分析人 + 气体分析单位负责人 {{ item.ANALYZE_USER }} @@ -167,7 +167,7 @@ -
所在单位意见:{{ pd.LEADER_CONTENT }}
+
属地监管单位意见:{{ pd.LEADER_CONTENT }}
签字: diff --git a/src/views/hotwork_cfd/hotwork/components/list.vue b/src/views/hotwork_cfd/hotwork/components/list.vue index d12291b..8a8958d 100644 --- a/src/views/hotwork_cfd/hotwork/components/list.vue +++ b/src/views/hotwork_cfd/hotwork/components/list.vue @@ -32,9 +32,9 @@ - + - +