[update] 市场清单发布流程

src/api/workCenter.js

@@ -21,16 +21,12 @@ const deleteFlowNode = (params) => postAction('/activitiModel/deleteTask', param
 const newRegulationImportSave = (params) => postAction('/process/newStandardImport/save', params)
 // 发起
 const newRegulationImportApproval = (params) => postAction('/process/newStandardImport/start', params)
-// 转办
-const newRegulationImportTurnTo = (params) => postAction('/process/newStandardImport/transfer', params)
 // 同意
 const newRegulationImportAgree = (params) => postAction('/process/newStandardImport/agree', params)
 // 驳回
 const newRegulationImportReject = (params) => postAction('/process/newStandardImport/reject', params)
 // 根据id查询流程数据--办理
 const newRegulationImportGetDataById = (taskId, params) => getAction(`/process/newStandardImport/handle/${taskId}`, params)
-// 草稿的办理回显数据
-const newRegulationImportGetDataDraft = (params) => getAction('/process/newStandardImport/draftHandle', params)
 
 // 法规符合性排查流程
 // 保存
@@ -54,19 +50,15 @@ const regulatoryComplianceCheckGenerate = (params) => postAction('/process/stand
 
 // 市场清单发布流程
 // 保存
-const marketListReleaseSave = (params) => postAction('/process/es/archive/save', params)
+const marketListReleaseSave = (params) => postAction('/process/otherDrafterUploadFileJson/save', params)
 // 发起
-const marketListReleaseApproval = (params) => postAction('/process/es/archive/start', params)
+const marketListReleaseApproval = (params) => postAction('/process/otherDrafterUploadFileJson/start', params)
-// 转办
-const marketListReleaseTurnTo = (params) => postAction('/process/es/archive/transfer', params)
 // 同意
-const marketListReleaseAgree = (params) => postAction('/process/es/archive/agree', params)
+const marketListReleaseAgree = (params) => postAction('/process/otherDrafterUploadFileJson/agree', params)
 // 驳回
-const marketListReleaseReject = (params) => postAction('/process/es/archive/reject', params)
+const marketListReleaseReject = (params) => postAction('/process/otherDrafterUploadFileJson/reject', params)
 // 根据id查询流程数据--办理
-const marketListReleaseGetDataById = (taskId, params) => getAction(`/process/es/archive/handle/${taskId}`, params)
+const marketListReleaseGetDataById = (taskId, params) => getAction(`/process/otherDrafterUploadFileJson/handle/${taskId}`, params)
-// 草稿的办理回显数据
-const marketListReleaseGetDataDraft = (params) => getAction('/process/es/archive/draftHandle', params)
 
 // 标准解读流程
 // 获取项目id
@@ -122,11 +114,9 @@ export {
 
   newRegulationImportSave,
   newRegulationImportApproval,
-  newRegulationImportTurnTo,
   newRegulationImportAgree,
   newRegulationImportReject,
   newRegulationImportGetDataById,
-  newRegulationImportGetDataDraft,
 
   regulatoryComplianceCheckSave,
   regulatoryComplianceCheckApproval,
@@ -140,11 +130,9 @@ export {
 
   marketListReleaseSave,
   marketListReleaseApproval,
-  marketListReleaseTurnTo,
   marketListReleaseAgree,
   marketListReleaseReject,
   marketListReleaseGetDataById,
-  marketListReleaseGetDataDraft,
 
   interpretGetProjectId,
   interpretGetFileByStandardId,

src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue

@@ -339,27 +339,35 @@ export default {
           this.$nextTick(() => {
             if (type === 'todo') {
               // 初始化流程信息
-              const processInfo = Object.assign({}, this.model.basicProcessInfoDTO)
+              if (this.currentNode === 1) {
-              // 清单编号
+                this.processInfoForm.setFieldsValue(pick(this.model.basicProcessInfoDTO, 'processName', 'processDueDate', 'processDescription'))
-              processInfo.manifestNo = this.model.businessInfoDTO.manifestNo
+              } else {
-              // 清单名称
+                const processInfo = Object.assign({}, this.model.basicProcessInfoDTO)
-              processInfo.manifestName = this.model.businessInfoDTO.manifestName
+                // 清单编号
-              // 国家/地区
+                processInfo.manifestNo = this.model.businessInfoDTO.manifestNo
-              processInfo.country = this.model.businessInfoDTO.country
+                // 清单名称
-              this.processInfoForm.setFieldsValue(pick(processInfo, 'processName', 'processDueDate', 'processDescription', 'manifestNo', 'manifestName', 'country'))
+                processInfo.manifestName = this.model.businessInfoDTO.manifestName
+                // 国家/地区
+                processInfo.country = this.model.businessInfoDTO.country
+                this.processInfoForm.setFieldsValue(pick(processInfo, 'processName', 'processDueDate', 'processDescription', 'manifestNo', 'manifestName', 'country'))
+              }
             }
             // 有草稿json按草稿进来的回显
             if (this.model.infoJsonStr) {
               this.draftModel = JSON.parse(this.model.infoJsonStr)
               // 初始化流程信息
-              const processInfo = Object.assign({}, this.draftModel.basicProcessInfoDTO)
+              if (this.currentNode === 1) {
-              // 清单编号
+                this.processInfoForm.setFieldsValue(pick(this.draftModel.basicProcessInfoDTO, 'processName', 'processDueDate', 'processDescription'))
-              processInfo.manifestNo = this.draftModel.businessInfoDTO.manifestNo
+              } else {
-              // 清单名称
+                const processInfo = Object.assign({}, this.draftModel.basicProcessInfoDTO)
-              processInfo.manifestName = this.draftModel.businessInfoDTO.manifestName
+                // 清单编号
-              // 国家/地区
+                processInfo.manifestNo = this.draftModel.businessInfoDTO.manifestNo
-              processInfo.country = this.draftModel.businessInfoDTO.country
+                // 清单名称
-              this.processInfoForm.setFieldsValue(pick(processInfo, 'processName', 'processDueDate', 'processDescription', 'manifestNo', 'manifestName', 'country'))
+                processInfo.manifestName = this.draftModel.businessInfoDTO.manifestName
+                // 国家/地区
+                processInfo.country = this.draftModel.businessInfoDTO.country
+                this.processInfoForm.setFieldsValue(pick(processInfo, 'processName', 'processDueDate', 'processDescription', 'manifestNo', 'manifestName', 'country'))
+              }
               // 初始化流程审批信息
               this.approvalInfoForm.setFieldsValue(pick(this.draftModel.basicTaskInfoDTO, 'handleText', 'handleFile'))
               // 如果是节点1的保存回显人员信息
@@ -540,9 +548,26 @@ export default {
       this.approvalInfoForm.validateFields((err, values) => {
         if (!err) {
           this.loading = true
+          // 保存快照需要的JSON start
+          const jasonObj = {}
+          // 流程信息表单
+          const processInfoForm = this.processInfoForm.getFieldsValue()
+          // 流程审批信息
+          const approvalInfoForm = this.approvalInfoForm.getFieldsValue()
+          // 业务基本信息
+          const baseInfo = this.$refs.baseInfoRef.getData()
+          // 流程信息
+          jasonObj.basicProcessInfoDTO = Object.assign({}, processInfoForm)
+          // 流程审批信息
+          jasonObj.basicTaskInfoDTO = Object.assign({}, approvalInfoForm)
+          // 业务信息
+          jasonObj.businessInfoDTO = baseInfo
+          // 保存快照需要的JSON end
           const param = {}
           param.basicTaskInfoDTO = Object.assign({}, values)
           param.basicTaskInfoDTO.taskId = this.$route.query.taskId
+          // 草稿JSON
+          param.infoJsonStr = JSON.stringify(jasonObj)
           marketListReleaseAgree(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)