diff --git a/public/components/common/chooseResourceStore/chooseResourceStore.js b/public/components/common/chooseResourceStore/chooseResourceStore.js
index 634c35768..5636aac7b 100755
--- a/public/components/common/chooseResourceStore/chooseResourceStore.js
+++ b/public/components/common/chooseResourceStore/chooseResourceStore.js
@@ -62,7 +62,7 @@
                         row: _row,
                         isShow: true,
                         communityId: vc.getCurrentCommunity().communityId,
-                        name: _name,
+                        // name: _name,
                         resOrderType: $that.chooseResourceStoreInfo.resOrderType,
                         resName: vc.component.chooseResourceStoreInfo._currentResourceStoreName,
                         parentRstId: vc.component.chooseResourceStoreInfo.parentRstId,
diff --git a/public/components/common/chooseResourceStore3/chooseResourceStore3.js b/public/components/common/chooseResourceStore3/chooseResourceStore3.js
index cec650300..b87c6131c 100644
--- a/public/components/common/chooseResourceStore3/chooseResourceStore3.js
+++ b/public/components/common/chooseResourceStore3/chooseResourceStore3.js
@@ -61,8 +61,11 @@
             _loadAllResourceStoreInfo: function (_page, _row) {
                 let _resOrderType = vc.component.chooseResourceStoreInfo3.resOrderType;
                 let _shType = '2806';
+                // 2022-3-7新增请求标识
+                let operationType = '';
                 if (_resOrderType == '20000') {
                     _shType = '2807';
+                    operationType = '1000';
                 }
                 var param = {
                     params: {
@@ -75,7 +78,8 @@
                         resName: vc.component.chooseResourceStoreInfo3._currentResourceStoreName,
                         parentRstId: vc.component.chooseResourceStoreInfo3.parentRstId,
                         rstId: vc.component.chooseResourceStoreInfo3.rstId,
-                        shId: vc.component.chooseResourceStoreInfo3.shId
+                        shId: vc.component.chooseResourceStoreInfo3.shId,
+                        operationType: operationType
                     }
                 };
                 //发送get请求
@@ -132,8 +136,11 @@
             _listStorehouses: function (_page, _rows) {
                 let _resOrderType = vc.component.chooseResourceStoreInfo3.resOrderType;
                 let _shType = '2806';
+                // 2022-3-7新增请求标识
+                let operationType = '';
                 if (_resOrderType == '20000') {
                     _shType = '2807';
+                    operationType = '1000';
                 }
                 var param = {
                     params: {
@@ -141,7 +148,8 @@
                         row: 100,
                         communityId: vc.getCurrentCommunity().communityId,
                         shType: _shType,
-                        isShow: true
+                        isShow: true,
+                        operationType: operationType
                     }
                 };
                 //发送get请求
diff --git a/public/pages/common/resourceStoreManage/resourceStoreManage.js b/public/pages/common/resourceStoreManage/resourceStoreManage.js
index 084dfac97..6ab865c0f 100755
--- a/public/pages/common/resourceStoreManage/resourceStoreManage.js
+++ b/public/pages/common/resourceStoreManage/resourceStoreManage.js
@@ -87,13 +87,17 @@
                             item.totalPrice = (item.averagePrice * item.stock).toFixed(2);
                         });
                         vc.component.resourceStoreManageInfo.resourceStores = _resourceStoreManageInfo.resourceStores;
