From 36884ea627ea63267a5f4ded8c6334196ede7946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 12 Nov 2021 15:45:04 +0800
Subject: [PATCH 1/8] =?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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../regulatoryRepository/dataStatis/index.vue | 97 ++-
.../dataStatis/miniPages/expendSubsidy.vue | 312 +++++++++
.../dataStatis/miniPages/inComeSubsidy.vue | 393 +++++++++++
.../dataStatis/page/listOfCost.vue | 112 ++++
.../dataStatis/page/listOfMeeting.vue | 428 ++++++++++++
.../dataStatis/page/listOfMember.vue | 444 ++++++++++++
.../dataStatis/page/listOfSociety.vue | 634 ++++++++++++++++++
.../dataStatis/page/listOfStandard.vue | 559 +++++++++++++++
.../dataStatis/pages/attendCost.vue | 343 ++++++++++
.../dataStatis/pages/purchaseCost.vue | 354 ++++++++++
.../dataStatis/pages/reviseCost.vue | 375 +++++++++++
.../dataStatis/pages/societyCost.vue | 375 +++++++++++
.../dataStatis/pages/subsidyCost.vue | 50 ++
.../dataStatis/pages/translateCost.vue | 395 +++++++++++
14 files changed, 4867 insertions(+), 4 deletions(-)
create mode 100644 src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue
create mode 100644 src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue
diff --git a/src/pages/regulatoryRepository/dataStatis/index.vue b/src/pages/regulatoryRepository/dataStatis/index.vue
index 3ada7755b..ff8e46689 100644
--- a/src/pages/regulatoryRepository/dataStatis/index.vue
+++ b/src/pages/regulatoryRepository/dataStatis/index.vue
@@ -1,13 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
new file mode 100644
index 000000000..6bb6dc0db
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
@@ -0,0 +1,312 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+ 新增
+
+
+ 编辑
+
+
+ 导入
+
+
+ 导出
+
+
+ 批量删除
+
+
+
+ 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue
new file mode 100644
index 000000000..b4c211458
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue
@@ -0,0 +1,393 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+ 新增
+
+
+ 编辑
+
+
+ 导入
+
+
+ 导出
+
+
+ 批量删除
+
+
+
+ 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue
new file mode 100644
index 000000000..e26a5459a
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue
new file mode 100644
index 000000000..4e804c728
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue
@@ -0,0 +1,428 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+ 新增
+
+
+ 导入
+
+
+ 导出
+
+
+ 批量删除
+
+
+
+ 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
new file mode 100644
index 000000000..ce8130099
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
@@ -0,0 +1,444 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+ 新增
+
+
+ 导入
+
+
+ 导出
+
+
+ 批量删除
+
+
+
+ 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.date }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.date }}
+
+
+
+
+
+
+ {{ scope.row.date }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
new file mode 100644
index 000000000..1f2e6db0c
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
@@ -0,0 +1,634 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+ 新增
+
+
+ 导入
+
+
+ 导出
+
+
+ 批量删除
+
+
+
+ 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue
new file mode 100644
index 000000000..a9e99509d
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue
@@ -0,0 +1,559 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+ 新增
+
+
+ 导入
+
+
+ 导出
+
+
+ 批量删除
+
+
+
+ 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.date }}
+
+
+ {{ scope.row.date }}
+
+
+
+
+
+
+ {{ scope.row.date }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认删除这些数据?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
new file mode 100644
index 000000000..ddfacbae8
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
@@ -0,0 +1,343 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+ 新增
+
+
+ 编辑
+
+
+ 导入
+
+
+ 导出
+
+
+ 批量删除
+
+
+
+ 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue
new file mode 100644
index 000000000..6f30ebe02
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue
@@ -0,0 +1,354 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+ 新增
+
+
+ 编辑
+
+
+ 导入
+
+
+ 导出
+
+
+ 批量删除
+
+
+
+ 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
new file mode 100644
index 000000000..07d88c475
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
@@ -0,0 +1,375 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+ 新增
+
+
+ 编辑
+
+
+ 导入
+
+
+ 导出
+
+
+ 批量删除
+
+
+
+ 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
new file mode 100644
index 000000000..c71875f24
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
@@ -0,0 +1,375 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+ 新增
+
+
+ 编辑
+
+
+ 导入
+
+
+ 导出
+
+
+ 批量删除
+
+
+
+ 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue
new file mode 100644
index 000000000..29befc979
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue
new file mode 100644
index 000000000..e6379a0c8
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+ 新增
+
+
+ 编辑
+
+
+ 导入
+
+
+ 导出
+
+
+ 批量删除
+
+
+
+ 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From faf043f76e46f3613393dbf998d40c30468baf21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 12 Nov 2021 17:38:37 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/xmpg2/step5.vue | 7 ++--
.../pages/creatProcess/xmpg2/step6.vue | 1 +
.../regulatoryRepository/dataStatis/index.vue | 25 +++++++++++++
.../dataStatis/miniPages/expendSubsidy.vue | 26 ++++++++++++--
.../dataStatis/miniPages/inComeSubsidy.vue | 28 ++++++++++++---
.../dataStatis/page/listOfCost.vue | 32 +++++++++++++++++
.../dataStatis/page/listOfMeeting.vue | 26 ++++++++++++--
.../dataStatis/page/listOfMember.vue | 26 ++++++++++++--
.../dataStatis/page/listOfSociety.vue | 30 ++++++++++++----
.../dataStatis/page/listOfStandard.vue | 35 ++++++++++++-------
.../dataStatis/pages/attendCost.vue | 26 ++++++++++++--
.../dataStatis/pages/purchaseCost.vue | 26 ++++++++++++--
.../dataStatis/pages/reviseCost.vue | 26 ++++++++++++--
.../dataStatis/pages/societyCost.vue | 26 ++++++++++++--
.../dataStatis/pages/subsidyCost.vue | 32 +++++++++++++++++
.../dataStatis/pages/translateCost.vue | 26 ++++++++++++--
16 files changed, 349 insertions(+), 49 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index 608baaa01..9a38ead1b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -407,7 +407,6 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
- console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
@@ -472,9 +471,13 @@ export default {
},
//提交事件
handleSubmit() {
+ let dataChildren = []
let dataListChildren = []
this.dataList.forEach(item => {
- dataListChildren.push(item.children)
+ dataChildren.push(item.children)
+ })
+ dataChildren.forEach((item,index) => {
+ dataListChildren = dataListChildren.concat(item)
})
this.isSubmit = true;
this.listForm.commentText = this.commentText;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 376ac71f1..3de61a2a1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -873,6 +873,7 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
+ console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
diff --git a/src/pages/regulatoryRepository/dataStatis/index.vue b/src/pages/regulatoryRepository/dataStatis/index.vue
index ff8e46689..cb117b7a3 100644
--- a/src/pages/regulatoryRepository/dataStatis/index.vue
+++ b/src/pages/regulatoryRepository/dataStatis/index.vue
@@ -98,5 +98,30 @@ export default {
background: #fff;
display: flex;
flex-direction: column;
+
+ /deep/ .el-tabs {
+ flex: auto;
+ display: flex;
+ flex-direction: column;
+
+ /deep/ .el-tabs__header {
+ margin: 0 !important;
+ }
+
+ .el-tabs__content {
+ height: 100% !important;
+ flex: auto;
+ position: relative;
+ display: flex;
+ flex-direction: column;
+
+ .el-tab-pane {
+ height: 100%;
+ flex: auto;
+ display: flex;
+ flex-direction: column;
+ }
+ }
+ }
}
diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
index 6bb6dc0db..4dd2132ab 100644
--- a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
+++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
@@ -47,12 +47,13 @@
-
+
@@ -248,7 +249,7 @@ export default {
submit: function(){
this.$confirm('确认进行添加','是否继续?','提示',{
confirmButtonText: '确定',
- confirmButtonText: '取消',
+ cancelButtonText: '取消',
}).then(()=>{
this.tableData.push({
name:this.formLabelAlign.name,
@@ -266,7 +267,7 @@ export default {
deleteDetail: function(index,rows) {
this.$confirm('此操作将删除数据,','是否继续?','提示',{
confirmButtonText:'确定',
- confirmButtonText:'取消',
+ cancelButtonText:'取消',
type:'warning'
}).then(()=>{
this.tableData.splice(index,1)
@@ -299,6 +300,25 @@ export default {
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue
index 4e804c728..96bb78946 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue
@@ -50,12 +50,13 @@
-
+
@@ -352,7 +353,7 @@ export default {
submit: function(){
this.$confirm('确认进行添加','是否继续?','提示',{
confirmButtonText: '确定',
- confirmButtonText: '取消',
+ cancelButtonText: '取消',
}).then(()=>{
this.tableData.push({
holdUnit:this.formLabelAlign.holdUnit,
@@ -379,7 +380,7 @@ export default {
deleteDetail: function(index,rows) {
this.$confirm('此操作将删除数据,','是否继续?','提示',{
confirmButtonText:'确定',
- confirmButtonText:'取消',
+ cancelButtonText:'取消',
type:'warning'
}).then(()=>{
this.tableData.splice(index,1)
@@ -415,6 +416,25 @@ export default {
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue
index e6379a0c8..6409bdc52 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue
@@ -47,12 +47,13 @@
-
+
@@ -325,7 +326,7 @@ export default {
submit: function(){
this.$confirm('确认进行添加','是否继续?','提示',{
confirmButtonText: '确定',
- confirmButtonText: '取消',
+ cancelButtonText: '取消',
}).then(()=>{
this.tableData.push({
type:this.formLabelAlign.type,
@@ -346,7 +347,7 @@ export default {
deleteDetail: function(index,rows) {
this.$confirm('此操作将删除数据,','是否继续?','提示',{
confirmButtonText:'确定',
- confirmButtonText:'取消',
+ cancelButtonText:'取消',
type:'warning'
}).then(()=>{
this.tableData.splice(index,1)
@@ -382,6 +383,25 @@ export default {