From 8edebe81b4ecaea7167f73b3eed3c745d1ca793b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 10 Sep 2020 11:49:17 +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

---
 .../property/addRoomView/addRoomView.html     |  4 ++--
 .../property/addRoomView/addRoomView.js       | 14 +++++++++++-
 .../property/editRoom/editRoom.html           |  4 ++--
 .../components/property/editRoom/editRoom.js  | 22 ++++++++++++++-----
 public/pages/property/room/room.html          |  7 +++---
 5 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/public/components/property/addRoomView/addRoomView.html b/public/components/property/addRoomView/addRoomView.html
index bc2600f3b..fe3455385 100644
--- a/public/components/property/addRoomView/addRoomView.html
+++ b/public/components/property/addRoomView/addRoomView.html
@@ -61,9 +61,9 @@
                     </div>
                 </div>
                 <div class="form-group row">
-                    <label class="col-sm-2 col-form-label">房屋单价</label>
+                    <label class="col-sm-2 col-form-label">算费系数</label>
                     <div class="col-sm-10">
-                        <input v-model="addRoomViewInfo.unitPrice" type="text" placeholder="请填写房屋单价(元)"
+                        <input v-model="addRoomViewInfo.feeCoefficient" type="text" placeholder="请填写算费系数"
                             class="form-control">
                     </div>
                 </div>
diff --git a/public/components/property/addRoomView/addRoomView.js b/public/components/property/addRoomView/addRoomView.js
index 09ff7ccc0..b542cc228 100644
--- a/public/components/property/addRoomView/addRoomView.js
+++ b/public/components/property/addRoomView/addRoomView.js
@@ -16,7 +16,7 @@
                 apartment1: '',
                 apartment2: '',
                 builtUpArea: '',
-                unitPrice: '',
+                feeCoefficient: '1.00',
                 state: '2002',
                 remark: '',
                 communityId: vc.getCurrentCommunity().communityId,
@@ -93,6 +93,18 @@
                             errInfo: "建筑面积错误，如 300.00"
                         },
                         ],
+                        'addRoomViewInfo.feeCoefficient':[
+                            {
+                                limit:"required",
+                                param:"",
+                                errInfo:"算费系数不能为空"
+                            },
+                            {
+                                limit:"money",
+                                param:"",
+                                errInfo:"算费系数错误，如 300.00"
+                            }
+                        ],
                         'addRoomViewInfo.state': [{
                             limit: "required",
                             param: "",
diff --git a/public/components/property/editRoom/editRoom.html b/public/components/property/editRoom/editRoom.html
index b13aeb39b..c1734048b 100644
--- a/public/components/property/editRoom/editRoom.html
+++ b/public/components/property/editRoom/editRoom.html
@@ -63,8 +63,8 @@
                             </div>
 
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">房屋单价</label>
-                                <div class="col-sm-10"><input v-model="editRoomInfo.unitPrice" type="number" placeholder="请填写房屋单价(单位元)" class="form-control"></div>
+                                <label class="col-sm-2 col-form-label">算费系数</label>
+                                <div class="col-sm-10"><input v-model="editRoomInfo.feeCoefficient" type="text" placeholder="请填写算费系数" class="form-control"></div>
                             </div>
                             <div v-for="(item,index) in editRoomInfo.attrs">
                                 <div class="form-group row" v-if="item.specType == '2233'">
diff --git a/public/components/property/editRoom/editRoom.js b/public/components/property/editRoom/editRoom.js
index 2db5bdcff..5558fd96d 100644
--- a/public/components/property/editRoom/editRoom.js
+++ b/public/components/property/editRoom/editRoom.js
@@ -13,7 +13,7 @@
                 apartment1:'',
                 apartment2:'',
                 builtUpArea:'',
-                unitPrice:'',
+                feeCoefficient:'1.00',
                 state:'',
                 remark:'',
                 communityId:'',
@@ -69,9 +69,9 @@
                             var tmpUnits = JSON.parse(json);
                             vc.component.editRoomUnits = tmpUnits;
 
-                            if('0.00' == vc.component.editRoomInfo.unitPrice){
-                                vc.component.editRoomInfo.unitPrice='';
-                            }
+                            // if('0.00' == vc.component.editRoomInfo.unitPrice){
+                            //     vc.component.editRoomInfo.unitPrice='';
+                            // }
                             vc.component.editRoomInfo.apartment1=vc.component.editRoomInfo.apartment.substr(0,2);
                             vc.component.editRoomInfo.apartment2=vc.component.editRoomInfo.apartment.substr(2,5);
                             /*if(tmpUnits == null || tmpUnits.length == 0){
@@ -181,6 +181,18 @@
                                   errInfo:"建筑面积数字长度不能超过6位"
                                 }
                             ],
+                            'editRoomInfo.feeCoefficient':[
+                                {
+                                    limit:"required",
+                                    param:"",
+                                    errInfo:"算费系数不能为空"
+                                },
+                                {
+                                    limit:"money",
+                                    param:"",
+                                    errInfo:"算费系数错误，如 300.00"
+                                }
+                            ],
                             'editRoomInfo.remark':[
                                 {
                                     limit:"maxLength",
@@ -242,7 +254,7 @@
                     apartment1:'',
                     apartment2:'',
                     builtUpArea:'',
-                    unitPrice:'',
+                    feeCoefficient:'1.00',
                     state:'',
                     remark:'',
                     communityId:'',
diff --git a/public/pages/property/room/room.html b/public/pages/property/room/room.html
index f745aa47f..047847345 100644
--- a/public/pages/property/room/room.html
+++ b/public/pages/property/room/room.html
@@ -107,10 +107,9 @@
                             <th data-hide="phone">单元</th>
                             <th data-hide="phone">楼层</th>
                             <th data-hide="phone">房屋名称</th>
-                            
-                            <!--<th data-hide="phone">户型</th>-->
+                        
                             <th data-hide="phone">建筑面积</th>
-                            <th data-hide="phone">单价</th>
+                            <th data-hide="phone">算费系数</th>
                             <th data-hide="phone">房屋状态</th>
                             <th v-for="(item,index) in roomInfo.listColumns">{{item}}</th>
                             <th class="text-right">操作</th>
@@ -142,7 +141,7 @@
                                 {{room.builtUpArea}}平方米
                             </td>
                             <td>
-                                {{room.unitPrice != '0.00'?room.unitPrice:'0'}}元
+                                {{room.feeCoefficient}}
                             </td>
                             <td>
                                 {{vc.component.showState(room.state)}}