diff --git a/public/template/各取水点取水量情况表.xlsx b/public/template/各取水点取水量情况表.xlsx new file mode 100644 index 0000000..e04305f Binary files /dev/null and b/public/template/各取水点取水量情况表.xlsx differ diff --git a/src/views/water/drinking-water/collect/index.vue b/src/views/water/drinking-water/collect/index.vue index 2966e9a..8911552 100644 --- a/src/views/water/drinking-water/collect/index.vue +++ b/src/views/water/drinking-water/collect/index.vue @@ -76,6 +76,7 @@ 县级(在用)地表水饮用水 县级(备用、规划)地表水饮用水 县级地下水饮用水 + 各取水点取水量取水量表 diff --git a/src/views/water/drinking-water/collect/water-bill.vue b/src/views/water/drinking-water/collect/water-bill.vue index 20cf2bd..2166920 100644 --- a/src/views/water/drinking-water/collect/water-bill.vue +++ b/src/views/water/drinking-water/collect/water-bill.vue @@ -162,8 +162,9 @@ > { return ( item[0] && !item[0].includes("取水点") && !item[0].includes("合计") ); }); + + const id=record.drinkingWaterBillId; + + // drinkingWaterList.drinkingWaterBillId=record.drinkingWaterBillId; // 解析成对象数组 // const billName1 = file.name; const billData1 = utils.importWaterWithdrawalData(drinkingWaterList); - console.log(billData1); + // console.log(drinkingWaterList.length); // console.log(billData1.place); if (!billData1 || billData1.length == 0) { hide(); @@ -369,9 +376,11 @@ export default { }); return; } - + if (billData1.length > 0) { updateWaterWithdrawal({ + // drinkingWaterBillId:record.drinkingWaterBillId, + drinkingWaterBillId:id, drinkingWaterList: billData1, }) .then((res) => { @@ -384,7 +393,7 @@ export default { Modal.error({ title: "导入失败", content: "数据上传出错1", - + }); } }) @@ -397,7 +406,7 @@ export default { .finally(() => { hide(); }); - + } // if (billData1.length > 0) { // // 上传到服务器 @@ -633,4 +642,4 @@ export default { .editable-cell:hover .editable-cell-icon { display: inline-block; } - \ No newline at end of file +