diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 595f0bca7..6a04988c1 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -188,7 +188,7 @@ diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formList.vue b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue new file mode 100644 index 000000000..ab57da038 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue @@ -0,0 +1,891 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue new file mode 100644 index 000000000..36fa47d76 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue @@ -0,0 +1,826 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfs/step2.vue b/src/pages/processCenter/pages/phone/qbfs/step2.vue deleted file mode 100644 index 681239939..000000000 --- a/src/pages/processCenter/pages/phone/qbfs/step2.vue +++ /dev/null @@ -1,458 +0,0 @@ - - - - - - diff --git a/src/pages/processCenter/pages/phone/qbfs/step4.vue b/src/pages/processCenter/pages/phone/qbfs/step4.vue deleted file mode 100644 index bdf95231d..000000000 --- a/src/pages/processCenter/pages/phone/qbfs/step4.vue +++ /dev/null @@ -1,482 +0,0 @@ - - - - - - diff --git a/src/pages/processCenter/pages/phone/qbfs/step5.vue b/src/pages/processCenter/pages/phone/qbfs/step5.vue new file mode 100644 index 000000000..9b663b732 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/step5.vue @@ -0,0 +1,844 @@ + + + + + diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 2762bd95d..4f84584d3 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -2418,7 +2418,7 @@ // 树节点鼠标移入移出 mouseenter(data){ this.$set(data, 'show', true) - if(data.parentId !== null){ + if(data.parentId !== null && data.id !== 'zcwdsc'){ this.$set(data, 'showDel', true) } }, diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 26cec42cd..b14655ab7 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -191,7 +191,7 @@
符合
-
不涉及
+
不涉及
不符合
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 9344a22f5..f7761a03a 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -1426,14 +1426,14 @@ lawsName: '', lawsEnName: '', lawsNo: '', - issueTime: '', + // issueTime: '', issueCompany: '', commentCycleStart: '', commentCycleEnd: '', lawsTextState: '', lawsSyqy: '', lawsSycx: '', - isRelateAccess: '', + // isRelateAccess: '', lawsYear: '', lawsNotisyncNum: '', lawsBulletin: '', @@ -2198,7 +2198,7 @@ pagetype = "BUSINESS_STAND "; } // 详情跳到新页 - if (routername !== "") { + if (routername !== "" && routername !== "OtherBussStandardDetails") { let routeUrl = this.$router.resolve({ name: routername, params: { @@ -2207,6 +2207,26 @@ } }); window.open(routeUrl.href, "_blank"); + }else{ + this.$http.get('lawss/sarBussionessStand/checkIsShow', { + id: item.id, + userId: this.$store.getters.userInfo.userId + }, { + _this: this + }, res =>{ + if(res){ + let routeUrl = this.$router.resolve({ + name: routername, + params: { + id: item.id, + pageType: pagetype + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('您暂无权限查看') + } + }) } }, judgeBussRole(item) { diff --git a/src/router/index.js b/src/router/index.js index 14ed05908..d12c0f404 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2636,19 +2636,9 @@ const routes = [ } }, { - path: '/phoneQbfsStep2', - name: 'phoneQbfsStep2', - component: () => import('@/pages/processCenter/pages/phone/qbfs/step2.vue'), - meta: { - isBoolean: true, - requireAuth: true, - title: '企标复审流程' - } - }, - { - path: '/phoneQbfsStep4', - name: 'phoneQbfsStep4', - component: () => import('@/pages/processCenter/pages/phone/qbfs/step4.vue'), + path: '/phoneBussFs3', + name: 'phoneBussFs3', + component: () => import('@/pages/processCenter/pages/phone/qbfs/step5.vue'), meta: { isBoolean: true, requireAuth: true,