From 427e275eae5253f2737f4ce63b4f143132775960 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 10 Oct 2023 23:15: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

---
 .../ownerApplyInvoice/ownerApplyInvoice.html  | 98 +++++++++++++++++--
 .../ownerApplyInvoice/ownerApplyInvoice.js    | 16 ++-
 .../property/listOwnerCar/listOwnerCar.js     |  7 +-
 3 files changed, 109 insertions(+), 12 deletions(-)

diff --git a/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.html b/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.html
index 5d8e03178..edcf48b2f 100644
--- a/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.html
+++ b/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.html
@@ -25,14 +25,14 @@
                                 </div>
                                 <div class="col-sm-1">
                                     <button type="button" class="btn btn-primary btn-sm"
-                                            v-on:click="_openChooseOwner()">选择
+                                        v-on:click="_openChooseOwner()">选择
                                     </button>
                                 </div>
                                 <label class="col-sm-2 col-form-label text-right">
                                     <vc:i18n name="纳税人识别号" namespace="ownerApplyInvoice"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
-                                    <input v-model="ownerApplyInvoiceInfo.invoiceNum"  type="text"
+                                    <input v-model="ownerApplyInvoiceInfo.invoiceNum" type="text"
                                         :placeholder="vc.i18n('必填，请选择纳税人识别号','ownerApplyInvoice')" class="form-control">
                                 </div>
                             </div>
@@ -42,16 +42,17 @@
                                 </label>
                                 <div class="col-sm-4">
                                     <select class="custom-select" v-model="ownerApplyInvoiceInfo.invoiceType">
-                                        <option selected disabled value="">{{vc.i18n('必填，请选择发票类型','ownerApplyInvoice')}}</option>
+                                        <option selected disabled value="">{{vc.i18n('必填，请选择发票类型','ownerApplyInvoice')}}
+                                        </option>
                                         <option value="1001">{{vc.i18n('个人','ownerApplyInvoice')}}</option>
                                         <option value="2002">{{vc.i18n('企业','ownerApplyInvoice')}}</option>
-                                      </select>
+                                    </select>
                                 </div>
                                 <label class="col-sm-2 col-form-label text-right">
                                     <vc:i18n name="地址、电话" namespace="ownerApplyInvoice"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
-                                    <input v-model="ownerApplyInvoiceInfo.invoiceAddress"  type="text"
+                                    <input v-model="ownerApplyInvoiceInfo.invoiceAddress" type="text"
                                         :placeholder="vc.i18n('必填，请选择地址、电话','ownerApplyInvoice')" class="form-control">
                                 </div>
                             </div>
@@ -60,21 +61,33 @@
                                     <vc:i18n name="业主" namespace="ownerApplyInvoice"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
-                                    <input v-model="ownerApplyInvoiceInfo.ownerName" disabled  type="text"
+                                    <input v-model="ownerApplyInvoiceInfo.ownerName" disabled type="text"
                                         :placeholder="vc.i18n('必填，请选择地址、电话','ownerApplyInvoice')" class="form-control">
                                 </div>
+                                <label class="col-sm-2 col-form-label text-right">
+                                    <vc:i18n name="开票内容" namespace="ownerApplyInvoice"></vc:i18n>
+                                </label>
+                                <div class="col-sm-4">
+                                    <select class="custom-select" v-model="ownerApplyInvoiceInfo.invoiceFlag">
+                                        <option selected disabled value="">{{vc.i18n('必填，请选择开票内容','ownerApplyInvoice')}}
+                                        </option>
+                                        <option value="FEE">{{vc.i18n('已缴费用','ownerApplyInvoice')}}</option>
+                                        <option value="ACCT">{{vc.i18n('账户预存','ownerApplyInvoice')}}</option>
+                                    </select>
+                                </div>
                             </div>
                         </div>
                     </div>
 
                 </div>
             </div>
-            <vc:create path="fee/searchOwnerInvoice" emitChooseOwner="ownerApplyInvoice" emitLoadData="ownerApplyInvoice">
+            <vc:create path="fee/searchOwnerInvoice" emitChooseOwner="ownerApplyInvoice"
+                emitLoadData="ownerApplyInvoice">
             </vc:create>
         </div>
     </div>
 
-    <div class="row" v-if="ownerApplyInvoiceInfo.feeDetails && ownerApplyInvoiceInfo.feeDetails.length >0">
+    <div class="row" v-if="ownerApplyInvoiceInfo.invoiceFlag == 'FEE'">
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
@@ -90,7 +103,8 @@
                         data-page-size="10">
                         <thead>
                             <tr>
-                                <th class="text-center"><input type="checkbox" class="i-checks all-check" @click="checkAll($event)"></th>
+                                <th class="text-center"><input type="checkbox" class="i-checks all-check"
+                                        @click="checkAll($event)"></th>
                                 <th class="text-center">
                                     <vc:i18n name="费用项" namespace="ownerApplyInvoice"></vc:i18n>
                                 </th>
@@ -124,7 +138,8 @@
                         <tbody>
                             <tr v-for="feeDetail in ownerApplyInvoiceInfo.feeDetails">
                                 <td class="text-center">
-                                    <input type="checkbox" class="i-checks checkItem" v-bind:value="feeDetail.detailId" v-model="ownerApplyInvoiceInfo.detailIds">
+                                    <input type="checkbox" class="i-checks checkItem" v-bind:value="feeDetail.detailId"
+                                        v-model="ownerApplyInvoiceInfo.detailIds">
                                 </td>
                                 <td class="text-center">
                                     {{feeDetail.feeName}}
