From e7681dc7ba913c1343cd66bacf48f226fd2c6653 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 5 Jun 2020 15:44:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=BC=B4=E8=B4=B9=E5=91=A8?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/addFeeConfig/addFeeConfig.html   | 20 +++++++------------
 .../property/addFeeConfig/addFeeConfig.js     | 14 ++++++++++++-
 .../property/editFeeConfig/editFeeConfig.html |  7 +++++++
 .../property/editFeeConfig/editFeeConfig.js   | 16 +++++++++++++--
 4 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/public/components/property/addFeeConfig/addFeeConfig.html b/public/components/property/addFeeConfig/addFeeConfig.html
index 1b6f0c01d..d8ab1cf14 100644
--- a/public/components/property/addFeeConfig/addFeeConfig.html
+++ b/public/components/property/addFeeConfig/addFeeConfig.html
@@ -7,19 +7,6 @@
                 <div class="ibox-content">
                     <div>
                         <div>
-                            <!--<div class="form-group row">
-                                <label class="col-sm-2 col-form-label">楼名称</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text" placeholder="必填，请填写名称" 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 v-model="addFloorInfo.floorNum" type="email" placeholder="必填，请填写编号" 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 v-model="addFloorInfo.remark" type="tel" placeholder="可填，请填写备注" class="form-control"></div>
-                            </div>-->
-
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">费用类型</label>
                                 <div class="col-sm-10">
@@ -46,6 +33,13 @@
                                         <option value="2006012">一次性费用</option>
                                     </select></div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">缴费周期</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addFeeConfigInfo.paymentCycle" type="text" placeholder="必填，请填写缴费周期 单位为月"
+                                           class="form-control">
+                                </div>
+                            </div>
                             <div class="form-group row" >
                                 <label class="col-sm-2 col-form-label">出账类型</label>
                                 <div class="col-sm-10">
diff --git a/public/components/property/addFeeConfig/addFeeConfig.js b/public/components/property/addFeeConfig/addFeeConfig.js
index 00419de3a..a8e976718 100644
--- a/public/components/property/addFeeConfig/addFeeConfig.js
+++ b/public/components/property/addFeeConfig/addFeeConfig.js
@@ -19,7 +19,8 @@
                 additionalAmount: '',
                 feeTypeCds:[],
                 computingFormulas:[],
-                billType:''
+                billType:'',
+                paymentCycle:''
             }
         },
         _initMethod: function() {
@@ -169,6 +170,17 @@
                         errInfo: "出账类型不能为空"
                     }
                     ],
+                    'addFeeConfigInfo.paymentCycle': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "缴费周期不能为空"
+                    },
+                    {
+                        limit: "num",
+                        param: "",
+                        errInfo: "缴费周期必须为数字 单位月"
+                    },
+                    ]
 
                 });
             },
diff --git a/public/components/property/editFeeConfig/editFeeConfig.html b/public/components/property/editFeeConfig/editFeeConfig.html
index c58f174e7..744cd2419 100644
--- a/public/components/property/editFeeConfig/editFeeConfig.html
+++ b/public/components/property/editFeeConfig/editFeeConfig.html
@@ -33,6 +33,13 @@
                                         <option value="2006012">一次性费用</option>
                                     </select></div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">缴费周期</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editFeeConfigInfo.paymentCycle" type="text" placeholder="必填，请填写缴费周期 单位为月"
+                                           class="form-control">
+                                </div>
+                            </div>
                             <div class="form-group row" >
                                 <label class="col-sm-2 col-form-label">出账类型</label>
                                 <div class="col-sm-10">
diff --git a/public/components/property/editFeeConfig/editFeeConfig.js b/public/components/property/editFeeConfig/editFeeConfig.js
index 3a152bfd6..a72cfeed0 100644
--- a/public/components/property/editFeeConfig/editFeeConfig.js
+++ b/public/components/property/editFeeConfig/editFeeConfig.js
@@ -15,7 +15,8 @@
                 isDefault:'',
                 feeTypeCds:[],
                 computingFormulas:[],
-                billType:''
+                billType:'',
+                paymentCycle:''
             }
         },
         _initMethod: function() {
@@ -171,7 +172,18 @@
                         limit: "required",
                         param: "",
                         errInfo: "出账类型不能为空"
-                    }]
+                    }],
+                    'editFeeConfigInfo.paymentCycle': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "缴费周期不能为空"
+                    },
+                    {
+                        limit: "num",
+                        param: "",
+                        errInfo: "缴费周期必须为数字 单位月"
+                    },
+                    ]
 
                 });
             },