From b16ae10a5c76b319a7034af4039cd8071db79802 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 12 二月 2025 15:08:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/projectProcess/components/RunProcess.vue | 14 ++++++++------ src/components/Process/panel/taskPanel.vue | 2 +- src/components/Process/panel/TaskConfPanel.vue | 16 +++++++++------- src/components/flow/Role/MyRole.vue | 1 - 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/components/Process/panel/TaskConfPanel.vue b/src/components/Process/panel/TaskConfPanel.vue index 9d93362..fc80fea 100644 --- a/src/components/Process/panel/TaskConfPanel.vue +++ b/src/components/Process/panel/TaskConfPanel.vue @@ -446,17 +446,18 @@ // 璁捐鍣ㄥ彸渚ц〃鍗曟暟鎹洖鏄� checkValuesEcho(formData) { if (formData.expId) { + console.log("456") this.getExpList(formData.expId); this.typeButDisable = true this.expButDisable = false } else { this.typeButDisable = false this.expSelect = null - if ("candidateGroups" === formData.userType || "candidateDeptGroups" === formData.userType) { - this.getRoleOrDeptReview(formData.candidateGroups) - } else { - this.getUserList(formData[formData.userType], formData.userType); - } + } + if ("candidateGroups" === formData.userType || "candidateDeptGroups" === formData.userType) { + this.getRoleOrDeptReview(formData.candidateGroups) + } else { + this.getUserList(formData[formData.userType], formData.userType); } }, @@ -492,8 +493,9 @@ this.typeButDisable = false // 鏍规嵁id绛涢�夊嚭鏄鑹茶繕鏄儴闂� const roleAndDeptIds = ids.split(","); - const deptIds = roleAndDeptIds.filter(item => item.includes("dept")); - const roleIds = roleAndDeptIds.filter(item => !item.includes("dept")); + console.log("woc", roleAndDeptIds) + const deptIds = roleAndDeptIds.filter(item => item.includes("dept") || item === '${data_launch}'); + const roleIds = roleAndDeptIds.filter(item => !item.includes("dept") && item !== '${data_launch}'); if (roleIds && roleIds.length > 0) { // 瑙掕壊 const targetRoleList = this.modelerStore.roleList?.filter(i => roleIds.includes(i.roleId.toString())) diff --git a/src/components/Process/panel/taskPanel.vue b/src/components/Process/panel/taskPanel.vue index 51fb63f..36d58f3 100644 --- a/src/components/Process/panel/taskPanel.vue +++ b/src/components/Process/panel/taskPanel.vue @@ -329,7 +329,7 @@ if (StrUtil.isNotBlank(val)) { // 鏍规嵁id绛涢�夊嚭鏄鑹茶繕鏄儴闂� const roleAndDeptIds = val.split(","); - const deptIds = roleAndDeptIds.filter(item => item.includes("dept")); + const deptIds = roleAndDeptIds.filter(item => item.includes("dept") || item === '${data_launch}'); const roleIds = roleAndDeptIds.filter(item => !item.includes("dept")); // 璋佹湁鍊煎氨鏄皝 if (roleIds && roleIds.length > 0) { diff --git a/src/components/flow/Role/MyRole.vue b/src/components/flow/Role/MyRole.vue index e5e9cd7..2615f81 100644 --- a/src/components/flow/Role/MyRole.vue +++ b/src/components/flow/Role/MyRole.vue @@ -106,7 +106,6 @@ watch: { }, mounted() { - console.log("鎴戝鍦ㄤ簡") this.getList(); }, methods: { diff --git a/src/views/projectProcess/components/RunProcess.vue b/src/views/projectProcess/components/RunProcess.vue index 0681311..0aba29b 100644 --- a/src/views/projectProcess/components/RunProcess.vue +++ b/src/views/projectProcess/components/RunProcess.vue @@ -99,8 +99,8 @@ /> </div> <span slot="footer" class="dialog-footer"> - <el-button type="danger" @click="startProcess" :disabled="(nowProcessInsId !== '') || (selectProcessDefId === '')">鍚姩娴佺▼</el-button> - <el-button type="primary" @click="changeProcess" :disabled="((nowProcessDefId === selectProcessDefId) && nowProcessInsId !== '') || selectProcessDefId === '' || nowProcessInsId === ''">娴佺▼鍙樻洿</el-button> + <el-button type="danger" v-loading="startLoading" @click="startProcess" :disabled="(nowProcessInsId !== '') || (selectProcessDefId === '')">鍚姩娴佺▼</el-button> + <el-button type="primary" v-loading="setLoading" @click="changeProcess" :disabled="((nowProcessDefId === selectProcessDefId) && nowProcessInsId !== '') || selectProcessDefId === '' || nowProcessInsId === ''">娴佺▼鍙樻洿</el-button> </span> </el-dialog> </div> @@ -122,10 +122,6 @@ required: true, // 椤圭洰id銆佸悕绉� type: Object }, - // processList: { // 娴佺▼鍒楄〃 - // required: true, - // type: Array - // }, nowProcessDefId: { // 褰撳墠椤圭洰缁戝畾鐨勫畾涔塱d required: true, type: String @@ -153,6 +149,8 @@ }, data() { return { + startLoading: false, + setLoading: false, processList: [], total:0, queryParams: { @@ -205,8 +203,10 @@ }, // 鍚姩娴佺▼ startProcess() { + this.startLoading = true startProcess(this.projectInfo.projectId, this.selectProcessDefId).then(res => { this.$message.success(res.msg); + this.startLoading = false this.handleClose() }) }, @@ -220,8 +220,10 @@ projectId: this.projectInfo.projectId, processDefId: this.selectProcessDefId } + this.setLoading = true projectSetProcess(data).then(res => { this.$message.success("鍙樻洿鎴愬姛") + this.setLoading = false this.handleClose() }) }, -- Gitblit v1.8.0