diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
index 943a4f46..26bbd53c 100644
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
@@ -59,7 +59,9 @@
               <el-date-picker  size="mini" style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
             </el-form-item>
             <el-form-item label="月结客户" prop="custNo">
-              <EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
+              <AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
+
+              <!-- <EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker> -->
             </el-form-item>
             <el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
               <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
@@ -258,11 +260,12 @@ import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
 
 
 export default {
   name: "ChargeBillMoneyPanel",
-  components: { PayRecordInput,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
+  components: { PayRecordInput,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker,AllMonthpayAccountPicker },
 
   dicts: [
   ],
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue
index 52dd9fe3..76d754c9 100644
--- a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue
+++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue
@@ -212,7 +212,7 @@
               <span slot="label">
                 <span style="color: red">退款人</span>
               </span>
-              <EmisMonthpayAccountPicker v-model="form.payManCode" @onChange="onMonthpayAccountSelect"></EmisMonthpayAccountPicker>
+              <AllMonthpayAccountPicker v-model="form.payManCode" @onChange="onMonthpayAccountSelect"></AllMonthpayAccountPicker>
                 <!-- <CustomerSimplePicker v-model="form.customerCode" @onChange="onCustomerSelect"  ></CustomerSimplePicker> -->
               </el-form-item>
           </el-col>
@@ -291,6 +291,7 @@ import { getInfoBySettleBillNo} from "@/api/emis/emisSettleBill";
 import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
 import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
 
 export default {
   name: "emisSettlePayRecordForm",
@@ -299,7 +300,7 @@ export default {
         type:Number
     }
   },
-  components: { EmisMonthpayAccountPicker,PayeePicker },
+  components: { EmisMonthpayAccountPicker,PayeePicker,AllMonthpayAccountPicker },
   dicts: ['emis_settlebill_pay_type'],
   data() {
     return {
diff --git a/src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue b/src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue
index 86b3da9a..e1f1ba13 100644
--- a/src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue
+++ b/src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue
@@ -45,7 +45,7 @@
         </el-col>
         <el-col :span="6">
             <el-form-item label="月结客户" prop="custNo">
-              <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
+              <AllMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></AllMonthpayAccountPicker>
             </el-form-item>
             <el-form-item label="付款方式" prop="paymentType" >
             <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@@ -595,6 +595,7 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
 import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
 
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
+import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
 
 
 import {dateToStr} from '@/utils/custom'
@@ -606,6 +607,7 @@ export default {
 
   components: {
     EmisMonthpayAccountPicker,
+    AllMonthpayAccountPicker,
     elDateAdvPicker,emisWaybillForm,
     CountryPicker1,
     CountryPicker2,ProvincePicker2,