diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 51a708a74..2e85d241d 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -125,11 +125,11 @@ export default { // // // title: '本地产品/项目库', // // // path: '/localProductsOrProjectLibrary' // // // }, - // { - // title: '企业标准库', - // path: '/enterpriseStandardDatabase', - // menuId: '3YVZP8R4TC' - // }, + { + title: '企业标准库', + path: '/enterpriseStandardDatabase', + menuId: '01ed8f752748227777b3572d56ee9ab5' + }, // { // title: '企标制修订计划', // path: '/enterBSysRevPlanManaLib', diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index ffe6f3326..993e50efe 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -32,14 +32,16 @@ class="common-button-primary add-button" @click="roleAdd" v-btn-permission="'93e75b6ec0b2b6b0b40d2b11adeba88a'" - size="mini">配置角色资源 + size="mini">配置角色权限 配置数据权限 新增角色
@@ -93,8 +95,8 @@ - 编辑 - 删除 + 编辑 + 删除
diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index ac50a05da..61b1a1d6e 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -22,7 +22,7 @@ export default { }, { label:'标准清单发布/更新流程', - value: '6' + value: '4' }, { label: '项目合规评估流程', diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 299d6dbe8..1c406b205 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -7,6 +7,7 @@
基础信息
+
审批历史
@@ -74,6 +75,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, + updateFile () { + window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model + }, checkedRole2 (data) { var idList = '' var nameList = '' @@ -148,9 +219,6 @@ this.form.responUserList = idList this.form.responUserListName = nameList }, - updateFile () { - window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model - }, choiceZRR () { this.nodeList2 = [] if ( this.form.responUserList.length > 0) { @@ -205,6 +273,7 @@ }, mounted () { this.getData() + this.getHistoryData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index b12708de0..e334f183f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -7,6 +7,7 @@
基础信息
+
审批历史
@@ -86,6 +87,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, updateFile () { window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model }, @@ -249,6 +317,7 @@ }, mounted () { this.getData() + this.getHistoryData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 11c25dc64..59b79f820 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -7,6 +7,7 @@
基础信息
+
审批历史
@@ -74,6 +75,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, updateFile (fileId) { window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId }, @@ -199,6 +267,7 @@ }, mounted () { this.getData() + this.getHistoryData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index d4156d554..4ddf7e974 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -7,6 +7,7 @@
基础信息
+
审批历史
@@ -113,6 +114,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, updateFile (fileId) { window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId }, @@ -272,6 +340,7 @@ }, mounted () { this.getData() + this.getHistoryData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 76ab545cb..d9e652faa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -7,6 +7,7 @@
基础信息
+
审批历史
@@ -108,6 +109,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, updateFile (fileId) { window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId }, @@ -285,6 +353,7 @@ }, }, mounted () { + this.getHistoryData() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index a9fb712bb..699657b95 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -7,6 +7,7 @@
基础信息
+
审批历史
@@ -108,6 +109,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, updateFile (fileId) { window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId }, @@ -285,6 +353,7 @@ }, }, mounted () { + this.getHistoryData() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index 2dcffae27..220de8e65 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -1,5 +1,5 @@ @@ -893,6 +967,60 @@ export default { }, data () { return { + props: { + label: 'menuName', + children: 'children' + }, + productModal: false, // 模态框是否打开 + modalType: '', + productTitle: '', // 模态框标题 + // 规范 + productRules: { + menuName: [ + {required: true, message: '一级菜单不能为空', trigger: 'blur'}, + {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'} + ], + displaySeq: [ + {type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'}, + {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'} + ], + remarks: [ + {type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'} + ], + dicTypeName: [ + {required: true, message: '选项不能为空', trigger: 'blur'}, + {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'} + ], + showIndex: [ + {type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'}, + {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'} + ], + describes: [ + {type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'} + ] + }, + productModelAdd: { + id : "", + sorDivide : "INLAND_STAND", + menuName : "", + parentId : null, + parentIds : null, + parentIdsName : "", + displaySeq : "", + validFlag : "", + creationTime : "", + modifyTime : "", + remarks : "", + children : [], + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: "" + }, + treeList: [], standId: '', visibleOrgTable: false, visibleShare: false, @@ -1423,6 +1551,183 @@ export default { } }, methods: { + closeModal () { + this.productModal = false + this.closeDrawer() + }, + // 提交新增/修改 + saveProduct (name) { + this.$refs[name].validate((valid) => { + if (valid) { + if (this.modalType === 1) { + this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, { + _this: this + }, res => { + if (res.ok) { + this.selectMenuList() + this.productModal = false + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: this.$route.params.id + } + } else { + this.productModal = true + } + }, e => {}) + } else if (this.modalType === 2) { + this.$http.putData('sarResource/ts-resource', this.productModelAdd, { + _this: this + }, res => { + this.selectMenuList() + this.productModal = false + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: this.$route.params.id + } + }, e => { + }) + } + } else { + } + }) + }, + closeDrawer () { + this.$nextTick(() => { + this.$refs['productModelAdd'].resetFields() + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: this.$route.params.id + } + }) + this.productModal = false + }, + // 查询二级菜单 + selectMenuList () { + this.$http.get('sarResource/ts-resource', { + sorDivide: 'BUSINESS_STAND' + }, {}, res => { + if (res.ok) { + this.treeList = res.data + } + }) + }, + // 查询二级菜单 + selectChildMenu (row) { + this.$http.get('sarResource/ts-resource/getMenuById', { + menuId: row.id + }, {}, res => { + if (res.ok) { + if(this.modalType === 1){ + let idsName = "" + if(row.parentIds !== null){ + if(row.parentIds.indexOf(res.data.id) != -1){ + this.productModelAdd.parentIds = row.parentIds + }else { + this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id + idsName = row.parentIdsName + ',' + res.data.menuName + } + }else { + this.productModelAdd.parentIds = res.data.id + idsName = res.data.menuName; + } + this.productModelAdd.parentId = res.data.id + this.productModelAdd.parentIdsName = idsName + this.$forceUpdate() + }else { + this.productModelAdd = res.data + } + } + }) + }, + update(data) { + this.modalType = 2 + this.selectChildMenu(data) + this.productModal = true + this.productTitle = '编辑信息' + // const newChild = { id: this.id++, label: 'testtest', children: [] }; + // if (!data.children) { + // this.$set(data, 'children', []); + // } + // data.children.push(newChild); + }, + + append(data) { + this.modalType = 1 + this.selectChildMenu(data) + this.productModal = true + this.productTitle = '新增下级菜单信息' + this.productModelAdd.dicTypeCode = '' + // const newChild = { id: this.id++, label: 'testtest', children: [] }; + // if (!data.children) { + // this.$set(data, 'children', []); + // } + // data.children.push(newChild); + }, + + remove(node, data) { + this.$confirm('是否删除菜单?', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonText: '取消', + roundButton: true, + type: 'warning' + }).then(() => { + this.$http.delete("sarResource/ts-resource", { + resourceId: data.id + }, res => { + }, e => { + if(e.ok){ + this.$message({ + type: 'success', + message: "删除成功" + }) + this.selectMenuList() + }else { + this.$message({ + type: 'warning', + message: e.message + }) + } + }) + }).catch(() => { + this.$refs.selections.clearSelection() + this.$message({ + type: 'info', + message: '已取消删除' + }) + }) + // const parent = node.parent; + // const children = parent.data.children || parent.data; + // const index = children.findIndex(d => d.id === data.id); + // children.splice(index, 1); + }, + // 树节点鼠标移入移出 + mouseenter(data){ + console.log(data) + this.$set(data, 'show', true) + if(data.parentId !== null){ + this.$set(data, 'showDel', true) + } + }, + mouseleave(data){ + this.$set(data, 'show', false) + this.$set(data, 'showDel', false) + }, /** * @description: 起草人名称展示 * @author: chenxiaoxi @@ -3147,7 +3452,7 @@ export default { mounted () { this.treeReload = true // 进入页面后查询树形结构目录 - this.selectMenu() + this.selectMenuList() // 查询各下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this @@ -3194,7 +3499,7 @@ export default { height: 100%; //background: #fff; .tree-content { - width: 16%; + width: 20%; position: relative; /*height: 100%;*/ background: #fff; diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 88ed4d9b9..ba58aec42 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -24,8 +24,8 @@ 项目经理: {{ localProEO.projectManager }} - 项目计划开始时间: {{ localProEO.projectStartDate}} - 项目计划完成时间: {{localProEO.projectEndDate }} + 项目计划开始时间: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD')}} + 项目计划完成时间: {{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }}
@@ -420,7 +420,7 @@ export default { okStand() { let _this = this; if (this.standList.length < 1) { - _this.$message.warning("请选择需要添加进清单的数据"); + _this.$message.warning("请选择标准"); } else { for (let i=0;i import('@/pages/processCenter/pages/creatProcess/xmpg2/step3.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step4', + name: 'xmpg2Step4', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step4.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step5', + name: 'xmpg2Step5', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step5.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step6', + name: 'xmpg2Step6', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step6.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, { path: '/wfhxzgStep1', name: 'wfhxzgStep1',