[update] 修改企标流程保存的数据格式

src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue

@@ -274,8 +274,8 @@
               :label="$t('esInitChange.newPrincipalDrafter')"
               v-model="baseInfoForm[0].newMainDraftingUser"
               :readonly="!newMainDrafterCanUpdate && !onlyNewMainDrafterCanUpdate"
-              filedName="newMainDraftingUser"
+              fieldName="newMainDraftingUser"
-              @nameChange="selectUserNameChange"
+              @selectNameChange="selectUserNameChange"
               :checkedNames="baseInfoForm[0].newMainDraftingUser_dictText"
               type="radio"
             />
@@ -291,8 +291,8 @@
               :label="$t('esInitChange.newHeadOfMainDraftingUnit')"
               v-model="baseInfoForm[0].newMainDraftingUnitResponsiblePerson"
               :readonly="!newMainDrafterCanUpdate"
-              filedName="newMainDraftingUnitResponsiblePerson"
+              fieldName="newMainDraftingUnitResponsiblePerson"
-              @nameChange="selectUserNameChange"
+              @selectNameChange="selectUserNameChange"
               :checkedNames="baseInfoForm[0].newMainDraftingUnitResponsiblePerson_dictText"
               type="radio"
             />
@@ -680,8 +680,8 @@
           :rules="userRules.newMainDraftUserLeader"
           :label="$t('esInitChange.superintendent')"
           v-model="userForm.newMainDraftUserLeader"
-          filedName="newMainDraftUserLeader"
+          fieldName="newMainDraftUserLeader"
-          @nameChange="userFormUserNameChange"
+          @selectNameChange="userFormUserNameChange"
           :checkedNames="userForm.newMainDraftUserLeader_dictText"
           type="radio"
         />
@@ -692,8 +692,8 @@
           :rules="userRules.relatedUserList"
           :label="$t('esInitChange.relatedPersonnel')"
           v-model="userForm.relatedUserList"
-          filedName="relatedUserList"
+          fieldName="relatedUserList"
-          @nameChange="userFormUserNameChange"
+          @selectNameChange="userFormUserNameChange"
           :checkedNames="userForm.relatedUserList_dictText"
           type="checkbox"
         />
@@ -747,15 +747,6 @@
             {{ $t('submit') }}
           </van-button>
         </template>
-        <template v-else-if="currentNode === 10">
-          <!--   确定   -->
-          <van-button class="operation-common-btn" type="primary" @click="handleDetermine">
-            <template #icon>
-              <van-icon class="iconfont" class-prefix="icon" name="check" />
-            </template>
-            {{ $t('determine') }}
-          </van-button>
-        </template>
         <template v-else>
           <!--   同意  -->
           <van-button class="operation-common-btn" type="primary" @click="handleAgree">
@@ -773,6 +764,15 @@
           </van-button>
         </template>
       </template>
+      <template v-else>
+        <!--   确定   -->
+        <van-button class="operation-common-btn only-one-btn" type="primary" @click="handleDetermine">
+          <template #icon>
+            <van-icon class="iconfont" class-prefix="icon" name="check" />
+          </template>
+          {{ $t('determine') }}
+        </van-button>
+      </template>
     </template>
     <select-user ref="selectUserRef" @selected-change="selectUserChange"></select-user>
   </process-common-layout>
