From 541477a752fe33f0d0fb7a2b554bfb1d9479daf1 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 17 Nov 2021 16:02:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/statisticsApi.js                      | 130 ++++++++-
 .../dataStatis/pages/attendCost.vue           | 194 +++++++++++--
 .../dataStatis/pages/reviseCost.vue           | 255 ++++++++++++++----
 .../dataStatis/pages/societyCost.vue          |  14 +-
 4 files changed, 496 insertions(+), 97 deletions(-)

diff --git a/src/api/statisticsApi.js b/src/api/statisticsApi.js
index 2fa1d3442..d82d71915 100644
--- a/src/api/statisticsApi.js
+++ b/src/api/statisticsApi.js
@@ -1,5 +1,7 @@
 import axios from '@/common/axiosV2'
 
+
+/** 协会费用信息统计接口 */
 // 获取所有统计数据
 export function statisticsAll (data) {
   return axios({
@@ -12,7 +14,7 @@ export function statisticsAll (data) {
 export function queryStatistics (data) {
   return axios({
     url: 'api/wgdCensusZ/wgd-assoc-cost/queryAllAssocCosts',
-    method: 'post',
+    method: 'get',
     params: data
   })
 }
@@ -21,7 +23,7 @@ export function queryStatistics (data) {
 export function queryStatistics (data) {
   return axios({
     url: 'api/wgdCensusZ/wgd-assoc-cost/getAssocCostById',
-    method: 'post',
+    method: 'get',
     params: data
   })
 }
@@ -30,7 +32,7 @@ export function queryStatistics (data) {
 export function statisticsEdit (data) {
   return axios({
     url: 'api/wgdCensusZ/wgd-assoc-cost/modAssocCost',
-    method: 'post',
+    method: 'put',
     params: data
   })
 }
@@ -42,18 +44,124 @@ export function statisticsAdd (data) {
     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: 'delete',
+    params: data
+  })
+}
+/** 参会费用信息统计  */
+// 查询
+export function meetAll (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-meet-cost/queryAllMeetCosts',
+    method: 'get',
+    params: data
+  })
+}
+// 编辑
+export function meetEdit (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-meet-cost/modMeetCost',
+    method: 'put',
+    params: data
+  })
+}
+// 新增
+export function meetAdd (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-meet-cost/addMeetCost',
+    method: 'post',
+    params: data
+  })
+}
+// 删除
+export function meetDel (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-meet-cost/delMeetCosts',
+    method: 'delete',
+    params: data
+  })
+}
+/** 参与外部标准制修订费用统计 */
+// 数据查询
+export function reviseAll (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-ex-revise-cost/queryAllExReviseCosts',
+    method: 'get',
+    params: data
+  })
+}
+// 编辑
+export function reviseEdit (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-ex-revise-cost/modExReviseCost',
+    method: 'put',
+    params: data
+  })
+}
+// 新增
+export function reviseAdd (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-ex-revise-cost/addExReviseCost',
+    method: 'post',
+    params: data
+  })
+}
+export function reviseDel (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-ex-revise-cost/delExReviseCosts',
+    method: 'delete',
+    params: data
+  })
+}
+/** 采购费用信息统计接口 */
+// 查询
+export function CgfysAll (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/queryAllCgfys',
+    method: 'get',
+    params: data
+  })
+}
+/*// 查询详情
+export function CgfyDetail(data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/getCgfyById',
+    method: 'get',
+    params: data
+  })
+}*/
+// 编辑接口
+export function CgfysEdit (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/modCgfy',
+    method: 'get',
+    params: data
+  })
+}
+// 新增接口
+export function CgfysAdd (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/addCgfy',
+    method: 'get',
+    params: data
+  })
+}
+// 单条删除
+export function CgfysDelOne (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/delCgfy',
+    method: 'get',
+    params: data
+  })
+}
+// 批量删除
+export function CgfysDelMore (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/delCgfys',
     method: 'get',
     params: data
   })
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
index df1fa0010..c7a6cdbcf 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
@@ -4,22 +4,28 @@
     <!-- 第一第二行表单 -->
     <el-form :inline="true" :model="formQuery">
       <el-form-item label="标准号">
-        <el-input v-model="formQuery.standardId" size="small" placeholder="请输入标准号"></el-input>
+        <el-input v-model="formQuery.proId" size="small" placeholder="请输入标准号"></el-input>
       </el-form-item>
       <el-form-item label="标准名称">
