diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue index 90422c7..0509a79 100644 --- a/src/views/corpInfo/user/components/list.vue +++ b/src/views/corpInfo/user/components/list.vue @@ -798,7 +798,7 @@ export default { SHIFTDUTYTWO: this.SHIFTDUTYTWO, IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER, USER_ID: this.USER_ID, - ISPUSH:'2' + ISPUSH: '2' } ).then((data) => { this.listLoading = false diff --git a/src/views/hidden/rectify/components/change.vue b/src/views/hidden/rectify/components/change.vue index c80f0f7..28fd353 100644 --- a/src/views/hidden/rectify/components/change.vue +++ b/src/views/hidden/rectify/components/change.vue @@ -37,6 +37,7 @@ + 上传到服务器
@@ -199,6 +201,7 @@ export default { dialogImageVisible: false, // 放大照片的显示和隐藏 dialogImageUrl: '', // 照片的地址 scheme_files: [], // 整改方案图片 + temporaryFilePath: '', formRule: { RECTIFICATIONDEPT: [{ required: true, message: '请选择整改部门', trigger: 'blur' }], RECTIFICATIONOR: [{ required: true, message: '请选择整改人', trigger: 'blur' }], @@ -603,6 +606,7 @@ export default { } todata.append('FOREIGN_KEY', this.HIDDEN_ID) todata.append('TYPE', 8) + todata.append('temporaryFilePath', this.temporaryFilePath) upload( '/imgfiles/add', todata @@ -684,6 +688,39 @@ export default { this.scheme_files.push(file) } }, + submitUpload() { + var _this = this + this.$refs.zhenggaiupload.submit() + var todata = new FormData() + for (var i = 0; i < _this.rectify_files.length; i++) { + if (_this.rectify_files[i]) { + todata.append('FFILE', _this.rectify_files[i]) + } + } + console.log(todata) + upload( + '/mfolder/upLoadTemporary', + todata + ).then((data) => { + if (data.result == 'success') { + this.$message({ + message: '保存成功', + type: 'success' + }) + this.loading = false + this.temporaryFilePath = data.temporaryFilePath + } else { + this.$message({ + message: data.exception, + type: 'error' + }) + this.loading = false + } + }).catch((e) => { + this.listLoading = false + this.loading = false + }) + }, back() { this.$parent.activeName = 'List' } diff --git a/src/views/keyprojects/outsourced/components/edit.vue b/src/views/keyprojects/outsourced/components/edit.vue index bb39f05..7d1fbc6 100644 --- a/src/views/keyprojects/outsourced/components/edit.vue +++ b/src/views/keyprojects/outsourced/components/edit.vue @@ -27,20 +27,23 @@ - { }) }, + pullSelectedSuperviseNodes(selectedItems) { + if (selectedItems.nodes && selectedItems.nodes.length > 0) { + for (let i = 0; i < selectedItems.nodes.length; i++) { + if (!this.form.DEPARTMENT_ID.includes(selectedItems.nodes[i].id)) { + this.form.DEPARTMENT_ID.push(selectedItems.nodes[i].id) + } + this.pullSelectedSuperviseNodes(selectedItems.nodes[i]) + } + } + console.log('this.form.DEPARTMENT_ID====' + this.form.DEPARTMENT_ID) + }, + handleSuperviseSelect(selectedItems) { + // 选择父节点时同时勾选全部子节点 + if (!this.form.DEPARTMENT_ID.includes(selectedItems.id)) { + this.form.DEPARTMENT_ID.push(selectedItems.id) + } + this.pullSelectedSuperviseNodes(selectedItems) + this.onClickSupervise() + console.log('this.form.DEPARTMENT_ID==2==' + this.form.DEPARTMENT_ID) + }, + + // 将选中项的子节点全部移除 + removeSuperviseSelectedNodes(selectedItems) { + if (selectedItems.nodes && selectedItems.nodes.length > 0) { + for (let i = 0; i < selectedItems.nodes.length; i++) { + if (this.form.DEPARTMENT_ID.includes(selectedItems.nodes[i].id)) { + this.form.DEPARTMENT_ID.splice(this.form.DEPARTMENT_ID.indexOf(selectedItems.nodes[i].id), 1) + } + this.removeSuperviseSelectedNodes(selectedItems.nodes[i]) + } + } + }, + // 移除选中项时触发的事件 + handleSuperviseRemove(selectedItems) { + // 移除选中项时同时移除全部子节点 + if (this.form.DEPARTMENT_ID.includes(selectedItems.id)) { + this.form.DEPARTMENT_ID.splice(this.form.DEPARTMENT_ID.indexOf(selectedItems.id), 1) + } + this.removeSuperviseSelectedNodes(selectedItems) + this.onClickSupervise() + }, + // 将树节点的子节点全部添加到数组中 pullSelectedNodes(selectedItems) { + console.log(selectedItems) if (selectedItems.nodes && selectedItems.nodes.length > 0) { for (let i = 0; i < selectedItems.nodes.length; i++) { if (!this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.nodes[i].id)) { @@ -1215,6 +1262,7 @@ export default { this.pullSelectedNodes(selectedItems.nodes[i]) } } + console.info('this.form.INVOLVING_CORPS_DEPART_ID========' + this.form.INVOLVING_CORPS_DEPART_ID) }, // 选择项时触发的事件 handleSelect(selectedItems) { @@ -1250,6 +1298,12 @@ export default { this.$nextTick(() => { this.updateValue = true }) + }, + onClickSupervise() { + this.updateSuperviseValue = false + this.$nextTick(() => { + this.updateSuperviseValue = true + }) } } } diff --git a/src/views/safetyenvironmental/archive/components/accept.vue b/src/views/safetyenvironmental/archive/components/accept.vue index a2ec907..3ba16b5 100644 --- a/src/views/safetyenvironmental/archive/components/accept.vue +++ b/src/views/safetyenvironmental/archive/components/accept.vue @@ -595,7 +595,7 @@ export default { this.$refs.form.validate(valid => { if (valid) { requestFN( - '/safetyenvironmental/V2/finalcheck', + '/safetyenvironmental/finalcheck', { HIDDEN_ID: this.HIDDEN_ID, FINAL_CHECKDESCR: this.form.FINAL_CHECKDESCR, diff --git a/src/views/safetyenvironmental/inspected/components/list.vue b/src/views/safetyenvironmental/inspected/components/list.vue index a2dfef5..ee159b8 100644 --- a/src/views/safetyenvironmental/inspected/components/list.vue +++ b/src/views/safetyenvironmental/inspected/components/list.vue @@ -330,7 +330,7 @@ export default { hiddenCount(INSPECTION_ID) { this.listLoading = true requestFN( - '/safetyenvironmental/V2/hiddencount', + '/safetyenvironmental/hiddencount', { INSPECTION_ID: INSPECTION_ID } diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue index 4389bb3..7d38400 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -471,7 +471,7 @@ export default { }).then(() => { this.listLoading = true requestFN( - '/safetyenvironmental/V2/hide', + '/safetyenvironmental/hide', { INSPECTION_ID: id, hide: '1'