@@ -817,7 +817,7 @@ export default {
       ProcessKey,
       ApplicationCategory,
       ProjectType,
-      readonly: true,
+      readonly: false,
       loading: false,
       // 申请类型
       applicationCategoryData: [
@@ -1134,6 +1134,7 @@ export default {
       this.baseInfoForm[0][fieldName + '_dictText'] = value
     },
     userFormUserNameChange (value, fieldName) {
+      console.log(value, fieldName)
       this.userForm[fieldName + '_dictText'] = value
     },
     // 转办
@@ -1162,16 +1163,40 @@ export default {
     // 保存
     handleSave () {
       if (this.loading) return
-      const param = {}
+      const flowUser = this.$refs.processCommonLayout.getDataObj()
-      param.common = Object.assign({}, this.processInfoForm)
+      const paramObj = {}
-      param.common.taskId = this.$route.query.taskId || null
+      // 流程信息
-      param.flowUser = this.$refs.processCommonLayout.getDataObj()
+      paramObj.basicProcessInfoDTO = Object.assign({}, this.processInfoForm)
-      param.dataList = Array.from(this.baseInfoForm)
+      paramObj.basicProcessInfoDTO.processName = paramObj.basicProcessInfoDTO.prcName
-      console.log(param)
+      paramObj.basicProcessInfoDTO.processDueDate = paramObj.basicProcessInfoDTO.dueTime
-      param.dataList[0] = { ...param.dataList[0], ...this.userForm }
+      paramObj.basicProcessInfoDTO.processDescription = paramObj.basicProcessInfoDTO.prcMes
+      paramObj.basicProcessInfoDTO.processInstanceId = this.$route.query.processInstanceId
+      // 流程审批信息
+      paramObj.basicTaskInfoDTO = {}
+      paramObj.basicTaskInfoDTO.handleText = paramObj.basicProcessInfoDTO.commitText
+      paramObj.basicTaskInfoDTO.handleFile = paramObj.basicProcessInfoDTO.commitFile
+      paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
+      // 业务基本信息和人员信息
+      console.log({
+        arr: this.baseInfoForm.map(item => {
+          return { ...item, ...this.userForm }
+        }),
+        personnelObj: flowUser
+      })
+      paramObj.infoJsonStr = JSON.stringify({
+        arr: this.baseInfoForm.map(item => {
+          return { ...item, ...this.userForm }
+        }),
+        personnelObj: flowUser
+      })
+      // param.common = Object.assign({}, this.processInfoForm)
+      // param.common.taskId = this.$route.query.taskId || null
+      // param.dataList = Array.from(this.baseInfoForm)
+      // console.log(param)
+      // param.dataList[0] = { ...param.dataList[0], ...this.userForm }
       this.loading = true
       // 保存到草稿
-      enterprisePlanApprovalSave(param).then(res => {
+      enterprisePlanApprovalSave(paramObj).then(res => {
         if (res.success) {
           this.$message.success(res.message)
           this.goBack()
@@ -1311,4 +1336,9 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+.only-one-btn {
+  flex: 1;
+  margin-left: 0.2rem !important;
+  margin-right: 0.2rem !important;
+}
 </style>

src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue

@@ -1,5 +1,5 @@
 <template>
-  <process-common-layout class="page-box" :processKey="ProcessKey.ES_RECHECK.value" :loading="loading">
+  <process-common-layout ref="processCommonLayout" class="page-box" :processKey="ProcessKey.ES_RECHECK.value" :loading="loading">
     <template v-slot:process>
       <!--  流程信息  -->
       <div class="process-part">
@@ -108,7 +108,7 @@
           <picker-field
             :rules="baseInfoRule.recheckAdvice"
             :label="$t('esRecheck.recheck')"
-            :placeholder="$t('pleaseEnter') + $t('esRecheck.recheck')"
+            :placeholder="$t('pleaseSelect') + $t('esRecheck.recheck')"
             :readonly="recheckAdviceReadonly"
             :columnData="recheckColumnData"
             v-model="baseInfoForm.recheckAdvice" />
@@ -267,6 +267,10 @@ export default {
           const result = res.result
           this.processInfoForm = result.common
           this.baseInfoForm = result.data
+          if (this.$route.query.processInstanceId && !Number(this.baseInfoForm.showFirstNode)) {
+            // 不显示第一个节点人员信息
+            this.$refs.processCommonLayout.personnelInfoData.shift()
+          }
         } else {
           this.$message(res.message)
         }
@@ -300,13 +304,28 @@ export default {
     // 保存
     handleSave () {
       if (this.loading) return
-      const param = {}
+      const paramObj = {}
-      param.common = Object.assign({}, this.processInfoForm)
+      // 流程信息
-      param.common.taskId = this.$route.query.taskId || null
+      paramObj.basicProcessInfoDTO = Object.assign({}, this.processInfoForm)
-      param.data = this.baseInfoForm
+      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 = {}
+      paramObj.basicTaskInfoDTO.handleText = paramObj.basicProcessInfoDTO.commitText
+      paramObj.basicTaskInfoDTO.handleFile = paramObj.basicProcessInfoDTO.commitFile
+      paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
+      // 业务基本信息和人员信息
+      paramObj.infoJsonStr = JSON.stringify({
+        baseInfo: this.baseInfoForm
+      })
+      // param.common = Object.assign({}, this.processInfoForm)
+      // param.common.taskId = this.$route.query.taskId || null
+      // param.data = this.baseInfoForm
       this.loading = true
       // 保存到草稿
-      enStandardRecheckSave(param).then(res => {
+      enStandardRecheckSave(paramObj).then(res => {
         if (res.success) {
           this.$message.success(res.message)
           this.goBack()