From 5ddab141a34cf7664687d8b4bc4608f95c3759c8 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 26 Nov 2021 10:23:04 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standAutoSplit/pages/itemSplitInfo.vue | 2 +- .../pages/creatProcess/bzhHd-rh/step1.vue | 39 +++++++---------- .../pages/creatProcess/bzhHd-rh/step2.vue | 34 +++++++++------ .../pages/creatProcess/bzhHd-rh/step3.vue | 43 ++++++++++--------- .../pages/creatProcess/bzhHd-rh/step4.vue | 31 +++++++------ .../pages/creatProcess/bzhHd-rh/step5.vue | 28 ++++++------ .../pages/creatProcess/bzhHd-rh/step6.vue | 28 ++++++------ .../pages/creatProcess/bzhHh-hh/step1.vue | 24 +++++------ .../pages/creatProcess/bzhHh-hh/step2.vue | 20 ++++----- .../pages/creatProcess/bzhHy-ch/step1.vue | 24 +++++------ .../pages/creatProcess/bzhHy-ch/step2.vue | 27 ++++++------ .../pages/creatProcess/bzhHy-ch/step3.vue | 37 ++++++++-------- .../pages/creatProcess/bzhHy-ch/step4.vue | 24 +++++------ .../pages/creatProcess/bzhHy-ch/step5.vue | 24 +++++------ .../pages/creatProcess/bzhHy-ch/step6.vue | 24 +++++------ .../dataStatis/miniPages/expendSubsidy.vue | 16 +++---- .../dataStatis/miniPages/inComeSubsidy.vue | 24 +++++------ .../dataStatis/pages/attendCost.vue | 18 ++++---- .../dataStatis/pages/purchaseCost.vue | 24 +++++------ .../dataStatis/pages/reviseCost.vue | 28 ++++++------ .../dataStatis/pages/societyCost.vue | 22 +++++----- .../dataStatis/pages/translateCost.vue | 28 ++++++------ 22 files changed, 290 insertions(+), 279 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 30ec43941..0bbe54f8e 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -42,7 +42,7 @@ 删除 模板下载 批量复制 - 合并条款 + 合并条款 提交 审核 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index d36e5c488..d89dae681 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -15,10 +15,10 @@
- + - + @@ -31,7 +31,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -57,10 +57,9 @@ - - + @@ -73,7 +72,7 @@ - + @@ -86,7 +85,7 @@ - + @@ -99,8 +98,7 @@ - - + - - + - + - + - + - + - + - - + - - +
基础信息
- + - + {{ rh_pageData.comityFileNum || '-' }} - + {{ rh_pageData.comityFileName || '-' }} - + {{ rh_pageData.comityName || '-' }} - + {{ rh_pageData.comityState || '-' }} - + {{ rh_pageData.comityKind || '-' }} - + {{ rh_pageData.comityMake.makeQualification || '-' }} - + {{ rh_pageData.comityMake.makeRole || '' }} - + {{ rh_pageData.comityMake.makeCost || '-' }} - + {{ rh_pageData.comityMake.makeDuties || '-' }} - + {{ rh_pageData.comityMake.makeTime || '-' }} - + - + - + 基础信息
- + - + {{ rh_pageData.comityFileNum || '-' }} - + {{ rh_pageData.comityFileName || '-' }} - + {{ rh_pageData.comityName || '-' }} - + {{ rh_pageData.comityState || '-' }} - + {{ rh_pageData.comityKind || '-' }} - + {{ rh_pageData.comityMake.makeQualification || '-' }} - + {{ rh_pageData.comityMake.makeRole || '' }} - + {{ rh_pageData.comityMake.makeDuties || '-' }} - + {{ rh_pageData.comityMake.makeCost || '-' }} - + {{ rh_pageData.comityMake.makeTime || '-' }} - + - + - + - + - + - + - + - + - + 基础信息
- + - + {{ rh_pageData.comityFileNum || '-' }} - + {{ rh_pageData.comityFileName || '-' }} - + {{ rh_pageData.comityName || '-' }} - + {{ rh_pageData.comityState || '-' }} - + {{ rh_pageData.comityKind || '-' }} - + {{ rh_pageData.comityMake.makeQualification || '-' }} - + {{ rh_pageData.comityMake.makeRole || '' }} - + {{ rh_pageData.comityMake.makeCost || '-' }} - + {{ rh_pageData.comityMake.makeDuties || '-' }} - + {{ rh_pageData.comityMake.makeTime || '-' }} - + - + - + 基础信息
- + - + {{ rh_pageData.comityFileNum || '-' }} - + {{ rh_pageData.comityFileName || '-' }} - + {{ rh_pageData.comityName || '-' }} - + {{ rh_pageData.comityState || '-' }} - + {{ rh_pageData.comityKind || '-' }} - + {{ rh_pageData.comityMake.makeQualification || '-' }} - + {{ rh_pageData.comityMake.makeRole || '' }} - + {{ rh_pageData.comityMake.makeCost || '-' }} - + {{ rh_pageData.comityMake.makeDuties || '-' }} - + {{ rh_pageData.comityMake.makeTime || '-' }} - + - + - +
基础信息
- + - + {{ rh_pageData.comityFileNum || '-' }} - + {{ rh_pageData.comityFileName || '-' }} - + {{ rh_pageData.comityName || '-' }} - + {{ rh_pageData.comityState || '-' }} - + {{ rh_pageData.comityKind || '-' }} - + {{ rh_pageData.comityMake.makeQualification || '-' }} - + {{ rh_pageData.comityMake.makeRole || '' }} - + {{ rh_pageData.comityMake.makeCost || '-' }} - + {{ rh_pageData.comityMake.makeDuties || '-' }} - + {{ rh_pageData.comityMake.makeTime || '-' }} - + - + - +
基础信息
- + - + {{ hh_pageData.associaName || '-' }} - + {{ hh_pageData.associaNameOne || '-' }} - + {{ hh_pageData.associaNameTwo || '-' }} - + {{ hh_pageData.partPeople || '-' }} - + {{ hh_pageData.meetingStartTime || '-' }} - + {{ hh_pageData.meetingName || '-' }} - +
添加 批量删除 @@ -84,7 +84,7 @@ - + - + - +

