diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index bbdbd002c..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', @@ -303,7 +303,7 @@ export default { { title: '菜单管理', path: '/menuManage', - menuId: '82665e94d406c6fc0d1f627e5880230b' + menuId: '87b8b4f5817a7829696e63185c744d52' }, { title: '链接管理', 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 @@