diff --git a/README.md b/README.md index 97c61388c..edfa321bb 100644 --- a/README.md +++ b/README.md @@ -17,3 +17,5 @@ npm run build ### Customize configuration See [Configuration Reference](https://cli.vuejs.org/config/). + +### test diff --git a/package-lock.json b/package-lock.json index b81c194e8..3d1e87236 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3619,23 +3619,6 @@ "upath": "^1.1.1" } }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", - "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", - "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", - "dev": true, - "optional": true - }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -4581,94 +4564,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.3.0", - "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.0.tgz", - "integrity": "sha1-LxleS6D7DiY1ltaDDfF9Gjbok2w=", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", - "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.nlark.com/big.js/download/big.js-5.2.2.tgz", - "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=", - "dev": true, - "optional": true - }, - "chalk": { - "version": "4.1.1", - "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz", - "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz", - "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz", - "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", - "dev": true, - "optional": true - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz", - "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=", - "dev": true, - "optional": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", - "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1622293630895&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz", - "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", @@ -9313,7 +9208,7 @@ }, "image-size": { "version": "0.5.5", - "resolved": "https://registry.nlark.com/image-size/download/image-size-0.5.5.tgz", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", "dev": true, "optional": true @@ -13622,6 +13517,94 @@ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz", "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q==" }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.3.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz", + "integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "hash-sum": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", + "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-router": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz", diff --git a/src/components/index.js b/src/components/index.js index e5167f1b8..50327d085 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -21,6 +21,7 @@ import AdvancedQuery from './advancedQuery' // 高级查询 import GenerationNumber from './generationNumber' // 生成企标编号组件 import RoleUserTree from './roleUserTree' // 根据部门和角色查询人员 import DeptRoleTree from './deptRoleTree' // 根据部门查询角色 +import RoleTree from './roleTree' // 查询所有机构及人员 import SQTree from './SQTree' import OrgTable from './OrgTable' @@ -46,6 +47,7 @@ const install = function (Vue) { Vue.component('DeptRoleTree', DeptRoleTree) Vue.component('SQTree', SQTree) Vue.component('OrgTable', OrgTable) + Vue.component('RoleTree', RoleTree) } export default { diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue new file mode 100644 index 000000000..fa5a0597e --- /dev/null +++ b/src/components/roleTree/index.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 178d7f8c3..5b24794bb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -154,57 +154,19 @@ @submit="handleSubmit" > - - - - - - - - - - + + 0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') - } - this.modalshowflag2 = true - }, - saveUserInfo2 () { + checkedRole2 (data) { var idList = '' var nameList = '' - this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { + data.forEach( item => { if (nameList.length > 0) { nameList += ',' idList += ',' @@ -342,10 +290,35 @@ }) this.roleForm.dockUserList = idList this.roleForm.dockUserName = nameList - this.modalshowflag2 = false }, - cancleUserInfo2 () { - this.modalshowflag2 = false + checkedRole (data) { + if (this.type === 'dockUser') { + this.roleForm.dockUser = data[0].id + this.roleForm.dockUserName = data[0].name + } else if (this.type === 'ministerUser') { + this.roleForm.ministerUser = data[0].id + this.roleForm.ministerUserName = data[0].name + } else if (this.type === 'directorUser') { + this.roleForm.directorUser = data[0].id + this.roleForm.directorUserName = data[0].name + } else if (this.type === 'presidentUser') { + this.roleForm.presidentUser = data[0].id + this.roleForm.presidentUserName = data[0].name + } + }, + choiceZRRS () { + this.nodeList2 = [] + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + this.modalshowflag2 = true + }, + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true }, // 导入按钮 上传之前的钩子 beginImportFile (file) { @@ -388,46 +361,6 @@ fileUpload () { this.fileMadel = true }, - saveUserInfo () { - if (this.type === 'dockUser') { - this.roleForm.dockUser = this.roleRow.id - this.roleForm.dockUserName = this.roleRow.name - } else if (this.type === 'ministerUser') { - this.roleForm.ministerUser = this.roleRow.id - this.roleForm.ministerUserName = this.roleRow.name - } else if (this.type === 'directorUser') { - this.roleForm.directorUser = this.roleRow.id - this.roleForm.directorUserName = this.roleRow.name - } else if (this.type === 'presidentUser') { - this.roleForm.presidentUser = this.roleRow.id - this.roleForm.presidentUserName = this.roleRow.name - } - this.modalshowflag = false - }, - cancleUserInfo () { - this.modalshowflag = false - }, - drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.modalshowflag = true - }, - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) - }, handleTabs(name) { this.active = name }, @@ -490,7 +423,6 @@ }, mounted () { this.getData() - this.getTree() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index be0700a43..f9ba573ed 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -154,116 +154,19 @@ @submit="handleSubmit" > - - - - - - - - - - - - 导入中... - - - - - - - - - - - - - 导入中... - + + { - this.treeData1 = res.data - this.treeLoading = false - }) - } else { - this.open1 = true - } - }, - filterText2 (val) { - if (val.length) { - this.open2 = false - this.treeLoading = true - this.$http.get('SarInstitution/institution/institutionAndUser', { - userName: val - }, {}, res => { - this.treeData2 = res.data - this.treeLoading = false - }) - } else { - this.open2 = true - } - }, - }, methods: { - loadNode(node, resolve) { - if (node.level === 0) { - return resolve(this.treeData); - } - this.getChildren(node, resolve) - }, - getChildren (node, resolve) { - this.$http.get('SarInstitution/institution/getNext', { - institutionId: node.key - }, {}, res => { - resolve(res) - }) - }, - choiceZRRS () { - this.nodeList2 = [] - if ( this.roleForm.dockUserList.length > 0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') - } - this.filterText2 = '' - this.modalshowflag2 = true - }, - saveUserInfo2 () { + checkedRole2 (data) { var idList = '' var nameList = '' - this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { + data.forEach( item => { if (nameList.length > 0) { nameList += ',' idList += ',' @@ -441,10 +280,35 @@ export default { }) this.roleForm.dockUserList = idList this.roleForm.dockUserName = nameList - this.modalshowflag2 = false }, - cancleUserInfo2 () { - this.modalshowflag2 = false + checkedRole (data) { + if (this.type === 'dockUser') { + this.roleForm.dockUser = data[0].id + this.roleForm.dockUserName = data[0].name + } else if (this.type === 'ministerUser') { + this.roleForm.ministerUser = data[0].id + this.roleForm.ministerUserName = data[0].name + } else if (this.type === 'directorUser') { + this.roleForm.directorUser = data[0].id + this.roleForm.directorUserName = data[0].name + } else if (this.type === 'presidentUser') { + this.roleForm.presidentUser = data[0].id + this.roleForm.presidentUserName = data[0].name + } + }, + choiceZRRS () { + this.nodeList2 = [] + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + this.modalshowflag2 = true + }, + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true }, // 导入按钮 上传之前的钩子 beginImportFile (file) { @@ -487,49 +351,6 @@ export default { fileUpload () { this.fileMadel = true }, - saveUserInfo () { - if (this.type === 'dockUser') { - this.roleForm.dockUser = this.roleRow.id - this.roleForm.dockUserName = this.roleRow.name - } else if (this.type === 'ministerUser') { - this.roleForm.ministerUser = this.roleRow.id - this.roleForm.ministerUserName = this.roleRow.name - } else if (this.type === 'directorUser') { - this.roleForm.directorUser = this.roleRow.id - this.roleForm.directorUserName = this.roleRow.name - } else if (this.type === 'presidentUser') { - this.roleForm.presidentUser = this.roleRow.id - this.roleForm.presidentUserName = this.roleRow.name - } - this.modalshowflag = false - }, - cancleUserInfo () { - this.modalshowflag = false - }, - drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.filterText1 = '' - this.modalshowflag = true - }, - getTree () { - this.treeLoading = true - this.$http.get('SarInstitution/institution/getFirstInstitution', {}, {}, res=> { - this.treeData = res - this.treeLoading = false - }) - }, handleTabs(name) { this.active = name }, @@ -591,9 +412,7 @@ export default { }) } }, - mounted () { - this.getTree() - } + mounted () {} } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 1169ad9bf..299d6dbe8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -82,31 +82,12 @@ @submit="handleSubmit" > - - - - - + @@ -123,15 +104,9 @@ commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - roleRow: {}, - nodeList: [], + nodeList2: [], type: '', - defaultProps: { - children: 'children', - label: 'name' - }, - treeData: [], // 人员数据 - modalshowflag: false, // drawer开关 + modalshowflag2: false, // drawer开关 drawerTitle: '', //drawer标题 textarea: '', // 意见 ListModel: false, // 新增编辑抽屉开关 @@ -159,13 +134,10 @@ ProcessTitle }, methods: { - updateFile () { - window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model - }, - saveUserInfo () { + checkedRole2 (data) { var idList = '' var nameList = '' - this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => { + data.forEach( item => { if (nameList.length > 0) { nameList += ',' idList += ',' @@ -175,22 +147,16 @@ }) this.form.responUserList = idList this.form.responUserListName = nameList - this.modalshowflag = false }, - cancleUserInfo () { - this.modalshowflag = false + updateFile () { + window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model }, choiceZRR () { - this.nodeList = [] - if (this.form.responUserList.length > 0) { - this.nodeList = this.form.responUserList.split(',') + this.nodeList2 = [] + if ( this.form.responUserList.length > 0) { + this.nodeList2 = this.form.responUserList.split(',') } - this.modalshowflag = true - }, - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) + this.modalshowflag2 = true }, handleTabs(name) { this.active = name @@ -238,7 +204,6 @@ }, }, mounted () { - this.getTree() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 4a1f06106..2618e5787 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1064,6 +1064,8 @@ export default { //提交事件 handleSubmit() { let json = this.listForm; + console.log(this.fileInfoList); + console.log(this.fileInfoList.join(',')); this.listForm.fileId = this.fileInfoList.join(',') this.listForm.fileName = this.fileListName.join(',') // let json = Object.assign(this.listForm, this.roleForm) @@ -1110,9 +1112,11 @@ export default { // 删除上传的文件 delFileInfo(file, fileList) { this.fileInfoList = fileList + let middle = [] fileList.forEach(item => { - this.fileListName = item.name + middle.push(item.name) }) + this.fileListName = middle }, fileUpload () { this.fileMadel = true @@ -1120,12 +1124,16 @@ export default { // 上传文件成功回调 uploadBackSuccess (res, file, fileList) { if (res.ok) { + let middle = [] fileList.forEach(item => { - this.fileListName = item.name + middle.push(item.name) }) - this.fileInfoList = fileList - this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id - this.$message.success('上传成功') + this.fileListName = middle + let files = [] + this.flielist + // this.fileInfoList = fileList + // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id + // this.$message.success('上传成功') } else { this.$message.error(res.message) fileList.pop() diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index b09a5622e..3643f6062 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -111,7 +111,7 @@
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ref="tree2"> -
-
+
{ + // if (this.selectList.includes(item.itemId)) { + // this.listForm.breakdownList[index].implementerId = this.roleRow.id; + // this.listForm.breakdownList[index].implementer = this.roleRow.name; + // } + // }); + // } else { + // this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id; + // this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name; + // } + // this.listForm.implementer = this.roleRow.name; + // this.showColumn = false; + // this.$nextTick(() => { + // this.showColumn = true; + // }); + // } + // this.modalshowflag = false; + // }, + saveUserInfo2 () { + var idList = ""; + var nameList = ""; + this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach(item => { + if (nameList.length > 0) { + nameList += ","; + idList += ","; + } + idList += item.id; + nameList += item.name; + }); // 如果有勾选的项 if (this.selectList.length) { this.listForm.breakdownList.forEach((item, index) => { + console.log(item.itemId); + console.log(index); if (this.selectList.includes(item.itemId)) { - this.listForm.breakdownList[index].implementerId = this.roleRow.id; - this.listForm.breakdownList[index].implementer = this.roleRow.name; + this.listForm.breakdownList[index].implementerId = idList; + this.listForm.breakdownList[index].implementer = nameList; } }); } else { - this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id; - this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name; + this.listForm.breakdownList[this.dsadadadsada].implementerId = idList; + this.listForm.breakdownList[this.dsadadadsada].implementer = nameList; } - this.listForm.implementer = this.roleRow.name; + this.listForm.implementer = nameList; this.showColumn = false; this.$nextTick(() => { this.showColumn = true; }); - } - this.modalshowflag = false; + this.modalshowflag2 = false; + //不要删除 By 宋伟佳 + console.log(this.$refs.multipleTable.clearSelection()) + this.$nextTick(() => { + for(var i=0;i 0) { + this.nodeList = this.roleForm.implementer.split(","); + } + this.modalshowflag2 = true; }, getTree() { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index a0d0d502b..a26e77563 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -271,9 +271,9 @@
-
+
-
+
-
+
-
+
+ - + @@ -499,6 +507,87 @@
+ + + + + {{ editRowData.standSortShow }} {{ editRowData.standNumber }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 提交 + 取消 +
+