From 561720f51022f2df3b52057f5820fbb054a77101 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 13 Aug 2021 16:18:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=B4=E8=B4=B9=20?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=BC=B4=E8=B4=B9=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/payFeeOrder/payFeeOrder.html     | 45 +++++++++++--------
 .../pages/property/payFeeOrder/payFeeOrder.js |  7 ++-
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/public/pages/property/payFeeOrder/payFeeOrder.html b/public/pages/property/payFeeOrder/payFeeOrder.html
index 3bd7377d1..0b12e9e0f 100755
--- a/public/pages/property/payFeeOrder/payFeeOrder.html
+++ b/public/pages/property/payFeeOrder/payFeeOrder.html
@@ -6,7 +6,7 @@
                     <h5>订单收费({{payFeeOrderInfo.payerObjName}})</h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                                v-on:click="_goBack()">返回
+                            v-on:click="_goBack()">返回
                         </button>
                     </div>
                 </div>
@@ -37,11 +37,19 @@
                                     <label class=" col-form-label">{{payFeeOrderInfo.endTime}}</label>
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">缴费时间</label>
+                                <div class="col-sm-6">
+                                    <input v-model="payFeeOrderInfo.createTime" type="text"
+                                           placeholder="必填，请填写缴费时间" readonly class=" payFeeOrderCreateTime" style="border: none; outline: none;">
+                                  
+                                </div>
+                            </div>
                             <div class="form-group row" v-if="payFeeOrderInfo.feeFlag != '2006012'">
                                 <label class="col-sm-2 col-form-label">缴费周期</label>
                                 <div class="col-sm-6">
                                     <select class="custom-select" v-model="payFeeOrderInfo.tempCycles"
-                                            @change="_changeMonth(payFeeOrderInfo.tempCycles)">
+                                        @change="_changeMonth(payFeeOrderInfo.tempCycles)">
                                         <option selected disabled value="">请选择缴费周期</option>
                                         <option v-for="item in payFeeOrderInfo.paymentCycles" :value="item">{{item}}个月
                                         </option>
@@ -54,15 +62,15 @@
                                 <label class="col-sm-2 col-form-label">实际周期</label>
                                 <div class="col-sm-6">
                                     <input type="text" placeholder="请输入实际周期" v-model="payFeeOrderInfo.cycles"
-                                           oninput="value=value.replace(/[^\d]/g,'')"
-                                           v-on:change="changeCycle(payFeeOrderInfo.cycles)" class="form-control">
+                                        oninput="value=value.replace(/[^\d]/g,'')"
+                                        v-on:change="changeCycle(payFeeOrderInfo.cycles)" class="form-control">
                                 </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;">
+                                <div class="col-sm-6" style="padding-left:5px;">
                                     <textarea placeholder="可填，请填写备注" class="form-control"
-                                              v-model="payFeeOrderInfo.remark">
+                                        v-model="payFeeOrderInfo.remark">
                                     </textarea>
                                 </div>
                             </div>
@@ -86,17 +94,18 @@
                             </div>
                             <div class="row">
                                 <label class="col-sm-3 col-form-label"
-                                       style="line-height: 50px;padding-right:0px;">应收款：</label>
+                                    style="line-height: 50px;padding-right:0px;">应收款：</label>
                                 <label class="col-sm-8 col-form-label"
-                                       style="font-size: 30px;color: red;padding-left:0px;">￥{{payFeeOrderInfo.totalFeePrice}}</label>
+                                    style="font-size: 30px;color: red;padding-left:0px;">￥{{payFeeOrderInfo.totalFeePrice}}</label>
                             </div>
                             <div class="row form-group">
                                 <label class="col-sm-3 col-form-label" style="padding-right:0px;">支付方式:</label>
                                 <div class="col-sm-6">
                                     <select class="custom-select" v-model="payFeeOrderInfo.primeRate">
                                         <option selected disabled value="">必填，请选择支付方式</option>
-                                        <option v-for="(item,index) in payFeeOrderInfo.primeRates" :key="index" v-if="item.statusCd != '5' && item.statusCd != '6'"
-                                                :value="item.statusCd">{{item.name}}
+                                        <option v-for="(item,index) in payFeeOrderInfo.primeRates" :key="index"
+                                            v-if="item.statusCd != '5' && item.statusCd != '6'" :value="item.statusCd">
+                                            {{item.name}}
                                         </option>
                                     </select>
                                 </div>
@@ -105,8 +114,9 @@
                                 <label class="col-sm-3 col-form-label" style="padding-right:0px;">实收款</label>
                                 <div class="col-sm-8" style="padding-left:5px;">
                                     <input type="text" placeholder="请输入实际收款金额" v-model="payFeeOrderInfo.receivedAmount"
-                                           class="form-control" v-if="payFeeOrderInfo.receivedAmountSwitch=='1'">
-                                    <label class="col-sm-8 col-form-label" v-if="payFeeOrderInfo.receivedAmountSwitch=='2'" style="font-size: 15px;">
+                                        class="form-control" v-if="payFeeOrderInfo.receivedAmountSwitch=='1'">
+                                    <label class="col-sm-8 col-form-label"
+                                        v-if="payFeeOrderInfo.receivedAmountSwitch=='2'" style="font-size: 15px;">
                                         ￥{{payFeeOrderInfo.receivedAmount}}
                                     </label>
                                 </div>
@@ -116,7 +126,7 @@
                             <div class="form-group row">
                                 <div class="col-sm-8">
                                     <button type="button" class="btn btn-warning btn-lg btn-block"
-                                            @click="_openPayFee()">提交收费
+                                        @click="_openPayFee()">提交收费
                                     </button>
                                 </div>
                             </div>
@@ -131,9 +141,6 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title">缴费提示</h5>
-                    <!-- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button> -->
                     <button type="button" class="close" @click="_back()">
                         <span aria-hidden="true">&times;</span>
                     </button>
@@ -144,8 +151,10 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" @click="_back()">返回</button>
-                    <button type="button" class="btn btn-primary" v-if="payFeeOrderInfo.receiptId" @click="_printSmallAndBack()">打印小票</button>
-                    <button type="button" class="btn btn-primary" v-if="payFeeOrderInfo.receiptId" @click="_printAndBack()">打印收据</button>
+                    <button type="button" class="btn btn-primary" v-if="payFeeOrderInfo.receiptId"
+                        @click="_printSmallAndBack()">打印小票</button>
+                    <button type="button" class="btn btn-primary" v-if="payFeeOrderInfo.receiptId"
+                        @click="_printAndBack()">打印收据</button>
                 </div>
             </div>
         </div>
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js
index 0d49924ef..6738467c7 100755
--- a/public/pages/property/payFeeOrder/payFeeOrder.js
+++ b/public/pages/property/payFeeOrder/payFeeOrder.js
@@ -32,7 +32,8 @@
                 selectDiscount: [],
                 totalDiscountMoney: 0.0,
                 toFixedSign: 1, // 编码映射-应收款取值标识
-                receivedAmountSwitch: ''
+                receivedAmountSwitch: '',
+                createTime:vc.dateTimeFormat(new Date().getTime())
             }
         },
         _initMethod: function () {
@@ -61,6 +62,10 @@
             vc.getDict('pay_fee_detail', "prime_rate", function (_data) {
                 vc.component.payFeeOrderInfo.primeRates = _data;
             });
+
+            vc.initDateTime('payFeeOrderCreateTime', function (_createTime) {
+                $that.payFeeOrderInfo.createTime = _createTime;
+            });
         },
         _initEvent: function () {
             // 子组件折扣change事件