-                        if (_resourceStoreManageInfo.resourceStores.length > 0) {
-                            vc.component.resourceStoreManageInfo.subTotalPrice = _resourceStoreManageInfo.resourceStores[0].subTotalPrice;
-                            vc.component.resourceStoreManageInfo.highTotalPrice = _resourceStoreManageInfo.resourceStores[0].highTotalPrice;
-                        } else {
-                            vc.component.resourceStoreManageInfo.subTotalPrice = 0.0;
-                            vc.component.resourceStoreManageInfo.highTotalPrice = 0.0;
-                        }
+                        // if (_resourceStoreManageInfo.resourceStores.length > 0) {
+                        //     vc.component.resourceStoreManageInfo.subTotalPrice = _resourceStoreManageInfo.resourceStores[0].subTotalPrice;
+                        //     vc.component.resourceStoreManageInfo.highTotalPrice = _resourceStoreManageInfo.resourceStores[0].highTotalPrice;
+                        // } else {
+                        //     vc.component.resourceStoreManageInfo.subTotalPrice = 0.0;
+                        //     vc.component.resourceStoreManageInfo.highTotalPrice = 0.0;
+                        // }
+
+                        // 大计小计
+                        vc.component.resourceStoreManageInfo.subTotalPrice = _resourceStoreManageInfo.subTotal;
+                        vc.component.resourceStoreManageInfo.highTotalPrice = _resourceStoreManageInfo.totalPrice;
                         vc.emit('pagination', 'init', {
                             total: vc.component.resourceStoreManageInfo.records,
                             dataCount: vc.component.resourceStoreManageInfo.total,
diff --git a/public/pages/frame/staff/staff.js b/public/pages/frame/staff/staff.js
index 08ee7b303..522fcfda0 100755
--- a/public/pages/frame/staff/staff.js
+++ b/public/pages/frame/staff/staff.js
@@ -13,7 +13,7 @@
                     departmentOrgId: '',
                     orgId: '',
                     orgName: '',
-                    orgLevel: '',
+                    orgLevel: '2',
                     parentOrgId: '',
                     name: '',
                     tel: '',
diff --git a/public/pages/property/payFeeBatch/payFeeBatch.html b/public/pages/property/payFeeBatch/payFeeBatch.html
index f099882e3..8b36f184a 100644
--- a/public/pages/property/payFeeBatch/payFeeBatch.html
+++ b/public/pages/property/payFeeBatch/payFeeBatch.html
@@ -12,36 +12,31 @@
                         <div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" placeholder="请输入批次编号" v-model="payFeeBatchInfo.conditions.batchId"
-                                    class=" form-control">
+                                       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>
+                                <option selected disabled 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">
+                                       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>
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_resetPayFeeBatchMethod()">
+                                <i class="fa fa-repeat"></i> 重置
+                            </button>
                         </div>
                     </div>
                 </div>
@@ -57,42 +52,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>
                     <!-- 分页 -->
diff --git a/public/pages/property/payFeeBatch/payFeeBatch.js b/public/pages/property/payFeeBatch/payFeeBatch.js
index e996850b5..89bae8534 100644
--- a/public/pages/property/payFeeBatch/payFeeBatch.js
+++ b/public/pages/property/payFeeBatch/payFeeBatch.js
@@ -18,7 +18,8 @@
                 conditions: {
                     communityId: vc.getCurrentCommunity().communityId,
                     state: '',
-                    batchId: ''
+                    batchId: '',
+                    createUserName: ''
                 }
             }
         },
@@ -40,6 +41,8 @@
                 var param = {
                     params: vc.component.payFeeBatchInfo.conditions
                 };
+                param.params.batchId = param.params.batchId.trim();
+                param.params.createUserName = param.params.createUserName.trim();
                 vc.http.apiGet('payFeeBatch.listPayFeeBatch',
                     param,
                     function (json) {
@@ -57,11 +60,19 @@
                     }
                 );
             },
+            //查询
             _queryPayFeeBatchMethod: function () {
                 vc.component._listPayFeeBatchs(DEFAULT_PAGE, DEFAULT_ROWS);
             },
-            _openApply:function(_payFee){
-                vc.emit('applyDeleteFeeBatch', 'openApply',_payFee);
+            //重置
+            _resetPayFeeBatchMethod: function () {
+                vc.component.payFeeBatchInfo.conditions.batchId = "";
+                vc.component.payFeeBatchInfo.conditions.state = "";
+                vc.component.payFeeBatchInfo.conditions.createUserName = "";
+                vc.component._listPayFeeBatchs(DEFAULT_PAGE, DEFAULT_ROWS);
+            },
+            _openApply: function (_payFee) {
+                vc.emit('applyDeleteFeeBatch', 'openApply', _payFee);
             },
             _auditPayFeeBatchState: function (_auditInfo) {
                 vc.component.payFeeBatchInfo.payFeeBatch.state = _auditInfo.state;