自测问题修复

src/components/UploadImg/index.vue

@@ -104,9 +104,13 @@ export default {
             //     filePath: '',
             // }
             if (file.response && file.response.data.length > 0) {
-                this.$emit('deleteFile', { filepath: file.response.data[0].filePath, isNew: true })
+                this.$emit('deleteFile', { filePath: file.response.data[0].filePath, isNew: true })
             } else {
-                this.$emit('deleteFile', { filepath: file.filePath, isNew: false })
+                if (file.isNew) {
+                    this.$emit('deleteFile', { filePath: file.filePath, isNew: true })
+                } else {
+                    this.$emit('deleteFile', { filePath: file.filePath, isNew: false })
+                }
             }
             this.$emit('update:fileList', fileList)
             // const res = await deleteImgAPI(deleteFile)

src/views/company-manage/key-person/components/addAndEditForm.vue

@@ -509,7 +509,7 @@ export default {
                     if (this.formType === 3) {
                         params.id = id
                     }
-                    const filePaths = this.deleteFileList.map((item) => item.filepath)
+                    const filePaths = this.deleteFileList.map((item) => item.filePath)
                     if (filePaths.length > 0) {
                         deleteImgAPI({ filePaths: filePaths.join(',') })
                     }

src/views/company-manage/key-person/index.vue

@@ -55,7 +55,7 @@
                     </template>
 
                     <template v-else>
-                        {{ row[item.prop] }}
+                        {{ row[item.prop] || '-' }}
                     </template>
                 </template>
             </el-table-column>
@@ -145,17 +145,7 @@ export default {
                 pageSize: 10,
             },
             // 列表
-            tableList: [
+            tableList: [],
-                {
-                    projectName: '测试工程1',
-                },
-                {
-                    projectName: '测试工程2',
-                },
-                {
-                    projectName: '测试工程3',
-                },
-            ],
             // 列表列
             tableColumn: [
                 { label: '姓名', prop: 'userName' },

src/views/company-manage/other-person/components/addAndEditForm.vue

@@ -468,7 +468,7 @@ export default {
                     if (this.formType === 3) {
                         params.id = id
                     }
-                    const filePaths = this.deleteFileList.map((item) => item.filepath)
+                    const filePaths = this.deleteFileList.map((item) => item.filePath)
 
                     if (filePaths.length > 0) {
                         deleteImgAPI({ filePaths: filePaths.join(',') })

src/views/company-manage/other-person/index.vue

@@ -59,7 +59,7 @@
                     </template>
 
                     <template v-else>
-                        {{ row[item.prop] }}
+                        {{ row[item.prop] || '-' }}
                     </template>
                 </template>
             </el-table-column>

src/views/company-manage/performance-manage/components/addAndEditForm.vue

@@ -292,7 +292,7 @@
 import moment from 'moment'
 import UploadImg from '@/components/UploadImg'
 import { getToken } from '@/utils/auth'
-import { getKeyPersonListAPI } from '@/api/common'
+import { getKeyPersonListAPI, deleteImgAPI } from '@/api/common'
 import { addCompanyPerformanceAPI, editCompanyPerformanceAPI } from '@/api/company-manage/performance-manage'
 export default {
     components: {
@@ -435,7 +435,7 @@ export default {
             // this.fileList.push(res)
         },
         onCancel() {
-            this.$emit('closeDialogOuter')
+            this.$emit('closeDialogOuter', false)
         },
         onConfirm() {
             this.$refs.addAndEditFormRef.validate(async (valid) => {
@@ -503,6 +503,12 @@ export default {
                     if (this.formType === 3) {
                         params.id = id
                     }
+
+                    const filePaths = this.deleteFileList.map((item) => item.filePath)
+
+                    if (filePaths.length > 0) {
+                        deleteImgAPI({ filePaths: filePaths.join(',') })
+                    }
                     const API = this.formType === 1 ? addCompanyPerformanceAPI : editCompanyPerformanceAPI
                     const res = await API(params)
                     if (res.code === 200) {
@@ -513,15 +519,63 @@ export default {
             })
         },
 
-        deleteFile() {},
+        deleteFile(filePath) {
+            this.deleteFileList.push(filePath)
+        },
+        deleteFileListFun() {
+            const { htKeyFileList } = this.addAndEditForm
+            const fileList = [...htKeyFileList]
+            const deleteFileList = []
+
+            this.deleteFileList.forEach((item) => {
+                if (item.isNew) {
+                    deleteFileList.push(item.filepath)
+                }
+            })
+
+            console.log(this.addTableList)
+
+            if (this.addTableList.length > 0) {
+                this.addTableList.forEach((item) => {
+                    if (item.tbFileSourceVoList.length > 0) {
+                        item.tbFileSourceVoList.forEach((e) => {
+                            if (e.isNew) {
+                                deleteFileList.push(e.filePath)
+                            }
+                        })
+                    }
+                })
+            }
+
+            fileList.forEach((item) => {
+                if (item.response && item.response.code === 200) {
+                    const { data } = item.response
+                    const { filePath } = data[0]
+
+                    deleteFileList.push(filePath)
+                }
+            })
+
+            if (deleteFileList.length > 0) {
+                deleteImgAPI({ filePaths: deleteFileList.join(',') })
+            }
+        },
         async getKeyPersonList() {
             const { rows: res } = await getKeyPersonListAPI()
             this.keyPersonList = res
         },
         // 人员选择
         onHandleChange(index, value) {
+            // 校验不可重复
+            if (this.addTableList.some((item, currentIndex) => item.keyUser == value && currentIndex !== index)) {
+                this.$modal.msgError('人员不可重复选择')
+                this.addTableList[index].userName = ''
+                this.addTableList[index].idCard = ''
+                this.addTableList[index].keyUser = ''
+            } else {
                 this.addTableList[index].userName = this.keyPersonList.find((item) => item.id == value).userName
                 this.addTableList[index].idCard = this.keyPersonList.find((item) => item.id == value).idCard
+            }
         },
         onCancelInner() {
             this.uploadOuterVisible = false
@@ -538,6 +592,7 @@ export default {
                         fileName,
                         fileType: 1,
                         url: this.fileViewUrl + filePath + '?file_token=' + getToken(),
+                        isNew: true,
                     })
                 } else {
                     this.addTableList[this.keyTbCurrentIndex].tbFileSourceVoList.push({
@@ -546,6 +601,7 @@ export default {
                         fileName: item.fileName,
                         fileType: 1,
                         url: this.fileViewUrl + item.filePath + '?file_token=' + getToken(),
+                        isNew: false,
                     })
                 }
             })
@@ -557,6 +613,8 @@ export default {
             this.uploadOuterVisible = false
         },
         onHandleDeleteFile(index, fileIndex) {
+            console.log(this.addTableList[index].tbFileSourceVoList[fileIndex])
+            this.deleteFileList.push(this.addTableList[index].tbFileSourceVoList[fileIndex])
             this.addTableList[index].tbFileSourceVoList.splice(fileIndex, 1)
             this.proveFileList.splice(fileIndex, 1)
         },
@@ -586,6 +644,7 @@ export default {
                             return {
                                 ...item,
                                 url: this.fileViewUrl + item.filePath + '?file_token=' + getToken(),
+                                isNew: false,
                             }
                         })
                     })

src/views/company-manage/performance-manage/index.vue

@@ -54,7 +54,7 @@
                     </template>
 
                     <template v-else>
-                        {{ row[item.prop] }}
+                        {{ row[item.prop] || '-' }}
                     </template>
                 </template>
             </el-table-column>
@@ -100,7 +100,12 @@
         />
         <DialogModel :dialogConfig="dialogConfig" @closeDialogOuter="closeDialogOuter">
             <template slot="outerContent">
-                <AddAndEditForm :formType="formType" @closeDialogOuter="closeDialogOuter" :editRow="editRow" />
+                <AddAndEditForm
+                    :editRow="editRow"
+                    :formType="formType"
+                    ref="addAndEditFormRef"
+                    @closeDialogOuter="closeDialogOuter"
+                />
             </template>
         </DialogModel>
     </div>
@@ -157,6 +162,8 @@ export default {
             this.dialogConfig.outerVisible = false
             if (isRefresh) {
                 this.getCompanyPerformanceList()
+            } else {
+                this.$refs.addAndEditFormRef.deleteFileListFun()
             }
         },
         // 删除

src/views/sub-manage/sub-manage/components/addAndEditForm.vue

@@ -214,7 +214,7 @@ export default {
                     if (this.formType === 3) {
                         params.id = id
                     }
-                    const filePaths = this.deleteFileList.map((item) => item.filepath)
+                    const filePaths = this.deleteFileList.map((item) => item.filePath)
 
                     if (filePaths.length > 0) {
                         deleteImgAPI({ filePaths: filePaths.join(',') })

src/views/sub-manage/sub-performance-manage/components/addAndEditForm.vue

@@ -403,7 +403,7 @@ export default {
                         params.id = id
                     }
 
-                    const filePaths = this.deleteFileList.map((item) => item.filepath)
+                    const filePaths = this.deleteFileList.map((item) => item.filePath)
                     if (filePaths.length > 0) {
                         deleteImgAPI({ filePaths: filePaths.join(',') })
                     }

src/views/sub-manage/sub-performance-manage/index.vue

@@ -54,7 +54,7 @@
                     </template>
 
                     <template v-else>
-                        {{ row[item.prop] }}
+                        {{ row[item.prop] || '-' }}
                     </template>
                 </template>
             </el-table-column>

src/views/sub-manage/sub-person-manage/components/addAndEditForm.vue

@@ -413,7 +413,7 @@ export default {
                     if (this.formType === 3) {
                         params.id = id
                     }
-                    const filePaths = this.deleteFileList.map((item) => item.filepath)
+                    const filePaths = this.deleteFileList.map((item) => item.filePath)
                     if (filePaths.length > 0) {
                         deleteImgAPI({ filePaths: filePaths.join(',') })
                     }