-        <el-input v-model="formQuery.standardName" size="small" placeholder="请输入标准名称"></el-input>
+        <el-input v-model="formQuery.proName" size="small" placeholder="请输入标准名称"></el-input>
       </el-form-item>
-      <el-form-item label="项目代号">
-        <el-input v-model="formQuery.codeNum" size="small" placeholder="根据项目代号搜索">
-        </el-input>
+      <el-form-item label="项目类型">
+        <el-select v-model="formQuery.type" size="small" placeholder="请选择类型">
+          <el-option
+            v-for="item in typeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.label">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="">查询</el-button>
+        <el-button type="primary" size="small" @click="dataQuery">查询</el-button>
         <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
       </el-form-item>
       <el-divider/>
       <div style="float: left;">
-        <el-button type="primary" size="small" @click="drawer1 = true">新增</el-button>
+        <el-button type="primary" size="small" @click="tableAdd">新增</el-button>
         <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
         <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
@@ -59,18 +65,18 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="num"
+          prop="proId"
           label="项目编号">
         </el-table-column>
 
         <el-table-column
           align="center"
-          prop="name"
+          prop="proName"
           label="项目名称">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="costList"
+          prop="costOutlay"
           label="费用列支项">
         </el-table-column>
         <el-table-column
@@ -109,22 +115,26 @@
       :title="drawerTitle"
       :visible.sync="drawerTable">
       <div style="margin: 10px;height: inherit">
-        <el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
+        <el-form label-width="100px" ref="formShowData" :model="formShowData" :rules="formRules">
           <el-form-item label="类型">
             <el-select v-model="formShowData.type" type="text" placeholder="请填写">
-              <el-option label="1" value="one"></el-option>
-              <el-option label="2" value="two"></el-option>
+              <el-option
+                v-for="item in typeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.label">
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="项目编号">
-            <el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.proId" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="项目名称">
-            <el-input v-model="formShowData.name" type="text" placeholder="请填写">
+            <el-input v-model="formShowData.proName" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
           <el-form-item label="费用列支项">
-            <el-input v-model="formShowData.costList" placeholder="请选择">
+            <el-input v-model="formShowData.costOutlay" placeholder="请选择">
             </el-input>
           </el-form-item>
           <el-form-item label="费用支出">
@@ -134,8 +144,8 @@
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+        <el-button size="small" @click="drawerTable = false">取消</el-button>
+        <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
     </el-drawer>
 
@@ -155,15 +165,16 @@
 </template>
 
 <script>
