Bläddra i källkod

bug-1046 检测实验附件归档时有遗漏

cfort 2 år sedan
förälder
incheckning
0d3e2700e9
1 ändrade filer med 18 tillägg och 3 borttagningar
  1. 18 3
      src/views/platform/bpmn/bpmInstHis/record/component/testingRecord.vue

+ 18 - 3
src/views/platform/bpmn/bpmInstHis/record/component/testingRecord.vue

@@ -348,7 +348,7 @@ export default {
             })
         },
         async getFile (row, type) {
-            const { xiu_gai_bao_gao_b, yang_pin_bian_hao, bao_gao_pdf_, qi_ta_bao_gao_ } = row
+            const { xiu_gai_bao_gao_b, yang_pin_bian_hao, bao_gao_pdf_, qi_ta_bao_gao_, suo_you_yuan_shi_ } = row
             this.fileList = []
             this.reportFileList = []
             if (type === 'file') {
@@ -358,12 +358,27 @@ export default {
                     if (!data.length) {
                         this.fileList = []
                     }
-                    const allFileID = data.map(i => [i.fu_tu_id_, i.wen_dang_fu_jian_, i.kuai_zhao_fu_jian].filter(i => i).join(','))
-                    const fileInfo = await this.getFileInfo(allFileID)
+                    /**
+                     * 补充逻辑:
+                     * 1. 获取各项目附件,与报告中的所有原始记录对比
+                     * 2. 剔除不在所有所有原始记录字段中的附件(不做)
+                     * 3. 将所有原始记录中新增的附件信息筛选出来另外归档
+                     */
+                    const allFileId = data.map(i => [i.fu_tu_id_, i.wen_dang_fu_jian_, i.kuai_zhao_fu_jian].filter(i => i).join(',')).join(',').split(',')
+                    const allReportFileId = suo_you_yuan_shi_.split(',')
+                    const addFileId = allReportFileId.filter(i => !allFileId.includes(i))
+                    // console.log(allFileId, allReportFileId, addFileId)
+                    const fileInfo = await this.getFileInfo(allReportFileId)
                     this.fileList = data.map(i => ({
                         projectName: i.xiang_mu_ming_che,
                         files: fileInfo.filter(k => [i.fu_tu_id_, i.wen_dang_fu_jian_, i.kuai_zhao_fu_jian].filter(i => i).join(',').includes(k.id))
                     }))
+                    if (addFileId.length) {
+                        this.fileList.push({    
+                            projectName: '新增附件',
+                            files: fileInfo.filter(k => addFileId.includes(k.id))
+                        })
+                    }
                 })
             } else {
                 const allReportID = [bao_gao_pdf_, qi_ta_bao_gao_].filter(i => i)