From 9e371b4b7a31b5c53effb6d316fd20d2ce81d2b8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 3 May 2021 14:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=85=A4=E6=B0=94=E6=8A=84?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/property/addMeterWater/addMeterWater.html  | 1 +
 public/components/property/addMeterWater/addMeterWater.js | 4 +++-
 .../property/importMeterWaterFee/importMeterWaterFee.html | 1 +
 .../property/importMeterWaterFee/importMeterWaterFee.js   | 2 ++
 .../pages/property/meterWaterManage/meterWaterManage.html | 2 +-
 .../pages/property/meterWaterManage/meterWaterManage.js   | 8 ++++++++
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/public/components/property/addMeterWater/addMeterWater.html b/public/components/property/addMeterWater/addMeterWater.html
index d09949161..548f8bd97 100755
--- a/public/components/property/addMeterWater/addMeterWater.html
+++ b/public/components/property/addMeterWater/addMeterWater.html
@@ -14,6 +14,7 @@
                                         <option selected disabled value="">必填，请选择费用类型</option>
                                         <option value="888800010015">水费</option>
                                         <option value="888800010016">电费</option>
+                                        <option value="888800010009">煤气费</option>
                                     </select>
                                 </div>
                             </div>
diff --git a/public/components/property/addMeterWater/addMeterWater.js b/public/components/property/addMeterWater/addMeterWater.js
index 8d967dc97..1ebfa567d 100755
--- a/public/components/property/addMeterWater/addMeterWater.js
+++ b/public/components/property/addMeterWater/addMeterWater.js
@@ -50,7 +50,7 @@
                     vc.component.addMeterWaterInfo.roomId = _param.roomId;
                     vc.component.addMeterWaterInfo.objId = _param.roomId;
                     // $that.addMeterWaterInfo.objName = _param.name.replace('0单元', ''); //处理商铺;
-                    $that.addMeterWaterInfo.objName = $that.transRoomName(_param.roomName);
+                    $that.addMeterWaterInfo.objName = $that.transRoomName(_param.name);
                     $that._queryPreMeterWater(_param.roomId);
                 }
             });
@@ -259,6 +259,8 @@
                 let _feeTypeCd = $that.addMeterWaterInfo.feeTypeCd;
                 if (_feeTypeCd == '888800010015') {
                     _meterType = '2020';
+                }else if(_feeTypeCd == '888800010009'){
+                    _meterType = '3030';
                 }
                 let param = {
                     params: {
diff --git a/public/components/property/importMeterWaterFee/importMeterWaterFee.html b/public/components/property/importMeterWaterFee/importMeterWaterFee.html
index 30309c805..79d9956ae 100755
--- a/public/components/property/importMeterWaterFee/importMeterWaterFee.html
+++ b/public/components/property/importMeterWaterFee/importMeterWaterFee.html
@@ -14,6 +14,7 @@
                                     <option selected disabled value="">必填，请选择费用类型</option>
                                     <option value="888800010015">水费</option>
                                     <option value="888800010016">电费</option>
+                                    <option value="888800010009">煤气费</option>
                                   </select>
                                 </div>
                               </div>
diff --git a/public/components/property/importMeterWaterFee/importMeterWaterFee.js b/public/components/property/importMeterWaterFee/importMeterWaterFee.js
index 0762a24cd..f80ec2f9f 100755
--- a/public/components/property/importMeterWaterFee/importMeterWaterFee.js
+++ b/public/components/property/importMeterWaterFee/importMeterWaterFee.js
@@ -112,6 +112,8 @@
 
                 if(_feeTypeCd == '888800010015'){
                     _meterType = '2020';
+                }else if(_feeTypeCd == '888800010009'){
+                    _meterType = '3030';
                 }
                 vc.jumpToPage('/callComponent/importMeterWaterFee/exportData?communityId=' + vc.getCurrentCommunity().communityId+'&meterType='+_meterType);
             },
diff --git a/public/pages/property/meterWaterManage/meterWaterManage.html b/public/pages/property/meterWaterManage/meterWaterManage.html
index c4b10cbaa..1f946e077 100755
--- a/public/pages/property/meterWaterManage/meterWaterManage.html
+++ b/public/pages/property/meterWaterManage/meterWaterManage.html
@@ -77,7 +77,7 @@
                         </thead>
                         <tbody>
                             <tr v-for="meterWater in meterWaterManageInfo.meterWaters">
-                                <td class="text-center">{{meterWater.meterType == '1010'?'电表':'水表'}}</td>
+                                <td class="text-center">{{_getMeteTypeName(meterWater.meterType)}}</td>
                                 <td class="text-center">{{meterWater.objName}}</td>
                                 <td class="text-center">{{meterWater.preDegrees}}</td>
                                 <td class="text-center">{{meterWater.curDegrees}}</td>
diff --git a/public/pages/property/meterWaterManage/meterWaterManage.js b/public/pages/property/meterWaterManage/meterWaterManage.js
index 1146684d3..9deb9a0c1 100755
--- a/public/pages/property/meterWaterManage/meterWaterManage.js
+++ b/public/pages/property/meterWaterManage/meterWaterManage.js
@@ -82,6 +82,14 @@
             },
             _openMeterWaterImport:function(){
                 vc.emit('importMeterWaterFee', 'openImportMeterWaterFeeModal',{});
+            },
+            _getMeteTypeName:function(_meterType){
+                if(_meterType == '1010'){
+                    return "电表";
+                }else if(_meterType == '2020'){
+                    return "水表";
+                }
+                return "煤气费";
             }
         }
     });