From c143be72329489ce0cb74e74bf3455ac405087e5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 10 一月 2025 17:16:20 +0800
Subject: [PATCH] 表单回显优化

---
 src/views/flowable/task/myProcess/send/index.vue |  118 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 82 insertions(+), 36 deletions(-)

diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index 7c23992..4dfb7be 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -1,30 +1,54 @@
 <template>
   <div class="app-container">
     <el-card class="box-card" >
-      <div slot="header" class="clearfix">
-        <span class="el-icon-document">{{`娴佺▼鍔炵悊锛歚 + processName}}</span>
+      <div slot="header" class="clearfix" style="display: flex">
+        <div style="flex: 1" class="el-icon-document">{{`浠诲姟鍔炵悊锛歚 + processName}}</div>
+        <div style="flex: 2">{{projectName + '鈥斺��' + flowName}}</div>
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">鍏抽棴</el-button>
       </div>
       <el-tabs  tab-position="top" v-model="activeName"  @tab-click="handleClick">
         <!--琛ㄥ崟淇℃伅-->
         <el-tab-pane label="琛ㄥ崟淇℃伅" name="1">
           <!--鍒濆鍖栨祦绋嬪姞杞借〃鍗曚俊鎭�-->
-          <el-col :span="16" :offset="4" v-if="formDataList && formDataList.length > 0">
-            <div v-for="(formDataObj, index) in formDataList" :key="index" class="form-warp" style="position: relative">
-              <div v-if="!formDataObj.current" style="position: absolute; top: 2px; right: 2px">
-                <el-button type="danger" @click="openRejectTask(formDataObj.beforeNodeDefId)">椹冲洖</el-button>
+          <el-col :span="16" :offset="4">
+            <div v-if="formDataList && formDataList.length > 0">
+              <div v-for="(formDataObj, index) in formDataList" :key="index" class="form-warp" style="position: relative">
+                <div v-if="formDataObj.current">
+                  <!--     褰撳墠鑺傜偣鍙崗鍚屻�佽浆鍔炵瓑鎿嶄綔         -->
+                  <div style="position: absolute; top: 4px; right: 4px; display: flex;justify-content: center; align-items: center;">
+                    <el-button size="small" type="primary" @click="submitForm">纭骞舵彁浜�</el-button>
+                    <el-button size="small" type="primary" disabled @click="submitForm">鍗忓悓鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>
+                    <el-button size="small" type="primary" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button>
+                  </div>
+                  <div style="margin-bottom: 15px;color: #E6A23C">褰撳墠闃舵锛�<span style="color: #409EFF">{{formDataObj.beforeNodeName}}</span></div>
+                </div>
+                <div v-else-if="formDataList.length > 1">
+                  <!--     鍓嶇疆鑺傜偣鍙┏鍥�         -->
+                  <div style="position: absolute; top: 4px; right: 4px">
+                    <el-button type="danger" size="small" @click="openRejectTask(formDataObj.beforeNodeDefId)">椹� 鍥�</el-button>
+                  </div>
+                  <div style="margin-bottom: 15px;color: #E6A23C">鍓嶇疆闃舵锛�<span style="color: #F56C6C">{{formDataObj.beforeNodeName}}</span></div>
+                </div>
+                <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
+                  <v-form-render  :form-data="formDataObj.formJson" :ref="'form' + index"/>
+                </div>
+                <div v-else>
+                  <el-alert
+                    title="鑺傜偣鏈粦瀹氳〃鍗�"
+                    type="warning"
+                    :closable="false"
+                  >
+                  </el-alert>
+                </div>
+                <div v-if="formDataList.length <= 1">
+                  <el-alert
+                    title="涓嶅瓨鍦ㄥ墠缃妭鐐�"
+                    type="warning"
+                    :closable="false"
+                  >
+                  </el-alert>
+                </div>
               </div>
-              <div v-if="formDataObj.current" style="margin-bottom: 15px;color: #409eff">褰撳墠闃舵锛�<span style="color: red">{{formDataObj.beforeNodeName}}</span></div>
-              <div v-else style="margin-bottom: 15px;color: #409eff">鍓嶇疆闃舵锛�<span style="color: #d5904b">{{formDataObj.beforeNodeName}}</span></div>
-              <v-form-render  :form-data="formDataObj.formJson" :ref="'form' + index"/>
-            </div>
-
-<!--            <v-form-render :form-data="formRenderData" ref="vFormRef"/>-->
-            <div style="display: flex;justify-content: center; align-items: center; margin: 20px 0">
-              <el-button type="primary" @click="submitForm">纭骞舵彁浜�</el-button>
-              <el-button type="primary" disabled @click="submitForm">鍗忓悓鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>
-              <el-button type="primary" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button>
-<!--              <el-button type="primary" @click="resetForm">閲� 缃�</el-button>-->
             </div>
           </el-col>
         </el-tab-pane>
@@ -84,13 +108,13 @@
           <el-form-item label="鐢ㄦ埛绫诲瀷" prop="peopleType">
             <el-select v-model="delegationForm.peopleType" @change="peopleTypeChange" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷">
               <el-option label="鎸囧畾浜哄憳" value="FIX_USER"></el-option>
