fix 项目合规评估、未符合项跟踪保存调整

src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue

@@ -531,13 +531,15 @@ export default {
         this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
         return
       }
-      const formData = {
+      const formData = { processInfo, businessInfo, approvalInfo, userInfo, dataSource: this.dataSource }
-        processInfo, businessInfo, approvalInfo, userInfo,
+      const params = {
-        dataSource: this.dataSource,
+        draftId: this.$route.query.draftId,
-        basicTaskInfoDTO: approvalInfo
+        infoJsonStr: JSON.stringify(formData),
+        basicTaskInfoDTO: approvalInfo,
+        basicProcessInfoDTO: processInfo
       }
       this.loading = true
-      saveNoMatchTrackingProcess({ infoJsonStr: JSON.stringify(formData) }).then(res => {
+      saveNoMatchTrackingProcess(params).then(res => {
         if (res.success) {
           this.$message.success(res.message)
           this.goBack()

src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue

@@ -258,7 +258,7 @@
       </template>
 
       <!--流程审批信息-->
-      <template v-if="showDispatchAndApprovalInfo">
+      <div v-show="showDispatchAndApprovalInfo">
         <div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
         <a-form :form="approvalInfoForm">
           <!--备注-->
@@ -274,7 +274,7 @@
             <j-upload v-decorator="['handleFile']" return-id />
           </a-form-item>
         </a-form>
-      </template>
+      </div>
     </div>
 
     <!--人员信息-->
@@ -904,12 +904,14 @@ export default {
             if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) {
               // 步骤条回显
               this.currentStep = draftResult.currentStep
-              // 项目信息
-              this.projectDataSource = draftResult.projectList || []
-              this.projectId = this.projectDataSource.length > 0 ? this.projectDataSource[0].id : null
-              // 标准信息
-              this.standardDataSource = draftResult.standardList
             }
+            // 项目信息
+            this.projectDataSource = draftResult.projectList || []
+            this.projectId = this.projectDataSource.length > 0 ? this.projectDataSource[0].id : null
+            // 标准信息
+            this.standardDataSource = draftResult.standardList
+            // 流程信息
+            this.processInfo = Object.assign({}, draftResult.basicProcessInfoDTO)
             // 业务分派信息
             this.dataSource = draftResult.dispatchList
             // 抄送人员
@@ -925,10 +927,10 @@ export default {
               item.tableRowKey = index
               return item
             })
+            // 流程信息
+            this.processInfo = Object.assign({}, result.basicProcessInfoDTO)
           }
-          // 流程信息
+          this.businessId = result.businessId || this.$route.query.projectId
-          this.processInfo = Object.assign({}, result.basicProcessInfoDTO)
-          this.businessId = result.businessId
           this.$nextTick(() => {
             if (this.processInfoForm) {
               this.processInfoForm.setFieldsValue(this.processInfo)
@@ -1302,6 +1304,9 @@ export default {
         } else {
           formData.standardList = this.standardDataSource
         }
+      } else {
+        formData.projectList = this.projectDataSource
+        formData.standardList = this.standardDataSource
       }
       // 分发列表
       formData.dispatchList = this.dataSource
@@ -1309,6 +1314,8 @@ export default {
       formData.approvalInfo = Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue())
       // 抄送人员
       formData.carbonCopyPersonnels = Object.assign(this.dispatchInfo, this.dispatchInfoForm.getFieldsValue())
+      // 流程信息
+      formData.basicProcessInfoDTO = processInfo
       const checkParams = Object.values({ ...formData.approvalInfo, ...processInfo, ...formData.carbonCopyPersonnels })
       if (!checkParams.some(tt => !!tt)) {
         // 提示至少填写一项