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/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;
}
diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue
index cbd1110bb..6e9946b8f 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("请填写整信息");
@@ -464,6 +469,7 @@ export default {
}
});
this.roleModal = false
+ this.nodeList = []
},
checkedRole2(data) {
this.addForm = {
@@ -483,6 +489,7 @@ export default {
}
});
this.roleModal2 = false
+ this.nodeList = []
},
pageChange(page) {
this.workSearch.page = page
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: {
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 9fe8e825a..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;
@@ -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 => {