+import { reviseAll, reviseEdit, reviseAdd, reviseDel } from '@/api/statisticsApi'
 export default {
   name: "child3",
   data() {
     return {
       loading: false,
       formQuery: {
-        standardNum: '',
-        standardName: '',
-        codeNum: '',
+        proId: '',
+        proName: '',
+        type: '',
         current: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
@@ -173,16 +184,23 @@ export default {
       multipleSelection: [],
 
       formShowData: {
+        id: '',
         type: '',
-        num: '',
-        name: '',
-        costList: '',
+        proId: '',
+        proName: '',
+        costOutlay: '',
         cost: ''
       },
       drawerTable: false,
       drawerTitle: '',
       formRules: {},
 
+      submitLoading: false,
+      typeOptions: [
+        { label: '类型1', value: '0' },
+        { label: '类型2', value: '1' },
+        { label: '类型3', value: '2' },
+      ]
     }
   },
 
@@ -191,17 +209,103 @@ export default {
   },
 
   methods: {
+    /** 查询数据 */
+    getTableData() {
+      reviseAll(this.formQuery).then(res=>{
+        this.tableData = res.data.list
+        this.tableTotal = res.data.count
+      })
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
     //新增方法
+    tableAdd() {
+      this.drawerTitle = '新增'
+      this.formShowData = {}
+      this.drawerTable = true
+    },
+    // 提交按钮
     submit() {
+      this.$refs['formShowData'].validate((valid) => {
+        if (valid) {
+          this.submitLoading = true
+          if (this.drawerTitle === '新增') {
+            reviseAdd(this.formShowData).then(res=>{
+              if (res.ok) {
+                this.$message.success('新增成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('新增失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            }, e => {
+            })
+          } else {
+            reviseEdit(this.formShowData).then(res => {
+              if (res.ok) {
+                this.$message.success('编辑成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('编辑失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            },e => {
+            })
+          }
+        }
+      })
     },
     //删除方法
     deleteDetail() {
+      if (this.multipleSelection.length > 0) {
+        let msgIds = []
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          let msgId = this.multipleSelection[i].id
+          msgIds.push(msgId)
+        }
+        let delId = {
+          ids: msgIds.join(',')
+        }
+        this.$confirm('确定删除这些数据?', '提示', {
+          confirmButtonText: this.$t('m.determine'),
+          cancelButtonText: this.$t('m.cancel'),
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          reviseDel(delId).then(res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.pageNo = 1
+              this.multipleSelection = []
+              this.getTableData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      } else {
+        this.$message.warning('请选择一条数据进行删除')
+      }
+    },
+    // 查询
+    dataQuery() {
+      this.getTableData()
     },
     //清空
     resetForm() {
+      this.formQuery = {}
+      this.getTableData()
     },
     // 列表更多按钮
     handleCommand(command) {
@@ -210,13 +314,49 @@ export default {
           this.editRowOne(command[0]);
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.deleteRowOne(command[0].id);
           break;
       }
     },
-    editRowOne() {
+    editRowOne(item) {
+      this.drawerTitle = '编辑'
+      this.formShowData = {
+        id: item.id,
+        type: item.type,
+        proId: item.proId,
+        proName: item.proName,
+        costOutlay: item.costOutlay,
+        cost: item.cost
+      }
+      this.drawerTable = true
     },
-    deleteRowOne() {
+    deleteRowOne(res) {
+      let delId = {
+        ids: res
+      }
+      this.$confirm('确定删除这些数据?', '提示', {
+        confirmButtonText: this.$t('m.determine'),
+        cancelButtonText: this.$t('m.cancel'),
+        type: 'warning',
+        confirmButtonClass: 'common-button-primary',
+        roundButton: true
+      }).then(() => {
+        reviseDel(delId).then(res => {
+          if (res.ok) {
+            this.$message.success('删除成功')
+            this.pageNo = 1
+            this.multipleSelection = ''
+            this.getTableData()
+          } else {
+            this.$message.warning('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     /** 分页  */
     pageChange(page) {
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
index 389367554..2797a907f 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
@@ -3,23 +3,39 @@
   <div id="attendCost" class="child2">
     <!--     第一第二行表单 -->
     <el-form :inline="true" :model="formQuery" class="demo-form-inline">
-      <el-form-item label="标准类型">
-        <el-input v-model="formQuery.type" size="small" placeholder="请输入标准类型"></el-input>
+      <el-form-item label="主办单位">
+        <el-input v-model="formQuery.unit" size="small" placeholder="请输入主办单位"></el-input>
       </el-form-item>
-      <el-form-item label="标准代号">
-        <el-input v-model="formQuery.num" size="small" placeholder="请输入标准代号"></el-input>
+      <el-form-item label="会议名称">
+        <el-input v-model="formQuery.meetName" size="small" placeholder="请输入会议名称"></el-input>
       </el-form-item>
-      <el-form-item label="标准名称">
-        <el-input v-model="formQuery.name" size="small" placeholder="请输入标准名称">
-        </el-input>
+      <el-form-item label="费用列支">
+        <el-select size="small" v-model="formQuery.costOutlay">
+          <el-option
+            v-for="item in costOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.label">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="会议时间">
+        <el-date-picker
+          size="small"
+          v-model="formQuery.meetTime"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择日期">
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" onclick="">查询</el-button>
+        <el-button type="primary" size="small" @click="queryData">查询</el-button>
         <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
       </el-form-item>
       <el-divider/>
       <div style="float: left">
-        <el-button type="primary" size="small" @click="drawer1 = true">新增</el-button>
+        <el-button type="primary" size="small" @click="tableAdd">新增</el-button>
         <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
         <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
@@ -47,52 +63,41 @@
           align="center"
           type="index"
           width="50"
-          label="序号"
-
-        >
+          label="序号">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="holdUnit"
-          label="主办单位"
-
-        >
+          prop="unit"
+          label="主办单位">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingName"
-          label="会议名称"
-
-        >
+          prop="meetName"
+          label="会议名称">
         </el-table-column>
 
         <el-table-column
           align="center"
-          prop="meetingTime"
-          label="会议时间"
-
-        >
+          prop="meetTime"
+          label="会议时间">
+          <template slot-scope="scope">
+            {{ scope.row.meetTime ? $moment(scope.row.meetTime).format("YYYY-MM-DD HH:mm:ss") : '' }}
+          </template>
         </el-table-column>
         <el-table-column
           align="center"
-          prop="costStandard"
-          label="会费标准"
-
-        >
+          prop="payStandard"
+          label="会费标准">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="reality"
-          label="实际发生"
-
-        >
+          prop="payReality"
+          label="实际发生">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="costList"
-          label="费用列支"
-
-        >
+          prop="costOutlay"
+          label="费用列支">
         </el-table-column>
         <el-table-column label="操作" align="center" width="50" fixed="right">
           <template slot-scope="scope">
@@ -125,37 +130,42 @@
       :title="drawerTitle"
       :visible.sync="drawerTable">
       <div style="margin: 10px;height: inherit">
-        <el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
+        <el-form label-width="100px" ref="formShowData" :model="formShowData" :rules="formRules">
           <el-form-item label="主办单位">
-            <el-select v-model="formShowData.holdUnit" type="text" placeholder="请填写">
+            <el-select v-model="formShowData.unit" type="text" placeholder="请填写">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="会议名称">
-            <el-input v-model="formShowData.meetingName" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.meetName" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="会议时间">
-            <el-input v-model="formShowData.meetingTime" type="text" placeholder="请填写">
-            </el-input>
+            <el-date-picker
+              v-model="formShowData.meetTime"
+              type="datetime"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期时间">
+            </el-date-picker>
           </el-form-item>
           <el-form-item label="会费标准">
-            <el-input v-model="formShowData.costStandard" type="text" placeholder="请填写">
+            <el-input v-model="formShowData.payStandard" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
           <el-form-item label="实际发生">
-            <el-input v-model="formShowData.reality" placeholder="请选择">
+            <el-input v-model="formShowData.payReality" placeholder="请选择">
             </el-input>
           </el-form-item>
           <el-form-item label="费用列支">
-            <el-input v-model="formShowData.costList" placeholder="请选择">
+            <el-input v-model="formShowData.costOutlay" placeholder="请选择">
             </el-input>
           </el-form-item>
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+        <el-button size="small" @click="drawerTable = false">取消</el-button>
+        <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
     </el-drawer>
 
@@ -198,19 +208,21 @@
 </template>
 
 <script>
+import { meetAll, meetEdit, meetAdd, meetDel } from '@/api/statisticsApi'
 export default {
   name: "child2",
   data() {
     return {
       loading: false,
       formQuery: {
-        type: '',
-        num: '',
-        name: '',
+        unit: '',
+        meetName: '',
+        meetTime: '',
         current: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
       },
+      submitLoading: false,
       tableTotal: 0,
       tableData: [],
       multipleSelection: [],
@@ -218,7 +230,20 @@ export default {
       drawerTable: false,
       drawerTitle: '',
       formRules: {},
-      formShowData: {}
+      formShowData: {
+        id: '',
+        unit: '',
+        meetName: '',
+        meetTime: '',
+        payStandard: '',
+        payReality: '',
+        costOutlay: ''
+      },
+      costOptions: [
+        { label: '列支1', value: '0' },
+        { label: '列支2', value: '1' },
+        { label: '列支2', value: '3' },
+      ]
     }
   },
 
@@ -227,17 +252,102 @@ export default {
   },
 
   methods: {
+    getTableData () {
+      meetAll(this.formQuery).then(res=>{
+        this.tableData = res.data.list
+        this.tableTotal = res.data.count
+      })
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
     //新增方法
+    tableAdd() {
+      this.drawerTitle = '新增'
+      this.formShowData = {}
+      this.drawerTable = true
+    },
     submit() {
+      this.$refs['formShowData'].validate((valid) => {
+        if (valid) {
+          this.submitLoading = true
+          if (this.drawerTitle === '新增') {
+            meetAdd(this.formShowData).then(res=>{
+              if (res.ok) {
+                this.$message.success('新增成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('新增失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            }, e => {
+            })
+          } else {
+            console.log(this.formShowData.meetTime)
+            meetEdit(this.formShowData).then(res => {
+              if (res.ok) {
+                this.$message.success('编辑成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('编辑失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            },e => {
+            })
+          }
+        }
+      })
     },
     //删除方法
     deleteDetail() {
+      if (this.multipleSelection.length > 0) {
+        let msgIds = []
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          let msgId = this.multipleSelection[i].id
+          msgIds.push(msgId)
+        }
+        let delId = {
+          ids: msgIds.join(',')
+        }
+        this.$confirm('确定删除这些数据?', '提示', {
+          confirmButtonText: this.$t('m.determine'),
+          cancelButtonText: this.$t('m.cancel'),
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          meetDel(delId).then(res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.pageNo = 1
+              this.multipleSelection = []
+              this.getTableData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      } else {
+        this.$message.warning('请选择一条数据进行删除')
+      }
+    },
+    // 查询
+    queryData() {
+      this.getTableData()
     },
     //清空
     resetForm() {
+      this.formQuery = {}
+      this.getTableData()
     },
 
     // 列表更多按钮
@@ -247,12 +357,51 @@ export default {
           this.editRowOne(command[0]);
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.deleteRowOne(command[0].id);
           break;
       }
     },
-    editRowOne() {},
-    deleteRowOne() {},
+    editRowOne(item) {
+      this.drawerTitle = '编辑'
+      this.formShowData = {
+        id: item.id,
+        unit: item.unit,
+        meetName: item.meetName,
+        meetTime: this.$moment(item.meetTime).format('YYYY-MM-DD HH:mm:ss'),
+        payStandard: item.payStandard,
+        payReality: item.payReality,
+        costOutlay: item.costOutlay
+      }
+      this.drawerTable = true
+    },
+    deleteRowOne(res) {
+      let delId = {
+        ids: res
+      }
+      this.$confirm('确定删除这些数据?', '提示', {
+        confirmButtonText: this.$t('m.determine'),
+        cancelButtonText: this.$t('m.cancel'),
+        type: 'warning',
+        confirmButtonClass: 'common-button-primary',
+        roundButton: true
+      }).then(() => {
+        meetDel(delId).then(res => {
+          if (res.ok) {
+            this.$message.success('删除成功')
+            this.pageNo = 1
+            this.multipleSelection = ''
+            this.getTableData()
+          } else {
+            this.$message.warning('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
     /** 分页  */
     pageChange(page) {
       this.formQuery.page = page
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
index a1845f941..d433b3747 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
@@ -23,6 +23,7 @@
         <el-button type="primary" size="small" @click="queryForm">查询</el-button>
         <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
       </el-form-item>
+      <el-divider/>
       <div style="float: left">
         <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
         <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
@@ -164,8 +165,7 @@
 <script>
 import {
   statisticsAll,statisticsAdd,
-  statisticsEdit, delOnlyOne,
-  delMore,queryStatistics } from '@/api/statisticsApi'
+  statisticsEdit, delMore,queryStatistics } from '@/api/statisticsApi'
 
 export default {
   name: "child1",
@@ -241,6 +241,7 @@ export default {
                   this.getTableData()
                 } else {
                   this.$message.warning('新增失败')
+                  this.submitLoading = false
                 }
                 this.drawerTable = false
               }, e => {
@@ -253,6 +254,7 @@ export default {
                   this.getTableData()
                 } else {
                   this.$message.warning('编辑失败')
+                  this.submitLoading = false
                 }
                 this.drawerTable = false
               },e => {
@@ -284,7 +286,7 @@ export default {
             if (res.ok) {
               this.$message.success('删除成功')
               this.pageNo = 1
-              this.multipleSelection = ''
+              this.multipleSelection = []
               this.getTableData()
             } else {
               this.$message.warning('删除失败')
@@ -327,7 +329,7 @@ export default {
           this.editRowOne(command[0]);
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.deleteRowOne(command[0].id);
           break;
       }
     },
@@ -349,7 +351,7 @@ export default {
     // 行内删除
     deleteRowOne(val) {
       let delId = {
-        id: val
+        ids: val
       }
       this.$confirm('确定删除这些数据?', '提示', {
         confirmButtonText: this.$t('m.determine'),
@@ -358,7 +360,7 @@ export default {
         confirmButtonClass: 'common-button-primary',
         roundButton: true
       }).then(() => {
-        delOnlyOne(delId).then(res => {
+        delMore(delId).then(res => {
           if (res.ok) {
             this.$message.success('删除成功')
             this.pageNo = 1