From 427384ad778074e4b7c4f23c0e573b5246aabb65 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Feb 2022 17:17:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20=E6=9D=83=E9=99=90=E6=A0=91?= =?UTF-8?q?=E7=BB=93=E6=9E=84=20=E7=9B=B8=E5=85=B3=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step1.vue | 16 +++-- .../creatProcess/qbrk-product/step13.vue | 59 +++++++++++++------ .../pages/creatProcess/qbrk-product/step3.vue | 26 ++++---- .../pages/creatProcess/qbrk-product/step5.vue | 2 +- .../pages/creatProcess/qbrk-product/step6.vue | 26 ++++---- .../creatProcess/qbrk-product/stepC3.vue | 26 ++++---- .../creatProcess/qbrk-product/stepC6.vue | 26 ++++---- .../pages/creatProcess/qbrk/step1.vue | 13 +++- .../pages/creatProcess/qbrk/step12.vue | 14 ++++- .../pages/creatProcess/qbrk/step13.vue | 39 ++++++++++-- .../pages/creatProcess/qbrk/step3.vue | 14 ++++- .../pages/creatProcess/qbrk/step6.vue | 14 ++++- .../pages/creatProcess/qbrk/stepC3.vue | 14 ++++- .../pages/creatProcess/qbrk/stepC6.vue | 14 ++++- .../components/EnterpriseStandardDatabase.vue | 36 ++++++++++- 15 files changed, 244 insertions(+), 95 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 23c7456f9..88209472a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2708,10 +2708,18 @@ }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { - if(checkedData.length > 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false @@ -2858,8 +2866,8 @@ // test this.isSubmit = false this.saveLoading = false - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") + if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { + this.$message.warning("请选择一条被代替企标编号") return } // this.changeTree(this.form.modelData) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 82c9d634f..04a126fbf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -566,7 +566,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"> @@ -2153,10 +2153,18 @@ }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { - if(checkedData.length > 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false @@ -2353,6 +2361,25 @@ this.rules.commentText[0].required = true; } }, + async saveConfStand(standId) { + if(this.form.menuId && this.form.menuId !== ''){ + let search = {} + let list = [] + list.push(standId) + search.menuId = this.form.menuId + search.menuName = this.form.TXLBBUSS + search.treeType = 'sarMs' + search.idlist = list + return new Promise((resolve, reject) => { + this.$http.postData('lawss/sarBussionessStand/saveStandardsMenu', search, { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + } + }, handleSubmit() { // this.getRule() // const val= this.form.country; @@ -2365,10 +2392,10 @@ // } else if (val === '') { // this.form.country = [] // } - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") - return - } + const json = JSON.stringify(this.form); + console.log(json) + this.processCreateBuss(json) + return; this.fileInfoHandle() this.$refs['form'].validate((valid) => { if (valid) { @@ -2417,8 +2444,10 @@ const _formData = new FormData() _formData.append('infoJson', json) processCreateBuss(_formData).then(res => { - if (res.result === '操作成功' || res.data === '入库成功') { - this.$message.success(res.data) + if (res.result === '操作成功' || res.ok) { + this.$message.success("入库成功") + // 自动匹配配置标准 + this.saveConfStand(res.data) const planForm = {} planForm.id = this.form.planId planForm.planStatus = '4' @@ -2539,8 +2568,8 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") + if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { + this.$message.warning("请选择一条被代替企标编号") return } if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){ @@ -2550,12 +2579,6 @@ this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ - }else if(this.form.standStatus === '3' ){ - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") - return - } - this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" if(type === '1'){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index a77c2a919..f6db759c5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -609,7 +609,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"> @@ -1133,8 +1133,8 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") + if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { + this.$message.warning("请选择一条被代替企标编号") return } if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){ @@ -1144,12 +1144,6 @@ this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ - }else if(this.form.standStatus === '3' ){ - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") - return - } - this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" if(type === '1'){ @@ -2208,10 +2202,18 @@ }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { - if(checkedData.length > 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 60a2e04a4..796b63a32 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -1071,7 +1071,7 @@ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } + { required: false, message: '请选择企标实施日期', trigger: 'change' } ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index bc0163325..2d2a8d1e6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -679,7 +679,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"> @@ -1212,8 +1212,8 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") + if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { + this.$message.warning("请选择一条被代替企标编号") return } if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){ @@ -1223,12 +1223,6 @@ this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ - }else if(this.form.standStatus === '3' ){ - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") - return - } - this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" if(type === '1'){ @@ -2300,10 +2294,18 @@ }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { - if(checkedData.length > 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 490aa5da1..6a47f0788 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -609,7 +609,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"> @@ -1133,8 +1133,8 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") + if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { + this.$message.warning("请选择一条被代替企标编号") return } if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){ @@ -1144,12 +1144,6 @@ this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ - }else if(this.form.standStatus === '3' ){ - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") - return - } - this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" if(type === '1'){ @@ -2209,10 +2203,18 @@ }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { - if(checkedData.length > 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 947ab22ec..93b3c4650 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -679,7 +679,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"> @@ -1212,8 +1212,8 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") + if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { + this.$message.warning("请选择一条被代替企标编号") return } if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){ @@ -1223,12 +1223,6 @@ this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ - }else if(this.form.standStatus === '3' ){ - if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { - this.$message.warning("请选择一条代替企标编号") - return - } - this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" if(type === '1'){ @@ -2300,10 +2294,18 @@ }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { - if(checkedData.length > 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 2d1ce9db9..ad5c485f0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2606,15 +2606,24 @@ }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { - if(checkedData.length > 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false this.$forceUpdate() }, + popoverHideCancel(){ this.modalShowFlag1 = false }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 1f750a67b..59ab2a1d8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -566,7 +566,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 3cee575ea..5a7ecc5ee 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -567,7 +567,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false @@ -2363,6 +2371,25 @@ }) }}) }, + async saveConfStand(standId) { + if(this.form.menuId && this.form.menuId !== ''){ + let search = {} + let list = [] + list.push(standId) + search.menuId = this.form.menuId + search.menuName = this.form.TXLBBUSS + search.treeType = 'sarMs' + search.idlist = list + return new Promise((resolve, reject) => { + this.$http.postData('lawss/sarBussionessStand/saveStandardsMenu', search, { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + } + }, /** * @description: 流程入库 * @date: 2020-11-18 21:47:58 @@ -2371,8 +2398,10 @@ const _formData = new FormData() _formData.append('infoJson', json) processCreateBuss(_formData).then(res => { - if (res.result === '操作成功' || res.data === '入库成功') { - this.$message.success(res.data) + if (res.result === '操作成功' || res.ok) { + this.$message.success("入库成功") + // 自动匹配配置标准 + this.saveConfStand(res.data) const planForm = {} planForm.id = this.form.planId planForm.planStatus = '4' diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 9b7ccb127..e4351f94b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -611,7 +611,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index c4c5eba51..e376ae0b0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -814,7 +814,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 6981af921..2546c3083 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -611,7 +611,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 53ff41365..c677815a6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -814,7 +814,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> 0){ + if (checkedData.length > 0) { this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",") - }else { + this.form.menuId = checkedData.map(item => item.menuId).join(",") + this.form.treeType = checkedData.map(item => item.treeType).join(",") + } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.form.TXLBBUSS = checkedData.menuName + this.form.menuId = checkedData.id + this.form.treeType = 'sarMs' } } this.modalShowFlag1 = false diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 8c8c338e8..174b57382 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -2652,9 +2652,17 @@ export default { if (checkedData) { if (checkedData.length > 0) { this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",") + this.sarBussionessStandEO.menuId = checkedData.map(item => item.menuId).join(",") + this.sarBussionessStandEO.treeType = checkedData.map(item => item.treeType).join(",") this.sarBussionessSearch.TXLBBUSS = checkedData.map(item => item.menuName).join(",") } else { + if (checkedData.parentId == null || checkedData.parentId === '') { + this.$message.error('请选择二级及以下目录') + return + } this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName + this.sarBussionessStandEO.menuId = checkedData.id + this.sarBussionessStandEO.treeType = checkedData.treeType this.sarBussionessSearch.TXLBBUSS = checkedData.menuName } } @@ -3171,10 +3179,31 @@ export default { this.configPage = 1 this.selectConfigStand = [] }, + async saveConfStand(item) { + if(item.menuId && item.menuId !== ''){ + let search = {} + let list = [] + list.push(item.id) + search.menuId = item.menuId + search.menuName = item.TXLBBUSS + search.treeType = 'sarMs' + search.idlist = list + return new Promise((resolve, reject) => { + this.$http.postData('lawss/sarBussionessStand/saveStandardsMenu', search, { + _this: this + }, res => { + const history = res; + this.getBussionStandTable(this.tableFlag) + resolve(history) + }) + }) + } + }, // 提交配置搜索项 saveConfigStand() { let search = {} search.menuId = this.selectSarMenu.id + search.menuName = this.selectSarMenu.menuName search.treeType = this.selectSarMenu.treeType if (this.selectConfigStand.length === 0) { this.$message({ @@ -3665,7 +3694,10 @@ export default { loading: 'isSubmit' }, res => { if (res.ok) { - this.getBussionStandTable(this.tableFlag) + + // 自动匹配 左侧树 指定菜单 + this.saveConfStand(nowstandinfo) + // this.pageChange(1) this.resetForm() } @@ -3931,6 +3963,7 @@ export default { let search = {} // 取最外层目录id search.menuId = this.selectSarMenu.id + console.log(this.selectSarMenu) search.treeType = this.selectSarMenu.treeType // search.menuId = this.removeOneId search.idlist = [] @@ -4087,7 +4120,6 @@ export default { return data.menuName.indexOf(value) !== -1; }, treeClick(treeNode) { - console.log(treeNode) this.selectSarMenu = treeNode // 记录当前选中的二级菜单 this.sarBussionessSearch.menuId = treeNode.id this.sarBussionessSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询