diff --git a/src/components/ProcessCommonLayout.vue b/src/components/ProcessCommonLayout.vue index 580cb69..bd8733a 100644 --- a/src/components/ProcessCommonLayout.vue +++ b/src/components/ProcessCommonLayout.vue @@ -114,7 +114,7 @@ export default { } getPersonInfoList(param).then(res => { if (res.success) { - console.log(res.result) + console.log('-------------获取人员信息完成', res.result) // 处理人员信息数据，判断每个节点是否能选人 this.personnelInfoData = res.result.map(item => { return { @@ -128,6 +128,7 @@ export default { }, // 从草稿进来填过的人员需要回显 draftInitPersonInfo (personInfoObj) { + console.log('--------------draftInitPersonInfo 草稿进来回显') this.personnelInfoData = this.personnelInfoData.map(item => { return { ...item, diff --git a/src/components/SelectUser.vue b/src/components/SelectUser.vue index 3fa1018..fbc5ef2 100644 --- a/src/components/SelectUser.vue +++ b/src/components/SelectUser.vue @@ -135,6 +135,7 @@ import ListMixin from '../mixins/ListMixin' import CustomHeader from '@/components/CustomHeader' import { queryAllRole, queryDepartTreeList } from '../api/api' +import { getAction } from '@/api/manage' export default { name: 'SelectUser', @@ -167,16 +168,16 @@ export default { default: 'radio' } }, - // watch: { - // selectedData: { - // immediate: true, - // deep: true, - // handler (val) { - // console.log(val) - // this.handleCheckedArr() - // } - // } - // }, + watch: { + selectedData: { + immediate: true, + handler (val) { + if (val) { + this.getUserListByIds(val) + } + } + } + }, data () { return { realname: '', // 搜索框数据 @@ -193,7 +194,8 @@ export default { pageSize: 10 }, url: { - list: '/sys/user/page' + list: '/sys/user/page', + userListByIds: '/sys/user/queryByIds' }, checkedArr: [], selectedDataArr: [], @@ -231,6 +233,12 @@ export default { arr.push(i) } } + for (const i of this.selectedDataArr) { + if (!arr.find(item => item.id === i.id)) { + // 已加载完的列表里还没有的选中数据，按顺序推入 + arr.push(i) + } + } this.selectedDataArr = arr } else { console.log('------------删除了数据------------') @@ -242,6 +250,18 @@ export default { } console.log(this.selectedDataArr) }, + // 根据id获取用户信息，初始化选中数据，不查选中数据的话如果没有划到那一页，名字带不出来 + getUserListByIds (ids) { + const params = {} + params.userIds = ids + getAction(this.url.userListByIds, params).then((res) => { + if (res.success) { + this.selectedDataArr = res.result || [] + } else { + this.$message(res.message) + } + }) + }, handleCheckedArr () { // 清空选中的数据 if (this.type === 'checkbox') { diff --git a/src/components/SelectUserByWorkGroup.vue b/src/components/SelectUserByWorkGroup.vue index ae370fe..309c631 100644 --- a/src/components/SelectUserByWorkGroup.vue +++ b/src/components/SelectUserByWorkGroup.vue @@ -64,7 +64,7 @@ stop-propagation :before-close="handleBeforeClose">
- +
{{ item.realname }}({{ item.username }}) @@ -91,7 +91,7 @@ stop-propagation :before-close="handleBeforeClose">
- +
{{ item.realname }}({{ item.username }}) @@ -134,6 +134,7 @@ import CustomHeader from '@/components/CustomHeader' import ListMixin from '@/mixins/ListMixin' import { getWorkGroupTreeList, queryAllRole } from '@/api/api' +import { getAction } from '@/api/manage' export default { name: 'SelectUserByWorkGroup', @@ -166,6 +167,16 @@ export default { default: 'radio' } }, + watch: { + selectedData: { + immediate: true, + handler (val) { + if (val) { + this.getUserListByIds(val) + } + } + } + }, data () { return { realname: '', // 搜索框数据 @@ -182,7 +193,8 @@ export default { pageSize: 10 }, url: { - list: '/act/user/workGroupPage' + list: '/act/user/workGroupPage', + userListByIds: '/sys/user/queryByIds' }, checkedArr: [], selectedDataArr: [], @@ -211,12 +223,18 @@ export default { checkboxClick (item) { console.log(item) if (this.type === 'checkbox') { - if (this.checkedArr.includes(item.id)) { + if (this.checkedArr.includes(item.userId)) { console.log('------------增加了数据------------') // 说明是增加了数据,为了顺序和列表顺序保持一致，用循环设置 const arr = [] for (const i of this.listData) { - if (this.checkedArr.includes(i.id)) { + if (this.checkedArr.includes(i.userId)) { + arr.push(i) + } + } + for (const i of this.selectedDataArr) { + if (!arr.find(item => item.userId === i.userId)) { + // 已加载完的列表里还没有的选中数据，按顺序推入 arr.push(i) } } @@ -224,13 +242,30 @@ export default { } else { console.log('------------删除了数据------------') // 说明是删除了数据 - this.selectedDataArr = this.selectedDataArr.filter(i => i.id !== item.id) + this.selectedDataArr = this.selectedDataArr.filter(i => i.userId !== item.userId) } } else { this.selectedDataArr = [item] } console.log(this.selectedDataArr) }, + // 根据id获取用户信息，初始化选中数据，不查选中数据的话如果没有划到那一页，名字带不出来 + getUserListByIds (ids) { + const params = {} + params.userIds = ids + getAction(this.url.userListByIds, params).then((res) => { + if (res.success) { + this.selectedDataArr = res.result.map(item => { + return { + ...item, + userId: item.id + } + }) || [] + } else { + this.$message(res.message) + } + }) + }, handleCheckedArr () { // 清空选中的数据 if (this.type === 'checkbox') { diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 9162b7d..76f2490 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -131,12 +131,13 @@ export const EsRevisionPlanStandardizationInitNodes = new EsEnums({ standardizationStart: { text: '标准化工程师发起', value: 'sid-880237E7-1735-49AE-B9EC-D7DA5D28E17D' }, contactSelectApprover: { text: '部所联络人选取审批人', value: 'sid-C3F65D96-76B0-4901-8C8A-D6B390099381' }, standardizationUpdate: { text: '标准化工程师修改调整', value: 'sid-3CB0E6B1-9918-4A21-9C62-9344FF1B7269' }, - mainDrafterLeaderSend: { text: '主起草单位主管级领导审批下发', value: 'sid-57656F2E-0AE1-45D8-85D0-CE3E37D9E926' }, + mainDrafterLeaderSend: { text: '主起草单位主管级领导审批下发', value: 'sid-050827D6-AA12-4561-8B37-4D2023AF6D7F' }, contactUpdate: { text: '部所联络人修改调整', value: 'sid-3AF454B3-1D93-4BF6-B925-98F1A7E125B8' }, mainDrafterEnterInfo: { text: '主起草人填写信息', value: 'sid-E2015AB3-9C52-4E49-A261-DA11CB4BAA7E' }, contactsApproval: { text: '部所联络人汇总', value: 'sid-158523C5-7D8F-4433-B2DB-8A6C09DFDB1B' }, - mainDrafterLeaderApproval: { text: '主起草单位主管级领导批准', value: 'sid-050827D6-AA12-4561-8B37-4D2023AF6D7F', isMobile: true }, - standardizationSumUp: { text: '标准化归档', value: 'sid-86610E08-1DDB-467A-A32E-C661FE889A57' } + mainDrafterLeaderApproval: { text: '主起草单位主管级领导批准', value: 'sid-57656F2E-0AE1-45D8-85D0-CE3E37D9E926', isMobile: true }, + standardizationSumUp: { text: '标准化归档', value: 'sid-86610E08-1DDB-467A-A32E-C661FE889A57' }, + standardizationTwoUpdate: { text: '标准化工程师二次修改调整', value: 'sid-BEAAC29F-17D8-4162-8C0B-01A4A8ED7729' } }) // 企标制修订流程 diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/AnnualRevisionPlanActivelyReport.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/AnnualRevisionPlanActivelyReport.vue index ba7c2da..8c835d1 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/AnnualRevisionPlanActivelyReport.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/AnnualRevisionPlanActivelyReport.vue @@ -65,7 +65,7 @@ bordered :scroll="{x: '100%'}" ref="table" - rowKey="espId" + rowKey="id" :columns="columns" :dataSource="baseInfoForm" :pagination="false"> @@ -125,7 +125,7 @@ -