diff --git a/src/api/accountCenter/butie.js b/src/api/accountCenter/butie.js
index 9506b129..03384b59 100644
--- a/src/api/accountCenter/butie.js
+++ b/src/api/accountCenter/butie.js
@@ -11,6 +11,7 @@ export function queryAccBaseSubApi(data) {
       data: data
     })
 }
+//补贴设置 
 export function saveAccBaseSubApi(data) {
     return request({
       url: '/smart-canteen/api/v2/acc/metadata/save/acc-sub',
@@ -36,7 +37,7 @@ export function saveAccBaseSubApi(data) {
 // 个人补贴-单个补贴
 export function updateAccRechargeSingleApi(data) {
   return request({
-    url: '/smart-canteen/api/v3/acc/subsidy/recharge/single',
+    url: '/smart-canteen/acc/subsidy/add',
     method: 'post',
     headers: {
       "merchant-id":"378915229716713472",
@@ -45,10 +46,22 @@ export function updateAccRechargeSingleApi(data) {
   })
 }
 
-  // 个人补贴-批量补贴
+// 个人补贴-批量补贴-校验
+export function checkAccRechargeBatchApi(data) {
+  return request({
+    url: '/smart-canteen/acc/subsidy/batch/add/check',
+    method: 'post',
+    headers: {
+      "merchant-id":"378915229716713472",
+    },
+    data: data
+  })
+}
+
+// 个人补贴-批量补贴
 export function updateAccRechargeBatchApi(data) {
   return request({
-    url: '/smart-canteen/api/v3/acc/subsidy/recharge/batch',
+    url: '/smart-canteen/acc/subsidy/batch/add',
     method: 'post',
     headers: {
       "merchant-id":"378915229716713472",
@@ -60,7 +73,19 @@ export function updateAccRechargeBatchApi(data) {
 // 个人补贴-单个补贴清空
 export function clearAccRechargeSingleApi(data) {
   return request({
-    url: '/smart-canteen/api/v3/acc/subsidy/clear/single',
+    url: '/smart-canteen/acc/subsidy/clear',
+    method: 'post',
+    headers: {
+      "merchant-id":"378915229716713472",
+    },
+    data: data
+  })
+}
+
+// 个人补贴-批量补贴清空-校验
+export function checkClearAccRechargeBatchApi(data) {
+  return request({
+    url: '/smart-canteen/acc/subsidy/batch/clear/check',
     method: 'post',
     headers: {
       "merchant-id":"378915229716713472",
@@ -72,7 +97,7 @@ export function clearAccRechargeSingleApi(data) {
 // 个人补贴-批量补贴清空
 export function clearAccRechargeBatchApi(data) {
   return request({
-    url: '/smart-canteen/api/v3/acc/subsidy/clear/batch',
+    url: '/smart-canteen/acc/subsidy/batch/clear',
     method: 'post',
     headers: {
       "merchant-id":"378915229716713472",
@@ -86,7 +111,7 @@ export function clearAccRechargeBatchApi(data) {
 //补贴明细
 export function accSubsidyRechargePageApi(data) {
   return request({
-    url: '/smart-canteen/api/v3/acc/subsidy/recharge/page',
+    url: '/smart-canteen/acc/subsidy/add/history',
     method: 'post',
     headers: {
         "merchant-id":"378915229716713472",
@@ -121,7 +146,7 @@ export function batchRepealSubsidyRechargeApi(data) {
 //补贴清空明细
 export function accSubsidyClearPageApi(data) {
   return request({
-    url: '/smart-canteen/api/v3/acc/subsidy/clear/page',
+    url: '/smart-canteen/acc/subsidy/clear/history',
     method: 'post',
     headers: {
         "merchant-id":"378915229716713472",
diff --git a/src/api/accountCenter/manager.js b/src/api/accountCenter/manager.js
index 3307d758..6e252f8e 100644
--- a/src/api/accountCenter/manager.js
+++ b/src/api/accountCenter/manager.js
@@ -17,7 +17,7 @@ export function accInfoOperateCountApi(data) {
 // 账户管理-列表
 export function accInfoPageApi(data) {
     return request({
-      url: '/smart-canteen/api/v3/accInfo/page',
+      url: '/smart-canteen/acc_info/list',
       method: 'post',
       headers: {
         "merchant-id":"378915229716713472",
@@ -30,7 +30,7 @@ export function accInfoPageApi(data) {
 // 账户管理-列表-总数
 export function accInfoSumPageApi(data) {
     return request({
-      url: '/smart-canteen/api/v3/accInfo/page/sum',
+      url: '/smart-canteen/acc_info/balance/sum',
       method: 'post',
       headers: {
         "merchant-id":"378915229716713472",
@@ -64,10 +64,10 @@ export function updateAccInfoBatchApi(data) {
   })
 }
 
-// 账户管理-更改账户状态
+// 账户管理-更改账户状态-账户启用停用
 export function updateAccStateApi(data) {
   return request({
-    url: '/smart-canteen/api/v3/accInfo/update/state',
+    url: '/smart-canteen/acc_info/status/edit',
     method: 'post',
     headers: {
       "merchant-id":"378915229716713472",
diff --git a/src/api/accountCenter/traderecords.js b/src/api/accountCenter/traderecords.js
index 7c48cc2f..67fd8f21 100644
--- a/src/api/accountCenter/traderecords.js
+++ b/src/api/accountCenter/traderecords.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 操作明细列表
 export function accInfoOperationListApi(data) {
   return request({
-    url: '/smart-canteen/api/v3/accInfo/operation/list',
+    url: '/smart-canteen/acc_info/operation/record',
     method: 'post',
     headers: {
       "merchant-id":"378915229716713472",
diff --git a/src/views/accountCenter/account/accountManager/expired.vue b/src/views/accountCenter/account/accountManager/expired.vue
index 5dc5ebbd..a2807635 100644
--- a/src/views/accountCenter/account/accountManager/expired.vue
+++ b/src/views/accountCenter/account/accountManager/expired.vue
@@ -15,8 +15,8 @@
                 :picker-options="pickerOptions" >
             </el-date-picker>
         </el-form-item>
-        <el-form-item label="所属组织" prop="orgIdList">  
-            <el-cascader v-model="queryParams.orgIdList"
+        <el-form-item label="所属组织" prop="deptIdList">  
+            <el-cascader v-model="queryParams.deptIdList"
             :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
             :props="{ 
                 multiple: true,
@@ -26,8 +26,8 @@
             }" clearable collapse-tags >
             </el-cascader> 
         </el-form-item> 
-        <el-form-item label="关键字" prop="keyword">
-            <el-input v-model="queryParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+        <el-form-item label="关键字" prop="searchValue">
+            <el-input v-model="queryParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
         <br>
         <el-form-item label="钱包类型" prop="walletType">
@@ -71,7 +71,7 @@
       <el-table v-loading="loading" :data="tableListData" height="800" :span-method="objectSpanMethod">
         <el-table-column label="序号" align="center" width="80" type="index">
             <template scope="scope">
-                <span v-if="!scope.row.custId">合计：</span>
+                <span v-if="!scope.row.userId">合计：</span>
                 <span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template> 
         </el-table-column> 
@@ -101,11 +101,11 @@
                 <span>{{ (scope.row.subsidyBal/100).toFixed(2) }}</span>
             </template> 
         </el-table-column>
-        <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
+        <!-- <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.redEnvelope/100).toFixed(2) }}</span>
             </template> 
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}</span>
@@ -169,8 +169,8 @@
           pageNum: 1,
           pageSize: 10,
           accStatusList:[4], 
-          orgIdList:[], 
-          keyword:null,
+          deptIdList:[], 
+          searchValue:null,
           walletType:null,
           walletMinAmount:null, 
           walletMaxAmount:null,
@@ -247,24 +247,24 @@
             console.log(this.queryParams)
             this.loading = true;
             let param = {
-              "current": this.queryParams.pageNum, 
-              "size": this.queryParams.pageSize,
+              "pageNum": this.queryParams.pageNum, 
+              "pageSize": this.queryParams.pageSize,
               "accStatusList": this.queryParams.accStatusList,
-              "orgIdList": this.queryParams.orgIdList, 
-              "keyword": this.queryParams.keyword,
+              "deptIdList": this.queryParams.deptIdList, 
+              "searchValue": this.queryParams.searchValue,
               "walletType": this.queryParams.walletType,
-              "walletMinAmount": Number(this.queryParams.walletMinAmount)*100,
-              "walletMaxAmount": Number(this.queryParams.walletMaxAmount)*100,
+              // "walletMinAmount": Number(this.queryParams.walletMinAmount)*100,
+              // "walletMaxAmount": Number(this.queryParams.walletMaxAmount)*100,
               "startDateTime":this.formatDate(this.dateRange[0]),
               "endDateTime":this.formatDate(this.dateRange[1])
             } 
             accInfoPageApi(param).then(response => {
-                this.tableListData = response.data.pageVO.records;
-                this.total = Number(response.data.pageVO.total);
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
                 this.loading = false;
             });
             accInfoSumPageApi(param).then(response => {
-                this.tableListData.push(response.data.sumVO)   
+                this.tableListData.push(response.data)   
             });
         },
         // 合并单元格 rowIndex=行数  columnIndex=列数  
diff --git a/src/views/accountCenter/account/accountManager/index.vue b/src/views/accountCenter/account/accountManager/index.vue
index 27c65405..db8b0ec9 100644
--- a/src/views/accountCenter/account/accountManager/index.vue
+++ b/src/views/accountCenter/account/accountManager/index.vue
@@ -3,12 +3,12 @@
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="账户状态" prop="accStatusList">
             <el-select v-model="queryParams.accStatusList" multiple style="width: 240px" clearable> 
-                <el-option label="正常" value="1"></el-option>
-                <el-option label="停用" value="2"></el-option>  
+                <el-option label="正常" value="0"></el-option>
+                <el-option label="停用" value="1"></el-option>  
             </el-select>   
         </el-form-item>
-        <el-form-item label="所属组织" prop="orgIdList">  
-            <el-cascader v-model="queryParams.orgIdList"
+        <el-form-item label="所属组织" prop="deptIdList">  
+            <el-cascader v-model="queryParams.deptIdList"
             :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
             :props="{ 
                 multiple: true,
@@ -18,10 +18,9 @@
             }" clearable collapse-tags >
             </el-cascader> 
         </el-form-item> 
-        <el-form-item label="关键字" prop="keyword">
-            <el-input v-model="queryParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+        <el-form-item label="关键字" prop="searchValue">
+            <el-input v-model="queryParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
-        <br>
         <el-form-item label="钱包类型" prop="walletType">
             <el-select v-model="queryParams.walletType" style="width: 240px" clearable> 
                 <el-option label="账户总余额" value="0"></el-option>
@@ -30,7 +29,7 @@
                 <el-option label="红包" value="3"></el-option> 
             </el-select>   
         </el-form-item>
-        <el-form-item label="最小金额" prop="walletMinAmount">
+        <!-- <el-form-item label="最小金额" prop="walletMinAmount">
             <el-input
                 v-model="queryParams.walletMinAmount"
                 placeholder="请输入最小金额" style="width: 240px" clearable  @input="(v)=>(queryParams.walletMinAmount=v.replace(/[^\d.]/g,''))">
@@ -43,7 +42,7 @@
                 placeholder="请输入最大金额" style="width: 240px" clearable  @input="(v)=>(queryParams.walletMaxAmount=v.replace(/[^\d.]/g,''))">
                 <template slot="append">元</template>
             </el-input>
-        </el-form-item> 
+        </el-form-item>  -->
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -72,15 +71,15 @@
       <el-table v-loading="loading" :data="tableListData" height="800" :span-method="objectSpanMethod">
         <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
             <template scope="scope">
-                <span v-if="!scope.row.custId">合计：</span>
+                <span v-if="!scope.row.userId">合计：</span>
                 <span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template> 
         </el-table-column> 
-        <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120" fixed="left"/>
-        <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" width="120" fixed="left"/>
-        <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/>
+        <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
+        <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="账户总余额" align="center" prop="accBalTotal" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.accBalTotal/100).toFixed(2) }}</span>
@@ -101,11 +100,11 @@
                 <span>{{ (scope.row.subsidyBal/100).toFixed(2) }}</span>
             </template> 
         </el-table-column>
-        <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
+        <!-- <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.redEnvelope/100).toFixed(2) }}</span>
             </template> 
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}</span>
@@ -135,14 +134,14 @@
             <el-button
               size="mini"
               type="text" style="color: red;"
-              v-if="scope.row.accStatus==1"
-              @click="handleUpdateState(scope.row,2)" 
+              v-if="scope.row.accStatus==0"
+              @click="handleUpdateState(scope.row,1)" 
             >停用</el-button>
             <el-button
               size="mini"
               type="text"
-              v-if="scope.row.accStatus==2"
-              @click="handleUpdateState(scope.row,1)" 
+              v-if="scope.row.accStatus==1"
+              @click="handleUpdateState(scope.row,0)" 
             >启用</el-button>
           </template>
         </el-table-column>
@@ -162,17 +161,17 @@
             <el-descriptions class="margin-top" title="账户信息" :column="2" size="small" border>  
                 <el-descriptions-item>
                     <template slot="label">用户编号</template>
-                    {{form.custNum}}
+                    {{form.userId}}
                 </el-descriptions-item> 
                 <el-descriptions-item>
                     <template slot="label">用户姓名</template>
-                    {{ form.custName }}
+                    {{ form.nickName }}
                 </el-descriptions-item>
 
 
                 <el-descriptions-item>
                     <template slot="label">用户手机号</template>
-                    {{ form.mobile }}
+                    {{ form.phoneNumber }}
                 </el-descriptions-item> 
                 <el-descriptions-item>
                     <template slot="label">账户状态</template>
@@ -182,7 +181,7 @@
 
                 <el-descriptions-item>
                     <template slot="label">所属组织</template>
-                    {{ form.orgFullName }}
+                    {{ form.deptName }}
                 </el-descriptions-item>
             </el-descriptions>
             <el-descriptions class="margin-top" title="账户钱包" :column="2" size="small" border> 
@@ -245,11 +244,11 @@
         <div style="width: 100%;height: 600px;overflow-y: auto;">
           <div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 10px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">第一步：选择用户</div>
             <el-form :model="dialogParams" ref="dialogParams" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="" prop="keyword">
-                  <el-input v-model="dialogParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+              <el-form-item label="" prop="searchValue">
+                  <el-input v-model="dialogParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
               </el-form-item>
-              <el-form-item label="" prop="orgIdList">  
-                  <el-cascader v-model="dialogParams.orgIdList"
+              <el-form-item label="" prop="deptIdList">  
+                  <el-cascader v-model="dialogParams.deptIdList"
                   :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                   placeholder="所属组织"
                   :props="{ 
@@ -276,11 +275,11 @@
             </el-form> 
             <el-table :data="dialogTableData" height="200" ref="multipleTable" :row-key="(row)=>{return row.accId}" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
-              <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
-              <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
-              <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
-              <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" />
-              <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/>
+              <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"  />
+              <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
+              <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
+              <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" />
+              <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/>
             </el-table>
             <pagination
               v-show="dialogTotal>0"
@@ -358,9 +357,9 @@
           pageNum: 1,
           pageSize: 10,
           accStatusList:[], 
-          orgIdList:[],  
+          deptIdList:[],  
           hasSum:true,
-          keyword:null,
+          searchValue:null,
           walletType:null,
           walletMinAmount:null, 
           walletMaxAmount:null,
@@ -384,9 +383,9 @@
           pageNum: 1,
           pageSize: 10,
           accStatusList:[],
-          orgIdList:[], 
+          deptIdList:[], 
           hasSum:true,
-          keyword:null,
+          searchValue:null,
           psnType:null
         },
         dialogTableData:[],
@@ -402,7 +401,7 @@
     },
     created() {
         this.getDeptTree()
-        this.getAccOperateCount()
+        // this.getAccOperateCount()
         this.getList();
     },
     methods: {
@@ -422,13 +421,13 @@
                 })
                 .filter((node) => node.status !== '1')
         },
-        //注销过期用户数量
-        getAccOperateCount(){
-          accInfoOperateCountApi().then(response => {
-              this.cancelCount = response.data.cancelCount
-              this.expiredCount = response.data.expiredCount
-          });
-        },
+        // //注销过期用户数量
+        // getAccOperateCount(){
+        //   accInfoOperateCountApi().then(response => {
+        //       this.cancelCount = response.data.cancelCount
+        //       this.expiredCount = response.data.expiredCount
+        //   });
+        // },
         
         /** 搜索按钮操作 */
         handleQuery() {
@@ -445,21 +444,21 @@
             console.log(this.queryParams)
             this.loading = true;
             let param = {
-              "current": this.queryParams.pageNum, 
-              "size": this.queryParams.pageSize,
+              "pageNum": this.queryParams.pageNum, 
+              "pageSize": this.queryParams.pageSize,
               "accStatusList": this.queryParams.accStatusList,
-              "orgIdList": this.queryParams.orgIdList, 
-              "hasSum": this.queryParams.hasSum,
-              "keyword": this.queryParams.keyword,
+              "deptIdList": this.queryParams.deptIdList, 
+              // "hasSum": this.queryParams.hasSum,
+              "searchValue": this.queryParams.searchValue,
               "walletType": this.queryParams.walletType,
-              "walletMinAmount": Number(this.queryParams.walletMinAmount)*100,
-              "walletMaxAmount": Number(this.queryParams.walletMaxAmount)*100
+              // "walletMinAmount": Number(this.queryParams.walletMinAmount)*100,
+              // "walletMaxAmount": Number(this.queryParams.walletMaxAmount)*100
             } 
             accInfoPageApi(param).then(response => {
-                this.tableListData = response.data.pageVO.records;
-                this.total = Number(response.data.pageVO.total);
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
                 accInfoSumPageApi(param).then(response => {
-                  this.tableListData.push(response.data.sumVO)   
+                  this.tableListData.push(response.data)   
                 }); 
                 this.loading = false;
             });
@@ -487,13 +486,13 @@
         handleUpdateState(row,state){
           let param = {
             accStatus:state,
-            custId:row.custId
+            userId:row.userId
           }
           let str = ''
-          if(state==1){
+          if(state==0){
             str = "是否确认启用账户？"
           }
-          if(state==2){
+          if(state==1){
             str = "是否确认停用账户？"
           }
           this.$modal.confirm(str+'').then(function() {
@@ -563,22 +562,22 @@
         //批量弹窗表格查询
         getDialogList(){
           let param = {
-              "current": this.dialogParams.pageNum, 
-              "size": this.dialogParams.pageSize,
+              "pageNum": this.dialogParams.pageNum, 
+              "pageSize": this.dialogParams.pageSize,
               "accStatusList": this.dialogParams.accStatusList,
-              "orgIdList": this.dialogParams.orgIdList, 
-              "hasSum": this.dialogParams.hasSum,
-              "keyword": this.dialogParams.keyword,
+              "deptIdList": this.dialogParams.deptIdList, 
+              // "hasSum": this.dialogParams.hasSum,
+              "searchValue": this.dialogParams.searchValue,
               "psnType": this.dialogParams.psnType
             } 
             accInfoPageApi(param).then(response => {
-                this.dialogTableData = response.data.pageVO.records;
-                this.dialogTotal = Number(response.data.pageVO.total); 
+                this.dialogTableData = response.rows;
+                this.dialogTotal = Number(response.total); 
             });
         },
         //批量弹窗勾选
         handleSelectionChange(selection){
-          this.batchIds = selection.map((item) => item.custId)  
+          this.batchIds = selection.map((item) => item.userId)  
         },
         //批量修改提交
         confirmBatchEdit(){
diff --git a/src/views/accountCenter/account/accountManager/logoff.vue b/src/views/accountCenter/account/accountManager/logoff.vue
index 461fbb60..e08960e2 100644
--- a/src/views/accountCenter/account/accountManager/logoff.vue
+++ b/src/views/accountCenter/account/accountManager/logoff.vue
@@ -15,8 +15,8 @@
                 :picker-options="pickerOptions" >
             </el-date-picker>
         </el-form-item>
-        <el-form-item label="所属组织" prop="orgIdList">  
-            <el-cascader v-model="queryParams.orgIdList"
+        <el-form-item label="所属组织" prop="deptIdList">  
+            <el-cascader v-model="queryParams.deptIdList"
             :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
             :props="{ 
                 multiple: true,
@@ -26,8 +26,8 @@
             }" clearable collapse-tags >
             </el-cascader> 
         </el-form-item> 
-        <el-form-item label="关键字" prop="keyword">
-            <el-input v-model="queryParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+        <el-form-item label="关键字" prop="searchValue">
+            <el-input v-model="queryParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
         <br>
         <el-form-item label="钱包类型" prop="walletType">
@@ -71,7 +71,7 @@
       <el-table v-loading="loading" :data="tableListData" height="800" :span-method="objectSpanMethod">
         <el-table-column label="序号" align="center" width="80" type="index">
             <template scope="scope">
-                <span v-if="!scope.row.custId">合计：</span>
+                <span v-if="!scope.row.userId">合计：</span>
                 <span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template> 
         </el-table-column> 
@@ -101,11 +101,11 @@
                 <span>{{ (scope.row.subsidyBal/100).toFixed(2) }}</span>
             </template> 
         </el-table-column>
-        <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
+        <!-- <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.redEnvelope/100).toFixed(2) }}</span>
             </template> 
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}</span>
@@ -169,8 +169,8 @@
           pageNum: 1,
           pageSize: 10,
           accStatusList:[3], 
-          orgIdList:[], 
-          keyword:null,
+          deptIdList:[], 
+          searchValue:null,
           walletType:null,
           walletMinAmount:null, 
           walletMaxAmount:null,
@@ -247,24 +247,24 @@
             console.log(this.queryParams)
             this.loading = true;
             let param = {
-              "current": this.queryParams.pageNum, 
-              "size": this.queryParams.pageSize,
+              "pageNum": this.queryParams.pageNum, 
+              "pageSize": this.queryParams.pageSize,
               "accStatusList": this.queryParams.accStatusList,
-              "orgIdList": this.queryParams.orgIdList,
-              "keyword": this.queryParams.keyword,
+              "deptIdList": this.queryParams.deptIdList,
+              "searchValue": this.queryParams.searchValue,
               "walletType": this.queryParams.walletType,
-              "walletMinAmount": Number(this.queryParams.walletMinAmount)*100,
-              "walletMaxAmount": Number(this.queryParams.walletMaxAmount)*100,
+              // "walletMinAmount": Number(this.queryParams.walletMinAmount)*100,
+              // "walletMaxAmount": Number(this.queryParams.walletMaxAmount)*100,
               "startDateTime":this.formatDate(this.dateRange[0]),
               "endDateTime":this.formatDate(this.dateRange[1])
-            } 
+            }
             accInfoPageApi(param).then(response => {
-                this.tableListData = response.data.pageVO.records;
-                this.total = Number(response.data.pageVO.total);
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
                 this.loading = false;
             });
             accInfoSumPageApi(param).then(response => {
-                this.tableListData.push(response.data.sumVO)   
+                this.tableListData.push(response.data)   
             });
         },
         // 合并单元格 rowIndex=行数  columnIndex=列数  
diff --git a/src/views/accountCenter/account/tradeRecords/index.vue b/src/views/accountCenter/account/tradeRecords/index.vue
index 7fe8dc15..ad76d5c1 100644
--- a/src/views/accountCenter/account/tradeRecords/index.vue
+++ b/src/views/accountCenter/account/tradeRecords/index.vue
@@ -22,10 +22,10 @@
             </el-select>   
         </el-form-item>
         <el-form-item label="操作员">
-            <el-input v-model="queryParams.crBy" placeholder="请输入操作员" maxlength="20" clearable style="width: 240px"/>
+            <el-input v-model="queryParams.createBy" placeholder="请输入操作员" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
-        <el-form-item label="所属组织" prop="orgIdList">  
-            <el-cascader v-model="queryParams.orgIdList"
+        <el-form-item label="所属组织" prop="deptIdList">  
+            <el-cascader v-model="queryParams.deptIdList"
             :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
             :props="{ 
                 multiple: true,
@@ -36,7 +36,7 @@
             </el-cascader> 
         </el-form-item>  
         <el-form-item label="关键字">
-            <el-input v-model="queryParams.keyword" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
+            <el-input v-model="queryParams.searchValue" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
 
         <el-form-item>
@@ -77,13 +77,13 @@
                     <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
         </el-table-column>
-        <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" />
-        <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
-        <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
-        <el-table-column label="组织全称" align="center" prop="orgFullName" :show-overflow-tooltip="true" /> 
-        <el-table-column label="操作员" align="center" prop="crby" :show-overflow-tooltip="true" />
+        <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
+        <el-table-column label="用户姓名" align="center" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true" />
+        <el-table-column label="组织全称" align="center" prop="deptFullName" :show-overflow-tooltip="true" /> 
+        <el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true" />
         <el-table-column label="操作员事件" align="center" prop="typeName" :show-overflow-tooltip="true" /> 
-        <el-table-column label="操作时间" align="center" prop="crtime" :show-overflow-tooltip="true" /> 
+        <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" /> 
         <!-- <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope"> 
             <el-button
@@ -183,9 +183,9 @@
           pageNum: 1,
           pageSize: 10,
           type:null,
-          crBy:null,
-          orgIdList:[],
-          keyword:null
+          createBy:null,
+          deptIdList:[],
+          searchValue:null
         },
         //订单详情
         orderInfoData: {},
@@ -246,9 +246,9 @@
               pageNum: 1,
               pageSize: 10,
               type:null,
-              crBy:null,
-              orgIdList:[],
-              keyword:null
+              createBy:null,
+              deptIdList:[],
+              searchValue:null
             }
             this.resetForm("queryForm");
             this.handleQuery();
@@ -258,14 +258,14 @@
             this.loading = false; 
             let param = { 
                 ...this.queryParams,
-                "current": this.queryParams.pageNum, 
-                "size": this.queryParams.pageSize, 
+                "pageNum": this.queryParams.pageNum, 
+                "pageSize": this.queryParams.pageSize, 
                 "startDateTime":this.formatDate(this.dateRange[0]),
                 "endDateTime":this.formatDate(this.dateRange[1])
             }
             accInfoOperationListApi(param).then(response => {
-                this.tableListData = response.data.records;
-                this.total = Number(response.data.total);
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
                 this.loading = false;
             });
         },
diff --git a/src/views/accountCenter/butie/butie/index.vue b/src/views/accountCenter/butie/butie/index.vue
index 2706b1ed..dd552d97 100644
--- a/src/views/accountCenter/butie/butie/index.vue
+++ b/src/views/accountCenter/butie/butie/index.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> 
-        <el-form-item label="所属组织" prop="orgIdList">  
-            <el-cascader v-model="queryParams.orgIdList"
+        <el-form-item label="所属组织" prop="deptIdList">  
+            <el-cascader v-model="queryParams.deptIdList"
             :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
             :props="{ 
                 multiple: true,
@@ -12,8 +12,8 @@
             }" clearable collapse-tags >
             </el-cascader> 
         </el-form-item> 
-        <el-form-item label="关键字" prop="keyword">
-            <el-input v-model="queryParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+        <el-form-item label="关键字" prop="searchValue">
+            <el-input v-model="queryParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -43,11 +43,11 @@
                 <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template> 
         </el-table-column> 
-        <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120" fixed="left"/>
-        <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" width="120" fixed="left"/>
-        <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/>
+        <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
+        <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="账户总余额" align="center" prop="accBalTotal" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.accBalTotal/100).toFixed(2) }}</span>
@@ -68,11 +68,11 @@
                 <span>{{ (scope.row.subsidyBal/100).toFixed(2) }}</span>
             </template> 
         </el-table-column>
-        <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
+        <!-- <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.redEnvelope/100).toFixed(2) }}</span>
             </template> 
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}</span>
@@ -110,20 +110,20 @@
             <el-descriptions class="margin-top" title="账户信息" :column="2" size="small" border>  
                 <el-descriptions-item>
                     <template slot="label">用户编号</template>
-                    {{form.custNum}}
+                    {{form.userId}}
                 </el-descriptions-item> 
                 <el-descriptions-item>
                     <template slot="label">用户姓名</template>
-                    {{ form.custName }}
+                    {{ form.nickName }}
                 </el-descriptions-item>
 
                 <el-descriptions-item>
                     <template slot="label">所属组织</template>
-                    {{ form.orgFullName }}
+                    {{ form.deptName }}
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">用户手机号</template>
-                    {{ form.mobile }}
+                    {{ form.phoneNumber }}
                 </el-descriptions-item>
                  
                 <el-descriptions-item>
@@ -132,7 +132,7 @@
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">用户类别</template>
-                    {{ form.psnTypeName }}
+                    {{ form.userTypeName }}
                 </el-descriptions-item>
 
                
@@ -154,10 +154,10 @@
                     <template slot="label">补贴钱包余额</template>
                     {{ (form.subsidyBal/100).toFixed(2) }}
                 </el-descriptions-item> 
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">红包余额</template>
                     {{ (form.redEnvelope/100).toFixed(2) }}
-                </el-descriptions-item> 
+                </el-descriptions-item>  -->
                 <el-descriptions-item>
                     <template slot="label">冻结金额</template>
                     {{ (form.accFreezeBalTotal/100).toFixed(2) }}
@@ -171,7 +171,7 @@
                       <template slot="append">元</template>
                     </el-input>
                 </el-form-item>  
-                <el-form-item label="补贴有效期" prop="validateDay">
+                <!-- <el-form-item label="补贴有效期" prop="validateDay">
                   <el-input  v-model="form.validateDay" placeholder="请输入补贴有效期天数" maxlength="9" clearable style="width: 300px;"
                       @input="(v)=>(form.validateDay=v.replace(/[^\d]/g,''))">
                       <template slot="append">天</template>
@@ -186,7 +186,7 @@
                 </el-form-item>
                 <el-form-item label="备注" prop="remark">
                   <el-input  v-model="form.remark" placeholder="请输入备注" maxlength="40" clearable style="width: 300px;"/>
-                </el-form-item> 
+                </el-form-item>  -->
             </el-form>
         </div> 
         <div slot="footer" class="dialog-footer">
@@ -196,14 +196,14 @@
       </el-dialog>
       <!-- 批量补贴 -->
       <el-dialog title="批量补贴" :visible.sync="openBatch" width="900px" append-to-body>
-        <div style="width: 100%;height: 650px;overflow-y: auto;">
+        <div style="width: 100%;height: 600px;overflow-y: auto;">
           <div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 10px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">第一步：选择用户</div>
             <el-form :model="dialogParams" ref="dialogParams" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="" prop="keyword">
-                  <el-input v-model="dialogParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+              <el-form-item label="" prop="searchValue">
+                  <el-input v-model="dialogParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
               </el-form-item>
-              <el-form-item label="" prop="orgIdList">  
-                  <el-cascader v-model="dialogParams.orgIdList"
+              <el-form-item label="" prop="deptIdList">  
+                  <el-cascader v-model="dialogParams.deptIdList"
                   :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                   placeholder="所属组织"
                   :props="{ 
@@ -230,11 +230,11 @@
             </el-form> 
             <el-table :data="dialogTableData" height="300" ref="multipleTable1" :row-key="(row)=>{return row.accId}" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
-              <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
-              <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
-              <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
-              <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" />
-              <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/>
+              <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"  />
+              <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
+              <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
+              <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" />
+              <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/>
             </el-table>
             <pagination
               v-show="dialogTotal>0"
@@ -251,7 +251,7 @@
                         <template slot="append">元</template>
                     </el-input>
                 </el-form-item>  
-                <el-form-item label="补贴有效期" prop="validateDay">
+                <!-- <el-form-item label="补贴有效期" prop="validateDay">
                     <el-input  v-model="batchForm.validateDay" placeholder="请输入补贴有效期天数" maxlength="9" clearable style="width: 300px;"
                         @input="(v)=>(batchForm.validateDay=v.replace(/[^\d]/g,''))">
                         <template slot="append">天</template>
@@ -266,38 +266,58 @@
                 </el-form-item>
                 <el-form-item label="备注" prop="remark">
                     <el-input  v-model="batchForm.remark" placeholder="请输入备注" maxlength="40" clearable style="width: 300px;"/>
-                </el-form-item>
-  
-  
-           
+                </el-form-item> --> 
             </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="confirmBatchEdit">确 定</el-button>
+          <el-button type="primary" @click="confirmBatchCheck">确 定</el-button>
           <el-button @click="openBatch=false">取 消</el-button>
         </div>
       </el-dialog>
+
+      <el-dialog title="批量补贴预览" :visible.sync="openResult" width="800px" append-to-body>
+        <div>总人数： {{resultData.totalUserSum || '--' }} ， 补贴人数：{{resultData.validCount || '--' }}， 补贴总额：{{(resultData.validTotalAmount/100) || '--' }}， 无效人数：{{resultData.invalidCount || '--'}}</div>
+        <el-table :data="resultData.errVOList" height="300">
+            <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
+            <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
+            <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
+            <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" />
+            <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/>
+            <el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
+                </template> 
+            </el-table-column>
+            <el-table-column label="失败原因" align="center" prop="errMsg" :show-overflow-tooltip="true"/>
+        </el-table> 
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="openResult=false" v-if="resultData.validUserIdList&&resultData.validUserIdList.length==0">确 定</el-button>
+          <el-button type="primary" @click="confirmBatchEdit" v-else>继 续</el-button> 
+          <el-button @click="openResult=false">取 消</el-button>
+        </div>
+      </el-dialog>
+
  
       <!-- 补贴清空对话框 -->
       <el-dialog :title="title" :visible.sync="openClear" width="800px" append-to-body>
-        <div style="width: 100%;height: 600px;overflow-y: auto;">
+        <div style="width: 100%;height: 300px;overflow-y: auto;">
             <el-descriptions class="margin-top" title="账户信息" :column="2" size="small" border>  
                 <el-descriptions-item>
                     <template slot="label">用户编号</template>
-                    {{form.custNum}}
+                    {{form.userId}}
                 </el-descriptions-item> 
                 <el-descriptions-item>
                     <template slot="label">用户姓名</template>
-                    {{ form.custName }}
+                    {{ form.nickName }}
                 </el-descriptions-item>
 
                 <el-descriptions-item>
                     <template slot="label">所属组织</template>
-                    {{ form.orgFullName }}
+                    {{ form.deptName }}
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">用户手机号</template>
-                    {{ form.mobile }}
+                    {{ form.phoneNumber }}
                 </el-descriptions-item>
                  
                 <el-descriptions-item>
@@ -306,7 +326,7 @@
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">用户类别</template>
-                    {{ form.psnTypeName }}
+                    {{ form.userTypeName }}
                 </el-descriptions-item>
 
                
@@ -328,17 +348,17 @@
                     <template slot="label">补贴钱包余额</template>
                     {{ (form.subsidyBal/100).toFixed(2) }}
                 </el-descriptions-item> 
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">红包余额</template>
                     {{ (form.redEnvelope/100).toFixed(2) }}
-                </el-descriptions-item> 
+                </el-descriptions-item>  -->
                 <el-descriptions-item>
                     <template slot="label">冻结金额</template>
                     {{ (form.accFreezeBalTotal/100).toFixed(2) }}
                 </el-descriptions-item>
             </el-descriptions>
-            <div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;"></div>
-            <el-form ref="form" :model="form" :rules="rules" label-width="100px">  
+            <!-- <div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;"></div> -->
+            <!-- <el-form ref="form" :model="form" :rules="rules" label-width="100px">  
                 <el-form-item label="" prop="clearType">
                   <el-radio-group v-model="form.clearType">
                       <el-radio :label="1">清空</el-radio>
@@ -351,10 +371,10 @@
                       <template slot="append">元</template>
                     </el-input>
                 </el-form-item>   
-            </el-form>
+            </el-form> -->
         </div>
-        <div v-if="form.clearType==1" style="color: red;">提示：清空多少元。例如填20，则清空20元</div>
-        <div v-if="form.clearType==2" style="color: red;">提示：清空至多少元。例如填20，则清空超出20元的部分</div>
+        <!-- <div v-if="form.clearType==1" style="color: red;">提示：清空多少元。例如填20，则清空20元</div>
+        <div v-if="form.clearType==2" style="color: red;">提示：清空至多少元。例如填20，则清空超出20元的部分</div> -->
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitClearForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
@@ -362,14 +382,14 @@
       </el-dialog>
       <!-- 批量补贴清空 -->
       <el-dialog title="批量补贴清空" :visible.sync="openBatchClear" width="900px" append-to-body>
-        <div style="width: 100%;height: 650px;overflow-y: auto;">
-          <div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 10px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">第一步：选择用户</div>
+        <div style="width: 100%;height: 500px;overflow-y: auto;">
+          <div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 10px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">选择用户</div>
             <el-form :model="dialogParams" ref="dialogParams" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="" prop="keyword">
-                  <el-input v-model="dialogParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+              <el-form-item label="" prop="searchValue">
+                  <el-input v-model="dialogParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
               </el-form-item>
-              <el-form-item label="" prop="orgIdList">  
-                  <el-cascader v-model="dialogParams.orgIdList"
+              <el-form-item label="" prop="deptIdList">  
+                  <el-cascader v-model="dialogParams.deptIdList"
                   :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                   placeholder="所属组织"
                   :props="{ 
@@ -396,11 +416,11 @@
             </el-form> 
             <el-table :data="dialogTableData" height="300" ref="multipleTable2" :row-key="(row)=>{return row.accId}" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
-              <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
-              <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
-              <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
-              <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" />
-              <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/>
+              <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"  />
+              <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
+              <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
+              <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" />
+              <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/>
             </el-table>
             <pagination
               v-show="dialogTotal>0"
@@ -409,7 +429,7 @@
               :limit.sync="dialogParams.pageSize"
               @pagination="getDialogList"
             />
-          <div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 20px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">第二步：输入金额</div>
+          <!-- <div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 20px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">第二步：输入金额</div>
             <el-form ref="batchForm" :model="batchForm" :rules="batchRules" label-width="100px">
                 <el-form-item label="" prop="clearType">
                   <el-radio-group v-model="batchForm.clearType">
@@ -423,15 +443,37 @@
                         <template slot="append">元</template>
                     </el-input>
                 </el-form-item> 
-            </el-form>
+            </el-form> -->
         </div>
-        <div v-if="batchForm.clearType==1" style="color: red;">提示：清空多少元。例如填20，则清空20元</div>
-        <div v-if="batchForm.clearType==2" style="color: red;">提示：清空至多少元。例如填20，则清空超出20元的部分</div>
+        <!-- <div v-if="batchForm.clearType==1" style="color: red;">提示：清空多少元。例如填20，则清空20元</div>
+        <div v-if="batchForm.clearType==2" style="color: red;">提示：清空至多少元。例如填20，则清空超出20元的部分</div> -->
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="confirmBatchClear">确 定</el-button>
+          <el-button type="primary" @click="confirmBatchClearCheck">确 定</el-button>
           <el-button @click="openBatchClear=false">取 消</el-button>
         </div>
       </el-dialog>
+      <el-dialog title="批量补贴清空预览" :visible.sync="openResult2" width="800px" append-to-body>
+        <div>总人数： {{resultData2.totalUserSum || '--' }} ， 清空补贴人数：{{resultData2.validCount || '--' }}， 补贴总额：{{(resultData2.validTotalAmount/100).toFixed(2) || '--' }}， 无效人数：{{resultData2.invalidCount || '--'}}</div>
+        <el-table :data="resultData2.errVOList" height="300">
+            <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
+            <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
+            <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
+            <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" />
+            <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/>
+            <el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
+                </template> 
+            </el-table-column>
+            <el-table-column label="失败原因" align="center" prop="errMsg" :show-overflow-tooltip="true"/>
+        </el-table> 
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="openResult2=false" v-if="resultData2.validUserIdList&&resultData2.validUserIdList.length==0">确 定</el-button>
+          <el-button type="primary" @click="confirmBatchClear" v-else>继 续</el-button> 
+          <el-button @click="openResult2=false">取 消</el-button>
+        </div>
+      </el-dialog>
+      
 
     </div>
   </template>
@@ -439,7 +481,7 @@
   <script>
   import { deptTreeSelect } from '@/api/system/user'   
   import { accInfoPageApi, accInfoSumPageApi } from "@/api/accountCenter/manager";
-  import { updateAccRechargeSingleApi,updateAccRechargeBatchApi,clearAccRechargeSingleApi, clearAccRechargeBatchApi } from "@/api/accountCenter/butie";
+  import { updateAccRechargeSingleApi,checkAccRechargeBatchApi,updateAccRechargeBatchApi,clearAccRechargeSingleApi,checkClearAccRechargeBatchApi,clearAccRechargeBatchApi } from "@/api/accountCenter/butie";
   
   export default {
     name: "",
@@ -469,9 +511,9 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10, 
-          orgIdList:[],
+          deptIdList:[],
           hasSum:true,
-          keyword:null,  
+          searchValue:null,  
         },
         // 是否显示弹出层
         open: false, 
@@ -496,9 +538,9 @@
         dialogParams: {
           pageNum: 1,
           pageSize: 10, 
-          orgIdList:[],
+          deptIdList:[],
           hasSum:true,
-          keyword:null,
+          searchValue:null,
           psnType:null
         },
         dialogTableData:[],
@@ -514,8 +556,11 @@
               { required: true, message: "金额不能为空", trigger: "blur" }
           ]
         },
-        batchIds:[]
-        
+        batchIds:[],
+        openResult:false,
+        resultData:{},
+        openResult2:false,
+        resultData2:{}
       };
     },
     created() {
@@ -555,15 +600,15 @@
             console.log(this.queryParams)
             this.loading = true;
             let param = {
-              "current": this.queryParams.pageNum, 
-              "size": this.queryParams.pageSize, 
-              "orgIdList": this.queryParams.orgIdList,
-              "hasSum": this.queryParams.hasSum,
-              "keyword": this.queryParams.keyword
+              "pageNum": this.queryParams.pageNum, 
+              "pageSize": this.queryParams.pageSize, 
+              "deptIdList": this.queryParams.deptIdList,
+              // "hasSum": this.queryParams.hasSum,
+              "searchValue": this.queryParams.searchValue
             } 
             accInfoPageApi(param).then(response => {
-                this.tableListData = response.data.pageVO.records;
-                this.total = Number(response.data.pageVO.total);
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
                 this.loading = false;
             });
             // accInfoSumPageApi(param).then(response => {
@@ -594,9 +639,9 @@
         handleUpdate(row) {
             this.reset();
             this.form = Object.assign({}, row) 
-            this.$set(this.form,"remark","")
-            this.$set(this.form,"receiveEndDate","")
-            this.$set(this.form,"validateDay","")
+            // this.$set(this.form,"remark","")
+            // this.$set(this.form,"receiveEndDate","")
+            // this.$set(this.form,"validateDay","")
             this.$set(this.form,"amount",null)
             this.open = true;
             this.title = "补贴";
@@ -605,7 +650,7 @@
         handleClear(row) {
             this.reset();
             this.form = Object.assign({}, row) 
-            this.$set(this.form,"clearType",1)
+            // this.$set(this.form,"clearType",1)
             this.$set(this.form,"amount",null)
             this.openClear = true;
             this.title = "补贴清空";
@@ -626,10 +671,11 @@
             this.$refs["form"].validate(valid => {
             if (valid) {
               let param = {
-                ...this.form,
-                remark:this.form.remark,
-                receiveEndDate:this.form.receiveEndDate,
-                validateDay:this.form.validateDay,
+                // ...this.form,
+                // remark:this.form.remark,
+                // receiveEndDate:this.form.receiveEndDate,
+                // validateDay:this.form.validateDay,
+                userId:this.form.userId,
                 amount:Number(this.form.amount*100)
               }
               updateAccRechargeSingleApi(param).then(response => {
@@ -642,20 +688,21 @@
         },
         /** 补贴清空提交按钮 */
         submitClearForm: function() {
-            this.$refs["form"].validate(valid => {
-            if (valid) {
+            // this.$refs["form"].validate(valid => {
+            // if (valid) {
               let param = {
-                ...this.form,
-                clearType:this.form.clearType,
-                amount:Number(this.form.amount*100)
+                userId:this.form.userId
+                // ...this.form,
+                // clearType:this.form.clearType,
+                // amount:Number(this.form.amount*100)
               }
               clearAccRechargeSingleApi(param).then(response => {
                     this.$modal.msgSuccess("操作成功");
                     this.openClear = false;
                     this.getList();
               }); 
-            }
-            });
+            // }
+            // });
         }, 
         //批量补贴弹窗
         handleBatchEdit() {
@@ -697,71 +744,94 @@
         //批量弹窗表格查询
         getDialogList(){
           let param = {
-              "current": this.dialogParams.pageNum, 
-              "size": this.dialogParams.pageSize, 
-              "orgIdList": this.dialogParams.orgIdList,
-              "hasSum": this.dialogParams.hasSum,
-              "keyword": this.dialogParams.keyword,
+              "pageNum": this.dialogParams.pageNum, 
+              "pageSize": this.dialogParams.pageSize, 
+              "deptIdList": this.dialogParams.deptIdList,
+              // "hasSum": this.dialogParams.hasSum,
+              "searchValue": this.dialogParams.searchValue,
               "psnType": this.dialogParams.psnType
             } 
             accInfoPageApi(param).then(response => {
-                this.dialogTableData = response.data.pageVO.records;
-                this.dialogTotal = Number(response.data.pageVO.total); 
+                this.dialogTableData = response.rows;
+                this.dialogTotal = Number(response.total); 
             });
         },
         //批量弹窗勾选
         handleSelectionChange(selection){
-          this.batchIds = selection.map((item) => item.custId)  
+          this.batchIds = selection.map((item) => item.userId)  
         },
-        //批量补贴提交
-        confirmBatchEdit(){
-          console.log(this.batchIds)
-          console.log(this.batchForm)
+        //批量补贴校验
+        confirmBatchCheck(){
           if(this.batchIds.length>0){
             this.$refs["batchForm"].validate(valid => {
             if (valid) {
               let param = { 
-                  remark:this.batchForm.remark,
-                  receiveEndDate:this.batchForm.receiveEndDate,
-                  validateDay:this.batchForm.validateDay,
+                  // remark:this.batchForm.remark,
+                  // receiveEndDate:this.batchForm.receiveEndDate,
+                  // validateDay:this.batchForm.validateDay,
                   amount:Number(this.batchForm.amount*100),
-                  custIdList:this.batchIds 
+                  userIds:this.batchIds 
               }
-              updateAccRechargeBatchApi(param).then(response => {
-                      this.$modal.msgSuccess("操作成功");
-                      this.openBatch = false;
-                      this.getList();
+              checkAccRechargeBatchApi(param).then(response => {
+                      // this.$modal.msgSuccess("操作成功");
+                      this.resultData = response.data
+                      this.openResult = true
+                      this.openBatch = false; 
+                      // this.getList();
               });
             }
             });
           }else{
             this.$modal.msgError("请先勾选账户！");
-          }
-
-        },
-        //批量补贴清空提交
-        confirmBatchClear(){
-          console.log(this.batchIds)
-          console.log(this.batchForm)
-          if(this.batchIds.length>0){ 
-            this.$refs["batchForm"].validate(valid => {
-            if (valid) {
-                let param = {   
-                    clearType:this.batchForm.clearType,
-                    amount:Number(this.batchForm.amount*100),
-                    custIdList:this.batchIds 
-                }
-                clearAccRechargeBatchApi(param).then(response => {
-                        this.$modal.msgSuccess("操作成功");
-                        this.openBatchClear = false;
-                        this.getList();
-                });
-            }
-            });
-          }else{
-            this.$modal.msgError("请先勾选账户！");
           } 
         },
+        //批量补贴提交
+        confirmBatchEdit(){  
+              let param = {  
+                  amount:this.resultData.amount,
+                  userIds:this.resultData.validUserIdList 
+              }
+              updateAccRechargeBatchApi(param).then(response => {
+                      this.$modal.msgSuccess("操作成功");
+                      this.openResult = false; 
+                      this.getList();
+              });
+        },
+        //批量补贴清空-校验
+        confirmBatchClearCheck(){
+          if(this.batchIds.length>0){ 
+            // this.$refs["batchForm"].validate(valid => {
+            // if (valid) {
+                let param = {   
+                    // clearType:this.batchForm.clearType,
+                    // amount:Number(this.batchForm.amount*100),
+                    userIds:this.batchIds 
+                }
+                checkClearAccRechargeBatchApi(param).then(response => {
+                        // this.$modal.msgSuccess("操作成功");
+                        this.resultData2 = response.data
+                        this.openResult2 = true
+                        this.openBatchClear = false;
+                        // this.getList();
+                });
+            // }
+            // });
+          }else{
+            this.$modal.msgError("请先勾选账户！");
+          } 
+        },
+        //批量补贴清空提交
+        confirmBatchClear(){  
+              let param = {  
+                  // amount:this.resultData.amount,
+                  userIds:this.resultData2.validUserIdList   
+              }
+              clearAccRechargeBatchApi(param).then(response => {
+                      this.$modal.msgSuccess("操作成功");
+                      this.openResult2 = false; 
+                      this.getList();
+              });
+        },
     }
   };
   </script>
diff --git a/src/views/accountCenter/butie/butieRecordsTab/index.vue b/src/views/accountCenter/butie/butieRecordsTab/index.vue
index d1522ed7..202b422d 100644
--- a/src/views/accountCenter/butie/butieRecordsTab/index.vue
+++ b/src/views/accountCenter/butie/butieRecordsTab/index.vue
@@ -18,10 +18,10 @@
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item label="关键字"> 
-                        <el-input v-model="queryParams1.keyword" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
+                        <el-input v-model="queryParams1.searchValue" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
                     </el-form-item>  
-                    <el-form-item label="所属组织" prop="orgIdList">  
-                        <el-cascader v-model="queryParams1.orgIdList"
+                    <el-form-item label="所属组织" prop="deptIds">  
+                        <el-cascader v-model="queryParams1.deptIds"
                         :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                         :props="{ 
                             multiple: true,
@@ -32,11 +32,11 @@
                         </el-cascader> 
                     </el-form-item>
                     <el-form-item label="操作员">
-                        <el-input v-model="queryParams1.crBy" placeholder="请输入操作员" maxlength="20" clearable style="width: 240px"/>
+                        <el-input v-model="queryParams1.createBy" placeholder="请输入操作员" maxlength="20" clearable style="width: 240px"/>
                     </el-form-item>
-                    <el-form-item label="订单号">
+                    <!-- <el-form-item label="订单号">
                         <el-input v-model="queryParams1.accTradeId" placeholder="请输入订单号" maxlength="20" clearable style="width: 240px"/>
-                    </el-form-item>
+                    </el-form-item> -->
                 
                     <el-form-item>
                     <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -44,47 +44,47 @@
                     </el-form-item>
                 </el-form>
                 <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
+                    <!-- <el-col :span="1.5">
                         <el-button 
                             type="danger"
                             size="mini"
                             @click="handleBatchRepeal1"
                         >批量撤销</el-button>
-                    </el-col>
+                    </el-col> -->
                     <right-toolbar :showSearch.sync="showSearch" @queryTable="getList1"></right-toolbar>
                 </el-row>
                 <el-table v-loading="loading" :data="tableListData1" height="550" ref="multipleTable1" :row-key="(row)=>{return row.tradeId}" @selection-change="handleSelectionChange1"> 
-                    <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+                    <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
                     <el-table-column label="序号" align="center" width="100" type="index" >
                         <template scope="scope">
-                            <span v-if="!scope.row.custId">合计：</span>
+                            <span v-if="!scope.row.userId">合计：</span>
                             <span v-else>{{ (queryParams1.pageNum - 1) * queryParams1.pageSize + scope.$index+1 }}</span>
                         </template> 
                     </el-table-column>
                     <el-table-column label="补贴时间" align="center" prop="tradeTime" :show-overflow-tooltip="true"  width="160"/>
-                    <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  width="120"/>
-                    <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true"  width="120" />
-                    <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true"  width="120" />
-                    <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true"  width="120"/> 
-                    <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"  width="120"/> 
-                    <el-table-column label="补贴金额" align="center" prop="rechargeAmount" :show-overflow-tooltip="true"  width="100" >
+                    <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"  width="120"/>
+                    <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true"  width="120" />
+                    <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true"  width="120" />
+                    <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/> 
+                    <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> 
+                    <el-table-column label="补贴金额" align="center" prop="amount" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span>{{ (scope.row.rechargeAmount/100).toFixed(2) }}</span>
+                            <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="补贴有效期" align="center" prop="validateTime" :show-overflow-tooltip="true"  width="160"/>
-                    <el-table-column label="补贴后补贴钱包余额" align="center" prop="rechargeAfterWalletBal" :show-overflow-tooltip="true"  width="100">
+                    <!-- <el-table-column label="补贴有效期" align="center" prop="validateTime" :show-overflow-tooltip="true"  width="160"/> -->
+                    <el-table-column label="补贴后补贴钱包余额" align="center" prop="walletBal" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span v-if="scope.row.rechargeAfterWalletBal>0">{{ (scope.row.rechargeAfterWalletBal/100).toFixed(2) }}</span>
+                            <span v-if="scope.row.walletBal>0">{{ (scope.row.walletBal/100).toFixed(2) }}</span>
                             <!-- <span v-else></span> -->
                         </template>
                     </el-table-column>
-                    <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"  width="120"/>
+                    <!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"  width="120"/> -->
                     <el-table-column label="补贴结果" align="center" prop="tradeStateName" :show-overflow-tooltip="true"  width="120"></el-table-column>
-                    <el-table-column label="操作员" align="center" prop="crby" :show-overflow-tooltip="true"  width="100"></el-table-column>
+                    <el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true"  width="100"></el-table-column>
                     <el-table-column label="补贴订单号" align="center" prop="tradeId" :show-overflow-tooltip="true"  width="180"></el-table-column>
-                    <el-table-column label="批次号" align="center" prop="batchNum" :show-overflow-tooltip="true"  width="150"></el-table-column>
-                    <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
+                    <!-- <el-table-column label="批次号" align="center" prop="batchNum" :show-overflow-tooltip="true"  width="150"></el-table-column> -->
+                    <!-- <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
                         <template slot-scope="scope">
                             <el-button
                                 size="mini"
@@ -93,7 +93,7 @@
                                 @click="handleRepeal1(scope.row)" 
                             >撤销</el-button>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                 </el-table> 
                 <pagination
                     v-show="total1>0"
@@ -120,10 +120,10 @@
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item label="关键字"> 
-                        <el-input v-model="queryParams2.keyword" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
+                        <el-input v-model="queryParams2.searchValue" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
                     </el-form-item>  
-                    <el-form-item label="组织" prop="orgIdList">  
-                        <el-cascader v-model="queryParams2.orgIdList"
+                    <el-form-item label="组织" prop="deptIds">  
+                        <el-cascader v-model="queryParams2.deptIds"
                         :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                         :props="{ 
                             multiple: true,
@@ -134,11 +134,11 @@
                         </el-cascader> 
                     </el-form-item>
                     <el-form-item label="操作员">
-                        <el-input v-model="queryParams2.crBy" placeholder="请输入操作员" maxlength="20" clearable style="width: 240px"/>
+                        <el-input v-model="queryParams2.createBy" placeholder="请输入操作员" maxlength="20" clearable style="width: 240px"/>
                     </el-form-item>
-                    <el-form-item label="订单号">
+                    <!-- <el-form-item label="订单号">
                         <el-input v-model="queryParams2.accTradeId" placeholder="请输入订单号" maxlength="20" clearable style="width: 240px"/>
-                    </el-form-item>
+                    </el-form-item> -->
                 
                     <el-form-item>
                     <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -151,28 +151,28 @@
                 <el-table v-loading="loading" :data="tableListData2" height="550" ref="multipleTable2" :row-key="(row)=>{return row.tradeId}"> 
                     <el-table-column label="序号" align="center" width="100" type="index" >
                         <template scope="scope">
-                            <span v-if="!scope.row.custId">合计：</span>
+                            <span v-if="!scope.row.userId">合计：</span>
                             <span v-else>{{ (queryParams2.pageNum - 1) * queryParams2.pageSize + scope.$index+1 }}</span>
                         </template> 
                     </el-table-column>
                     <el-table-column label="补贴清空时间" align="center" prop="tradeTime" :show-overflow-tooltip="true"  width="160"/>
-                    <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"/>
-                    <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true"/>
-                    <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true"/>
-                    <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true"/> 
-                    <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/> 
-                    <el-table-column label="清空金额" align="center" prop="clearAmount" :show-overflow-tooltip="true">
+                    <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"/>
+                    <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true"/>
+                    <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true"/>
+                    <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/> 
+                    <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> 
+                    <el-table-column label="清空金额" align="center" prop="amount" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span>{{ (scope.row.clearAmount/100).toFixed(2) }}</span>
+                            <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
                         </template>
                     </el-table-column> 
-                    <el-table-column label="清空后补贴钱包余额" align="center" prop="clearAfterWalletBal" :show-overflow-tooltip="true">
+                    <el-table-column label="清空后补贴钱包余额" align="center" prop="walletBal" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span v-if="scope.row.clearAfterWalletBal>0">{{ (scope.row.clearAfterWalletBal/100).toFixed(2) }}</span>
+                            <span>{{ (scope.row.walletBal/100).toFixed(2) }}</span>
                         </template>
                     </el-table-column> 
-                    <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/> 
-                    <el-table-column label="操作员" align="center" prop="crby" :show-overflow-tooltip="true"></el-table-column>
+                    <!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>  -->
+                    <el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true"></el-table-column>
                     <el-table-column label="补贴清空订单号" align="center" prop="tradeId" :show-overflow-tooltip="true"  width="180"></el-table-column> 
                 </el-table> 
                 <pagination
@@ -183,7 +183,7 @@
                     @pagination="getList2"
                 /> 
             </el-tab-pane>
-            <el-tab-pane label="补贴撤销明细" name="3">
+            <!-- <el-tab-pane label="补贴撤销明细" name="3">
                 <el-form :model="queryParams3" ref="queryForm3" size="small" :inline="true" v-show="showSearch" label-width="90px">
                     <el-form-item label="日期时间">
                         <el-date-picker
@@ -200,7 +200,7 @@
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item label="关键字"> 
-                        <el-input v-model="queryParams3.keyword" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
+                        <el-input v-model="queryParams3.searchValue" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
                     </el-form-item>
                     <el-form-item label="订单号">
                         <el-input v-model="queryParams3.accTradeId" placeholder="请输入订单号" maxlength="20" clearable style="width: 240px"/>
@@ -217,16 +217,16 @@
                 <el-table v-loading="loading" :data="tableListData3" height="550" ref="multipleTable3" :row-key="(row)=>{return row.tradeId}"> 
                     <el-table-column label="序号" align="center" width="100" type="index" >
                         <template scope="scope">
-                            <span v-if="!scope.row.custId">合计：</span>
+                            <span v-if="!scope.row.userId">合计：</span>
                             <span v-else>{{ (queryParams3.pageNum - 1) * queryParams3.pageSize + scope.$index+1 }}</span>
                         </template> 
                     </el-table-column>
                     <el-table-column label="撤销时间" align="center" prop="tradeTime" :show-overflow-tooltip="true"  width="160"/>
-                    <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"/>
-                    <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true"/>
-                    <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true"/>
-                    <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true"/> 
-                    <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/> 
+                    <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"/>
+                    <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true"/>
+                    <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true"/>
+                    <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/> 
+                    <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> 
                     <el-table-column label="撤销金额" align="center" prop="repealAmount" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
                             <span>{{ (scope.row.repealAmount/100).toFixed(2) }}</span>
@@ -237,7 +237,7 @@
                             <span v-if="scope.row.repealAfterWalletBal>0">{{ (scope.row.repealAfterWalletBal/100).toFixed(2) }}</span>
                         </template>
                     </el-table-column>  
-                    <el-table-column label="操作员" align="center" prop="crby" :show-overflow-tooltip="true"></el-table-column>
+                    <el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true"></el-table-column>
                     <el-table-column label="充值撤销订单号" align="center" prop="tradeId" :show-overflow-tooltip="true"  width="180"></el-table-column> 
                 </el-table> 
                 <pagination
@@ -265,10 +265,10 @@
                         </el-date-picker>
                     </el-form-item> 
                     <el-form-item label="关键字"> 
-                        <el-input v-model="queryParams4.keyword" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
+                        <el-input v-model="queryParams4.searchValue" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
                     </el-form-item>  
-                    <el-form-item label="所属组织" prop="orgIdList">  
-                        <el-cascader v-model="queryParams4.orgIdList"
+                    <el-form-item label="所属组织" prop="deptIds">  
+                        <el-cascader v-model="queryParams4.deptIds"
                         :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                         :props="{ 
                             multiple: true,
@@ -289,7 +289,7 @@
                         </el-select>   
                     </el-form-item>
                     <el-form-item label="操作员">
-                        <el-input v-model="queryParams4.crBy" placeholder="请输入操作员" maxlength="20" clearable style="width: 240px"/>
+                        <el-input v-model="queryParams4.createBy" placeholder="请输入操作员" maxlength="20" clearable style="width: 240px"/>
                     </el-form-item>
                     <el-form-item label="到账状态"> 
                         <el-select v-model="queryParams4.receiveStateList" multiple style="width: 240px" clearable> 
@@ -326,16 +326,16 @@
                     <el-table-column type="selection" width="50" align="center" :reserve-selection="true" :selectable="selectable"/>
                     <el-table-column label="序号" align="center" width="100" type="index" >
                         <template scope="scope">
-                            <span v-if="!scope.row.custId">合计：</span>
+                            <span v-if="!scope.row.userId">合计：</span>
                             <span v-else>{{ (queryParams4.pageNum - 1) * queryParams4.pageSize + scope.$index+1 }}</span>
                         </template> 
                     </el-table-column> 
-                    <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
-                    <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
-                    <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true"/>
+                    <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"  />
+                    <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
+                    <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true"/>
                     <el-table-column label="补贴时间" align="center" prop="crtime" :show-overflow-tooltip="true" width="160"/>
-                    <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true"/> 
-                    <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/>
+                    <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/> 
+                    <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/>
                     <el-table-column label="补贴金额" align="center" prop="amount" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
                             <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
@@ -345,7 +345,7 @@
                     <el-table-column label="领取有效期" align="center" prop="receiveEndDate" :show-overflow-tooltip="true"/>
                     <el-table-column label="到账前是否清零补贴钱包" align="center" prop="receiveClearFlagName" :show-overflow-tooltip="true"/>
                     <el-table-column label="到账状态" align="center" prop="receiveStateName" :show-overflow-tooltip="true"></el-table-column>
-                    <el-table-column label="操作员" align="center" prop="crby" :show-overflow-tooltip="true"></el-table-column>
+                    <el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true"></el-table-column>
                     <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
                         <template slot-scope="scope">
                             <el-button
@@ -369,7 +369,7 @@
                     :limit.sync="queryParams4.pageSize"
                     @pagination="getList4"
                 /> 
-            </el-tab-pane>
+            </el-tab-pane> -->
         </el-tabs>
     </div>
   </template>
@@ -428,9 +428,9 @@
         queryParams1: {
           pageNum: 1,
           pageSize: 10, 
-          keyword:null,  
-          orgIdList:[], 
-          crBy:null,
+          searchValue:null,  
+          deptIds:[], 
+          createBy:null,
           accTradeId:null,  
         },    // 总条数
         total1: 0,
@@ -443,9 +443,9 @@
         queryParams2: {
           pageNum: 1,
           pageSize: 10, 
-          keyword:null,  
-          orgIdList:[],
-          crBy:null,
+          searchValue:null,  
+          deptIds:[],
+          createBy:null,
           accTradeId:null,  
         },    // 总条数
         total2: 0,
@@ -456,7 +456,7 @@
         queryParams3: {
           pageNum: 1,
           pageSize: 10, 
-          keyword:null,
+          searchValue:null,
           accTradeId:null
         },    // 总条数
         total3: 0,
@@ -467,9 +467,9 @@
         queryParams4: {
           pageNum: 1,
           pageSize: 10, 
-          keyword:null,
-          orgIdList:[],
-          crBy:null,
+          searchValue:null,
+          deptIds:[],
+          createBy:null,
           receiveStateList:[], 
           psnTypeList:[]
         },    // 总条数
@@ -527,9 +527,9 @@
                 this.queryParams1 = {
                     pageNum: 1,
                     pageSize: 10, 
-                    keyword:null,  
-                    orgIdList:[], 
-                    crBy:null,
+                    searchValue:null,  
+                    deptIds:[], 
+                    createBy:null,
                     accTradeId:null
                 }
                 this.resetForm("queryForm1");
@@ -537,9 +537,9 @@
                 this.queryParams2 = {
                     pageNum: 1,
                     pageSize: 10, 
-                    keyword:null,  
-                    orgIdList:[], 
-                    crBy:null,
+                    searchValue:null,  
+                    deptIds:[], 
+                    createBy:null,
                     accTradeId:null
                 }
                 this.resetForm("queryForm2");
@@ -547,7 +547,7 @@
                 this.queryParams3 = {
                     pageNum: 1,
                     pageSize: 10, 
-                    keyword:null,
+                    searchValue:null,
                     accTradeId:null
                 }
                 this.resetForm("queryForm3");
@@ -555,9 +555,9 @@
                 this.queryParams4 = {
                     pageNum: 1,
                     pageSize: 10, 
-                    keyword:null,
-                    orgIdList:[],
-                    crBy:null,
+                    searchValue:null,
+                    deptIds:[],
+                    createBy:null,
                     receiveStateList:[], 
                     psnTypeList:[]
                 }
@@ -570,8 +570,8 @@
             this.loading = true;
             let param = { 
                 ...this.queryParams1,
-                "current": this.queryParams1.pageNum,
-                "size": this.queryParams1.pageSize, 
+                // "current": this.queryParams1.pageNum,
+                // "size": this.queryParams1.pageSize, 
                 "startDateTime":this.formatDate(this.dateRange[0]),
                 "endDateTime":this.formatDate(this.dateRange[1])
             } 
@@ -579,11 +579,11 @@
             this.tableListData1 = []
             this.total1 = 0
             accSubsidyRechargePageApi(param).then(response => {
-                this.tableListData1 = response.data.pageVO.records;
-                this.total1 = Number(response.data.pageVO.total);
-                if(this.tableListData1.length>0){
-                    this.tableListData1.push(response.data.sumVO)   
-                }
+                this.tableListData1 = response.rows;
+                this.total1 = Number(response.total);
+                // if(this.tableListData1.length>0){
+                //     this.tableListData1.push(response.data.sumVO)   
+                // }
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
@@ -629,20 +629,20 @@
             this.loading = true;
             let param = { 
                 ...this.queryParams2,
-                "current": this.queryParams2.pageNum,
-                "size": this.queryParams2.pageSize, 
+                // "current": this.queryParams2.pageNum,
+                // "size": this.queryParams2.pageSize, 
                 "startDateTime":this.formatDate(this.dateRange[0]),
                 "endDateTime":this.formatDate(this.dateRange[1])
             } 
-            param.type=2
+            // param.type=2
             this.tableListData2 = []
             this.total2 = 0
             accSubsidyClearPageApi(param).then(response => {
-                this.tableListData2 = response.data.pageVO.records;
-                this.total2 = Number(response.data.pageVO.total);
-                if(this.tableListData2.length>0){
-                    this.tableListData2.push(response.data.sumVO)  
-                }
+                this.tableListData2 = response.rows;
+                this.total2 = Number(response.total);
+                // if(this.tableListData2.length>0){
+                //     this.tableListData2.push(response.data.sumVO)  
+                // }
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
diff --git a/src/views/accountCenter/consume/deduct/index.vue b/src/views/accountCenter/consume/deduct/index.vue
index b49d7e72..dd3c0472 100644
--- a/src/views/accountCenter/consume/deduct/index.vue
+++ b/src/views/accountCenter/consume/deduct/index.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="所属组织" prop="orgIdList">  
-            <el-cascader v-model="queryParams.orgIdList"
+        <el-form-item label="所属组织" prop="deptIdList">  
+            <el-cascader v-model="queryParams.deptIdList"
             :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
             :props="{ 
                 multiple: true,
@@ -12,8 +12,8 @@
             }" clearable collapse-tags >
             </el-cascader> 
         </el-form-item> 
-        <el-form-item label="关键字" prop="keyword">
-            <el-input v-model="queryParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+        <el-form-item label="关键字" prop="searchValue">
+            <el-input v-model="queryParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -62,11 +62,11 @@
                 <span>{{ (scope.row.subsidyBal/100).toFixed(2) }}</span>
             </template> 
         </el-table-column>
-        <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
+        <!-- <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.redEnvelope/100).toFixed(2) }}</span>
             </template> 
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}</span>
@@ -222,11 +222,11 @@
         <div style="width: 100%;height: 650px;overflow-y: auto;">
           <div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 10px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">第一步：选择用户</div>
             <el-form :model="dialogParams" ref="dialogParams" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="" prop="keyword">
-                  <el-input v-model="dialogParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+              <el-form-item label="" prop="searchValue">
+                  <el-input v-model="dialogParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
               </el-form-item>
-              <el-form-item label="" prop="orgIdList">  
-                  <el-cascader v-model="dialogParams.orgIdList"
+              <el-form-item label="" prop="deptIdList">  
+                  <el-cascader v-model="dialogParams.deptIdList"
                   :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                   placeholder="所属组织"
                   :props="{ 
@@ -450,8 +450,8 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10, 
-          orgIdList:[],
-          keyword:null, 
+          deptIdList:[],
+          searchValue:null, 
         },
         cancelCount:0,
         expiredCount:0,
@@ -499,8 +499,8 @@
           pageNum: 1,
           pageSize: 10,
           accStatusList:[],
-          orgIdList:[],
-          keyword:null,
+          deptIdList:[],
+          searchValue:null,
           psnType:null
         },
         dialogTableData:[],
@@ -548,14 +548,14 @@
         getList() { 
             this.loading = true;
             let param = {
-              "current": this.queryParams.pageNum, 
-              "size": this.queryParams.pageSize, 
-              "orgIdList": this.queryParams.orgIdList,
-              "keyword": this.queryParams.keyword,
+              "pageNum": this.queryParams.pageNum, 
+              "pageSize": this.queryParams.pageSize, 
+              "deptIdList": this.queryParams.deptIdList,
+              "searchValue": this.queryParams.searchValue,
             }
             accInfoPageApi(param).then(response => {
-                this.tableListData = response.data.pageVO.records;
-                this.total = Number(response.data.pageVO.total);
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
                 this.loading = false;
             });
         },
@@ -674,20 +674,20 @@
         //批量弹窗表格查询
         getDialogList(){
           let param = {
-              "current": this.dialogParams.pageNum, 
-              "size": this.dialogParams.pageSize, 
-              "orgIdList": this.dialogParams.orgIdList,
-              "keyword": this.dialogParams.keyword,
+              "pageNum": this.dialogParams.pageNum, 
+              "pageSize": this.dialogParams.pageSize, 
+              "deptIdList": this.dialogParams.deptIdList,
+              "searchValue": this.dialogParams.searchValue,
               "psnType": this.dialogParams.psnType
             } 
             accInfoPageApi(param).then(response => {
-                this.dialogTableData = response.data.pageVO.records;
-                this.dialogTotal = Number(response.data.pageVO.total); 
+                this.dialogTableData = response.rows;
+                this.dialogTotal = Number(response.total); 
             });
         },
         //批量弹窗勾选
         handleSelectionChange(selection){
-          this.batchIds = selection.map((item) => item.custId)  
+          this.batchIds = selection.map((item) => item.userId)  
         },
         //批量补扣提交
         confirmBatchEdit(){
diff --git a/src/views/accountCenter/freeze/freeze/index.vue b/src/views/accountCenter/freeze/freeze/index.vue
index bbf98e75..b05f0609 100644
--- a/src/views/accountCenter/freeze/freeze/index.vue
+++ b/src/views/accountCenter/freeze/freeze/index.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> 
-        <el-form-item label="所属组织" prop="orgIdList">  
-            <el-cascader v-model="queryParams.orgIdList"
+        <el-form-item label="所属组织" prop="deptIdList">  
+            <el-cascader v-model="queryParams.deptIdList"
             :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
             :props="{ 
                 multiple: true,
@@ -12,8 +12,8 @@
             }" clearable collapse-tags >
             </el-cascader> 
         </el-form-item> 
-        <el-form-item label="关键字" prop="keyword">
-            <el-input v-model="queryParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+        <el-form-item label="关键字" prop="searchValue">
+            <el-input v-model="queryParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -68,11 +68,11 @@
                 <span>{{ (scope.row.subsidyBal/100).toFixed(2) }}</span>
             </template> 
         </el-table-column>
-        <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
+        <!-- <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.redEnvelope/100).toFixed(2) }}</span>
             </template> 
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
                 <span>{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}</span>
@@ -160,10 +160,10 @@
                     <template slot="label">账户冻结金额</template>
                     {{ (form.accFreezeBalTotal/100).toFixed(2) }}
                 </el-descriptions-item>
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">红包余额</template>
                     {{ (form.redEnvelope/100).toFixed(2) }}
-                </el-descriptions-item> 
+                </el-descriptions-item>  -->
                 <el-descriptions-item>
                     <template slot="label">账户总余额</template>
                     {{ (form.accBalTotal/100).toFixed(2) }}
@@ -209,11 +209,11 @@
         <div style="width: 100%;height: 650px;overflow-y: auto;">
           <div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 10px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">第一步：选择用户</div>
             <el-form :model="dialogParams" ref="dialogParams" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="" prop="keyword">
-                  <el-input v-model="dialogParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+              <el-form-item label="" prop="searchValue">
+                  <el-input v-model="dialogParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
               </el-form-item>
-              <el-form-item label="" prop="orgIdList">  
-                  <el-cascader v-model="dialogParams.orgIdList"
+              <el-form-item label="" prop="deptIdList">  
+                  <el-cascader v-model="dialogParams.deptIdList"
                   :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                   placeholder="所属组织"
                   :props="{ 
@@ -341,10 +341,10 @@
                     <template slot="label">账户冻结金额</template>
                     {{ (form.accFreezeBalTotal/100).toFixed(2) }}
                 </el-descriptions-item>
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">红包余额</template>
                     {{ (form.redEnvelope/100).toFixed(2) }}
-                </el-descriptions-item> 
+                </el-descriptions-item>  -->
                 <el-descriptions-item>
                     <template slot="label">账户总余额</template>
                     {{ (form.accBalTotal/100).toFixed(2) }}
@@ -390,11 +390,11 @@
         <div style="width: 100%;height: 650px;overflow-y: auto;">
           <div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 10px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">第一步：选择用户</div>
             <el-form :model="dialogParams" ref="dialogParams" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="" prop="keyword">
-                  <el-input v-model="dialogParams.keyword" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
+              <el-form-item label="" prop="searchValue">
+                  <el-input v-model="dialogParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
               </el-form-item>
-              <el-form-item label="" prop="orgIdList">  
-                  <el-cascader v-model="dialogParams.orgIdList"
+              <el-form-item label="" prop="deptIdList">  
+                  <el-cascader v-model="dialogParams.deptIdList"
                   :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                   placeholder="所属组织"
                   :props="{ 
@@ -503,9 +503,9 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10, 
-          orgIdList:[],
+          deptIdList:[],
           hasSum:true,
-          keyword:null,  
+          searchValue:null,  
         },
         // 是否显示弹出层
         open: false, 
@@ -530,9 +530,9 @@
         dialogParams: {
           pageNum: 1,
           pageSize: 10, 
-          orgIdList:[],
+          deptIdList:[],
           hasSum:true,
-          keyword:null,
+          searchValue:null,
           psnType:null
         },
         dialogTableData:[],
@@ -584,15 +584,15 @@
             console.log(this.queryParams)
             this.loading = true;
             let param = {
-              "current": this.queryParams.pageNum, 
-              "size": this.queryParams.pageSize, 
-              "orgIdList": this.queryParams.orgIdList,
-              "hasSum": this.queryParams.hasSum,
-              "keyword": this.queryParams.keyword
+              "pageNum": this.queryParams.pageNum, 
+              "pageSize": this.queryParams.pageSize, 
+              "deptIdList": this.queryParams.deptIdList,
+              // "hasSum": this.queryParams.hasSum,
+              "searchValue": this.queryParams.searchValue
             } 
             accInfoPageApi(param).then(response => {
-                this.tableListData = response.data.pageVO.records;
-                this.total = Number(response.data.pageVO.total);
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
                 this.loading = false;
             });
             // accInfoSumPageApi(param).then(response => {
@@ -668,7 +668,7 @@
                 this.$modal.msgError("请输入金额！");
             }else{ 
                 let param = {
-                    custId:this.form.custId,   
+                    userId:this.form.userId,   
                     frozenType:this.form.frozenType,
                     ifUseWallet:this.form.ifUseWallet,
                     ifUseSub:this.form.ifUseSub,
@@ -692,7 +692,7 @@
                 this.$modal.msgError("请输入金额！");
             }else{ 
                 let param = {
-                    custId:this.form.custId,  
+                    userId:this.form.userId,  
                     frozenType:this.form.frozenType,
                     ifUseWallet:this.form.ifUseWallet,
                     ifUseSub:this.form.ifUseSub,
@@ -747,21 +747,21 @@
         //批量弹窗表格查询
         getDialogList(){
           let param = {
-              "current": this.dialogParams.pageNum, 
-              "size": this.dialogParams.pageSize, 
-              "orgIdList": this.dialogParams.orgIdList,
-              "hasSum": this.dialogParams.hasSum,
-              "keyword": this.dialogParams.keyword,
+              "pageNum": this.dialogParams.pageNum, 
+              "pageSize": this.dialogParams.pageSize, 
+              "deptIdList": this.dialogParams.deptIdList,
+              // "hasSum": this.dialogParams.hasSum,
+              "searchValue": this.dialogParams.searchValue,
               "psnType": this.dialogParams.psnType
             } 
             accInfoPageApi(param).then(response => {
-                this.dialogTableData = response.data.pageVO.records;
-                this.dialogTotal = Number(response.data.pageVO.total); 
+                this.dialogTableData = response.rows;
+                this.dialogTotal = Number(response.total); 
             });
         },
         //批量弹窗勾选
         handleSelectionChange(selection){
-          this.batchIds = selection.map((item) => item.custId)  
+          this.batchIds = selection.map((item) => item.userId)  
         },
         //批量冻结提交
         confirmBatchEdit(){
diff --git a/vue.config.js b/vue.config.js
index 11d036c3..26f9d0a1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,9 +35,9 @@ module.exports = {
         proxy: {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
-                // target: `http://192.168.2.80:48380`,
-                target: `http://192.168.0.44:48380`,
-                // target: `http://192.168.0.244:58580`,
+                target: `http://192.168.2.80:48380`,
+                // target: `http://192.168.0.44:48380`,
+                // target: `http://192.168.0.176:48380`,
                 changeOrigin: true,
                 pathRewrite: {
                     ['^' + process.env.VUE_APP_BASE_API]: '',