-              <el-option label="鍊欓�夌敤鎴�" value="USER"></el-option>
+              <el-option label="鍊欓�変汉鍛�" value="USER"></el-option>
               <el-option label="鍊欓�夐儴闂�" value="DEPT"></el-option>
               <el-option label="鍊欓�夎鑹�" value="ROLE"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item v-if="delegationForm.peopleType === 'DEPT'" label="鍊欓�夐儴闂�" prop="targetId">
-            <MyDept ref="dept" :checkeds="delegationDeptSelect" :show="deptShow" @close="closeDept" @submit="getDeptSelect"/>
+            <MyDept ref="dept" :checkeds="delegationDeptSelect" :title="`閫夋嫨杞姙閮ㄩ棬`" :show="deptShow" @close="closeDept" @submit="getDeptSelect" :key="deptKey"/>
             <div style="display: flex;align-items: center">
               <div>
                 <el-tag v-for="dept in delegationDeptSelect" :key="dept.id + 'zxc'" type="info" closable @close="removeDept(dept)">{{dept.label}}</el-tag>
@@ -98,8 +122,8 @@
               <el-button style="margin-left: 8px" type="text" @click="editDept">閫夋嫨</el-button>
             </div>
           </el-form-item>
-          <el-form-item v-if="delegationForm.peopleType === 'FIX_USER'" label="鎸囧畾鐢ㄦ埛" prop="targetId">
-            <single-user ref="singleUser" :select-user="delegationForm.targetId" :show="singleUserShow" @close="closeSingleUser" @submit="getSingleUserSelect"/>
+          <el-form-item v-if="delegationForm.peopleType === 'FIX_USER'" label="鎸囧畾浜哄憳" prop="targetId">
+            <single-user ref="singleUser" :select-user="delegationForm.targetId" :title="`閫夋嫨杞姙鎺ユ敹浜哄憳(鍗曚汉)`" :show="singleUserShow" @close="closeSingleUser" @submit="getSingleUserSelect" :key="singleUserKey"/>
             <div style="display: flex;align-items: center">
               <div>
                 <el-tag v-for="user in delegationUserSelect" :key="user.userId + 'abc'" type="info" closable @close="removeSingleUser(user)">{{user.nickName}}</el-tag>
@@ -107,8 +131,8 @@
               <el-button style="margin-left: 8px" type="text" @click="editSingleUser">閫夋嫨</el-button>
             </div>
           </el-form-item>
-          <el-form-item v-if="delegationForm.peopleType === 'USER'" label="鍊欓�夌敤鎴�" prop="targetId">
-            <mult-user ref="multUser" :select-user="delegationUserSelect" :show="multUserShow" @close="closeMultUser" @submit="getMultUserSelect"/>
+          <el-form-item v-if="delegationForm.peopleType === 'USER'" label="鍊欓�変汉鍛�" prop="targetId">
+            <mult-user ref="multUser" :select-user="delegationUserSelect" :title="`閫夋嫨杞姙鎺ユ敹浜哄憳(鍙浜�)`" :show="multUserShow" @close="closeMultUser" @submit="getMultUserSelect" :key="multUserKey"/>
             <div style="display: flex;align-items: center">
               <div>
                 <el-tag v-for="user in delegationUserSelect" :key="user.userId + 'qwe'" type="info" closable @close="removeMultUser(user)">{{user.nickName}}</el-tag>
@@ -117,7 +141,7 @@
             </div>
           </el-form-item>
           <el-form-item v-if="delegationForm.peopleType === 'ROLE'" label="鍊欓�夎鑹�" prop="targetId">
-            <my-role ref="role" :select-values="delegationRoleSelect" :show="roleShow" @close="closeRole" @submit="getRoleSelect"/>
+            <my-role ref="role" :select-values="delegationRoleSelect" :title="`閫夋嫨杞姙瑙掕壊`" :show="roleShow" @close="closeRole" @submit="getRoleSelect" :key="roleKey"/>
             <div style="display: flex;align-items: center">
               <div>
                 <el-tag v-for="role in delegationRoleSelect" :key="role.roleId + 'rty'" type="info" closable @close="removeRole(role)">{{role.roleName}}</el-tag>
@@ -128,7 +152,7 @@
         </el-form>
       </div>
       <div class="opBut">
-        <el-button type="danger" size="small" @click="delegation">杞姙</el-button>
+        <el-button type="danger" size="small" @click="delegation">杞� 鍔�</el-button>
       </div>
     </el-dialog>
 
