From 27ea4a4b4919135225fe5b7bcf57fb00e9e16674 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 7 Oct 2021 20:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meterWaterManage/meterWaterManage.html    |  6 ++---
 .../meterWaterManage/meterWaterManage.js      | 25 ++++++++++++++++---
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/public/pages/property/meterWaterManage/meterWaterManage.html b/public/pages/property/meterWaterManage/meterWaterManage.html
index 5c6aebdfb..863d28bc3 100755
--- a/public/pages/property/meterWaterManage/meterWaterManage.html
+++ b/public/pages/property/meterWaterManage/meterWaterManage.html
@@ -19,8 +19,8 @@
                             <select class="custom-select" v-model="meterWaterManageInfo.conditions.meterType">
                                 <option selected value="">请选择表类型</option>
                                 <option v-for="(item,index) in meterWaterManageInfo.meterTypes" :key="index"
-                                        v-bind:value="item.statusCd">
-                                    {{item.name}}
+                                        v-bind:value="item.typeId">
+                                    {{item.typeName}}
                                 </option>
                             </select>
                         </div>
@@ -80,7 +80,7 @@
                         <tbody>
                         <tr v-for="meterWater in meterWaterManageInfo.meterWaters">
                             <td class="text-center">{{meterWater.waterId}}</td>
-                            <td class="text-center">{{_getMeteTypeName(meterWater.meterType)}}</td>
+                            <td class="text-center">{{meterWater.meterTypeName}}</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 dba380526..5791cb956 100755
--- a/public/pages/property/meterWaterManage/meterWaterManage.js
+++ b/public/pages/property/meterWaterManage/meterWaterManage.js
@@ -21,9 +21,7 @@
             }
         },
         _initMethod: function () {
-            vc.getDict('meter_water', "meter_type", function (_data) {
-                vc.component.meterWaterManageInfo.meterTypes = _data;
-            });
+            $that.listMeterTypes();
             vc.component._listMeterWaters(DEFAULT_PAGE, DEFAULT_ROWS);
         },
         _initEvent: function () {
@@ -102,7 +100,26 @@
                     return "水表";
                 }
                 return "煤气费";
-            }
+            },
+            listMeterTypes: function () {
+                let param = {
+                    params: {
+                        page:1,
+                        row:100,
+                        communityId:vc.getCurrentCommunity().communityId
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('meterType.listMeterType',
+                    param,
+                    function (json, res) {
+                        let _meterTypeManageInfo = JSON.parse(json);
+                        $that.meterWaterManageInfo.meterTypes = _meterTypeManageInfo.data;
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
         }
     });
 })(window.vc);