From 651f907a85dbae50cdb2e50398eedf6e7a674959 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 18 Sep 2023 22:41:38 +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

---
 .../simplifyFeeReceipt.html                   | 51 +++++++++++--------
 .../property/simplifyHisFee/simplifyHisFee.js |  3 +-
 .../simplifyAcceptance/simplifyAcceptance.js  |  6 +++
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html
index 73810382a..f09832b7b 100644
--- a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html
+++ b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html
@@ -1,7 +1,8 @@
 <div>
     <div class="row margin-top-lg">
         <div class="col-lg-2 padding-right-xs padding-left-xl">
-            <select class="custom-select custom-select-sm" v-model="simplifyFeeReceiptInfo.objType" @change="_changeSimplifyFeeReceiptFeeTypeCd(simplifyFeeReceiptInfo.objType)">
+            <select class="custom-select custom-select-sm" v-model="simplifyFeeReceiptInfo.objType"
+                @change="_changeSimplifyFeeReceiptFeeTypeCd(simplifyFeeReceiptInfo.objType)">
                 <option disabled value="">{{vc.i18n('请选择收费类型','simplifyFeeReceipt')}}</option>
                 <option selected value="3333">{{vc.i18n('房屋费','simplifyFeeReceipt')}}</option>
                 <option value="6666">{{vc.i18n('车位费','simplifyFeeReceipt')}}</option>
@@ -9,14 +10,16 @@
             </select>
         </div>
         <div class="col-lg-2 padding-right-xs padding-left-xl" v-if="simplifyFeeReceiptInfo.objType == '6666'">
-            <select class="custom-select custom-select-sm" v-model="simplifyCarFeeInfo.carId" @change="changeSimplifyFeeReceiptCar()">
+            <select class="custom-select custom-select-sm" v-model="simplifyCarFeeInfo.carId"
+                @change="changeSimplifyFeeReceiptCar()">
                 <option disabled value="">{{vc.i18n('请选择车辆','simplifyFeeReceipt')}}</option>
                 <option v-for="(item,index) in simplifyFeeReceiptInfo.ownerCars" :value="item.carId">{{item.carNum}}
                 </option>
             </select>
         </div>
         <div class="col-lg-2 padding-right-xs padding-left-xl" v-else-if="simplifyFeeReceiptInfo.objType == '7777'">
-            <select class="custom-select custom-select-sm" v-model="simplifyCarFeeInfo.contractId" @change="changeSimplifyFeeReceiptCar()">
+            <select class="custom-select custom-select-sm" v-model="simplifyCarFeeInfo.contractId"
+                @change="changeSimplifyFeeReceiptCar()">
                 <option disabled value="">{{vc.i18n('请选择合同','simplifyFeeReceipt')}}</option>
                 <option v-for="(item,index) in simplifyFeeReceiptInfo.ownerContracts" :value="item.contractId">
                     {{item.contractCode}}
@@ -24,7 +27,8 @@
             </select>
         </div>
         <div class="col-lg-2 padding-right-xs padding-left-xl" v-if="simplifyFeeReceiptInfo.objType != '7777'">
-            <select class="custom-select custom-select-sm" v-model="simplifyFeeReceiptInfo.ownerFlag" @change="_queryFeeReceiptMethod()">
+            <select class="custom-select custom-select-sm" v-model="simplifyFeeReceiptInfo.ownerFlag"
+                @change="_queryFeeReceiptMethod()">
                 <option value="F">{{vc.i18n('当前','simplifyFeeReceipt')}}{{simplifyFeeReceiptInfo.objType ==
                     '6666'?'车辆':'房屋'}}
                 </option>
@@ -34,22 +38,25 @@
             </select>
         </div>
         <div class="col-lg-1 padding-right-xs padding-left-xl input-group-sm">
-            <input v-model="simplifyFeeReceiptInfo.receiptCode" type="text"  
-                   :placeholder="vc.i18n('收据编号','simplifyFeeReceipt')" class="form-control ">
+            <input v-model="simplifyFeeReceiptInfo.receiptCode" type="text"
+                :placeholder="vc.i18n('收据编号','simplifyFeeReceipt')" class="form-control ">
         </div>
         <div class="col-lg-1 padding-right-xs padding-left-xl">
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                   v-on:click="_queryFeeReceiptMethod()">查询
+                v-on:click="_queryFeeReceiptMethod()">查询
             </button>
         </div>
         <div class="col-lg-2 padding-right-xs padding-left-xl" v-if="simplifyFeeReceiptInfo.objType != '6666' ">
         </div>
         <div class="col-lg-4 text-right padding-right-lg">
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_printFeeReceipt()">打印
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                v-on:click="_printFeeReceipt()">打印
             </button>
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_printFeeSmallReceipt()">打印小票
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                v-on:click="_printFeeSmallReceipt()">打印小票
             </button>
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_printApplyFeeReceipt()">申请单
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                v-on:click="_printApplyFeeReceipt()">申请单
             </button>
         </div>
     </div>
@@ -58,7 +65,8 @@
             <thead>
                 <tr>
                     <th class="text-center">
