From 3b9519be9f060c71e49afd20cee99df5fd2ad831 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 15 Nov 2021 10:49:29 +0800
Subject: [PATCH 1/4] feat: There is no way the,
---
src/pages/details/otherBussStandardDetails/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 99d0348b9..a00765509 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -46,7 +46,7 @@
-
+
{{ file.oldFileName | ellipsis }}
更多
- -
+ -
{{ sarStandardsInfoEO.standName || '-' }}
From a9d547a6783bfaab08d19fb99371bbe8e7adaf12 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 15 Nov 2021 11:01:30 +0800
Subject: [PATCH 2/4] feat: There is no way the,
---
src/pages/details/otherBussStandardDetails/index.vue | 2 +-
src/pages/details/otherStandardDetails/index.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index a00765509..066759cb2 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -76,7 +76,7 @@
更多
- -
+ -
{{ sarStandardsInfoEO.standName || '-' }}
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 6ed60b145..8557d1325 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -88,7 +88,7 @@
更多
- -
+ -
{{
From be8dc8c60da80c5f3881586bc141ae66b97f5d79 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 15 Nov 2021 11:24:39 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=8D=E7=82=B9=E8=AE=A4=E8=AF=81?=
=?UTF-8?q?=E6=A0=87=E5=87=86/=E6=94=BF=E7=AD=96=E5=90=88=E8=A7=84?=
=?UTF-8?q?=E6=80=A7=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=20=E5=B8=A6=E5=85=A5=E6=95=B0=E6=8D=AE=E7=9A=84=E6=89=B9?=
=?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../creatProcess/zdrzbzORzchgxxmsc/step1.vue | 54 +++++++++++++++++--
1 file changed, 51 insertions(+), 3 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue
index c61938329..bc4b30ce1 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue
@@ -23,12 +23,13 @@
{
+ //拿出deleteSelectedList里的每一个元素
+ this.deleteSelectedList.map(item => {
+ let index;
+ index = this.infoTableDatas.findIndex(items => {
+ //返回infoTableDatas里id和deleteSelectedList的id相同的元素对应的位置
+ return items.id === item;
+ });
+ //如果符合条件,就删除(==-1是没有符合条件的意思)
+ if (index > -1) {
+ this.infoTableDatas.splice(index, 1);
+ }
+ });
+ this.selectList = [];
+ // for (let i = 0; i < this.infoTableDatas.length; i++) {
+ // for (let j = 0; j < this.deleteSelectedList.length; j++) {
+ // if (this.infoTableDatas[i].id === this.deleteSelectedList[j].id){
+ // console.log('表里的数据',i,this.infoTableDatas[i])
+ // console.log('要删的数据',j,this.deleteSelectedList[j])
+ // this.infoTableDatas.splice(i,1)
+ // }
+ // }
+ // }
+ this.$message({
+ type: 'success',
+ message: '删除成功!'
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ });
+ },
handleProcessStandardNext(status) {
switch (status) {
// 新增
@@ -490,9 +540,7 @@ export default {
// 带入
case 2:
if (this.standardCheckedList && this.standardCheckedList.length >= 1) {
- console.log('504',this.standardCheckedList)
this.infoTableDatas = this.standardCheckedList
- console.log('505',this.infoTableDatas)
this.standardDrawer = false
} else {
this.$message.warning('请选择要带入的数据')
From c8ad9a403e62560e491d1e36d1cba131d37e986c Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Mon, 15 Nov 2021 16:10:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/statisticsApi.js | 61 ++
.../dataStatis/page/listOfSociety.vue | 857 +++++++-----------
.../dataStatis/pages/societyCost.vue | 651 ++++++-------
3 files changed, 737 insertions(+), 832 deletions(-)
create mode 100644 src/api/statisticsApi.js
diff --git a/src/api/statisticsApi.js b/src/api/statisticsApi.js
new file mode 100644
index 000000000..2fa1d3442
--- /dev/null
+++ b/src/api/statisticsApi.js
@@ -0,0 +1,61 @@
+import axios from '@/common/axiosV2'
+
+// 获取所有统计数据
+export function statisticsAll (data) {
+ return axios({
+ url: 'api/wgdCensusZ/wgd-assoc-cost/getAllAssocCosts',
+ method: 'get',
+ params: data
+ })
+}
+// 多条件查询
+export function queryStatistics (data) {
+ return axios({
+ url: 'api/wgdCensusZ/wgd-assoc-cost/queryAllAssocCosts',
+ method: 'post',
+ params: data
+ })
+}
+// 获取单个详情
+/*
+export function queryStatistics (data) {
+ return axios({
+ url: 'api/wgdCensusZ/wgd-assoc-cost/getAssocCostById',
+ method: 'post',
+ params: data
+ })
+}
+*/
+// 数据编辑
+export function statisticsEdit (data) {
+ return axios({
+ url: 'api/wgdCensusZ/wgd-assoc-cost/modAssocCost',
+ method: 'post',
+ params: data
+ })
+}
+// 页面数据新增
+export function statisticsAdd (data) {
+ return axios({
+ url: 'api/wgdCensusZ/wgd-assoc-cost/addAssocCost',
+ method: 'post',
+ params: data
+ })
+}
+// 单个数据删除
+export function delOnlyOne (data) {
+ return axios({
+ url: 'api/wgdCensusZ/wgd-assoc-cost/delAssocCost',
+ method: 'get',
+ params: data
+ })
+}
+// 多数据删除
+export function delMore (data) {
+ return axios({
+ url: 'api/wgdCensusZ/wgd-assoc-cost/delAssocCosts',
+ method: 'get',
+ params: data
+ })
+}
+
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
index a4e164e94..5027f2c43 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
@@ -1,56 +1,44 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
- 查询
-
-
- 清空
+
+ 查询
+ 清空
+
+ 新增
+ 导入
+ 导出
+
+ 批量删除
+
+ 模板下载
+
-
-
- 新增
-
-
- 导入
-
-
- 导出
-
-
- 批量删除
-
-
-
- 模板下载
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
- 点击或拖拽上传文件
+ title="导入文件"
+ :visible.sync="dialogVisible1"
+ width="30%"
+ >
+ 点击或拖拽上传文件
-
+
+ title="导出文件"
+ :visible.sync="dialogVisible2"
+ width="30%"
+ >
-
+
-
+
-
+
@@ -412,91 +252,33 @@
确 定
-
-
+
-
-
-
-
-
-
-
-