From 533208f4821a41ab3b6bb4b2935a13080bb87d4f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 23 Sep 2021 01:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E6=88=90=20?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applyDeleteFeeBatch.html                  |   2 +-
 .../applyDeleteFeeBatch.js                    |   8 +-
 .../property/payFeeBatch/payFeeBatch.html     | 112 +++++++++++++-----
 .../pages/property/payFeeBatch/payFeeBatch.js |   2 +-
 4 files changed, 84 insertions(+), 40 deletions(-)

diff --git a/public/components/property/applyDeleteFeeBatch/applyDeleteFeeBatch.html b/public/components/property/applyDeleteFeeBatch/applyDeleteFeeBatch.html
index 99f656c40..1e226f30c 100644
--- a/public/components/property/applyDeleteFeeBatch/applyDeleteFeeBatch.html
+++ b/public/components/property/applyDeleteFeeBatch/applyDeleteFeeBatch.html
@@ -39,7 +39,7 @@
                             </div>
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
-                                        v-on:click="saveApplyRoomDiscountRecordInfo()">
+                                        v-on:click="saveApplyDeleteFeeBatchInfo()">
                                     <i class="fa fa-check"></i>&nbsp;保存
                                 </button>
                                 <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
diff --git a/public/components/property/applyDeleteFeeBatch/applyDeleteFeeBatch.js b/public/components/property/applyDeleteFeeBatch/applyDeleteFeeBatch.js
index c96500c46..50f294639 100644
--- a/public/components/property/applyDeleteFeeBatch/applyDeleteFeeBatch.js
+++ b/public/components/property/applyDeleteFeeBatch/applyDeleteFeeBatch.js
@@ -49,12 +49,7 @@
                     return;
                 }
                 vc.component.applyDeleteFeeBatchInfo.communityId = vc.getCurrentCommunity().communityId;
-                //不提交数据将数据 回调给侦听处理
-                if (vc.notNull($props.callBackListener)) {
-                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.applyDeleteFeeBatchInfo);
-                    $('#applyDeleteFeeBatchModel').modal('hide');
-                    return;
-                }
+                
                 vc.http.apiPost(
                     '/payFeeBatch.applyDeletePayFeeBatchCmd',
                     JSON.stringify(vc.component.applyDeleteFeeBatchInfo),
@@ -69,7 +64,6 @@
                             $('#applyDeleteFeeBatchModel').modal('hide');
                             vc.component.clearApplyDeleteFeeBatchInfo();
                             vc.emit('pagination', 'page_event', 1);
-                            location.reload();
                             return;
                         }
                         vc.message(_json.msg);
diff --git a/public/pages/property/payFeeBatch/payFeeBatch.html b/public/pages/property/payFeeBatch/payFeeBatch.html
index 0632717cc..f099882e3 100644
--- a/public/pages/property/payFeeBatch/payFeeBatch.html
+++ b/public/pages/property/payFeeBatch/payFeeBatch.html
@@ -1,4 +1,53 @@
 <div class="animated fadeInRight ecommerce">
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox ">
+                <div class="ibox-title">
+                    <h5>查询条件</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入批次编号" v-model="payFeeBatchInfo.conditions.batchId"
+                                    class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <select class="custom-select" v-model="payFeeBatchInfo.conditions.state">
+                                <option selected value="">请选择状态</option>
+                                <option value="2006001">
+                                    正常
+                                </option>
+                                <option value="2007001">
+                                    申请取消
+                                </option>
+                                <option value="2008001">
+                                    审核通过
+                                </option>
+                                <option value="2009001">
+                                    审核失败
+                                </option>
+                            </select>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请填写创建员工"
+                                    v-model="payFeeBatchInfo.conditions.createUserName" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-2">
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryPayFeeBatchMethod()">
+                                <i class="fa fa-search"></i> 查询
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="row">
         <div class="col-lg-12">
             <div class="ibox">
@@ -8,42 +57,42 @@
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">批次号</th>
-                            <th class="text-center">员工</th>
-                            <th class="text-center">时间</th>
-                            <th class="text-center">取消原因</th>
-                            <th class="text-center">审核状态</th>
-                            <th class="text-center">审核意见</th>
-                            <th class="text-center">操作</th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">批次号</th>
+                                <th class="text-center">员工</th>
+                                <th class="text-center">时间</th>
+                                <th class="text-center">取消原因</th>
+                                <th class="text-center">审核状态</th>
+                                <th class="text-center">审核意见</th>
+                                <th class="text-center">操作</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="payFee in payFeeBatchInfo.payFeeBatchs">
-                            <td class="text-center">{{payFee.batchId}}</td>
-                            <td class="text-center">{{payFee.createUserName}}</td>
-                            <td class="text-center">{{payFee.createTime}}</td>
-                            <td class="text-center">{{payFee.remark || '无'}}</td>
-                            <td class="text-center">{{payFee.stateName}}</td>
-                            <td class="text-center">{{payFee.msg}}</td>
-                            <td class="text-center">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-if="payFee.state == 2006001"
+                            <tr v-for="payFee in payFeeBatchInfo.payFeeBatchs">
+                                <td class="text-center">{{payFee.batchId}}</td>
+                                <td class="text-center">{{payFee.createUserName}}</td>
+                                <td class="text-center">{{payFee.createTime}}</td>
+                                <td class="text-center">{{payFee.remark || '无'}}</td>
+                                <td class="text-center">{{payFee.stateName}}</td>
+                                <td class="text-center">{{payFee.msg}}</td>
+                                <td class="text-center">
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs" v-if="payFee.state == 2006001"
                                             v-on:click="_openApply(payFee)">申请取消
-                                    </button>
-                                    <button class="btn-white btn btn-xs" v-if="payFee.state == 2007001"
+                                        </button>
+                                        <button class="btn-white btn btn-xs" v-if="payFee.state == 2007001"
                                             v-on:click="_openPayFeeBatchAuditModel(payFee)">审核
-                                    </button>
-                                </div>
-                            </td>
-                        </tr>
+                                        </button>
+                                    </div>
+                                </td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="9">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="9">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
@@ -52,6 +101,7 @@
             </div>
         </div>
     </div>
-    <vc:create path="property/applyDeleteFeeBatch" callBackListener="payFeeBatch" callBackFunction="notifyAuditInfo"></vc:create>
+    <vc:create path="property/applyDeleteFeeBatch" callBackListener="payFeeBatch" callBackFunction="notifyAuditInfo">
+    </vc:create>
     <vc:create path="common/audit" callBackListener="payFeeBatch" callBackFunction="notifyAuditInfo"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/pages/property/payFeeBatch/payFeeBatch.js b/public/pages/property/payFeeBatch/payFeeBatch.js
index 1553b1cfe..e996850b5 100644
--- a/public/pages/property/payFeeBatch/payFeeBatch.js
+++ b/public/pages/property/payFeeBatch/payFeeBatch.js
@@ -65,7 +65,7 @@
             },
             _auditPayFeeBatchState: function (_auditInfo) {
                 vc.component.payFeeBatchInfo.payFeeBatch.state = _auditInfo.state;
-                //vc.component.payFeeBatchInfo.payFeeBatch.remark = _auditInfo.remark;
+                vc.component.payFeeBatchInfo.payFeeBatch.msg = _auditInfo.remark;
                 let _payFeeBatch = vc.component.payFeeBatchInfo.payFeeBatch;
                 vc.http.apiPost(
                     'payFeeBatch.updatePayFeeBatch',