参会人

@@ -143,7 +143,7 @@ - +

法规工程师

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue index 3e5e65c59..a7e06d66d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue @@ -14,44 +14,44 @@
- + - + {{ hh_pageData.associaName || '-' }} - + {{ hh_pageData.associaNameOne || '-' }} - + {{ hh_pageData.associaNameTwo || '-' }} - + {{ hh_pageData.partPeople || '-' }} - + {{ hh_pageData.meetingStartTime || '-' }} - + {{ hh_pageData.meetingName || '-' }} - + - + - + 基础信息
- + - + - + - + @@ -45,7 +45,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -73,7 +73,7 @@ - + - + - + - + @@ -111,7 +111,7 @@ - + - + 计划内 计划外 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index 37b316657..ae2d7683e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -14,51 +14,51 @@
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + - + {{ ch_pageData.sort || '-'}} - + - + 基础信息
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + - + {{ ch_pageData.sort || '-' }} - + - + - + - + - + - + - + 基础信息
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + - + {{ ch_pageData.sort || '-' }} - + - + 基础信息
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + - + {{ ch_pageData.sort || '-' }} - + - +
基础信息
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + - + {{ ch_pageData.sort || '-' }} - + - + - + - + - + @@ -111,19 +111,19 @@ :title="drawerTitle" :visible.sync="drawerTable">
- - + + - + - + - + - + - + - + @@ -108,23 +108,23 @@ :title="drawerTitle" :visible.sync="drawerTable">
- - + + - + - + - + - + - + - + - + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue index 97e28b707..2bb617058 100644 --- a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue +++ b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue @@ -3,13 +3,13 @@
- + - + - +
- - + + - + - + - + - + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue index 4af7ec81b..a3e96217a 100644 --- a/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue +++ b/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue @@ -3,13 +3,13 @@
- + - + - + @@ -106,25 +106,25 @@ :title="drawerTitle" :visible.sync="drawerTable">
- - + + - + - + - + - + @@ -152,13 +152,13 @@ width="30%" > - + - + - + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue index 99059bd95..9f1f93c16 100644 --- a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue +++ b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue @@ -3,13 +3,13 @@
- + - + - + - +
- - + + - + - + - + - + - + - + - + - + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue index 3989bf1fe..d8c64c8dd 100644 --- a/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue +++ b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue @@ -3,13 +3,13 @@
- + - + - +
- - + + - + - + - + - + - + - + - + - + - + @@ -116,34 +116,34 @@ :title="drawerTitle" :visible.sync="drawerTable">
- - + + - + - + - + - + - + - + @@ -171,13 +171,13 @@ width="30%" > - + - + - + From 3280b73396d91624e8c7acdc11023a95ffb3bcc2 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 26 Nov 2021 10:40:06 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=BA=95=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E7=95=99=E7=99=BD=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standardWarning.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index d5132893b..6dd0f6fcf 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -828,7 +828,7 @@ export default { .content { padding-bottom: 10px; - height: calc(~'100% - 40px'); + height: calc(~'100% - 7%'); /deep/ .el-button--mini { padding: 5px 7px; From 997e25565fd36409da04d6b2657490222ac19dfd Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 26 Nov 2021 14:29:18 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataStatis/miniPages/expendSubsidy.vue | 14 ++--- .../dataStatis/miniPages/inComeSubsidy.vue | 24 ++++---- .../dataStatis/page/listOfCost.vue | 58 ++++++------------- .../dataStatis/pages/attendCost.vue | 22 +++---- .../dataStatis/pages/purchaseCost.vue | 24 ++++---- .../dataStatis/pages/reviseCost.vue | 31 +++++----- .../dataStatis/pages/subsidyCost.vue | 23 +++----- .../dataStatis/pages/translateCost.vue | 33 ++++++----- 8 files changed, 104 insertions(+), 125 deletions(-) diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue index c148b5d8e..9761463ac 100644 --- a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue +++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue @@ -1,16 +1,16 @@