diff --git a/src/views/safetyenvironmental/inspection/components/add.vue b/src/views/safetyenvironmental/inspection/components/add.vue index 2e21ba9..78ab20a 100644 --- a/src/views/safetyenvironmental/inspection/components/add.vue +++ b/src/views/safetyenvironmental/inspection/components/add.vue @@ -519,8 +519,8 @@ export default { ).then((data) => { if (data.message != null) { this.INSPECTION_DEPARTMENT_ID = '' - this.INSPECTOR_List = [] this.INSPECTION_USER_ID = '' + this.form.inspectorList.splice(i,1) this.$message.error(data.message) } else { // 获取人员列表 @@ -544,9 +544,9 @@ export default { }).catch((e) => { }) } - this.form.inspectorList = [] - this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: item.INSPECTION_INSPECTOR_ID, INSPECTION_DEPARTMENT_ID: item.INSPECTION_DEPARTMENT_ID, INSPECTION_USER_ID: '', USER_SIDE: item.USER_SIDE }) - this.INSPECTOR_List.push([]) + // this.form.inspectorList = [] + // this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: item.INSPECTION_INSPECTOR_ID, INSPECTION_DEPARTMENT_ID: item.INSPECTION_DEPARTMENT_ID, INSPECTION_USER_ID: '', USER_SIDE: item.USER_SIDE }) + // this.INSPECTOR_List.push([]) }, // 获取人员列表 getInspectorList(DEPARTMENT_ID, i) { diff --git a/src/views/util/uploadFile/index.vue b/src/views/util/uploadFile/index.vue index ba25c46..a672a6e 100644 --- a/src/views/util/uploadFile/index.vue +++ b/src/views/util/uploadFile/index.vue @@ -66,6 +66,17 @@ export default { this.$refs.uploadFile.clearFiles() return false } + let nameNumber = 0 + for (let j = 0; j < fileList.length; j++) { + if (fileList[j].name === file.name) { + nameNumber = nameNumber + 1 + } + } + if (nameNumber > 1) { + this.$message.error('文件名重复,请重新选择!') + this.$refs.uploadFile.handleRemove(file) + return false + } this.$emit('update:fileList', fileList) }, onRemove(file, fileList) { diff --git a/src/views/xgf/flow/components/entrust.vue b/src/views/xgf/flow/components/entrust.vue index c412e3e..f199ce4 100644 --- a/src/views/xgf/flow/components/entrust.vue +++ b/src/views/xgf/flow/components/entrust.vue @@ -1,10 +1,10 @@