@@ -160,6 +184,12 @@
   props: {},
   data() {
     return {
+      roleKey: 'role',
+      deptKey: 'dept',
+      multUserKey: 0,
+      singleUserKey: 'single',
+      projectName: '',
+      flowName: '',
       roleShow: false, // 瑙掕壊缁勬樉绀�
       delegationRoleSelect: [], // 閫変腑瑙掕壊
       multUserShow: false, // 鐢ㄦ埛缁勬樉绀�
@@ -221,6 +251,8 @@
     this.processName = this.$route.query && this.$route.query.processName;
     this.deployId = this.$route.query && this.$route.query.deployId;
     this.taskId = this.$route.query && this.$route.query.taskId;
+    this.projectName = this.$route.query && this.$route.query.projectName;
+    this.flowName = this.$route.query && this.$route.query.flowName;
     // 鍒濆鍖栬〃鍗�
     this.procDefId  = this.$route.query && this.$route.query.procDefId;
     this.goBackParams  = this.$route.query && this.$route.query.goBackParams;
@@ -302,6 +334,7 @@
       }
     },
     editDept() {
+      this.deptKey += '1'
       this.$nextTick(() => {
         this.$refs.dept.setCheckList(this.delegationDeptSelect)
       })
@@ -309,6 +342,7 @@
     },
     editSingleUser() {
       if (this.delegationUserSelect && this.delegationUserSelect.length > 0) {
+        this.singleUserKey += '1'
         this.$nextTick(() => {
           this.$refs.singleUser.setChecked(this.delegationUserSelect[0])
         })
@@ -317,6 +351,7 @@
     },
     editRole() {
       if (this.delegationRoleSelect && this.delegationRoleSelect.length > 0) {
+        this.roleKey += '1'
         this.$nextTick(() => {
           this.$refs.role.setChecked(this.delegationRoleSelect)
         })
@@ -325,6 +360,7 @@
     },
     editMultUser() {
       if (this.delegationForm.targetId) {
+        this.multUserKey += 1
         this.$nextTick(() => {
           this.$refs.multUser.setChecked(this.delegationUserSelect)
         })
@@ -335,8 +371,11 @@
       if (deptList && deptList.length > 0) {
         this.delegationForm.targetId = deptList.map(item => item.id).join(",")
         this.delegationDeptSelect = deptList
+      } else {
+        this.delegationDeptSelect = []
       }
       this.deptShow = false
+      this.deptKey += 1
     },
     getMultUserSelect(userList) {
       if (userList && userList.length > 0) {
@@ -347,6 +386,7 @@
         this.delegationUserSelect = []
       }
       this.multUserShow = false
+      this.multUserKey += 1
     },
     getRoleSelect(roleList) {
       if (roleList && roleList.length > 0) {
@@ -357,6 +397,7 @@
         this.delegationRoleSelect = []
       }
       this.roleShow = false
+      this.roleKey += '1'
     },
     getSingleUserSelect(user) {
       if (user) {
@@ -367,18 +408,23 @@
         this.delegationUserSelect = []
       }
       this.singleUserShow = false
+      this.singleUserKey += '1'
     },
     closeDept() {
       this.deptShow = false
+      this.deptKey += '1'
     },
     closeSingleUser() {
       this.singleUserShow = false
+      this.singleUserKey += '1'
     },
     closeRole() {
       this.roleShow = false
+      this.roleKey += '1'
     },
     closeMultUser() {
       this.multUserShow = false
+      this.multUserKey += 1
     },
     openDelegation(taskName) {
       this.delegationForm.taskName = taskName
@@ -411,14 +457,16 @@
         if (this.formDataList && this.formDataList.length > 0) {
           this.$nextTick(() => {
             this.formDataList.forEach((formDataObj, index) => {
-              console.log("琛ㄥ崟鏁版嵁鍒楄〃", formDataObj.formJson)
               let that = this
-              console.log(eval("that.$refs.form" +index)[0])
-              eval("that.$refs.form" +index)[0].setFormJson(formDataObj.formJsonObj.formJson);
-
-              eval("that.$refs.form" +index)[0].setFormData(formDataObj.formJsonObj);
+              console.log(eval("that.$refs.form" +index))
+              if (eval("that.$refs.form" +index) && formDataObj.formJsonObj) {
+                eval("that.$refs.form" +index)[0].setFormJson(formDataObj.formJsonObj.formJson);
+                eval("that.$refs.form" +index)[0].setFormData(formDataObj.formJsonObj);
+              }
             })
-            this.formJson = this.formDataList[0].formJsonObj.formJson
+            if (this.formDataList[0].formJsonObj) {
+              this.formJson = this.formDataList[0].formJsonObj.formJson
+            }
           })
 
         }
@@ -442,7 +490,6 @@
         //   })
         // }
       }).catch(res => {
-        console.log("鎶ラ敊浜嗭細", res)
         this.goBack();
       })
     },
@@ -610,11 +657,10 @@
 }
 
 .form-warp {
+  min-width: 700px;
   padding: 20px;
+  margin-top: 5px;
   margin-bottom: 20px;
-  box-shadow:
-    inset 0 -3em 3em rgba(0, 0, 0, 0.1),
-    0 0 0 2px rgb(239, 239, 239),
-    0.3em 0.3em 1em rgba(0, 0, 0, 0.3);
+  box-shadow: rgba(67, 71, 85, 0.27) 0px 0px 0.25em, rgba(90, 125, 188, 0.05) 0px 0.25em 1em;
 }
 </style>

--
Gitblit v1.8.0