[update] 法规符合性排查-各部门接口人分发节点联调

src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue

@@ -184,7 +184,9 @@ import {
   regulatoryComplianceCheckAgree, regulatoryComplianceCheckApproval,
   regulatoryComplianceCheckGetDataById,
   regulatoryComplianceCheckReject,
-  regulatoryComplianceCheckSave, regulatoryComplianceCheckTurnTo
+  regulatoryComplianceCheckSave,
+  regulatoryComplianceCheckSubmit,
+  regulatoryComplianceCheckTurnTo
 } from '../../../api/workCenter'
 import pick from 'lodash.pick'
 import EngineerInitBaseInfo from './modules/EngineerInitBaseInfo'
@@ -406,7 +408,7 @@ export default {
               }
             }
             if (this.$refs.baseInfoRef) {
-              this.$refs.baseInfoRef.initData(this.draftModel.businessInfoDTO || this.model.businessInfoDTO)
+              this.$refs.baseInfoRef.initData(this.draftModel ? this.draftModel.businessInfoDTO : this.model.businessInfoDTO)
             }
           })
           // 初始化业务基本信息中组件内容
@@ -559,14 +561,33 @@ export default {
     // 提交
     handleSubmit () {
       if (this.loading) return
-      this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => {
+      this.approvalInfoForm.validateFields(async (err, values) => {
         const data = await this.$refs.baseInfoRef.getDataValidate()
-        if (!approvalErr && data) {
+        if (!err && data) {
-          const param = {} // 需要传给后端的数据
-          param.common = Object.assign({}, approvalValues)
-          param.common.taskId = this.$route.query.taskId
-          param.data = data
           this.loading = true
+          // 保存快照需要的JSON start
+          const jasonObj = {}
+          // 流程信息表单
+          const processInfoForm = this.processInfoForm.getFieldsValue()
+          // 流程审批信息
+          const approvalInfoForm = this.approvalInfoForm.getFieldsValue()
+          // 业务基本信息
+          const baseInfo = data
+          // 流程信息
+          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
+          // 流程业务信息
+          param.businessInfoDTO = data
+          // 草稿JSON
+          param.infoJsonStr = JSON.stringify(jasonObj)
           regulatoryComplianceCheckSubmit(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)
@@ -591,9 +612,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.common = Object.assign({}, values)
+          param.basicTaskInfoDTO = Object.assign({}, values)
-          param.common.taskId = this.$route.query.taskId
+          param.basicTaskInfoDTO.taskId = this.$route.query.taskId
+          // 草稿JSON
+          param.infoJsonStr = JSON.stringify(jasonObj)
           regulatoryComplianceCheckAgree(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)

src/views/workCenter/regulatoryComplianceCheckProcess/modules/InterfacePersonDeliveryBaseInfo.vue

@@ -21,7 +21,7 @@
                               filedName="mainCheckUser"
                               @nameChange="userSelectNameChange"
                               :nameStr="formInline.mainCheckUser_dictText"
-                              type="checkbox"/>
+                              type="radio"/>
             </a-form-model-item>
           </div>
         </div>