From e2a691fcf369685860c6d7fae66cdacac5842d92 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 20 Aug 2020 15:21:22 +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

---
 app.js                                                    | 8 ++++----
 public/components/property/addFloor/addFloor.html         | 2 +-
 public/components/property/editFloor/editFloor.html       | 2 +-
 .../parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.js  | 3 ++-
 .../property/roomCreateFeeAdd/roomCreateFeeAdd.js         | 3 ++-
 public/pages/property/payFeeOrder/payFeeOrder.html        | 7 +++++++
 public/pages/property/payFeeOrder/payFeeOrder.js          | 3 ++-
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 0ba9148d2..4b4cb0be0 100644
--- a/app.js
+++ b/app.js
@@ -34,10 +34,10 @@ let opts = {
 //app.use('/callComponent',proxy('https://app.demo.winqi.cn/',opts));
 //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012/',opts));
 //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
-app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
-app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
-//app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
-//app.use('/app',proxy('http://192.168.1.16:8012',opts));
+//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
+//app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
+app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
+app.use('/app',proxy('http://192.168.1.16:8012',opts));
 
 //app.listen(3000);
 app.use(express.json());
diff --git a/public/components/property/addFloor/addFloor.html b/public/components/property/addFloor/addFloor.html
index be393070e..c68787008 100644
--- a/public/components/property/addFloor/addFloor.html
+++ b/public/components/property/addFloor/addFloor.html
@@ -15,7 +15,7 @@
                             </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" readonly type="text"
+                                <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text"
                                                               placeholder="必填，请填写名称" class="form-control"></div>
                             </div>
                             <div class="form-group row">
diff --git a/public/components/property/editFloor/editFloor.html b/public/components/property/editFloor/editFloor.html
index 5d472c8b9..542e9660c 100644
--- a/public/components/property/editFloor/editFloor.html
+++ b/public/components/property/editFloor/editFloor.html
@@ -15,7 +15,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">楼栋名称</label>
-                                <div class="col-sm-10"><input v-model="editFloorInfo.floorName" readonly type="text"
+                                <div class="col-sm-10"><input v-model="editFloorInfo.floorName" type="text"
                                                               placeholder="必填，请填写名称" class="form-control"></div>
                             </div>
                             <div class="form-group row">
diff --git a/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.js b/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.js
index 4cab0e32d..4bdf48f06 100644
--- a/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.js
+++ b/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.js
@@ -155,7 +155,8 @@
                         row:20,
                         communityId:vc.getCurrentCommunity().communityId,
                         feeTypeCd:_feeTypeCd,
-                        isDefault:'F'
+                        isDefault:'F',
+                        valid:'1'
                     }
                 };
 
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
index 1ca9cbb62..76b76577e 100644
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
@@ -179,7 +179,8 @@
                         row:20,
                         communityId:vc.getCurrentCommunity().communityId,
                         feeTypeCd:_feeTypeCd,
-                        isDefault:'F'
+                        isDefault:'F',
+                        valid:'1'
                     }
                 };
 
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.html b/public/pages/property/payFeeOrder/payFeeOrder.html
index 47aa87968..d726906ae 100644
--- a/public/pages/property/payFeeOrder/payFeeOrder.html
+++ b/public/pages/property/payFeeOrder/payFeeOrder.html
@@ -47,6 +47,13 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label" style="padding-right:0px;">备注</label>
+                                <div class="col-sm-8" style="padding-left:5px;">
+                                    <textarea placeholder="可填，请填写备注" class="form-control"
+                                  v-model="payFeeOrderInfo.remark"></textarea>
+                                   </div>
+                            </div>
                         </div>
                         <div class="col-4" style="padding-left: 30px;">
                             <div class="row">
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js
index da59c5a36..742a4a249 100644
--- a/public/pages/property/payFeeOrder/payFeeOrder.js
+++ b/public/pages/property/payFeeOrder/payFeeOrder.js
@@ -17,7 +17,8 @@
                 communityId: vc.getCurrentCommunity().communityId,
                 roomName:'',
                 squarePrice:'',
-                additionalAmount:''
+                additionalAmount:'',
+                remark:''
             }
         },
         _initMethod: function () {