@@ -168,6 +183,69 @@
             </div>
         </div>
     </div>
+    <div class="row" v-if="ownerApplyInvoiceInfo.invoiceFlag == 'ACCT'">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>
+                        <vc:i18n name="账户预存" namespace="ownerApplyInvoice"></vc:i18n>
+                    </h5>
+                    <div class="ibox-tools" style="top:10px;">
+
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px"
+                        data-page-size="10">
+                        <thead>
+                            <tr>
+                                <th class="text-center"><input type="checkbox" class="i-checks all-check-acct"
+                                        @click="checkAllAcct($event)"></th>
+                                <th class="text-center">
+                                    <vc:i18n name="账户名称" namespace="ownerApplyInvoice"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="账户类型" namespace="ownerApplyInvoice"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="业主" namespace="ownerApplyInvoice"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="预存金额" namespace="ownerApplyInvoice"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="预存方式" namespace="ownerApplyInvoice"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="总金额" namespace="ownerApplyInvoice"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="预存时间" namespace="ownerApplyInvoice"></vc:i18n>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr v-for="acctDetail in ownerApplyInvoiceInfo.acctDetails">
+                                <td class="text-center">
+                                    <input type="checkbox" class="i-checks checkItemAcct" v-bind:value="acctDetail.arId"
+                                        v-model="ownerApplyInvoiceInfo.arIds">
+                                </td>
+                                <td class="text-center">{{acctDetail.acctName}}</td>
+                                <td class="text-center">{{acctDetail.acctTypeName}}</td>
+                                <td class="text-center">{{acctDetail.ownerName}}</td>
+                                <td class="text-center">{{acctDetail.receivedAmount}}</td>
+                                <td class="text-center">{{acctDetail.primeRateName}}</td>
+                                <td class="text-center">{{acctDetail.amount}}元</td>
+                                <td class="text-center">{{acctDetail.createTime}}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <!-- 分页 -->
+                    <vc:create path="frame/pagination"></vc:create>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="row">
         <div class="col-md-12 text-right">
             <button class="btn btn-primary" type="button" v-on:click="saveHandoverInfo()"><i
diff --git a/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.js b/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.js
index e68452fed..2f4f6ea07 100644
--- a/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.js
+++ b/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.js
@@ -9,7 +9,10 @@
                 invoiceAddress: '',
                 invoiceNum: '',
                 detailIds: [],
-                feeDetails: []
+                feeDetails: [],
+                invoiceFlag:'FEE',
+                arIds:[],
+                acctDetails:[]
             }
         },
         watch: {
@@ -23,6 +26,17 @@
                         checkObj[0].checked = true;
                     }
                 }
+            },
+            'ownerApplyInvoiceInfo.arIds': {
+                deep: true,
+                handler: function () {
+                    let checkObj = document.querySelectorAll('.all-check-acct'); // 获取所有checkbox项
+                    if ($that.ownerApplyInvoiceInfo.arIds.length < $that.ownerApplyInvoiceInfo.acctDetails.length) {
+                        checkObj[0].checked = false;
+                    } else {
+                        checkObj[0].checked = true;
+                    }
+                }
             }
         },
         _initMethod: function () {
diff --git a/public/pages/property/listOwnerCar/listOwnerCar.js b/public/pages/property/listOwnerCar/listOwnerCar.js
index 9891e30f4..4609a1bc1 100644
--- a/public/pages/property/listOwnerCar/listOwnerCar.js
+++ b/public/pages/property/listOwnerCar/listOwnerCar.js
@@ -22,6 +22,7 @@
                     link: '',
                     memberCarNumLike: ''
                 },
+                currentPage: DEFAULT_PAGE,
                 listColumns: [],
             }
         },
@@ -30,9 +31,11 @@
         },
         _initEvent: function() {
             vc.on('listOwnerCar', 'listOwnerCarData', function() {
-                $that._listOwnerCar(DEFAULT_PAGE, DEFAULT_ROWS);
+                $that._listOwnerCar($that.listOwnerCarInfo.currentPage, DEFAULT_ROWS);
             });
             vc.on('pagination', 'page_event', function(_currentPage) {
+                $that.listOwnerCarInfo.currentPage = _currentPage;
+
                 $that._listOwnerCar(_currentPage, DEFAULT_ROWS);
             });
             //与字典表关联
@@ -57,6 +60,7 @@
         methods: {
             swatchLeaseType: function(_item) {
                 $that.listOwnerCarInfo.conditions.leaseType = _item.statusCd;
+                $that.listOwnerCarInfo.currentPage = DEFAULT_PAGE;
                 $that._listOwnerCar(DEFAULT_PAGE, DEFAULT_ROWS);
             },
             _listOwnerCar: function(_page, _row) {
@@ -114,6 +118,7 @@
                 $that.listOwnerCarInfo.conditions.leaseType = "H";
                 $that.listOwnerCarInfo.conditions.ownerName = "";
                 $that.listOwnerCarInfo.conditions.link = "";
+                $that.listOwnerCarInfo.currentPage = DEFAULT_PAGE;
                 $that._listOwnerCar(DEFAULT_PAGE, DEFAULT_ROWS);
             },
             _moreCondition: function() {