diff --git a/src/App.vue b/src/App.vue index d0911b674..369bd74f9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -217,7 +217,8 @@ export default { && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex' && this.$route.name !== 'AdvancedSearchExternal' && this.$route.name !== 'LoginVerifyNoEncryption' - && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage') { + && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' + && this.$route.name !== 'loginStandDetails' && this.$route.name !== 'error') { this.isBoolean = true } else { this.isBoolean = false diff --git a/src/main.js b/src/main.js index 26cb746cb..a9c6ae19b 100644 --- a/src/main.js +++ b/src/main.js @@ -72,7 +72,7 @@ router.beforeEach(function (to, from, next) { } let toName = to.name - if (toName === 'CheckPage') { + if (toName === 'CheckPage' || toName === 'loginStandDetails' || toName === 'error') { next() return } diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 8dc89e209..e323821fc 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -1338,6 +1338,7 @@ export default { }, data () { return { + externalStatus:'', QFTP: false, textOptions: [], commentAverageScoreTag: '1', @@ -3089,6 +3090,10 @@ export default { // } }, async mounted () { + let external = localStorage.getItem("external"); + if(external !== undefined && external !== null){ + this.externalStatus = external + } //查询动态评价总平均分和质量评价总平均分 let standId = this.$route.params.id // 从数据库中查询各下拉框数据 @@ -3156,7 +3161,7 @@ export default { formFieldList.forEach((field) => { displayLocation.forEach((location) => { location.isShowImp = '0' - if (dynamicFormField) { + if (dynamicFormField && (this.externalStatus === 'external' ? field.attrField !== 'XGLC' : true)) { let value = dynamicFormField[field.attrField] if (field.attrField === 'SVPPS') { let tips = dynamicFormField.SVPPSTips diff --git a/src/pages/details/otherBussStandardExternalDetails/index.vue b/src/pages/details/otherBussStandardExternalDetails/index.vue new file mode 100644 index 000000000..eb8a223a6 --- /dev/null +++ b/src/pages/details/otherBussStandardExternalDetails/index.vue @@ -0,0 +1,3583 @@ + + + + + diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index b785040db..b2f14711a 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -1801,6 +1801,7 @@ export default { }, data() { return { + externalStatus:'', handleList: [], CycxOptions: [], activeNames: ['基础信息', '过程稿件', '实施日期'], @@ -3723,7 +3724,11 @@ export default { }) },*/ async mounted() { - this.sarStandardsInfoEO.id = this.$route.params.id + let external = localStorage.getItem("external"); + if(external !== undefined && external !== null){ + this.externalStatus = external + } + this.sarStandardsInfoEO.id = this.$route.params.id // await this.selectStandMessage() this.standItemEO.standId = this.$route.params.id // 从数据库中查询各下拉框数据 @@ -3749,7 +3754,7 @@ export default { // } displayLocation.forEach((location) => { location.isShowImp = '0' - if (dynamicFormField) { + if (dynamicFormField && (this.externalStatus === 'external' ? field.attrField !== 'XGLC' : true)) { let value = dynamicFormField[field.attrField] if (field.attrField === 'SVPPS') { let tips = dynamicFormField.SVPPSTips diff --git a/src/pages/details/otherStandardExternalDetails/components/RelatedTermsSelect.vue b/src/pages/details/otherStandardExternalDetails/components/RelatedTermsSelect.vue new file mode 100644 index 000000000..4917b1547 --- /dev/null +++ b/src/pages/details/otherStandardExternalDetails/components/RelatedTermsSelect.vue @@ -0,0 +1,322 @@ + + + + + diff --git a/src/pages/details/otherStandardExternalDetails/index.vue b/src/pages/details/otherStandardExternalDetails/index.vue new file mode 100644 index 000000000..3c6b6e47a --- /dev/null +++ b/src/pages/details/otherStandardExternalDetails/index.vue @@ -0,0 +1,4482 @@ + + + + + diff --git a/src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectDetailTwo.vue b/src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectDetailTwo.vue new file mode 100644 index 000000000..7b5ea27ee --- /dev/null +++ b/src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectDetailTwo.vue @@ -0,0 +1,985 @@ + + + + + + diff --git a/src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectTwo.vue b/src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectTwo.vue new file mode 100644 index 000000000..a0b52f008 --- /dev/null +++ b/src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectTwo.vue @@ -0,0 +1,415 @@ + + + + + diff --git a/src/pages/details/otherStandardExternalDetails/pages/technologyInvolveProjectTwo.vue b/src/pages/details/otherStandardExternalDetails/pages/technologyInvolveProjectTwo.vue new file mode 100644 index 000000000..4ae4b8199 --- /dev/null +++ b/src/pages/details/otherStandardExternalDetails/pages/technologyInvolveProjectTwo.vue @@ -0,0 +1,991 @@ + + + + + + diff --git a/src/pages/loginStandDetails/common/error.vue b/src/pages/loginStandDetails/common/error.vue new file mode 100644 index 000000000..8169bf6a4 --- /dev/null +++ b/src/pages/loginStandDetails/common/error.vue @@ -0,0 +1,46 @@ + + + + + + diff --git a/src/pages/loginStandDetails/index.vue b/src/pages/loginStandDetails/index.vue new file mode 100644 index 000000000..22679b85f --- /dev/null +++ b/src/pages/loginStandDetails/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/pages/loginVerifyNoEncryption/index.vue b/src/pages/loginVerifyNoEncryption/index.vue index 0a3cf1066..88221cd38 100644 --- a/src/pages/loginVerifyNoEncryption/index.vue +++ b/src/pages/loginVerifyNoEncryption/index.vue @@ -23,15 +23,7 @@ }, methods: { logout(){ - this.$store.dispatch('logout') - this.$alert('您没有系统访问权限,请联系管理员进行授权', '提示', { - confirmButtonText: '确定', - type: 'warning', - showClose: false, - showCancelButton: false, - }).then(() => { - window.location.href = ssoLogoutUrlDev - }) + this.$router.push('error') }, /** * @description: 获取菜单logout diff --git a/src/router/index.js b/src/router/index.js index 56078fa11..aba27e034 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,6 +60,18 @@ const routes = [ component: () => import('@/pages/loginVerify') }, + { + path: '/loginStandDetails', + name: 'loginStandDetails', + component: () => + import('@/pages/loginStandDetails') + }, + { + path: '/error', + name: 'error', + component: () => + import('@/pages/loginStandDetails/common/error.vue') + }, { path: '/loginVerifyNoEncryption', name: 'LoginVerifyNoEncryption', @@ -3948,6 +3960,18 @@ const routes = [ menuId: 'SSA6WR4HV8' } }, + { + path: '/otherStandardExternalDetails/:id/:pageType', + name: 'otherStandardExternalDetails', + component: () => + import('@/pages/details/otherStandardExternalDetails/index'), + meta: { + requireAuth: true, + title: '标准详情', + isBoolean: true, + menuId: 'SSA6WR4HV8' + } + }, { path: '/standInvolveProjectTwo', name: 'standInvolveProjectTwo', @@ -3992,6 +4016,17 @@ const routes = [ title: '企标详情' } }, + { + path: '/otherBussStandardExternalDetails/:id/:pageType', + name: 'otherBussStandardExternalDetails', + component: () => + import('@/pages/details/otherBussStandardExternalDetails'), + meta: { + requireAuth: true, + isBoolean: true, + title: '企标详情' + } + }, { path: '/otherLawsStandDetails/:id/:pageType', name: 'OtherLawsStandDetails',