From 0c12db10d9dcfd4087972758cf95f006e225e5ca Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 24 Nov 2023 10:10:53 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E9=80=89=E4=BA=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6bug=EF=BC=8Cbug78606=EF=BC=8C=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E7=AB=8B=E9=A1=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workCenter.js | 3 - src/components/dict/JMultiSelectTag.vue | 2 +- src/components/selection/UserSelectModal.vue | 2 +- .../modules/ApprovalBaseInfo.vue | 2 +- .../processCenter/table/TodoList.vue | 77 +++++++++++++++++-- 5 files changed, 75 insertions(+), 11 deletions(-) diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 34bb6386..dfbf5f09 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -155,8 +155,6 @@ const enStandardStartUseGetDataById = (taskId, params) => getAction(`/process/es const enStandardStartUseGetDataDraft = (params) => getAction('/process/es/enable/draftHandle', params) // 流程中心 -// 待办-转办 -const toDoTurnTo = (params) => postAction('', params) // 已发-强制撤回 const compulsoryWithdrawal = (params) => postAction('', params) @@ -311,7 +309,6 @@ export { enStandardStartUseReject, enStandardStartUseGetDataDraft, - toDoTurnTo, compulsoryWithdrawal, initiateStandardECProcess, diff --git a/src/components/dict/JMultiSelectTag.vue b/src/components/dict/JMultiSelectTag.vue index bb0517ae..6f0570aa 100644 --- a/src/components/dict/JMultiSelectTag.vue +++ b/src/components/dict/JMultiSelectTag.vue @@ -110,7 +110,7 @@ export default { }, // update--begin--autor:lvdandan-----date:20201120------for：LOWCOD-1086 下拉多选框,搜索时只字典code进行搜索不能通过字典text搜索 filterOption (input, option) { - return option.componentOptions.children[0].children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 } // update--end--autor:lvdandan-----date:20201120------for：LOWCOD-1086 下拉多选框,搜索时只字典code进行搜索不能通过字典text搜索 }, diff --git a/src/components/selection/UserSelectModal.vue b/src/components/selection/UserSelectModal.vue index 3e2d3817..c4347e73 100644 --- a/src/components/selection/UserSelectModal.vue +++ b/src/components/selection/UserSelectModal.vue @@ -188,10 +188,10 @@ export default { methods: { open (value) { this.visible = true + this.loadData() if (value) { this.selectedRowKeys = value.split(',') this.getUserListByIds(value) - this.loadData() } }, // 获取组织机构树 diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue index 383ab830..0499d646 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue @@ -368,7 +368,7 @@ v-model="formInline.componentName" @nameChange="treeSelectNameChange" filedName="componentName" - type="radio" + type="checkbox" :nameStr="formInline.componentName_dictText" dict-id="1696007957666533377" :disabled="disabled" /> diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue index 397b2f14..09706b5a 100644 --- a/src/views/workCenter/processCenter/table/TodoList.vue +++ b/src/views/workCenter/processCenter/table/TodoList.vue @@ -69,7 +69,19 @@ import JTable from '@/components/jero/JTable' import { JeroListMixin } from '@/mixins/JeroListMixin' import UserSelectModal from '@/components/selection/UserSelectModal' -import { toDoTurnTo } from '@/api/workCenter' +import { + activelyReportTurnTo, + enStandardAnnulTurnTo, + enStandardChangeTurnTo, + enStandardEditTurnTo, + enStandardRecheckTurnTo, + enStandardSealSaveTurnTo, enStandardStartUseTurnTo, + enterprisePlanApprovalTurnTo, + standardizationInitTurnTo, + transferConsultationProcess, transferInspectPlan, + transferProcurementProcess, + turnToStandardECProcess +} from '../../../../api/workCenter' export default { name: 'TodoList', @@ -212,10 +224,65 @@ export default { // 转办选完人的回调 userSelectChange (value) { if (value) { - const params = {} - params.processId = this.currentTurnTo.id - params.person = value - toDoTurnTo(params).then(res => { + let func + switch (this.currentTurnTo.prcType + '') { + // 标准法规入库/变更流程 + case '1': + func = turnToStandardECProcess + break + // 标准征求意见流程 + case '2': + func = transferConsultationProcess + break + // 法规采购流程 + case '6': + func = transferProcurementProcess + break + // 企标立项、变更计划 + case '7': + func = enterprisePlanApprovalTurnTo + break + // 年度制修订计划（各部门主动上报） + case '8': + func = activelyReportTurnTo + break + // 年度制修订计划（标准化发起） + case '9': + func = standardizationInitTurnTo + break + // 企标制修订流程 + case '10': + func = enStandardEditTurnTo + break + // 企标更改流程 + case '11': + func = enStandardChangeTurnTo + break + // 企标复审流程 + case '12': + func = enStandardRecheckTurnTo + break + // 企标废止流程 + case '13': + func = enStandardAnnulTurnTo + break + // 企标封存流程 + case '14': + func = enStandardSealSaveTurnTo + break + // 已封存企标启用流程 + case '15': + func = enStandardStartUseTurnTo + break + // 企标稽查计划 + case '16': + func = transferInspectPlan + break + } + const param = {} + param.userId = value + param.taskId = this.$route.query.taskId + func(param).then(res => { if (res.success) { this.$message.success(res.message) this.loadData()