From a078581cd5a0923d962515837b447a0d911686f0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 19 Apr 2023 01:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=20=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exportCarFeeImportExcel.html              |  2 +-
 .../exportCarFeeImportExcel.js                |  3 +-
 .../exportFeeImportExcel.js                   |  6 ++-
 .../payFeeAuditManage/payFeeAuditManage.html  | 44 ++++++++++--------
 .../payFeeAuditManage/payFeeAuditManage.js    | 46 ++++++++++++++++++-
 5 files changed, 77 insertions(+), 24 deletions(-)

diff --git a/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.html b/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.html
index 5ca5715d8..94ec64b12 100644
--- a/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.html
+++ b/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.html
@@ -23,7 +23,7 @@
                                     <label>
                                         <input type="checkbox" v-model="exportCarFeeImportExcelInfo.isConfigAll"  @change="changeAllConfig()" ><span><vc:i18n name="全部" namespace="exportCarFeeImportExcel"></vc:i18n></span>
                                       </label>
-                                    <label class="margin-left" v-for="(item,index) in exportCarFeeImportExcelInfo.configs">
+                                    <label class="margin-left" v-for="(item,index) in exportCarFeeImportExcelInfo.configs" v-if="item.feeTypeCd != '888800010001' && item.feeTypeCd != '888800010009' && item.feeTypeCd != '888800010011'">
                                         <input type="checkbox" v-model="exportCarFeeImportExcelInfo.configIds" @change="changeItemConfig()" :value="item.configId"> {{item.feeName}}
                                      </label>
                                 </div>
diff --git a/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.js b/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.js
index 804817e70..802badf11 100644
--- a/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.js
+++ b/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.js
@@ -122,7 +122,8 @@
                     params: {
                         page: 1,
                         row: 100,
-                        communityId: vc.getCurrentCommunity().communityId
+                        communityId: vc.getCurrentCommunity().communityId,
+                        isDefault:'F'
                     }
                 };
 
diff --git a/public/components/property/exportFeeImportExcel/exportFeeImportExcel.js b/public/components/property/exportFeeImportExcel/exportFeeImportExcel.js
index 6dba6c2bc..6532331ec 100644
--- a/public/components/property/exportFeeImportExcel/exportFeeImportExcel.js
+++ b/public/components/property/exportFeeImportExcel/exportFeeImportExcel.js
@@ -98,7 +98,8 @@
                     params: {
                         page: 1,
                         row: 150,
-                        communityId: vc.getCurrentCommunity().communityId
+                        communityId: vc.getCurrentCommunity().communityId,
+                    
                     }
                 };
 
@@ -122,7 +123,8 @@
                     params: {
                         page: 1,
                         row: 100,
-                        communityId: vc.getCurrentCommunity().communityId
+                        communityId: vc.getCurrentCommunity().communityId,
+                        isDefault:'F'
                     }
                 };
 
diff --git a/public/pages/property/payFeeAuditManage/payFeeAuditManage.html b/public/pages/property/payFeeAuditManage/payFeeAuditManage.html
index 1877f41d9..ad4673588 100755
--- a/public/pages/property/payFeeAuditManage/payFeeAuditManage.html
+++ b/public/pages/property/payFeeAuditManage/payFeeAuditManage.html
@@ -65,12 +65,12 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="缴费审核" namespace="payFeeAuditManage"></vc:i18n></span>
+                        <vc:i18n name="缴费审核" namespace="payFeeAuditManage"></vc:i18n>
                     </h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <!-- <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
-                            <i class="fa fa-plus"></i>导出
-                        </button> -->
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_batchAuditFees()">
+                            批量审核
+                        </button>
                     </div>
                 </div>
                 <div class="ibox-content">
@@ -78,48 +78,56 @@
                         <thead>
                         <tr>
                             <th class="text-center">
-                                <span><vc:i18n name="房屋" namespace="payFeeAuditManage"></vc:i18n></span>
+                                <input type="checkbox" class="i-checks " @click="checkAll($event)"
+                                       id="quan">
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="费用项目" namespace="payFeeAuditManage"></vc:i18n></span>
+                                <vc:i18n name="房屋" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="付费周期" namespace="payFeeAuditManage"></vc:i18n></span>
+                                <vc:i18n name="费用项目" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="缴费起始时间" namespace="payFeeAuditManage"></vc:i18n></span>
+                                <vc:i18n name="付费周期" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="缴费结束时间" namespace="payFeeAuditManage"></vc:i18n></span>
+                                <vc:i18n name="缴费起始时间" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="应付金额(单位:元)" namespace="payFeeAuditManage"></vc:i18n></span>
+                                <vc:i18n name="缴费结束时间" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="实付金额(单位:元)" namespace="payFeeAuditManage"></vc:i18n></span>
+                                <vc:i18n name="应付金额(单位:元)" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="操作员工" namespace="payFeeAuditManage"></vc:i18n></span>
+                                <vc:i18n name="实付金额(单位:元)" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="缴费时间" namespace="payFeeAuditManage"></vc:i18n></span>
+                               <vc:i18n name="操作员工" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="审核状态" namespace="payFeeAuditManage"></vc:i18n></span>
+                                <vc:i18n name="缴费时间" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="审核说明" namespace="payFeeAuditManage"></vc:i18n></span>
+                               <vc:i18n name="审核状态" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="缴费备注" namespace="payFeeAuditManage"></vc:i18n></span>
+                               <vc:i18n name="审核说明" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="详情" namespace="payFeeAuditManage"></vc:i18n></span>
+                                <vc:i18n name="缴费备注" namespace="payFeeAuditManage"></vc:i18n>
+                            </th>
+                            <th class="text-center">
+                                <vc:i18n name="详情" namespace="payFeeAuditManage"></vc:i18n>
                             </th>
                         </tr>
                         </thead>
                         <tbody>
                         <tr v-for="payFee in payFeeAuditManageInfo.payFees">
