From e87846bfc7e467836d958632b15a22a901eb51d2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 09 一月 2025 15:33:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/task/myProcess/send/index.vue | 111 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 82 insertions(+), 29 deletions(-)
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index 76f7c37..1fdc23e 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -10,21 +10,56 @@
<!--琛ㄥ崟淇℃伅-->
<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: 4px; right: 4px">
- <el-button type="danger" size="small" @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 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="info"
+ :closable="false"
+ >
+ </el-alert>
+ </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 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="info"
+ :closable="false"
+ >
+ </el-alert>
+ </div>
+ </div>
+ <div v-if="formDataList.length <= 1">
+ <el-alert
+ title="涓嶅瓨鍦ㄥ墠缃妭鐐�"
+ type="info"
+ :closable="false"
+ >
+ </el-alert>
+ </div>
</div>
-<!-- 褰撳墠鑺傜偣鍙崗鍚屻�佽浆鍔炵瓑鎿嶄綔 -->
- <div v-else 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 v-if="formDataObj.current" style="margin-bottom: 15px;color: #E6A23C">褰撳墠闃舵锛�<span style="color: #409EFF">{{formDataObj.beforeNodeName}}</span></div>
- <div v-else style="margin-bottom: 15px;color: #E6A23C">鍓嶇疆闃舵锛�<span style="color: #F56C6C">{{formDataObj.beforeNodeName}}</span></div>
- <v-form-render :form-data="formDataObj.formJson" :ref="'form' + index"/>
</div>
</el-col>
</el-tab-pane>
@@ -84,13 +119,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 +133,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 +142,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 +152,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 +163,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 +195,10 @@
props: {},
data() {
return {
+ roleKey: 'role',
+ deptKey: 'dept',
+ multUserKey: 0,
+ singleUserKey: 'single',
projectName: '',
flowName: '',
roleShow: false, // 瑙掕壊缁勬樉绀�
@@ -306,6 +345,7 @@
}
},
editDept() {
+ this.deptKey += '1'
this.$nextTick(() => {
this.$refs.dept.setCheckList(this.delegationDeptSelect)
})
@@ -313,6 +353,7 @@
},
editSingleUser() {
if (this.delegationUserSelect && this.delegationUserSelect.length > 0) {
+ this.singleUserKey += '1'
this.$nextTick(() => {
this.$refs.singleUser.setChecked(this.delegationUserSelect[0])
})
@@ -321,6 +362,7 @@
},
editRole() {
if (this.delegationRoleSelect && this.delegationRoleSelect.length > 0) {
+ this.roleKey += '1'
this.$nextTick(() => {
this.$refs.role.setChecked(this.delegationRoleSelect)
})
@@ -329,6 +371,7 @@
},
editMultUser() {
if (this.delegationForm.targetId) {
+ this.multUserKey += 1
this.$nextTick(() => {
this.$refs.multUser.setChecked(this.delegationUserSelect)
})
@@ -339,8 +382,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) {
@@ -351,6 +397,7 @@
this.delegationUserSelect = []
}
this.multUserShow = false
+ this.multUserKey += 1
},
getRoleSelect(roleList) {
if (roleList && roleList.length > 0) {
@@ -361,6 +408,7 @@
this.delegationRoleSelect = []
}
this.roleShow = false
+ this.roleKey += '1'
},
getSingleUserSelect(user) {
if (user) {
@@ -371,18 +419,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
@@ -415,14 +468,15 @@
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);
+ if (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
+ }
})
}
@@ -446,7 +500,6 @@
// })
// }
}).catch(res => {
- console.log("鎶ラ敊浜嗭細", res)
this.goBack();
})
},
--
Gitblit v1.8.0