-                        <input type="checkbox" class="i-checks" v-bind:checked="simplifyFeeReceiptInfo.quan == true" @click="checkAllReceipt($event)">
+                        <input type="checkbox" class="i-checks" v-bind:checked="simplifyFeeReceiptInfo.quan == true"
+                            @click="checkAllReceipt($event)">
                     </th>
                     <th class="text-center">
                         <vc:i18n name="收据编号" namespace="simplifyFeeReceipt"></vc:i18n>
@@ -70,39 +78,42 @@
                         {{_getFeeObjName(simplifyFeeReceiptInfo.objType)}}
                     </th>
                     <th class="text-center">
-                        <span><vc:i18n name="业主" namespace="simplifyFeeReceipt"></vc:i18n></span>
+                        <vc:i18n name="业主" namespace="simplifyFeeReceipt"></vc:i18n>
                     </th>
                     <th class="text-center">
-                        <span><vc:i18n name="费用项目" namespace="simplifyFeeReceipt"></vc:i18n></span>
+                        <vc:i18n name="费用项目" namespace="simplifyFeeReceipt"></vc:i18n>
                     </th>
                     <th class="text-center">
-                        <span><vc:i18n name="收费时间段" namespace="simplifyFeeReceipt"></vc:i18n></span>
+                        <vc:i18n name="收费时间段" namespace="simplifyFeeReceipt"></vc:i18n>
                     </th>
                     <th class="text-center">
-                        <span><vc:i18n name="总金额" namespace="simplifyFeeReceipt"></vc:i18n></span>
+                        <vc:i18n name="总金额" namespace="simplifyFeeReceipt"></vc:i18n>
                     </th>
                     <th class="text-center">
-                        <span><vc:i18n name="缴费时间" namespace="simplifyFeeReceipt"></vc:i18n></span>
+                        <vc:i18n name="缴费时间" namespace="simplifyFeeReceipt"></vc:i18n>
                     </th>
                     <th class="text-center">
-                        <span><vc:i18n name="收据" namespace="simplifyFeeReceipt"></vc:i18n></span>ID
+                        <vc:i18n name="收据ID" namespace="simplifyFeeReceipt"></vc:i18n>
                     </th>
                 </tr>
             </thead>
             <tbody>
                 <tr v-for="feeReceipt in simplifyFeeReceiptInfo.feeReceipts">
                     <td class="text-center">
-                        <input type="checkbox" class="i-checks checReceiptItem" v-bind:value="feeReceipt.receiptId" v-model="simplifyFeeReceiptInfo.selectReceipts">
+                        <input type="checkbox" class="i-checks checReceiptItem" v-bind:value="feeReceipt.receiptId"
+                            v-model="simplifyFeeReceiptInfo.selectReceipts">
                     </td>
                     <td class="text-center">{{feeReceipt.receiptCode}}
                     </td>
                     <td class="text-center">{{_getFeeObjName(feeReceipt.objType)}}
-                        <span><vc:i18n name="费" namespace="simplifyFeeReceipt"></vc:i18n></span>
+                        <span>
+                            <vc:i18n name="费" namespace="simplifyFeeReceipt"></vc:i18n>
+                        </span>
                     </td>
                     <td class="text-center">{{feeReceipt.objName}}</td>
                     <td class="text-center">{{feeReceipt.payObjName}}</td>
                     <td class="text-center">{{feeReceipt.feeName}}</td>
-                    <td class="text-center">{{vc.dateFormat(feeReceipt.startTime)}}~<br/>
+                    <td class="text-center">{{vc.dateFormat(feeReceipt.startTime)}}~<br />
                         <span class="text-center" v-if="feeReceipt.startTime >= feeReceipt.endTime">
                             {{vc.dateFormat(feeReceipt.endTime)}}
                         </span>
diff --git a/public/components/property/simplifyHisFee/simplifyHisFee.js b/public/components/property/simplifyHisFee/simplifyHisFee.js
index 0a7a3e1ad..cbafcdba9 100644
--- a/public/components/property/simplifyHisFee/simplifyHisFee.js
+++ b/public/components/property/simplifyHisFee/simplifyHisFee.js
@@ -101,8 +101,9 @@
                         if (_json.code != '0') {
                             return;
                         }
-                        $that._listSimplifyFeeDetails(DEFAULT_PAGE, DEFAULT_ROWS);
+                        //$that._listSimplifyFeeDetails(DEFAULT_PAGE, DEFAULT_ROWS);
                         $('#generatorReceiptModel').modal('hide');
+                        vc.emit('simplifyAcceptance', 'doSearch','simplifyHisFee')
 
                     },
                     function(errInfo, error) {
diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.js b/public/pages/property/simplifyAcceptance/simplifyAcceptance.js
index 285e0b027..df9c2455d 100644
--- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.js
+++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.js
@@ -72,6 +72,12 @@
                 $that.simplifyAcceptanceInfo.searchValue = _param.roomName;
                 $that.simplifyAcceptanceInfo.searchPlaceholder = "请输入房屋编号 楼栋-单元-房屋 如1-1-1";
                 $that._doSearch();
+            });
+            vc.on('simplifyAcceptance', 'doSearch', function (_tab) {
+                $that._doSearch();
+                setTimeout(function(){
+                    $that.changeTab(_tab)
+                },2000)
             })
         },
         methods: {