From bfe240d8a95035c6a7172ea87e38c7c91d986418 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 10 Sep 2020 23:45:54 +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/addFeeFormula/addFeeFormula.html    | 11 +++++++++--
 .../property/addFeeFormula/addFeeFormula.js      | 15 ++++++++++++++-
 .../property/editFeeFormula/editFeeFormula.html  | 11 +++++++++--
 .../property/editFeeFormula/editFeeFormula.js    | 16 ++++++++++++++--
 .../feeFormulaManage/feeFormulaManage.html       |  2 ++
 5 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/public/components/property/addFeeFormula/addFeeFormula.html b/public/components/property/addFeeFormula/addFeeFormula.html
index 044da6e6d..d2a6a88c5 100644
--- a/public/components/property/addFeeFormula/addFeeFormula.html
+++ b/public/components/property/addFeeFormula/addFeeFormula.html
@@ -14,6 +14,13 @@
                                     v-model="addFeeFormulaInfo.formulaValue"></textarea>
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">单价</label>
+                                <div class="col-sm-10">
+                                    <input placeholder="必填，请填写单价" type="text" class="form-control"
+                                    v-model="addFeeFormulaInfo.price">
+                                </div>
+                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">描述</label>
                                 <div class="col-sm-10">
@@ -29,8 +36,8 @@
                                     <div>U 代表房屋对应单元面积</div>
                                     <div>R 代表房屋面积</div>
                                     <div>X 代表房屋收费系数（房屋管理中配置）</div>
-                                    <div>举例：公共区域公摊电费  电量/楼栋面积*房屋面积*单价</div>
-                                    <div>公式：T/F * R * 1.5   1.5为单价</div>
+                                    <div>举例：公共区域公摊电费  电量/楼栋面积*房屋面积</div>
+                                    <div>公式：T/F * R</div>
                                 </div>
                             </div>
 
diff --git a/public/components/property/addFeeFormula/addFeeFormula.js b/public/components/property/addFeeFormula/addFeeFormula.js
index 1562ff318..22041d8e8 100644
--- a/public/components/property/addFeeFormula/addFeeFormula.js
+++ b/public/components/property/addFeeFormula/addFeeFormula.js
@@ -10,6 +10,7 @@
                 formulaId: '',
                 formulaValue: '',
                 formulaDesc: '',
+                price:''
 
             }
         },
@@ -38,6 +39,18 @@
                             errInfo: "公式太复杂"
                         },
                     ],
+                    'addFeeFormulaInfo.price': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "单价不能为空"
+                        },
+                        {
+                            limit: "money",
+                            param: "",
+                            errInfo: "单价填写有误，如1.50"
+                        },
+                    ],
                     'addFeeFormulaInfo.formulaDesc': [
                         {
                             limit: "maxLength",
@@ -97,7 +110,7 @@
                 vc.component.addFeeFormulaInfo = {
                     formulaValue: '',
                     formulaDesc: '',
-
+                    price:''
                 };
             }
         }
diff --git a/public/components/property/editFeeFormula/editFeeFormula.html b/public/components/property/editFeeFormula/editFeeFormula.html
index 39c1f28e4..ca8403bb6 100644
--- a/public/components/property/editFeeFormula/editFeeFormula.html
+++ b/public/components/property/editFeeFormula/editFeeFormula.html
@@ -14,6 +14,13 @@
                                         class="form-control">
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">单价</label>
+                                <div class="col-sm-10">
+                                    <input placeholder="必填，请填写单价" type="text" class="form-control"
+                                    v-model="editFeeFormulaInfo.price">
+                                </div>
+                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">描述</label>
                                 <div class="col-sm-10">
@@ -29,8 +36,8 @@
                                     <div>U 代表房屋对应单元面积</div>
                                     <div>R 代表房屋面积</div>
                                     <div>X 代表房屋收费系数（房屋管理中配置）</div>
-                                    <div>举例：公共区域公摊电费  电量/楼栋面积*房屋面积*单价</div>
-                                    <div>公式：T/F * R * 1.5   1.5为单价</div>
+                                    <div>举例：公共区域公摊电费  电量/楼栋面积*房屋面积</div>
+                                    <div>公式：T/F * R</div>
                                 </div>
                             </div>
 
diff --git a/public/components/property/editFeeFormula/editFeeFormula.js b/public/components/property/editFeeFormula/editFeeFormula.js
index b79449514..2537cccf8 100644
--- a/public/components/property/editFeeFormula/editFeeFormula.js
+++ b/public/components/property/editFeeFormula/editFeeFormula.js
@@ -6,7 +6,7 @@
                 formulaId: '',
                 formulaValue: '',
                 formulaDesc: '',
-
+                price:''
             }
         },
         _initMethod: function () {
@@ -37,6 +37,18 @@
                             errInfo: "公式太复杂"
                         },
                     ],
+                    'editFeeFormulaInfo.price': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "单价不能为空"
+                        },
+                        {
+                            limit: "money",
+                            param: "",
+                            errInfo: "单价填写有误，如1.50"
+                        },
+                    ],
                     'editFeeFormulaInfo.formulaDesc': [
                         {
                             limit: "maxLength",
@@ -87,7 +99,7 @@
                     formulaId: '',
                     formulaValue: '',
                     formulaDesc: '',
-
+                    price:''
                 }
             }
         }
diff --git a/public/pages/property/feeFormulaManage/feeFormulaManage.html b/public/pages/property/feeFormulaManage/feeFormulaManage.html
index 5700db14f..39d16aed8 100644
--- a/public/pages/property/feeFormulaManage/feeFormulaManage.html
+++ b/public/pages/property/feeFormulaManage/feeFormulaManage.html
@@ -18,6 +18,7 @@
                             <tr>
                                 <th class="text-center">公式ID</th>
                                 <th class="text-center">公式</th>
+                                <th class="text-center">单价</th>
                                 <th class="text-center">描述</th>
                                 <th class="text-center">操作</th>
                             </tr>
@@ -26,6 +27,7 @@
                             <tr v-for="feeFormula in feeFormulaManageInfo.feeFormulas">
                                 <td class="text-center">{{feeFormula.formulaId}}</td>
                                 <td class="text-center">{{feeFormula.formulaValue}}</td>
+                                <td class="text-center">{{feeFormula.price}}</td>
                                 <td class="text-center">{{feeFormula.formulaDesc}}</td>
                                 <td class="text-center">
                                     <div class="btn-group">