+                            <td class="text-center">
+                                <input type="checkbox" class="i-checks checkItem"
+                                       v-bind:value="payFee.detailId" v-model="payFeeAuditManageInfo.selectFeeDetailIds">
+                            </td>
                             <td class="text-center">{{payFee.payerObjName}}</td>
                             <td class="text-center">{{payFee.feeName}}</td>
                             <td class="text-center">{{payFee.cycles}}
@@ -145,7 +153,7 @@
                                 <button class="btn btn-link btn-xs"
                                         v-if="payFee.state != '2020' && payFee.state != '3030' "
                                         v-on:click="_openAuditFeeModal(payFee)">
-                                    <span><vc:i18n name="审核费用" namespace="payFeeAuditManage"></vc:i18n></span>
+                                    <vc:i18n name="审核费用" namespace="payFeeAuditManage"></vc:i18n>
                                 </button>
                                 <button class="btn btn-link btn-xs" v-if=" payFee.state == '3030' "
                                         v-on:click="_openRefundModel(payFee)">
diff --git a/public/pages/property/payFeeAuditManage/payFeeAuditManage.js b/public/pages/property/payFeeAuditManage/payFeeAuditManage.js
index b119437d8..792933a8b 100755
--- a/public/pages/property/payFeeAuditManage/payFeeAuditManage.js
+++ b/public/pages/property/payFeeAuditManage/payFeeAuditManage.js
@@ -8,6 +8,7 @@
         data: {
             payFeeAuditManageInfo: {
                 payFees: [],
+                selectFeeDetailIds:[],
                 payObjTypes: [],
                 total: 0,
                 records: 1,
@@ -25,6 +26,18 @@
                 curPayFee: {}
             }
         },
+        watch: { // 监视双向绑定的数据数组
+            payFeeAuditManageInfo: {
+                handler() { // 数据数组有变化将触发此函数
+                    if ($that.payFeeAuditManageInfo.selectFeeDetailIds.length == $that.payFeeAuditManageInfo.payFees.length) {
+                        document.querySelector('#quan').checked = true;
+                    } else {
+                        document.querySelector('#quan').checked = false;
+                    }
+                },
+                deep: true // 深度监视
+            }
+        },
         _initMethod: function() {
             vc.component._listPayFees(DEFAULT_PAGE, DEFAULT_ROWS);
             //vc.component._listFeeType();
@@ -50,6 +63,7 @@
                 var param = {
                     params: vc.component.payFeeAuditManageInfo.conditions
                 };
+                $that.payFeeAuditManageInfo.selectFeeDetailIds = [];
                 //发送get请求
                 vc.http.apiGet('/payFeeAudit/queryPayFeeAudit',
                     param,
@@ -111,17 +125,31 @@
             },
             _openAuditFeeModal: function(_payFee) { // 打开 审核框
                 $that.payFeeAuditManageInfo.curPayFee = _payFee;
+                $that.payFeeAuditManageInfo.selectFeeDetailIds = [];
+                vc.emit('audit', 'openAuditModal', {});
+            },
+            _batchAuditFees:function(){
+                if($that.payFeeAuditManageInfo.selectFeeDetailIds.length<1){
+                    vc.toast('请选择费用');
+                    return;
+                }
+                $that.payFeeAuditManageInfo.curPayFee = {};
                 vc.emit('audit', 'openAuditModal', {});
             },
             _auditFee: function(_param) {
                 //2020 审核通过 3030 未审核
                 let _state = _param.state == '1100' ? '2020' : '3030';
+                let _feeDetailId = "";
+                if($that.payFeeAuditManageInfo.selectFeeDetailIds.length>0){
+                    _feeDetailId = $that.payFeeAuditManageInfo.selectFeeDetailIds.join(',');
+                }else{
+                    _feeDetailId = $that.payFeeAuditManageInfo.curPayFee.detailId;
+                }
                 let _data = {
                     state: _state,
                     message: _param.remark,
-                    feeDetailId: $that.payFeeAuditManageInfo.curPayFee.detailId,
+                    feeDetailId: _feeDetailId,
                     communityId: vc.getCurrentCommunity().communityId,
-                    feeId: $that.payFeeAuditManageInfo.curPayFee.feeId
                 };
                 vc.http.apiPost(
                     '/payFeeAudit/savePayFeeAudit',
@@ -134,6 +162,8 @@
                         if (_json.code == 0) {
                             //关闭model
                             vc.component._listPayFees(DEFAULT_PAGE, DEFAULT_ROWS);
+                            $that.payFeeAuditManageInfo.selectFeeDetailIds = [];
+                            $that.payFeeAuditManageInfo.curPayFee = {};
                             vc.toast("保存成功");
                             return;
                         } else {
@@ -158,6 +188,18 @@
                     feeId: _feeDetail.feeId
                 }
                 vc.emit('returnPayFee', 'openReturnPayFeeModel', _feeDetail);
+            },
+            checkAll: function(e) {
+                let checkObj = document.querySelectorAll('.checkItem'); // 获取所有checkbox项
+                if (e.target.checked) { // 判定全选checkbox的勾选状态
+                    for (var i = 0; i < checkObj.length; i++) {
+                        if (!checkObj[i].checked) { // 将未勾选的checkbox选项push到绑定数组中
+                            $that.payFeeAuditManageInfo.selectFeeDetailIds.push(checkObj[i].value);
+                        }
+                    }
+                } else { // 如果是去掉全选则清空checkbox选项绑定数组
+                    $that.payFeeAuditManageInfo.selectFeeDetailIds = [];
+                }
             }
         }
     });