From cdc841baf164e6ecc42e04b1e60653645c52c36b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 22 Nov 2020 16:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=20=E6=8A=84=E8=A1=A8Excel?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../property/addMeterWater/addMeterWater.html | 2 +-
.../property/addMeterWater/addMeterWater.js | 2 +-
.../importMeterWaterFee.html | 72 +++++++
.../importMeterWaterFee.js | 175 ++++++++++++++++++
.../meterWaterManage/meterWaterManage.html | 12 +-
.../meterWaterManage/meterWaterManage.js | 5 +-
.../property/roomFeeImport/roomFeeImport.html | 2 -
7 files changed, 257 insertions(+), 13 deletions(-)
create mode 100644 public/components/property/importMeterWaterFee/importMeterWaterFee.html
create mode 100644 public/components/property/importMeterWaterFee/importMeterWaterFee.js
diff --git a/public/components/property/addMeterWater/addMeterWater.html b/public/components/property/addMeterWater/addMeterWater.html
index 8c1d58f8a..50913ac1f 100644
--- a/public/components/property/addMeterWater/addMeterWater.html
+++ b/public/components/property/addMeterWater/addMeterWater.html
@@ -10,7 +10,7 @@
@@ -69,13 +73,10 @@
本期读表时间 |
创建时间 |
操作 |
-
-
-
| {{meterWater.meterType == '1010'?'电表':'水表'}} |
{{meterWater.objName}} |
{{meterWater.preDegrees}} |
@@ -93,7 +94,6 @@
v-on:click="_openDeleteMeterWaterModel(meterWater)">删除
-
@@ -110,11 +110,9 @@
-
-
-
+
\ No newline at end of file
diff --git a/public/pages/property/meterWaterManage/meterWaterManage.js b/public/pages/property/meterWaterManage/meterWaterManage.js
index 7d0831d1e..8d4e1919d 100644
--- a/public/pages/property/meterWaterManage/meterWaterManage.js
+++ b/public/pages/property/meterWaterManage/meterWaterManage.js
@@ -78,9 +78,10 @@
} else {
vc.component.meterWaterManageInfo.moreCondition = true;
}
+ },
+ _openMeterWaterImport:function(){
+ vc.emit('importMeterWaterFee', 'openImportMeterWaterFeeModal',{});
}
-
-
}
});
})(window.vc);
diff --git a/public/pages/property/roomFeeImport/roomFeeImport.html b/public/pages/property/roomFeeImport/roomFeeImport.html
index 0a012b75c..308ce5ee4 100644
--- a/public/pages/property/roomFeeImport/roomFeeImport.html
+++ b/public/pages/property/roomFeeImport/roomFeeImport.html
@@ -65,8 +65,6 @@
创建时间 |
备注 |
操作 |
-
-