From ca313528c6bb396f0ad9aed714a7b5f6a6d0af80 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 15 Sep 2020 21:20:26 +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/pages/property/carCreateFee/carCreateFee.html   | 4 ++--
 public/pages/property/listRoomFee/listRoomFee.html     | 4 +++-
 public/pages/property/payFeeManage/payFeeManage.html   | 4 ++--
 public/pages/property/payFeeManage/payFeeManage.js     | 8 ++++----
 public/pages/property/roomCreateFee/roomCreateFee.html | 4 ++--
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app.js b/app.js
index de97f63d2..088aa3e01 100644
--- a/app.js
+++ b/app.js
@@ -36,12 +36,12 @@ let 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://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://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/pages/property/carCreateFee/carCreateFee.html b/public/pages/property/carCreateFee/carCreateFee.html
index 7b6f157bc..c767d4a18 100644
--- a/public/pages/property/carCreateFee/carCreateFee.html
+++ b/public/pages/property/carCreateFee/carCreateFee.html
@@ -95,10 +95,10 @@
                                 {{car.stateName}}
                             </td>
                             <td class="text-right">
-                                <div class="btn-group" v-if="car.state != 'F'">
+                                <!-- <div class="btn-group" v-if="car.state != 'F'">
                                     <button class="btn-white btn btn-xs" v-on:click="_openCarCreateFeeAddModal(car,false)">创建收费
                                     </button>
-                                </div>
+                                </div> -->
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openViewParkingSpaceCreateFee(car)">查看收费
                                     </button>
diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html
index 8c80d2267..fe80ead91 100644
--- a/public/pages/property/listRoomFee/listRoomFee.html
+++ b/public/pages/property/listRoomFee/listRoomFee.html
@@ -53,7 +53,9 @@
                                 <td class="text-center">{{fee.amountOwed}}</td>
                                 <td class="text-center">{{fee.startTime}}</td>
                                 <td class="text-center">{{fee.endTime}}</td>
-                                <td class="text-center">{{fee.deadlineTime}}</td>
+                                <td class="text-center" v-if="fee.amountOwed == 0 && fee.endTime == fee.deadlineTime">-</td>
+                               
+                                <td class="text-center" v-else>{{fee.deadlineTime}}</td>
                                 <td class="text-center" v-if="fee.feeTypeCd == '888800010015' || fee.feeTypeCd == '888800010016' ">
                                     <div>上期度数：{{fee.preDegrees}}</div> 
                                     <div>本期度数：{{fee.curDegrees}} </div>
diff --git a/public/pages/property/payFeeManage/payFeeManage.html b/public/pages/property/payFeeManage/payFeeManage.html
index ffd81be14..f78c798af 100644
--- a/public/pages/property/payFeeManage/payFeeManage.html
+++ b/public/pages/property/payFeeManage/payFeeManage.html
@@ -19,12 +19,12 @@
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择开始时间"   readonly class="form-control form_datetime  start_time">
+                                <input size="16" type="text" placeholder="请选择开始时间"   class="form-control form_datetime  start_time">
                             </div>
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择结束时间"  readonly class="form-control form_datetime  end_time">
+                                <input size="16" type="text" placeholder="请选择结束时间"  class="form-control form_datetime  end_time">
                             </div>
                         </div>
                         <div class="col-sm-1">
diff --git a/public/pages/property/payFeeManage/payFeeManage.js b/public/pages/property/payFeeManage/payFeeManage.js
index 787c109e3..2f0e4290e 100644
--- a/public/pages/property/payFeeManage/payFeeManage.js
+++ b/public/pages/property/payFeeManage/payFeeManage.js
@@ -40,8 +40,8 @@
                 $(".start_time").datetimepicker({
                     language: 'zh-CN',
                     fontAwesome: 'fa',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
+                    format: 'yyyy-mm-dd hh:ii:ss',
+                    initTime: true,
                     initialDate: new Date(),
                     autoClose: 1,
                     todayBtn: true
@@ -49,8 +49,8 @@
                 $(".end_time").datetimepicker({
                     language: 'zh-CN',
                     fontAwesome: 'fa',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
+                    format: 'yyyy-mm-dd hh:ii:ss',
+                    initTime: true,
                     initialDate: new Date(),
                     autoClose: 1,
                     todayBtn: true
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.html b/public/pages/property/roomCreateFee/roomCreateFee.html
index fb0789e25..b6d0cdfc9 100644
--- a/public/pages/property/roomCreateFee/roomCreateFee.html
+++ b/public/pages/property/roomCreateFee/roomCreateFee.html
@@ -123,11 +123,11 @@
                                 {{room.ownerId}}
                             </td> -->
                                 <td class="text-right">
-                                    <div class="btn-group" v-if="room.state == '2001'">
+                                    <!-- <div class="btn-group" v-if="room.state == '2001'">
                                         <button class="btn-white btn btn-xs"
                                             v-on:click="_openRoomCreateFeeAddModal(room,false)">创建收费
                                         </button>
-                                    </div>
+                                    </div> -->
                                     <div class="btn-group" v-if="room.state == '2001'">
                                         <button class="btn-white btn btn-xs" v-on:click="_toOwnerPayFee(room)">欠费缴费
                                         </button>