From 3bdd48b83ef94a931b636d3ba54b9550632589f9 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 1 Jul 2024 18:26:11 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E8=8A=82=E7=82=B9=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E4=BB=8E=E6=B5=81=E7=A8=8B=E4=B8=8E=E6=A0=87=E5=87=86=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E9=87=8C=E9=80=89=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PersonnelInfo.vue | 9 ++++ src/components/selection/UserSelectModal.vue | 43 ++++++++++++++++++- .../EnterpriseStandardAnnulFlow.vue | 5 ++- .../EnterpriseStandardChangeFlow.vue | 5 ++- .../PlanApprovalChangeFlow.vue | 5 ++- .../EnterpriseStandardRecheckFlow.vue | 5 ++- .../EnterpriseStandardRevisionFlow.vue | 5 ++- .../MainDrafterUploadMinuteBaseInfo.vue | 1 + .../EnterpriseStandardSealSaveFlow.vue | 5 ++- .../EnterpriseStandardStartUseFlow.vue | 5 ++- .../PermissionApplicationProcess.vue | 12 +++--- 11 files changed, 80 insertions(+), 20 deletions(-) diff --git a/src/components/PersonnelInfo.vue b/src/components/PersonnelInfo.vue index 8561ab1c..849d88b1 100644 --- a/src/components/PersonnelInfo.vue +++ b/src/components/PersonnelInfo.vue @@ -45,6 +45,7 @@ input-type="textarea" /> { return [] } + }, + // 只能在标准与流程所里选人的节点 + onlySelectFromFlowStation: { + type: Array, + required: false, + default: () => { + return [] + } } }, data () { diff --git a/src/components/selection/UserSelectModal.vue b/src/components/selection/UserSelectModal.vue index aadb959a..1a953cf1 100644 --- a/src/components/selection/UserSelectModal.vue +++ b/src/components/selection/UserSelectModal.vue @@ -22,6 +22,7 @@ :getPopupContainer="triggerNode=> triggerNode.parentNode" style="width: 100%" :tree-data="categoryTreeList" + :disabled="isOnlySelectFromOneDept" :placeholder="$t('pleaseSelect')" /> @@ -110,6 +111,19 @@ export default { type: Boolean, required: false, default: true + }, + // 固定只能从某个部门选人，与isOnlySelectFromSomeDept一起用 + fixDepart: { + type: String, + required: false, + // 默认标准与流程所 + default: '流程与标准化' + }, + // 是否固定只能从某个部门选人 + isOnlySelectFromOneDept: { + type: Boolean, + required: false, + default: false } }, watch: { @@ -229,7 +243,8 @@ export default { isClickedSearch: false, // 改完搜索条件是否点击过搜索 oldQueryParam: {}, // 上一次的搜索条件，用于从一个搜索条件改成另一个搜索条件，但是没有点搜索，这时候全选时传旧的搜索条件 oldTotal: 0, - currentQueryAllData: [] // 当前查询条件下的所有数据 + currentQueryAllData: [], // 当前查询条件下的所有数据 + fixDepartId: '' } }, methods: { @@ -248,11 +263,33 @@ export default { queryDepartTreeList().then((res) => { if (res.success) { this.categoryTreeList = res.result + // 固定只能从某个部门选人，查找该部门id + if (this.isOnlySelectFromOneDept) { + const targetNode = this.findNodeInTreeList(this.categoryTreeList, this.fixDepart) + this.fixDepartId = targetNode.id + this.queryParam.departId = targetNode.id + } } else { this.categoryTreeList = [] } }) }, + findNodeInTreeList (treeData, name) { + let node = {} + for (const item of treeData) { + if (item.departName === name) { + node = item + break + } + if (item.children && item.children.length > 0) { + node = this.findNodeInTreeList(item.children, name) + if (node && node.id) { + break + } + } + } + return node && node.id ? node : {} + }, // 初始化角色字典 initRoleList () { queryall().then((res) => { @@ -325,6 +362,9 @@ export default { }, searchReset () { this.queryParam = {} + if (this.isOnlySelectFromOneDept) { + this.queryParam.departId = this.fixDepartId + } this.loadData(1) }, searchQuery () { @@ -453,6 +493,7 @@ export default { showSizeChanger: true, total: 0 } + this.dataSource = [] } } } diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue index 45bda42d..0eb8bccd 100644 --- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue +++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue @@ -77,7 +77,7 @@
- +
@@ -237,7 +237,8 @@ export default { personnelInfoData: [], url: { list: '' // 人员信息的右侧表格获取接口 - } + }, + onlySelectFromFlowStation: [EsAnnulNodes.standardizationApproval.value] // 只能在标准与流程所里选人的节点 } }, methods: { diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index 76e1f211..0e9c0cf8 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -78,7 +78,7 @@
- +
@@ -248,7 +248,8 @@ export default { url: { list: '' // 人员信息的右侧表格获取接口 }, - tempDraftId: '' // 临时草稿id,解决发起的时候点在线编辑会生成多条草稿的问题 + tempDraftId: '', // 临时草稿id,解决发起的时候点在线编辑会生成多条草稿的问题 + onlySelectFromFlowStation: [EsChangeNodes.standardizationApproval.value] // 只能在标准与流程所里选人的节点 } }, methods: { diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index ca59f02b..4d69cf7e 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -212,7 +212,7 @@
- +
@@ -482,7 +482,8 @@ export default { url: { list: '' // 人员信息的右侧表格获取接口 }, - isInitData: false // 是否正在初始化数据，正在初始化数据的时候不获取企标编号 + isInitData: false, // 是否正在初始化数据，正在初始化数据的时候不获取企标编号 + onlySelectFromFlowStation: [EsInitChangeNodes.standardizationApproval.value] // 只能在标准与流程所里选人的节点 } }, methods: { diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue index a780150f..afbfb5a6 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue @@ -80,7 +80,7 @@
- +
@@ -285,7 +285,8 @@ export default { approvalInfoForm: this.$form.createForm(this), // 审批信息表单 url: { list: '' // 人员信息的右侧表格获取接口 - } + }, + onlySelectFromFlowStation: [EsRecheckNodes.standardizationApproval.value] // 只能在标准与流程所里选人的节点 } }, methods: { diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index c51ee117..b0bbf04c 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -110,7 +110,7 @@
- +
@@ -370,7 +370,8 @@ export default { flowInitType: 'newProcess', // 流程发起类型，是自动发起（auto）的还是从新建流程发起的(newProcess) rejectBtnDisabled: false, // 驳回按钮是否置灰 agreeBtnDisabled: false, // 同意按钮是否置灰 - tempDraftId: '' // 临时草稿id,解决发起的时候点在线编辑会生成多条草稿的问题 + tempDraftId: '', // 临时草稿id,解决发起的时候点在线编辑会生成多条草稿的问题 + onlySelectFromFlowStation: [EsRevisionNodes.standardizationAudit.value] // 只能在标准与流程所里选人的节点 } }, methods: { diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue index 74caee2d..abac6f13 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue @@ -106,6 +106,7 @@ filedName="approvalUserStandard" @nameChange="userSelectNameChange" :nameStr="formInline.approvalUserStandard_dictText" + :isOnlySelectFromOneDept="true" type="radio"/> diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue index 959d0761..1a6ccf96 100644 --- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue +++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue @@ -77,7 +77,7 @@
- +
@@ -237,7 +237,8 @@ export default { personnelInfoData: [], url: { list: '' // 人员信息的右侧表格获取接口 - } + }, + onlySelectFromFlowStation: [EsSealSaveNodes.standardizationApproval.value] // 只能在标准与流程所里选人的节点 } }, methods: { diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue index 35b0454e..3e03eba9 100644 --- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue +++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue @@ -77,7 +77,7 @@
- +
@@ -237,7 +237,8 @@ export default { personnelInfoData: [], url: { list: '' // 人员信息的右侧表格获取接口 - } + }, + onlySelectFromFlowStation: [EsStartUseNodes.standardizationApproval.value] // 只能在标准与流程所里选人的节点 } }, methods: { diff --git a/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue b/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue index a9569934..d9859066 100644 --- a/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue +++ b/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue @@ -120,7 +120,8 @@
@@ -146,8 +147,8 @@ import '@assets/less/common.less' import InternalDetailPage from '@comp/InternalDetailPage' import ProcessDetailList from '@comp/ProcessDetailList' -// import PersonnelInfo from '@comp/PersonnelInfo' -import PersonnelInfoPap from './modules/PersonnelInfoPap' +import PersonnelInfo from '@comp/PersonnelInfo' +// import PersonnelInfoPap from './modules/PersonnelInfoPap' import BaseInfoTable from '@views/workCenter/permissionApplicationProcess/modules/BaseInfoTable' import UserSelectModal from '@comp/selection/UserSelectModal' import { WorkCenterMixin } from '@/mixins/WorkCenterMixin' @@ -164,7 +165,7 @@ import { cloneDeep } from 'lodash' const tabList = ['base', 'user'] export default { name: 'PermissionApplicationProcess', - components: { PersonnelInfoPap, UserSelectModal, BaseInfoTable, ProcessDetailList, InternalDetailPage }, + components: { PersonnelInfo, UserSelectModal, BaseInfoTable, ProcessDetailList, InternalDetailPage }, mixins: [WorkCenterMixin], data () { return { @@ -241,7 +242,8 @@ export default { // 业务表单 baseInfoForm: this.$form.createForm(this), // 流程审批信息表单 - approvalInfoForm: this.$form.createForm(this) + approvalInfoForm: this.$form.createForm(this), + onlySelectFromFlowStation: [PermissionApply.standardApproval.value] // 只能在标准与流程所里选人的节点 } }, computed: {