From 6f5401258c6d2c9641421b26ecbc4b453ff3f16e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 1 Jul 2021 18:22:02 +0800 Subject: [PATCH 1/4] commit --- .../pages/creatProcess/bzdy/step1.vue | 46 +++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 3d2d360f7..c65ce2dc3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -86,8 +86,7 @@

责任对接人

- - +
@@ -161,7 +160,24 @@ @submit="handleSubmit" > - + + + + @@ -174,6 +190,13 @@ export default { name: "bzdyStep1", data() { return { + defaultProps: { + children: 'children', + label: 'name' + }, + treeData: [], // 人员数据 + modalshowflag: false, // drawer开关 + drawerTitle: '', //drawer标题 textarea: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 @@ -204,6 +227,22 @@ export default { ProcessTitle }, methods: { + drawerCheck (data) { + var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); + if(getlist.length == 1) { + }else { + this.$refs.tree.setCheckedKeys([data.id]); + } + }, + choiceZRR () { + this.drawerTitle = '选择责任人' + this.modalshowflag = true + }, + getTree () { + this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { + this.treeData = res.data + }) + }, closeDrawer() { this.ListModel = false }, @@ -226,6 +265,7 @@ export default { } }, mounted () { + this.getTree() } } From adacd33cb8110bc183317fd325c43bf9a0f57bb9 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 2 Jul 2021 15:33:01 +0800 Subject: [PATCH 2/4] commit --- src/assets/styles/mixins.less | 7 +- src/components/navMenu/index.vue | 2 +- .../config/pages/mechanismManage/index.vue | 4 + src/pages/config/pages/menuManage/index.vue | 2 + src/pages/config/pages/postManage/index.vue | 2 + src/pages/config/pages/roleManage/index.vue | 234 +++++++++++++++++- .../pages/creatProcess/bzdy/step1.vue | 1 + 7 files changed, 248 insertions(+), 4 deletions(-) diff --git a/src/assets/styles/mixins.less b/src/assets/styles/mixins.less index 07fee2f0a..c7564f51d 100644 --- a/src/assets/styles/mixins.less +++ b/src/assets/styles/mixins.less @@ -3,7 +3,12 @@ * @author: xx * @date: 2018-09-01 15:11:57 */ - +/deep/.el-tree-node:focus > .el-tree-node__content { + color: #409EFF !important; +} +.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content { + color: #409EFF !important; +} .ellipsis () { overflow: hidden; white-space: nowrap; diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 6e8bffd28..a11e76a7f 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -385,7 +385,7 @@ export default { { title: '我的板块', path: '/plate', - menuId: '971d576ef9bce3bddd6f0d6bcc55d184' + menuId: 'e4a94f03223df6f4ad70732b96f07221' } // { // title: '个人信息', diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 62f774fbc..5b17d5bd9 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -13,7 +13,9 @@ :props="defaultProps" default-expand-all :filter-node-method="filterNode" + highlight-current ref="tree" + :expand-on-click-node="false" @node-click="handleNodeClick"> @@ -109,8 +111,10 @@ :props="props" :data="postList" :default-checked-keys="nodeList" + highlight-current check-strictly default-expand-all + :expand-on-click-node="false" show-checkbox> + +
+ + + + + + + + + + + + +
+
+ 取消 + 确定 +
+ + + + + + @@ -139,6 +235,24 @@ export default { name: 'role-manage', data () { return { + type: '', // 新增/编辑状态 + addRoleTitle: '', + SuperiorRoleData: {}, + nodeList3: [], + SuperiorRoleModel: false, + addFormRules: { + name: [ + { required: true, message: '请输入角色名称', trigger: 'blur' } + ] + }, + addForm: { + name: '', // 角色名称 + parentId: '', // 上级ID + remarks: '', // 角色描述 + parent: '', + id: '' + }, + addModel: false, treeData3: [], defaultProps3: { children: 'children', @@ -167,6 +281,116 @@ export default { } }, methods: { + handleCommand (command) { + switch (command[1]) { + case '编辑': + this.RolesAdd(0, command[0]) + break + case '删除': + this.deleteRole(command[0]) + break + } + }, + deleteRole (row) { // 删除角色 + this.$confirm('此操作将永久删除该角色, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$http.delete('sarRole/role', { + roleId: row.id + }, {}, res => { + if (res.ok) { + this.$message({ + type: 'success', + message: '删除成功!' + }); + this.getTree() + } + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + }, + drawerCheck (data) { + var getlist = this.$refs.tree4.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); + if(getlist.length == 1) { + }else { + this.$refs.tree4.setCheckedKeys([data.id]); + } + this.SuperiorRoleData = data + }, + SuperiorRoleOk () { // 上级角色确定 + this.addForm.parentId = this.SuperiorRoleData.id + this.addForm.parent = this.SuperiorRoleData.name + this.nodeList3 = [] + this.nodeList3.push(this.addForm.parentId) + this.SuperiorRoleModel = false + }, + SuperiorRoleCancle () { // 上级角色取消 + this.SuperiorRoleModel = false + }, + AddRoleCancel () { // 新增角色取消 + this.$refs['addForm'].resetFields(); + this.addModel = false + }, + AddRoleOk () { // 新增角色确定 + this.$refs['addForm'].validate((valid) => { + if (valid) { + if (this.type === 1) { // 新增 + this.$http.postData('sarRole/role',this.addForm , {}, res=> { + if (res.ok) { + this.$message.success('新增角色成功') + this.addModel = false + this.getTree() + } else { + this.$message.warning(res.message) + this.addModel = false + } + }) + } else { // 编辑 + this.$http.putData('sarRole/role',this.addForm , {}, res=> { + if (res.ok) { + this.$message.success('修改角色信息成功') + this.addModel = false + this.getTree() + } else { + this.$message.warning(res.message) + this.addModel = false + } + }) + } + } + }) + this.addModel = false + }, + SuperiorRole () { // 点击选择上级角色按钮 + this.SuperiorRoleModel = true + }, + RolesAdd (type, row) { // 新增/编辑角色按钮 + this.type = type + if (type === 1) { + this.addRoleTitle = '新增角色' + this.addForm.name = '' + this.addForm.remarks = '' + this.addForm.parentId = '' + this.addForm.parent = '' + this.addForm.id = '' + } else { + this.addRoleTitle = '编辑角色' + this.addForm.name = row.name + this.addForm.remarks = row.remarks + this.addForm.parentId = row.parentId + this.addForm.parent = row.parent + this.addForm.id = row.id + this.nodeList3 = [] + this.nodeList3.push(this.addForm.parentId) + } + this.addModel = true + }, getTree3 () { this.$http.get('sarResource/ts-resource', {}, {}, res=> { if (res.ok) { @@ -282,6 +506,12 @@ export default { .role-manage { display: flex; height: 100%; + /deep/.el-form-item__content { + width: 100%; + } + .filter-tree1 { + height: 100%; + } .tree-close{ .tree{ left: -200px !important; diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index c65ce2dc3..e94153470 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -174,6 +174,7 @@ check-strictly @check="drawerCheck" default-expand-all + :expand-on-click-node="false" show-checkbox ref="tree"> From 91aa3554e560f04002fc9f2ee9d9e30c899eaa0b Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 2 Jul 2021 17:54:53 +0800 Subject: [PATCH 3/4] commit --- src/pages/config/pages/roleManage/index.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index b225f96c6..19718aa73 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -256,7 +256,7 @@ export default { treeData3: [], defaultProps3: { children: 'children', - label: 'name' + label: 'menuName' }, nodeList2: [], modalflag: false, @@ -389,6 +389,9 @@ export default { this.nodeList3 = [] this.nodeList3.push(this.addForm.parentId) } + this.$watch('newForm', (newVal, oldVal) => { + console.log(newVal, oldVal); + }) this.addModel = true }, getTree3 () { @@ -493,7 +496,12 @@ export default { this.$refs.tree.filter(val); } }, - mounted () { + computed:{ + newForm() { + return JSON.parse(JSON.stringify(this.addForm)) + } + }, + mounted () { this.getTree() this.getTree2() this.getTree3() From bb0f02f7306ab0ae56bfe638116caa7fed52f962 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Sun, 4 Jul 2021 18:05:26 +0800 Subject: [PATCH 4/4] commit --- .../pages/creatProcess/bzdy/step1.vue | 261 +++++++++++------- .../domesticStandardsAndRegulations/index.vue | 180 ++---------- .../foreignStandardsAndRegulations/index.vue | 178 ++---------- 3 files changed, 217 insertions(+), 402 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index e94153470..4cab4e89a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -14,6 +14,7 @@ @@ -30,10 +31,10 @@ clearable > - + @@ -56,98 +57,86 @@
- - -
- - -
- - + + + + + + + + + + + + +
- - -

流程发起人

-
- -
- - - - -

责任对接人

-
- - -
- - - - -

责任人

-
- -
- - - - - -

责任对接人

-
- -
- - - - -

标准法规工程师

-
- -
- - - - -

责任人

-
- -
- - - - -

责任部门领导与标准法规部部长

-
- -
- - - - -

技术管理中心负责人

-
- -
- - - - -

标准法规业务院级领导

-
- -
- - + + + + +

流程发起人

+
+ + +
+ + + + + + +

责任部门对接人

+
+ + + +
+ + + + + + +

标准法规部部长

+
+ + +
+ + + + + + +

技术管理中心主任

+
+ + +
+ + + + + + +

工程研究总院院长

+
+ + +
+ + + +
@@ -166,10 +155,13 @@ :wrapperClosable="false" size="800px"> + @@ -191,6 +187,9 @@ export default { name: "bzdyStep1", data() { return { + roleRow: {}, + nodeList: [], + type: '', defaultProps: { children: 'children', label: 'name' @@ -206,20 +205,47 @@ export default { saveLoading: false, form: { title: '', // 调研标题 - year: '', // 完成时间 + date: '', // 完成时间 model: '', // 上传模板 }, + formRules: { + title: [ + { required: true, message: '请输入调研标题', trigger: 'blur' }, + ], + date: [ + { type: 'date', required: true, message: '请选择完成时间', trigger: 'change' } + ] + }, data: [], // 标准列表数据 ListForm: {}, // 新增数据 - user1: '', - user2: '', - user3: '', - user4: '', - user5: '', - user6: '', - user7: '', - user8: '', - user9: '', + roleForm: { + startUserName: this.$store.getters.userInfo.account, + startUser: this.$store.getters.userInfo.id, + dockUser: '', + responUserList: '', + ministerUser: '', + directorUser: '', + presidentUser: '', + dockUserName: '', + responUserListName: '', + ministerUserName: '', + directorUserName: '', + presidentUserName: '' + }, + roleFormRules: { + dockUserName: [ + { required: true, message: '请输入调研标题', trigger: 'blur' }, + ], + ministerUserName: [ + { required: true, message: '请输入调研标题', trigger: 'blur' }, + ], + directorUserName: [ + { required: true, message: '请输入调研标题', trigger: 'blur' }, + ], + presidentUserName: [ + { required: true, message: '请输入调研标题', trigger: 'blur' }, + ] + } } }, components: { @@ -228,15 +254,39 @@ export default { ProcessTitle }, methods: { + 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 () { - this.drawerTitle = '选择责任人' + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title this.modalshowflag = true }, getTree () { @@ -263,6 +313,13 @@ export default { }, handleSave() {}, handleSubmit() { + this.$refs['Form'].validate((valid) => { + if (valid) { + alert('submit!'); + } else { + return false; + } + }) } }, mounted () { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 66c1c4855..87ab93d05 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3,26 +3,17 @@
- + +
@@ -961,6 +952,11 @@ export default { }, data () { return { + props: { + label: 'menuName', + children: 'children' + }, + treeList: [], visibleOrgTable: false, orgTableVal: '', orgTableValName: '', @@ -1693,104 +1689,12 @@ export default { }) } }, - // 二级菜单新建，编辑，删除 - clickDropMenu (name, treeNode) { - this.selectSarMenu = JSON.parse(JSON.stringify(treeNode)) - if (undefined !== this.selectSarMenu.id) { // 当前有选中节点 - if (name === 'newMenu') { - this.menuModalTitle = '新增目录' - this.menuModalFlag = true - this.menuAddOrUpdateFlag = 1 - this.sarMenu = { - id: '', - parentId: '', - menuName: '', - sorDivide: 'INLAND_STAND', - displaySeq: '', - parentIds: '', - remarks: '' - } - } else if (name === 'editMenu') { - this.menuModalTitle = '编辑目录' - this.menuModalFlag = true - this.menuAddOrUpdateFlag = 2 - this.sarMenu.id = treeNode.id - this.sarMenu.parentId = treeNode.pId - this.sarMenu.menuName = treeNode.oldname || treeNode.name - this.sarMenu.displaySeq = treeNode.displaySeq - if (treeNode.remarks == null || treeNode.remarks === '' || treeNode.remarks === 'null') { - this.sarMenu.remarks = '' - } else { - this.sarMenu.remarks = treeNode.remarks - } - } else { - if (this.selectSarMenu.parentId == null) { // 如果父id为null 说明是根目录 - this.$message({ - title: '提示', - content: '根目录不可删除！' - }) - } else { - // deleteMenu 删除二级菜单，先判断是否选中，选中项目，然后调用删除方法 - // 先判断目录下是否有菜单 - this.$http.post('lawss/sarMenu/judgequeryMenuByPid', this.selectSarMenu, { - _this: this, loading: 'loading' - }, res => { - if (res.data) { - // this.deleteMenuModal = true - this.$confirm('该节点下有记录，确定删除？', '提示', { - confirmButtonText: '确定', - confirmButtonClass: 'common-button-primary', - cancelButtonText: '取消', - type: 'warning', - roundButton: false - }).then(() => { - this.$http.post('lawss/sarMenu/deleteMenuAndChildren', this.selectSarMenu, { - _this: this, loading: 'loading' - }, res => { - this.selectMenu() // 删除成功后，更新二级菜单 - // 获取下一个节点 - let currentNode = this.$refs.domesticTree.getNextNode() - let nodeId = '' - // 如果这个节点为null, 本次删除了最后一个节点 - if (currentNode === null) { - // 选中根节点 - this.$refs.domesticTree.selectRootNode() - } else { - nodeId = currentNode.id - } - this.getDomesticStandardTable(nodeId) - }, e => { - }) - }).catch(() => { - // 取消删除，清空选择 - // this.$refs.selections.clearSelection() - }) - } else { - this.sureDeleteSarMenu() - } - }, e => { - }) - } - } - } else { - this.$Modal.info({ - title: '提示', - content: '请选择节点！' - }) - } - }, treeClick (treeNode) { - this.selectSarMenu = treeNode // 记录当前选中的二级菜单 this.standCommonlySearch.menuId = treeNode.id this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询 this.sarStandardsSearch.page = 1 this.standCommonlySearch.page = 1 - this.getDomesticStandardTable(this.tableFlag) // 根据选中的二级菜单查询对应的标准列表 - }, - treeRightClick (treeNode) { - this.selectSarMenu = treeNode // 记录当前选中的二级菜单 - this.standCommonlySearch.menuId = treeNode.id - this.sarStandardsSearch.menuId = treeNode.id + this.getDomesticStandardTable(this.tableFlag) }, // 点击搜索按钮 searchBtnClick (standCommonlySearch) { @@ -1906,43 +1810,12 @@ export default { }, // 查询二级菜单 selectMenu () { - return new Promise((resolve, reject) => { - this.$http.get('lawss/sarMenu/selectMenuByRole', {sorDivide: 'INLAND_STAND'}, { - _this: this - }, res => { - let treeNode = [] - this.parentNode = {} - if (res.data == null) { - res.data = [] - } - res.data.map((item, index) => { - let treeItem = {} - for (let key in item) { - if (key === 'parentId') { - treeItem.pId = item[key] - treeItem.parentId = item[key] - } else if (key === 'menuName') { - treeItem.name = item[key] - } else { - treeItem[key] = item[key] - } - if (this.initZNode === '' && item.id === '64df1d5522bb49c09af2') { this.initZNode = treeItem } - } - treeNode[index] = treeItem - // 记录最外层父节点 - if (treeItem.parentId === '' || treeItem.parentId == null) { - this.parentNode = treeItem - } - }) - this.zNodes = treeNode - // 查完左侧目录后，如果没有选中的，设置最外层选中 - if (JSON.stringify(this.selectSarMenu) === '{}' || !this.selectSarMenu) { - this.selectSarMenu = JSON.parse(JSON.stringify(this.parentNode)) - } - resolve(res) - }, e => { - reject(e) - }) + this.$http.get('sarResource/ts-resource', { + sorDivide: 'INLAND_STAND' + }, {}, res => { + if (res.ok) { + this.treeList = res.data + } }) }, // 树-删除 @@ -2446,7 +2319,12 @@ export default { } // this.sarStandardsSearch.menuId = this.selectSarMenu.id const formData = {...data} - formData.menuId = this.selectSarMenu.id + if (!item) { + formData.menuId = this.sarStandardsSearch.menuId + } else { + formData.menuId = this.selectSarMenu.id + } + // 排序 formData.orderBy = this.orderBy // 处理我的收藏和个性化标签传参 diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 0c0fd9c14..cb3ee2016 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3,27 +3,17 @@
- + +
@@ -934,6 +924,11 @@ export default { }, data () { return { + treeList: [], + props: { + label: 'menuName', + children: 'children' + }, menuTreeLoading: true, orderBy:'', nowOrder:'', @@ -1644,101 +1639,11 @@ export default { }) }) }, - // 二级菜单新建，编辑，删除 - clickDropMenu (name, treeNode) { - this.selectSarMenu = JSON.parse(JSON.stringify(treeNode)) - if (undefined !== this.selectSarMenu.id) { // 当前有选中节点 - if (name === 'newMenu') { - this.menuModalTitle = '新增目录' - this.menuModalFlag = true - this.menuAddOrUpdateFlag = 1 - this.sarMenu = { - id: '', - parentId: '', - menuName: '', - sorDivide: 'FOREIGN_STAND', - displaySeq: '', - parentIds: '', - remarks: '' - } - } else if (name === 'editMenu') { - this.menuModalTitle = '编辑目录' - this.menuModalFlag = true - this.menuAddOrUpdateFlag = 2 - this.sarMenu.id = treeNode.id - this.sarMenu.parentId = treeNode.pId - this.sarMenu.menuName = treeNode.oldname || treeNode.name - this.sarMenu.displaySeq = treeNode.displaySeq - if (treeNode.remarks == null || treeNode.remarks === '' || treeNode.remarks === 'null') { - this.sarMenu.remarks = '' - } else { - this.sarMenu.remarks = treeNode.remarks - } - } else { - if (this.selectSarMenu.parentId == null) { // 如果父id为null 说明是根目录 - this.$message({ - title: '提示', - content: '根目录不可删除！' - }) - } else { - // deleteMenu 删除二级菜单，先判断是否选中，选中项目，然后调用删除方法 - // 先判断目录下是否有菜单 - this.$http.post('lawss/sarMenu/judgequeryMenuByPid', this.selectSarMenu, { - _this: this, loading: 'loading' - }, res => { - if (res.data) { - // this.deleteMenuModal = true - this.$confirm('该节点下有记录，确定删除？', '提示', { - confirmButtonText: '确定', - confirmButtonClass: 'common-button-primary', - cancelButtonText: '取消', - type: 'warning', - roundButton: false - }).then(() => { - this.$http.post('lawss/sarMenu/deleteMenuAndChildren', this.selectSarMenu, { - _this: this, loading: 'loading' - }, res => { - this.selectMenu() // 删除成功后，更新二级菜单 - // 获取下一个节点 - let currentNode = this.$refs.domesticTree.getNextNode() - let nodeId = '' - // 如果这个节点为null, 本次删除了最后一个节点 - if (currentNode === null) { - // 选中根节点 - this.$refs.domesticTree.selectRootNode() - } else { - nodeId = currentNode.id - } - this.getDomesticStandardTable() - }, e => { - }) - }).catch(() => { - // 取消删除，清空选择 - // this.$refs.selections.clearSelection() - }) - } else { - this.sureDeleteSarMenu() - } - }, e => { - }) - } - } - } else { - this.$Modal.info({ - title: '提示', - content: '请选择节点！' - }) - } - }, treeClick (treeNode) { - this.selectSarMenu = treeNode // 记录当前选中的二级菜单 + this.selectSarMenu = treeNode this.standCommonlySearch.menuId = treeNode.id this.standCommonlySearch.page = 1 - this.getDomesticStandardTable() // 根据选中的二级菜单查询对应的标准列表 - }, - treeRightClick (treeNode) { - this.selectSarMenu = treeNode // 记录当前选中的二级菜单 - this.standCommonlySearch.menuId = treeNode.id + this.getDomesticStandardTable() }, // 点击搜索按钮 searchBtnClick () { @@ -1828,40 +1733,12 @@ export default { }, // 查询二级菜单 selectMenu () { - return new Promise((resolve, reject) => { - this.$http.get('lawss/sarMenu/selectMenuByRole', {sorDivide: 'FOREIGN_STAND'}, { - _this: this - }, res => { - let treeNode = [] - this.parentNode = {} - res.data.forEach((item, index) => { - let treeItem = {} - for (let key in item) { - if (key === 'parentId') { - treeItem.pId = item[key] - treeItem.parentId = item[key] - } else if (key === 'menuName') { - treeItem.name = item[key] - } else { - treeItem[key] = item[key] - } - if (this.initZNode === '' && item.id === '64df1d5522bb49c09af2') { this.initZNode = treeItem } - } - treeNode[index] = treeItem - // 记录最外层父节点 - if (treeItem.parentId === '' || treeItem.parentId == null) { - this.parentNode = treeItem - } - }) - this.zNodes = treeNode - // 查完左侧目录后，如果没有选中的，设置最外层选中 - if (JSON.stringify(this.selectSarMenu) === '{}' || !this.selectSarMenu) { - this.selectSarMenu = JSON.parse(JSON.stringify(this.parentNode)) - } - resolve(res) - }, e => { - reject(e) - }) + this.$http.get('sarResource/ts-resource', { + sorDivide: 'FOREIGN_STAND' + }, {}, res => { + if (res.ok) { + this.treeList = res.data + } }) }, // 树-删除 @@ -2416,7 +2293,11 @@ export default { data.sarStandardsSearch = '' } const formData = {...data} - formData.menuId = this.selectSarMenu.id + if (!item) { + formData.menuId = this.selectSarMenu.id + } else { + formData.menuId = this.standCommonlySearch.menuId + } formData.nowOrderBy = this.nowOrder ? this.orderBy : '' formData.nowOrder = this.nowOrder // 处理我的收藏和个性化标签传参 @@ -2437,7 +2318,6 @@ export default { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { _this: this, loading: 'loading' }, res => { - console.log('2441',formData); this.isAdvancedSearch = false if (res.ok) { for (let i = 0; i < res.data.list.length; i++) {