update 稽查流程完善

src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue

@@ -59,7 +59,7 @@ import { getFileInfo } from '@/api/api'
 import { previewPdf } from '@/utils/previewPdf'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
-import { getFileByInspectId } from '@api/workCenter'
+import { getFileByInspectId, getInspectProcessProjectId } from '@api/workCenter'
 import moment from 'moment/moment'
 
 const Base64 = require('js-base64').Base64
@@ -178,8 +178,14 @@ export default {
           if (!param.createTime) {
             param.createTime = moment().format('YYYY-MM-DD HH:mm:ss')
           }
+          this.confirmLoading = true
+          getInspectProcessProjectId().then(res => {
+            param.id = res + ''
             this.$emit('ok', param, this.index)
             this.form.resetFields()
+          }).finally(() => {
+            this.confirmLoading = false
+          })
         }
       })
     },
@@ -190,8 +196,13 @@ export default {
           if (!param.createTime) {
             param.createTime = moment().format('YYYY-MM-DD HH:mm:ss')
           }
+          getInspectProcessProjectId().then(res => {
+            param.id = res + ''
             this.$emit('ok', param, this.index)
             this.close()
+          }).finally(() => {
+            this.confirmLoading = false
+          })
         }
       })
     }

src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue

@@ -147,6 +147,7 @@
 import UploadFile from '@comp/UploadFile'
 import UserSelection from '@comp/selection/UserSelection'
 import moment from 'moment'
+import { getInspectProcessProjectId } from '@api/workCenter'
 export default {
   name: 'InspectionProcessRectificationPlanModal',
   components: { UserSelection, UploadFile },
@@ -228,9 +229,10 @@ export default {
       this.index = index
       // 获取章节条款下拉
       this.initSectionClauseList()
-      const { standardRequire, executionStatus, attachment, evaluateScore } = record.enterpriseStandardInspectReport || {}
+      const { id, inspectContentId, standardRequire, executionStatus, attachment, evaluateScore } = record.enterpriseStandardInspectReport || {}
       this.form = Object.assign({}, record, {
-        // inspectContentId,
+        inspectContentId,
+        inspectReportId: id,
         standardRequire,
         executionStatus,
         attachment,
@@ -261,8 +263,14 @@ export default {
           if (!params.createTime) {
             params.createTime = moment().format('YYYY-MM-DD HH:mm:ss')
           }
+          this.confirmLoading = true
+          getInspectProcessProjectId().then(res => {
+            params.id = res + ''
             this.$emit('ok', params, this.index)
             this.close()
+          }).finally(() => {
+            this.confirmLoading = false
+          })
         } else {
           return false
         }
@@ -338,14 +346,14 @@ export default {
         const reportList = this.data.enterpriseStandardInspectReportList || []
         const content = contentList.find(item => item.id === val) || {}
         const report = reportList.find(item => item.inspectContentId === val) || {}
-        // this.form.inspectReportId = report.inspectReportId
+        this.form.inspectReportId = report.inspectReportId
         this.form.standardRequire = content.requirement
         this.form.executionStatus = report.executionStatus
         this.form.attachment = report.attachment
         this.form.evaluateScore = report.evaluateScore
         this.form.enterpriseStandardInspectReport = report
       } else {
-        // this.form.inspectReportId = undefined
+        this.form.inspectReportId = undefined
         this.form.standardRequire = undefined
         this.form.executionStatus = undefined
         this.form.attachment = undefined