diff --git a/package.json b/package.json index 2782af0..a7afc00 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202409031604", + "version": "1.0.202409051514", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/public/static/企业名录模板.xlsx b/public/static/企业名录模板.xlsx index 3be33e5..94090ef 100644 Binary files a/public/static/企业名录模板.xlsx and b/public/static/企业名录模板.xlsx differ diff --git a/src/views/dataCloudMap/components/headquarterEnterprise.vue b/src/views/dataCloudMap/components/headquarterEnterprise.vue index d8a5739..eccf33b 100644 --- a/src/views/dataCloudMap/components/headquarterEnterprise.vue +++ b/src/views/dataCloudMap/components/headquarterEnterprise.vue @@ -132,10 +132,22 @@ export default { selectZbCount().then(res=>{ this.countData = res.data; }) + this.pagination = { + current: 1, + size: 10 + } + this.pagination = { ...this.pagination,...this.formInline }; this.getList(); }, infoClose(){ this.infoVisible = false; + this.formInline = { + qymc:"", + tyshxydm:"", + type:"", + projectSmallType:"" + } + this.projectSmallType = ""; }, getList(){ this.loading = true; diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue index 35e36d1..56797b9 100644 --- a/src/views/onlineDeclaration/declareDetailContent/index.vue +++ b/src/views/onlineDeclaration/declareDetailContent/index.vue @@ -128,6 +128,7 @@
{{ item.approvalByName }}
+
{{ item.approvalByName }}
审核意见:{{ item.approvalOpinions }}
@@ -141,7 +142,7 @@
- + {{ attachment | dealURL @@ -499,6 +500,7 @@ export default { item.children = item.approvalAttachment.split(","); } this.approvalInfoList.push(item); + console.log(this.approvalInfoList,"this.approvalInfoList"); return item; }); if (this.templateId == "1") { diff --git a/src/views/project/projectInfo/components/projectProgress/index.vue b/src/views/project/projectInfo/components/projectProgress/index.vue index 20bdcb5..2c411c8 100644 --- a/src/views/project/projectInfo/components/projectProgress/index.vue +++ b/src/views/project/projectInfo/components/projectProgress/index.vue @@ -25,6 +25,7 @@
{{ activity.approvalByName }}
+
{{ activity.approvalByName }}
+ 资金引导