From 2025fcdbf1aa95cd4fb0fdc5eb8cb66fd255d6fb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 11 Nov 2020 14:11:35 +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 ++++----
 .../carCreateFeeAdd/carCreateFeeAdd.html       |  7 +++++++
 .../carCreateFeeAdd/carCreateFeeAdd.js         | 17 ++++++++++++++++-
 .../roomCreateFeeAdd/roomCreateFeeAdd.html     |  8 ++++++++
 .../roomCreateFeeAdd/roomCreateFeeAdd.js       | 18 +++++++++++++++++-
 5 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index 3aa078f84..2f1c18d48 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/components/property/carCreateFeeAdd/carCreateFeeAdd.html b/public/components/property/carCreateFeeAdd/carCreateFeeAdd.html
index 0a6f7ef65..4fc662eae 100644
--- a/public/components/property/carCreateFeeAdd/carCreateFeeAdd.html
+++ b/public/components/property/carCreateFeeAdd/carCreateFeeAdd.html
@@ -47,6 +47,13 @@
                                         </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="carCreateFeeAddInfo.startTime" type="text" placeholder="必填，请填写计费起始时间"
+                                        class="form-control carCreateFeeStartTime">
+                                </div>
+                            </div>
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
                                     v-on:click="saveCarCreateFeeInfo()"><i class="fa fa-check"></i>&nbsp;提交
diff --git a/public/components/property/carCreateFeeAdd/carCreateFeeAdd.js b/public/components/property/carCreateFeeAdd/carCreateFeeAdd.js
index 9ef5ea313..fdf78c0da 100644
--- a/public/components/property/carCreateFeeAdd/carCreateFeeAdd.js
+++ b/public/components/property/carCreateFeeAdd/carCreateFeeAdd.js
@@ -14,6 +14,7 @@
                 carState:'SH',
                 isMore:false,
                 locationTypeCdName:'',
+                startTime:''
             }
         },
         _initMethod: function() {
@@ -21,6 +22,10 @@
                 vc.component.carCreateFeeAddInfo.feeTypeCds = _data;
             });
 
+            vc.initDateTime('carCreateFeeStartTime',function(_value){
+                $that.carCreateFeeAddInfo.startTime = _value;
+            })
+
             vc.component._loadParkingAreas();
 
         },
@@ -79,7 +84,17 @@
                          param: "",
                          errInfo: "出账类型不能为空"
                      }
-                     ]
+                     ],
+                     'carCreateFeeAddInfo.startTime': [{
+                         limit: "required",
+                         param: "",
+                         errInfo: "计费起始时间不能为空"
+                     },
+                     {
+                         limit: "datetime",
+                         param: "",
+                         errInfo: "计费起始时间格式错误 YYYY-MM-DD hh:mm:ss"
+                     }]
                 });
             },
             saveCarCreateFeeInfo: function() {
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
index e774d6ac2..63c045f88 100644
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
@@ -88,6 +88,14 @@
                                     </div>
                                 </div>
                             </div>
+
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">计费起始时间</label>
+                                <div class="col-sm-10">
+                                    <input v-model="roomCreateFeeAddInfo.startTime" type="text" placeholder="必填，请填写计费起始时间"
+                                        class="form-control roomCreateFeeStartTime">
+                                </div>
+                            </div>
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
                                     v-on:click="saveRoomCreateFeeInfo()"><i class="fa fa-check"></i>&nbsp;提交
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
index c9be1d02d..d09020c50 100644
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
@@ -18,6 +18,7 @@
                 roomState: ['2001'],
                 isMore: false,
                 locationTypeCdName: '',
+                startTime:''
             }
         },
         _initMethod: function () {
@@ -25,6 +26,10 @@
                 vc.component.roomCreateFeeAddInfo.feeTypeCds = _data;
             });
 
+            vc.initDateTime('roomCreateFeeStartTime',function(_value){
+                $that.roomCreateFeeAddInfo.startTime = _value;
+            })
+
         },
         _initEvent: function () {
             vc.on('roomCreateFeeAdd', 'openRoomCreateFeeAddModal',
@@ -98,7 +103,17 @@
                             param: "",
                             errInfo: "房屋状态不能为空"
                         }
-                        ]
+                        ],
+                        'roomCreateFeeAddInfo.startTime': [{
+                            limit: "required",
+                            param: "",
+                            errInfo: "计费起始时间不能为空"
+                        },
+                        {
+                            limit: "datetime",
+                            param: "",
+                            errInfo: "计费起始时间格式错误 YYYY-MM-DD hh:mm:ss"
+                        }]
                     });
             },
             saveRoomCreateFeeInfo: function () {
@@ -174,6 +189,7 @@
                     roomState: ['2001'],
                     isMore: false,
                     locationTypeCdName: '',
+                    startTime:''
                 };
 
                 vc.component.roomCreateFeeAddInfo.feeTypeCds = _feeTypeCds;