Merge branch 'master' of https://github.com/java110/MicroCommunity

WebService/src/main/resources/components/feePackage/parkingSpace-fee/parkingSpaceFee.html

@@ -1,4 +1,4 @@
-<div id="component" >
+<div id="component">
     <vc:create name="viewMainParkingSpaceFee"
                feeName="停车费"
                payName="propertyPay"
@@ -13,13 +13,15 @@
 
                     <div class="row">
                         <div class="col-sm-3 input-group">
-                            <input size="16" type="text" placeholder="请选择开始时间"   readonly class="form-control form-control-sm start_time">
+                            <input size="16" type="text" placeholder="请选择开始时间" readonly
+                                   class="form-control form-control-sm start_time">
                         </div>
                         <div class="col-sm-2">
 
                         </div>
                         <div class="col-sm-3 input-group">
-                            <input size="16" type="text" placeholder="请选择结束时间"  readonly class="form-control form-control-sm end_time">
+                            <input size="16" type="text" placeholder="请选择结束时间" readonly
+                                   class="form-control form-control-sm end_time">
                         </div>
 
                         <div class="col-sm-2">
@@ -28,12 +30,14 @@
 
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="queryFeeDetailMethod()">
-                                <i class="glyphicon glyphicon-search"></i> 马上查询</button>
+                                <i class="glyphicon glyphicon-search"></i> 马上查询
+                            </button>
                         </div>
 
-                        </div>
+                    </div>
 
-                    <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
+                    <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px"
+                           data-page-size="10">
                         <thead>
                         <tr>
                             <th>缴费ID</th>
@@ -41,7 +45,7 @@
                             <th data-hide="phone">应收金额</th>
                             <th data-hide="phone">实收金额</th>
                             <th data-hide="phone">打折率</th>
-                            <th data-hide="phone" >备注</th>
+                            <th data-hide="phone">备注</th>
                             <th data-hide="phone">缴费时间</th>
                         </tr>
                         </thead>

WebService/src/main/resources/components/feePackage/parkingSpace-fee/parkingSpaceFee.js

@@ -32,18 +32,30 @@
         },
         methods:{
             initDate:function(){
-                $(".start_time").datetimepicker({format: 'yyyy-mm-dd', language: 'zh-CN',minView: "day"});
-                $(".end_time").datetimepicker({format: 'yyyy-mm-dd', language: 'zh-CN',minView: "hour"});
+                $('.start_time').datetimepicker({
+                    language: 'zh-CN',
+                    format: 'yyyy-mm-dd',
+                    autoClose: 1,
+                    minView: "month",
+                    todayBtn: true
+                });
                 $('.start_time').datetimepicker()
-                          .on('changeDate', function (ev) {
-                            var value = $(".start_time").val();
-                            vc.component.feeDetailInfo.startTime = value ;
-                          });
+                    .on('changeDate', function (ev) {
+                        var value = $(".start_time").val();
+                        vc.component.feeDetailInfo.startTime = value;
+                    });
+                $('.end_time').datetimepicker({
+                    language: 'zh-CN',
+                    format: 'yyyy-mm-dd',
+                    autoClose: 1,
+                    minView: "month",
+                    todayBtn: true
+                });
                 $('.end_time').datetimepicker()
-                              .on('changeDate', function (ev) {
-                                var value = $(".end_time").val();
-                                vc.component.feeDetailInfo.endTime = value ;
-                              });
+                  .on('changeDate', function (ev) {
+                    var value = $(".end_time").val();
+                    vc.component.feeDetailInfo.endTime = value ;
+                  });
             },
             listFeeDetail:function(_page,_row){
                 var param = {

WebService/src/main/resources/components/feePackage/view-main-parkingSpace-fee/viewMainParkingSpaceFee.html

@@ -54,7 +54,7 @@
                     <div class="col-sm-4">
                         <div class="form-group" v-if="mainParkingSpaceFeeInfo.amount != '-1.00'">
                             <label class="col-form-label">费用金额：</label>
-                            <label class="">{{mainParkingSpaceFeeInfo.amount}}</label>
+                            <label class="">{{mainParkingSpaceFeeInfo.amount}} 元</label>
                         </div>
                     </div>
                 </div>

WebService/src/main/resources/views/parkingSpaceFeeFlow.html

@@ -7,7 +7,6 @@
     <meta charset="UTF-8"/>
     <title>停车费|java110</title>
     <vc:create name="commonTop"></vc:create>
-    <link rel="stylesheet" href="/css/bootstrap/bootstrap-datetimepicker.min.css"/>
 </head>
 <body>
 <vc:create name="bodyTop"></vc:create>
@@ -31,7 +30,6 @@
 
     </div>
 </div>
-<script src="/js/bootstrap/bootstrap-datetimepicker.min.js"></script>
 <vc:create name="commonBottom"></vc:create>
 </body>
 </html>