[update] 年度制修订标准化发起流程保存联调

src/api/workCenter.js

@@ -60,7 +60,7 @@ const standardizationInitReject = (params) => postAction('/process/es/annualInit
 // 根据流程id获取流程信息
 const standardizationInitGetDataById = (taskId, params) => getAction(`/process/es/annualInit/handle/${taskId}`, params)
 // 草稿的办理回显数据
-const standardizationInitGetDataDraft = (params) => getAction('', params)
+const standardizationInitGetDataDraft = (params) => getAction('/process/es/annualInit/draftHandle', params)
 // 批量驳回
 const standardizationInitBatchReject = (params) => postAction('/process/es/annualInit/batchReject', params)
 

src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue

@@ -317,7 +317,16 @@ export default {
             this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
             // 初始化流程审批信息，草稿进来的才回显审批信息
             if (type === 'draft') {
-              this.approvalInfoForm.setFieldsValue(pick(this.model.common, 'commitText', 'commitFile'))
+              // 初始化流程信息
+              const prcObj = Object.assign({}, this.model)
+              prcObj.dueTime = this.model.processDueDate
+              prcObj.prcMes = this.model.processDescription
+              this.processInfoForm.setFieldsValue(pick(prcObj, 'prcName', 'dueTime', 'prcMes'))
+              // 初始化流程审批信息
+              prcObj.commitText = this.model.handleText
+              prcObj.commitFile = this.model.handleFile
+              this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
+              this.model.dataList = JSON.parse(this.model.infoJsonStr)
             }
             // 初始化业务基本信息
             this.$refs.baseInfoRef.initData(this.model.dataList)
@@ -340,13 +349,24 @@ export default {
       // 流程审批信息
       const approvalInfoForm = this.approvalInfoForm.getFieldsValue()
       // 人员信息的数据, 处理成对象
-      const personnelObj = this.$refs.personnelInfogetDataObj()
+      const personnelObj = this.$refs.personnelInfo.getDataObj()
       // 需要传给后端的
-      const param = {}
-      param.common = { ...processInfoForm, ...approvalInfoForm }
-      param.flowUser = personnelObj
+      const paramObj = {}
+      // 流程信息
+      paramObj.basicProcessInfoDTO = Object.assign({}, processInfoForm)
+      paramObj.basicProcessInfoDTO.processName = paramObj.basicProcessInfoDTO.prcName
+      paramObj.basicProcessInfoDTO.processDueDate = paramObj.basicProcessInfoDTO.dueTime
+      paramObj.basicProcessInfoDTO.processDescription = paramObj.basicProcessInfoDTO.prcMes
+      paramObj.basicProcessInfoDTO.processInstanceId = this.$route.query.processInstanceId
+      // 流程审批信息
+      paramObj.basicTaskInfoDTO = Object.assign({}, approvalInfoForm)
+      paramObj.basicTaskInfoDTO.handleText = paramObj.basicTaskInfoDTO.commitText
+      paramObj.basicTaskInfoDTO.handleFile = paramObj.basicTaskInfoDTO.commitFile
+      paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
+      // param.common = { ...processInfoForm, ...approvalInfoForm }
+      // param.flowUser = personnelObj
       // 业务基本信息
-      if (this.$refs.basicInfoFormRef) {
+      if (this.$refs.baseInfoRef) {
         const ruleForm = this.$refs.baseInfoRef.getData()
         const form = { ...processInfoForm, ...approvalInfoForm, ...personnelObj }
         const flag = Object.values(form).some(v => !!v || v === 0)
@@ -356,7 +376,7 @@ export default {
           return
         }
         // 该流程中业务基本信息只有表格
-        param.dataList = ruleForm.dataSource
+        paramObj.infoJsonStr = JSON.stringify(ruleForm.dataSource)
       } else {
         // 需要外层信息至少填了一项
         const form = { ...processInfoForm, ...approvalInfoForm, ...personnelObj }
@@ -369,7 +389,7 @@ export default {
       }
       this.loading = true
       // 保存到草稿
-      standardizationInitSave(param).then(res => {
+      standardizationInitSave(paramObj).then(res => {
         if (res.success) {
           this.$message.success(res.message)
           this.goBack()

src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue

@@ -949,13 +949,8 @@ export default {
             // 翻译项目类别
             formInline.projectType_dictText = formInline.projectType === ProjectType.ENACT.value ? ProjectType.ENACT.text : ProjectType.MODIFY.text
             // 设置变更状态
-            if (formInline.projectType === ProjectType.ENACT.value) {
-              // 是制定，变更状态是新增
-              formInline.changeStatus_dictText = '新增'
-            } else {
-              // 是修订，变更状态是变更
-              formInline.changeStatus_dictText = '变更'
-            }
+            formInline.changeStatus = 1
+            formInline.changeStatus_dictText = '新增'
           }
           // 翻译企业标准代号
           if (formInline.enStandardCode) {

src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue

@@ -299,9 +299,7 @@ export default {
     getData () {
       // 把数据抛出
       const data = {}
-      data.dataSource = this.dataSource.map(item => {
-        return { ...item, enStandardSystem: item.enStandardSystem ? item.enStandardSystem.join(',') : ''}
-      })
+      data.dataSource = this.dataSource
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验