[update] 新法规导入流程-保存

src/api/workCenter.js

@@ -18,7 +18,7 @@ const deleteFlowNode = (params) => postAction('/activitiModel/deleteTask', param
 
 // 新法规导入流程
 // 保存
-const newRegulationImportSave = (params) => postAction('/process/es/archive/save', params)
+const newRegulationImportSave = (params) => postAction('/process/newStandardImport/save', params)
 // 发起
 const newRegulationImportApproval = (params) => postAction('/process/newStandardImport/start', params)
 // 转办
@@ -89,6 +89,9 @@ const compulsoryWithdrawal = (params) => postAction('/workCenter/forcedWithdrawa
 // 流程中心统一转办
 const processTransfer = (params) => postAction('/workCenter/transfer', params)
 
+// 流程中心-草稿-办理
+const getDataDraft = (params) => getAction('/process/common/draftHandle', params)
+
 // 在线编辑-生成空白模板
 const generateEmptyFileTemplate = (params) => getAction('/onlyOffice/saveEditFile', params)
 // 在线编辑-通过在线编辑的文件id获取文件信息
@@ -145,6 +148,8 @@ export {
 
   processTransfer,
 
+  getDataDraft,
+
   generateEmptyFileTemplate,
   queryFileInfoByEditId,
   getOnlineFileIdByFileId,

src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue

@@ -129,10 +129,13 @@ import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 import pick from 'lodash.pick'
 import { NewRegulationsImportNodes, ProcessKey } from '../../../enums/commonEnums'
 import {
-  newRegulationImportAgree, newRegulationImportApproval,
+  newRegulationImportAgree,
+  newRegulationImportApproval,
   newRegulationImportGetDataById,
-  newRegulationImportGetDataDraft, newRegulationImportReject,
+  newRegulationImportReject,
-  newRegulationImportSave, newRegulationImportTurnTo
+  newRegulationImportSave,
+  newRegulationImportTurnTo,
+  getDataDraft
 } from '../../../api/workCenter'
 
 export default {
@@ -214,6 +217,7 @@ export default {
       currentNodeName: '',
       currentNodeId: NewRegulationsImportNodes.initiated.value, // 当前节点id
       model: {},
+      draftModel: {}, // 草稿Json转化的对象
       processInfoForm: this.$form.createForm(this),
       labelCol: {
         xs: { span: 24 },
@@ -277,7 +281,7 @@ export default {
         func = newRegulationImportGetDataById
         params = param.taskId
       } else {
-        func = newRegulationImportGetDataDraft
+        func = getDataDraft
         params = param
       }
       func(params).then(res => {
@@ -290,23 +294,19 @@ export default {
             }
             // 有草稿json按草稿进来的回显
             if (this.model.infoJsonStr) {
+              this.draftModel = JSON.parse(this.model.infoJsonStr)
+              console.log('=========draftModel', this.draftModel)
               // 初始化流程信息
-              const prcObj = Object.assign({}, this.model)
+              this.processInfoForm.setFieldsValue(pick(this.draftModel.basicProcessInfoDTO, 'processName', 'processDueDate', 'processDescription'))
-              prcObj.processDueDate = this.model.processDueDate
-              prcObj.processDescription = this.model.processDescription
-              this.processInfoForm.setFieldsValue(pick(prcObj, 'processName', 'processDueDate', 'processDescription'))
               // 初始化流程审批信息
-              prcObj.handleText = this.model.handleText
+              this.approvalInfoForm.setFieldsValue(pick(this.draftModel.basicTaskInfoDTO, 'handleText', 'handleFile'))
-              prcObj.handleFile = this.model.handleFile
-              this.approvalInfoForm.setFieldsValue(pick(prcObj, 'handleText', 'handleFile'))
-              this.model.data = JSON.parse(this.model.infoJsonStr).data
               // 如果是节点1的保存回显人员信息
               if (this.currentNode === 1) {
-                this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj)
+                this.draftInitPersonInfo(this.draftModel.userInfoMap)
               }
             }
             if (this.$refs.baseInfoRef) {
-              this.$refs.baseInfoRef.initData(this.model.businessInfoDTO)
+              this.$refs.baseInfoRef.initData(this.draftModel.businessInfoDTO || this.model.businessInfoDTO)
             }
           })
           // 初始化业务基本信息中组件内容
@@ -342,6 +342,7 @@ export default {
       const personnelObj = this.$refs.personnelInfo.getDataObj()
       // 业务基本信息
       const baseInfo = this.$refs.baseInfoRef.getData()
+      // 判断是否每一项都没填
       const param = { ...processInfoForm, ...baseInfo.formInline, ...approvalInfoForm, ...personnelObj }
       const flag = Object.values(param).some(v => !!v || v === 0)
       if (!flag) {
@@ -361,11 +362,12 @@ export default {
       if (this.model.infoJsonStr) {
         paramObj.draftId = this.model.id
       }
+      // 业务信息
+      paramObj.businessInfoDTO = baseInfo
+      // 人员信息
+      paramObj.userInfoMap = personnelObj
       // 业务基本信息和人员信息
-      paramObj.infoJsonStr = JSON.stringify({
+      paramObj.infoJsonStr = JSON.stringify(paramObj)
-        data: baseInfo.formInline,
-        personnelObj: personnelObj
-      })
       this.loading = true
       // 保存到草稿
       newRegulationImportSave(paramObj).then(res => {

src/views/workCenter/processCenter/table/DraftList.vue

@@ -142,93 +142,21 @@ export default {
       let path = ''
       // 跳转到对应流程页面
       switch (record.prcType + '') {
-        // 标准法规入库/变更流程
+        // 新法规导入流程
         case '1':
-          path = '/workCenter/StandardEntryOrChangeProcess'
+          path = '/workCenter/NewRegulationIntroductionProcess'
           break
-        // 标准征求意见流程
+        // 标准解读流程
         case '2':
-          path = '/workCenter/StandardConsultationProcess'
+          path = '/workCenter/StandardInterpretationProcess'
           break
-        // 项目合规评估流程
+        // 法规符合性排查流程
         case '3':
-          path = '/workCenter/ProjectComplianceEvaluationProcess'
+          path = '/workCenter/RegulatoryComplianceCheckProcess'
           break
-        // 未符合项跟踪流程
+        // 市场清单发布流程
         case '4':
-          path = '/workCenter/NoMatchTrackingProcess'
+          path = '/workCenter/MarketListReleaseProcess'
-          break
-        // 法规合规评估流程
-        case '5':
-          path = '/workCenter/StandardComplianceProcess'
-          break
-        // 法规采购流程
-        case '6':
-          path = '/workCenter/StandardProcurementProcess'
-          break
-        // 企标立项、变更计划
-        case '7':
-          path = '/workCenter/enterpriseStandardInitChange/planApprovalChangeFlow'
-          break
-        // 年度制修订计划（各部门主动上报）
-        case '8':
-          path = '/workCenter/annualRevisionPlanActivelyReport/revisionPlanActivelyReportFlow'
-          break
-        // 年度制修订计划（标准化发起）
-        case '9':
-          path = '/workCenter/annualRevisionPlanStandardizationInit/revisionPlanStandardizationInitFlow'
-          break
-        // 企标制修订流程
-        case '10':
-          path = '/workCenter/enterpriseStandardRevision/enterpriseStandardRevisionFlow'
-          break
-        // 企标更改流程
-        case '11':
-          path = '/workCenter/enterpriseStandardChange/enterpriseStandardChangeFlow'
-          break
-        // 企标复审流程
-        case '12':
-          path = '/workCenter/enterpriseStandardRecheck/enterpriseStandardRecheckFlow'
-          break
-        // 企标废止流程
-        case '13':
-          path = '/workCenter/enterpriseStandardAnnul/enterpriseStandardAnnulFlow'
-          break
-        // 企标封存流程
-        case '14':
-          path = '/workCenter/enterpriseStandardSealSave/enterpriseStandardSealSaveFlow'
-          break
-        // 已封存企标启用流程
-        case '15':
-          path = '/workCenter/enterpriseStandardStartUse/enterpriseStandardStartUseFlow'
-          break
-        // 企标稽查计划
-        case '16':
-          path = '/workCenter/EnterpriseStandardInspectionPlan'
-          break
-        // 企标稽查流程
-        case '17':
-          path = '/workCenter/EnterpriseStandardInspectionProcess'
-          break
-        // 稽查延期申请流程
-        case '18':
-          path = '/workCenter/InspectionExtensionRequestProcess'
-          break
-        // 企标稽查整改
-        case '19':
-          path = '/workCenter/EnterpriseStandardInspectionRectification'
-          break
-        // 权限申请流程
-        case '20':
-          path = '/workCenter/PermissionApplicationProcess'
-          break
-        // 标准宣贯流程
-        case '21':
-          path = '/workCenter/StandardPromotionProcess'
-          break
-        // 会后管理流程
-        case '22':
-          path = '/workCenter/PostMeetingManageProcess'
           break
       }
       const query = {}