From 5f90df0716fcf3d5accb06528d18ed9239c1225f Mon Sep 17 00:00:00 2001
From: 710356044 <710356044@qq.com>
Date: Tue, 4 Jan 2022 21:04:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B0=B4=E9=87=8Fbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drinking-water/collect/water-bill.vue     | 41 ++-----------------
 1 file changed, 4 insertions(+), 37 deletions(-)

diff --git a/src/views/water/drinking-water/collect/water-bill.vue b/src/views/water/drinking-water/collect/water-bill.vue
index 2166920..4bda014 100644
--- a/src/views/water/drinking-water/collect/water-bill.vue
+++ b/src/views/water/drinking-water/collect/water-bill.vue
@@ -360,7 +360,7 @@ export default {
           });
 
 
-          const id=record.drinkingWaterBillId;
+          const drinkingWaterBillId=record.drinkingWaterBillId;
 
           // drinkingWaterList.drinkingWaterBillId=record.drinkingWaterBillId;
           // 解析成对象数组
@@ -380,13 +380,14 @@ export default {
           if (billData1.length > 0) {
               updateWaterWithdrawal({
                 // drinkingWaterBillId:record.drinkingWaterBillId,
-                drinkingWaterBillId:id,
-                drinkingWaterList: billData1,
+                id:drinkingWaterBillId,
+                waterWithdrawals: billData1,
               })
                 .then((res) => {
                   if (res.data.code == 0) {
                     Modal.success({
                       title: "导入成功",
+                      content: `成功导入${billData1.length}条数据`,
                     });
                     this.$refs.water && this.$refs.water.reload();
                   } else {
@@ -408,40 +409,6 @@ export default {
                 });
 
           }
-          // if (billData1.length > 0) {
-          //   // 上传到服务器
-          //   saveDrinkingWaterBill({
-          //     billName: billName1,
-          //     regionLevel: "县级",
-          //     waterSourceType: 1,
-          //     drinkingWaterType: 2,
-          //     drinkingWaterList: billData1,
-          //     // reportTime:  new Date(`${this.year}-01-01 00:00:00`).getTime(),
-          //   })
-          //     .then((res) => {
-          //       if (res.data.code == 0) {
-          //         Modal.success({
-          //           title: "导入成功",
-          //           content: `成功导入${billData1.length}条数据`,
-          //         });
-          //         this.$refs.water && this.$refs.water.reload();
-          //       } else {
-          //         Modal.error({
-          //           title: "导入失败",
-          //           content: "数据上传出错",
-          //         });
-          //       }
-          //     })
-          //     .catch(() => {
-          //       Modal.error({
-          //         title: "导入失败",
-          //         content: "数据上传出错",
-          //       });
-          //     })
-          //     .finally(() => {
-          //       hide();
-          //     });
-          // }
         } catch (error) {
           hide();
           Modal.error({