diff --git a/.env.development b/.env.development index 3f00139..638b82c 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.109:9040' +VUE_APP_BASE_API = 'http://192.168.0.103:9040' # VUE_APP_BASE_API = 'http://39.101.188.84:9040' # 路由懒加载 diff --git a/public/favicon.ico b/public/favicon.ico index e263760..a04b7a7 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon1.ico b/public/favicon1.ico new file mode 100644 index 0000000..e263760 Binary files /dev/null and b/public/favicon1.ico differ diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue index 5d93527..d4cf6b3 100644 --- a/src/views/onlineDeclaration/declareDetailContent/index.vue +++ b/src/views/onlineDeclaration/declareDetailContent/index.vue @@ -1695,6 +1695,7 @@ export default { active: 4, templateId: null, //公司id templateRecordId: null, //模版ID + enterpriseId: null, detailId: null, //当前数据id pageType: null, //类型 uploadLabel: null, @@ -1824,15 +1825,16 @@ export default { uploadListEight: [], uploadListNine: [], // 审核列表 - approvalInfoList: [] + approvalInfoList: [], }; }, async mounted(){ - let { templateId, templateRecordId, pageType, detailId} = this.$route.query; + let { templateId, templateRecordId, pageType, detailId, enterpriseId} = this.$route.query; this.templateId = templateId this.templateRecordId = templateRecordId this.detailId = detailId this.pageType = pageType + this.enterpriseId = enterpriseId let { data } = await getTemplateInfo({templateId: templateId}) this.templateInfo = data switch (this.templateId){ @@ -1853,7 +1855,8 @@ export default { break; } console.log('this.templateInfo: ', this.templateInfo); - getBasicInfo({enterpriseId: this.$store.state.user.enterpriseId}).then((response) => { + // getBasicInfo({enterpriseId: this.$store.state.user.enterpriseId}).then((response) => { + getBasicInfo({enterpriseId: this.enterpriseId}).then((response) => { this.baseInfo = response.data }) getOpenInterface({templateRecordId: templateRecordId}).then((response) => { diff --git a/src/views/onlineDeclaration/pendingReview/index.vue b/src/views/onlineDeclaration/pendingReview/index.vue index c0072c2..bae33e8 100644 --- a/src/views/onlineDeclaration/pendingReview/index.vue +++ b/src/views/onlineDeclaration/pendingReview/index.vue @@ -285,7 +285,8 @@ export default { templateId: row.templateId, templateRecordId: row.templateRecordId, pageType: "detail", - detailId: row.declarationRecordsId + detailId: row.declarationRecordsId, + enterpriseId: row.enterpriseId }}) }, /** 切换审批项 */ diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue index 600f824..aeb2c3b 100644 --- a/src/views/onlineDeclaration/records/index.vue +++ b/src/views/onlineDeclaration/records/index.vue @@ -465,7 +465,8 @@ export default { templateId: row.templateId, templateRecordId: row.templateRecordId, pageType: "detail", - detailId: row.id + detailId: row.id, + enterpriseId: row.enterpriseId }}) }, /** 修改按钮操作 */