From 08215c4a196339db3a04080ae5d70648a55edda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 16 Mar 2022 16:09:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E5=A7=94=E5=91=98?= =?UTF-8?q?=E4=BC=9A=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=2051828=20=20=E6=8A=80=E6=9C=AF=E5=A7=94?= =?UTF-8?q?=E5=91=98=E4=BC=9A=E6=96=B0=E5=A2=9Ebug=2051825?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/mechanismManage/pages/committee.vue | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/pages/config/pages/mechanismManage/pages/committee.vue b/src/pages/config/pages/mechanismManage/pages/committee.vue index d2f7278cd..383d35149 100644 --- a/src/pages/config/pages/mechanismManage/pages/committee.vue +++ b/src/pages/config/pages/mechanismManage/pages/committee.vue @@ -226,6 +226,15 @@ export default { //新增 committeeAdd() { this.dialogTitle = "新增"; + this.addForm = { + committeeName: "", //委员会名称 + committeeDirector: "", //主任 + committeeDirectorName: "", //主任 + committeeSecretary: "", //秘书长 + committeeSecretaryName: "", //秘书长 + committor: "", //委员 + committeeIds: "" //委员 + } this.addModel = true; }, //编辑 @@ -297,6 +306,15 @@ export default { //取消新增 cancelModel() { this.addModel = false; + this.addForm = { + committeeName: "", //委员会名称 + committeeDirector: "", //主任 + committeeDirectorName: "", //主任 + committeeSecretary: "", //秘书长 + committeeSecretaryName: "", //秘书长 + committor: "", //委员 + committeeIds: "" //委员 + } }, //确定新增 addOk() { @@ -308,7 +326,7 @@ export default { }, { _this: this }, res => { - if(res.ok){ + if(res.message === '新增成功'){ this.getCommittee(); this.addModel = false; } From beef71c7c015ff7cf168d27c7c0cb7fa8b072a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 16 Mar 2022 16:16:25 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=97=A0=E6=A0=A1=E9=AA=8C=2051824?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/mechanismManage/pages/workgroup.vue | 75 ++++++++++--------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue index cbd1110bb..9decf6c81 100644 --- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue +++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue @@ -390,41 +390,46 @@ export default { this.nodeList2 = []; } } else { - let workLeader = ""; - let workLeaderId = ""; - this.addForm.workLeaderGroup.map(item => { - workLeader += item.name; - workLeader += ","; - workLeaderId += item.id; - workLeaderId += ","; - }); - - let workPeople = ""; - let workPeopleId = ""; - this.addForm.workPeopleGroup.map(item => { - workPeople += item.name; - workPeople += ","; - workPeopleId += item.id; - workPeopleId += ","; - }); - this.$http.put("workGroup/work-group", { - id: this.addForm.id, - workGroup: this.addForm.workGroup, - workLeader: workLeader, - workLeaderId: workLeaderId, - workPeople: workPeople, - workPeopleId: workPeopleId - }, { - _this: this - }, res => { - if (res.ok) { - } else { - this.$message.warning(res.message); - } - this.getWorkData(); - }); - this.addModel = false; - this.$refs.workGroup.clearSelection(); + if (!this.addForm.workLeaderGroup.length) { + this.$message.warning("请选择工作组组长"); + } else if (!this.addForm.workPeopleGroup.length) { + this.$message.warning("请选择工作组组员"); + } else { + let workLeader = ""; + let workLeaderId = ""; + this.addForm.workLeaderGroup.map(item => { + workLeader += item.name; + workLeader += ","; + workLeaderId += item.id; + workLeaderId += ","; + }); + let workPeople = ""; + let workPeopleId = ""; + this.addForm.workPeopleGroup.map(item => { + workPeople += item.name; + workPeople += ","; + workPeopleId += item.id; + workPeopleId += ","; + }); + this.$http.put("workGroup/work-group", { + id: this.addForm.id, + workGroup: this.addForm.workGroup, + workLeader: workLeader, + workLeaderId: workLeaderId, + workPeople: workPeople, + workPeopleId: workPeopleId + }, { + _this: this + }, res => { + if (res.ok) { + } else { + this.$message.warning(res.message); + } + this.getWorkData(); + }); + this.addModel = false; + this.$refs.workGroup.clearSelection(); + } } } else { this.$message.warning("请填写整信息"); From a14d9744b26d9490a36426a61af255160829285c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 16 Mar 2022 16:22:56 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE=20=20=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E6=A0=87=E5=87=86=E8=B7=9F=E8=B8=AA=E6=B8=85=E5=8D=95=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/roleManage/index.vue | 101 ++++++++++++++++++ .../accessStandardsAndRegulations/index.vue | 2 +- 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 87d126f6c..595f0bca7 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -40,6 +40,12 @@ v-btn-permission="'bb2571b08179edb36880aae169cb2e54'" size="mini">配置法规库权限 + 配置法规库数据权限 + + +
+ + +
+
+ 取消 + + + 确定 + +
+ 0){ this.treeData3 = this.sortByKey(list1,"displaySeq") + this.treeData4 = this.sortByKey(list1,"displaySeq") } @@ -651,9 +692,27 @@ export default { } }) }, + //配置数据确定按钮 + confirmDialogData2(){ + let menuIds = this.$refs.tree4.getCheckedKeys().join(',') + this.$http.postData('tsRoleMeunData/ts-role-menu-data/saveBatch', { + menuIds: menuIds, + roleId: this.id + }, {}, res => { + if (res.ok) { + this.$message.success('设置权限成功') + this.modalflag2 = false + }else{ + this.$message.warning(res.message) + } + }) + }, closeDialogData() { this.modalflag = false }, + closeDialogData2() { + this.modalflag2 = false + }, /** 父子节点的级联 */ nodeClick(currentObj, treeStatus) { // 用于：父子节点严格互不关联时，父节点勾选变化时通知子节点同步变化，实现单向关联。 @@ -671,6 +730,30 @@ export default { } } }, + /** 父子节点的级联 */ + nodeClick3(currentObj, treeStatus) { + // 用于：父子节点严格互不关联时，父节点勾选变化时通知子节点同步变化，实现单向关联。 + let selected = treeStatus.checkedKeys.indexOf(currentObj.id) // -1未选中 + // 选中 + if (selected !== -1) { + // 子节点只要被选中父节点就被选中 + this.selectedParent4(currentObj) + // 统一处理子节点为相同的勾选状态 + this.uniteChildSame4(currentObj, true) + } else { + // 未选中 处理子节点全部未选中 + if (currentObj.children.length !== 0) { + this.uniteChildSame4(currentObj, false) + } + } + }, + // 统一处理子节点为相同的勾选状态 + uniteChildSame4(treeList, isSelected) { + this.$refs.tree4.setChecked(treeList.id, isSelected) + for (let i = 0; i < treeList.children.length; i++) { + this.uniteChildSame4(treeList.children[i], isSelected) + } + }, // 统一处理子节点为相同的勾选状态 uniteChildSame(treeList, isSelected) { this.$refs.tree3.setChecked(treeList.id, isSelected) @@ -686,6 +769,14 @@ export default { this.selectedParent(currentNode.parent) } }, + // 统一处理父节点为选中 + selectedParent4(currentObj) { + let currentNode = this.$refs.tree4.getNode(currentObj) + if (currentNode.parent.key !== undefined) { + this.$refs.tree4.setChecked(currentNode.parent, true) + this.selectedParent4(currentNode.parent) + } + }, nodeClick2(currentObj, treeStatus) { // 用于：父子节点严格互不关联时，父节点勾选变化时通知子节点同步变化，实现单向关联。 let selected = treeStatus.checkedKeys.indexOf(currentObj.id) // -1未选中 @@ -726,6 +817,16 @@ export default { } }) }, + roleDataAdd(){ + this.$http.get('tsRoleMeunData/ts-role-menu-data/list', { + ids: this.id + }, {}, res => { + if (res.ok) { + this.nodeList4 = res.data + this.modalflag2 = true + } + }) + }, closeDialog() { this.treeData2 = [] this.modalshowflag = false diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 41db2c5bc..6071af3b9 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -39,7 +39,7 @@ export default { library: false, list: [], tabValue: "", - menuName: ["国家/地区清单", "车型类别清单"/*, "重点标准跟踪清单"*/, "其他清单", "项目清单"] + menuName: ["国家/地区清单", "车型类别清单","重点标准跟踪清单", "其他清单", "项目清单"] }; }, methods: { From 27ef4f985a3b8ec6833172e636c764eb603108ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 16 Mar 2022 16:30:09 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=80=89=E4=BA=BA=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=2051820?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workTree/index.vue | 1 + src/pages/config/pages/mechanismManage/pages/workgroup.vue | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/components/workTree/index.vue b/src/components/workTree/index.vue index 0d805290e..d93320d38 100644 --- a/src/components/workTree/index.vue +++ b/src/components/workTree/index.vue @@ -175,6 +175,7 @@ export default { this.filterText = '' this.isVisible2 = false this.open1 = true + this.nodeList = [] }, saveUserInfo () { if (this.checkBox) { diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue index 9decf6c81..6e9946b8f 100644 --- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue +++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue @@ -469,6 +469,7 @@ export default { } }); this.roleModal = false + this.nodeList = [] }, checkedRole2(data) { this.addForm = { @@ -488,6 +489,7 @@ export default { } }); this.roleModal2 = false + this.nodeList = [] }, pageChange(page) { this.workSearch.page = page From f167fa842685bf286dd56bf881cc68096a4381a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 16 Mar 2022 17:13:52 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 9fe8e825a..00f133a89 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4368,6 +4368,7 @@ export default { formData.issueTime = null; } this.SarExportSearchEo = formData + formData.isKU = '1' this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', formData, { _this: this, loading: 'loading' }, res => { From 5ee3cc67c21006f70d17e9e91e791135625d3197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 16 Mar 2022 17:54:54 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 00f133a89..329566308 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -2767,7 +2767,7 @@ export default { // 查询二级菜单 selectMenuList() { return new Promise((resolve, reject) => { - this.$http.get('sarResource/ts-resource/getListStand', { + this.$http.get('sarResource/ts-resource/getListStandLimitData', { sorDivide: 'BUSINESS_STAND', userId: this.$store.getters.userInfo.userId }, { @@ -2780,7 +2780,7 @@ export default { }, selectMenu2(res,json) { return new Promise((resolve, reject) => { - this.$http.get('lawss/sarMenuStandard/getListStand', {dicId:'9m4qqqaansxmox5e82zm'}, { + this.$http.get('lawss/sarMenuStandardLimit/getListStandLimit', {dicId:'9m4qqqaansxmox5e82zm'}, { _this: this }, res => { const history = res;