diff --git a/src/views/emis/emisCreditCustomer/index.vue b/src/views/emis/emisCreditCustomer/index.vue
index f74f0d25..414f42ed 100644
--- a/src/views/emis/emisCreditCustomer/index.vue
+++ b/src/views/emis/emisCreditCustomer/index.vue
@@ -28,18 +28,6 @@
       </el-form-item>
 
       <el-form-item label="剩余比率(%)" prop="curMoneyRate">
-        <!-- <el-select v-model="queryParams.curMoneyRate"  filterable placeholder="剩余比率" @change="handleQuery">
-              <el-option key="10" label="10%" :value="10" />
-              <el-option key="20" label="20%" :value="20" />
-              <el-option key="30" label="30%" :value="30" />
-              <el-option key="40" label="40%" :value="40" />
-              <el-option key="50" label="50%" :value="50" />
-              <el-option key="60" label="60%" :value="60" />
-              <el-option key="70" label="70%" :value="70" />
-              <el-option key="80" label="80%" :value="80" />
-              <el-option key="90" label="90%" :value="90" />
-              <el-option key="100" label="100%" :value="100" />
-        </el-select> -->
         <NumberRangePicker style="width:200px" v-model="queryParams.params.curMoneyRateRange"> </NumberRangePicker>
       </el-form-item>
 
@@ -60,13 +48,14 @@
 
 
           ref="refTable"
+          storageName="emisCreditCustomerList_main_250303"
 
           v-loading="loading"
            border stripe
            size="small"
            :data="emisCreditCustomerList"
 
-           storageName="emisCreditCustomerList_main_250303"
+
 
 
            :showSearch.sync="showSearch"
@@ -250,27 +239,16 @@ export default {
       this.loading = true;
       let qParam = {...this.queryParams};
 
-      console.log("====>===>1==>",qParam);
-
       if(qParam.params.curMoneyRange&&qParam.params.curMoneyRange.length>0){
-        // let rgn=qParam.params.curMoneyRange;
-        // this.$set(qParam,"beginCurMoney",rgn[0]);
-        // if(rgn.length>1){
-        //   this.$set(qParam,"endCurMoney",rgn[1]);
-        // }
         qParam=this.addDateRange(this.qParam, qParam.params.curMoneyRange,'CurMoney')
       }
 
       if(qParam.params.curMoneyRateRange&&qParam.params.curMoneyRateRange.length>0){
-        // let rgn=qParam.params.curMoneyRateRange;
-        // this.$set(qParam,"beginCurMoneyRateRange",rgn[0]);
-        // if(rgn.length>1){
-        //   this.$set(qParam,"endCurMoneyRateRange",rgn[1]);
-        // }
         qParam=this.addDateRange(this.qParam, qParam.params.curMoneyRateRange,'CurMoneyRate')
-
       }
 
+      console.log("====>listEmisCreditCustomer==>",qParam);
+
       listEmisCreditCustomer(qParam).then(response => {
         this.emisCreditCustomerList = response.rows;
         this.total = response.total;
@@ -361,20 +339,13 @@ export default {
       else{
 
           let qParam = {...this.queryParams};
-          if(qParam.params.curMoneyRange){
-            let rgn=qParam.params.curMoneyRange.split(',');
-            this.$set(qParam,"beginCurMoney",rgn[0]);
-            if(rgn.length>1){
-              this.$set(qParam,"endCurMoney",rgn[1]);
-            }
+
+          if(qParam.params.curMoneyRange&&qParam.params.curMoneyRange.length>0){
+            qParam=this.addDateRange(this.qParam, qParam.params.curMoneyRange,'CurMoney')
           }
 
-          if(qParam.params.curMoneyRateRange){
-            let rgn=qParam.params.curMoneyRateRange.split(',');
-            this.$set(qParam,"beginCurMoneyRateRange",rgn[0]);
-            if(rgn.length>1){
-              this.$set(qParam,"endCurMoneyRateRange",rgn[1]);
-            }
+          if(qParam.params.curMoneyRateRange&&qParam.params.curMoneyRateRange.length>0){
+            qParam=this.addDateRange(this.qParam, qParam.params.curMoneyRateRange,'CurMoneyRate')
           }
 
           qParam.pageNum=1;
diff --git a/src/views/emis/emisCreditSalesmen/emisCreditSalesmenForm.vue b/src/views/emis/emisCreditSalesmen/emisCreditSalesmenForm.vue
index cd486c0e..439429e5 100644
--- a/src/views/emis/emisCreditSalesmen/emisCreditSalesmenForm.vue
+++ b/src/views/emis/emisCreditSalesmen/emisCreditSalesmenForm.vue
@@ -3,65 +3,50 @@
        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
           <el-col :span="24">
-            <el-form-item label="销售名称" prop="salesmen">
-              <el-input v-model="form.salesmen" placeholder="请输入销售名称" />
+            <el-form-item label="员工姓名" prop="salesmen">
+              <SalemanPicker :placeholder="$t('员工姓名')" v-model="form.salesmen" :disabled="form.id!=null"  ></SalemanPicker>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="当前余额" prop="curMoney">
-              <el-input v-model="form.curMoney" placeholder="请输入当前余额" />
+          <el-col :span="12">
+            <el-form-item label="运输方式" prop="transTypeIdArr">
+                <el-select  multiple clearable  collapse-tags v-model="form.transTypeIdArr" placeholder="运输方式"  >
+                  <el-option
+                    v-for="item in dict.type.emis_biz_shipping_method"
+                    v-bind:key="item.value"
+                    v-bind:label="item.label"
+                    v-bind:value="item.value"
+                  />
+                </el-select>
+
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="余额比率" prop="curMoneyRate">
-              <el-input v-model="form.curMoneyRate" placeholder="请输入余额比率" />
+          <el-col :span="12">
+            <el-form-item label="起始时间" prop="startDate">
+              <el-date-picker clearable
+                v-model="form.startDate"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :placeholder="$t('起始时间')">
+              </el-date-picker>
             </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="信用额度" prop="creditMoney">
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="结束时间" prop="endDate">
+              <el-date-picker clearable
+                v-model="form.endDate"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :placeholder="$t('结束时间')">
+              </el-date-picker>
+            </el-form-item>
+        </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="固定额度" prop="creditMoney">
               <el-input v-model="form.creditMoney" placeholder="请输入信用额度" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="币种" prop="currency">
-              <el-input v-model="form.currency" placeholder="请输入币种" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="运输方式" prop="transType">
-              <el-input v-model="form.transType" placeholder="请输入运输方式" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="24">
-            <el-form-item label="开始日期" prop="startDate">
-              <el-date-picker clearable
-                v-model="form.startDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择开始日期">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-        <el-col :span="24">
-            <el-form-item label="结束日期" prop="endDate">
-              <el-date-picker clearable
-                v-model="form.endDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择结束日期">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-          <el-col :span="24">
-            <el-form-item label="是否启用" prop="blOpen">
-              <el-input v-model="form.blOpen" placeholder="请输入是否启用" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="是否锁定" prop="blLock">
-              <el-input v-model="form.blLock" placeholder="请输入是否锁定" />
-            </el-form-item>
-          </el-col>
+
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -73,12 +58,13 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    
+
   </div>
 </template>
 
 <script>
 import { listEmisCreditSalesmen, getEmisCreditSalesmen, delEmisCreditSalesmen, addEmisCreditSalesmen, updateEmisCreditSalesmen } from "@/api/emis/emisCreditSalesmen";
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 
 export default {
   name: "emisCreditSalesmenForm",
@@ -87,9 +73,8 @@ export default {
         type:Number
     }
   },
-  components: {  },
-  dicts: [
-  ],
+  components: { SalemanPicker },
+  dicts: ['emis_biz_shipping_method'],
   data() {
     return {
       emisCreditSalesmenOptions: [],
@@ -138,17 +123,26 @@ export default {
 
   methods: {
     initData() {
-       
+
         if(this.id !=null) {
           this.loading = true;
           getEmisCreditSalesmen(this.id).then(response => {
             this.form = response.data;
+
+
+            if(this.form.transType){
+              this.$set(this.form,"transTypeIdArr",this.form.transType.split(","))
+            }
+
+
             this.loading = false;
           });
         }else{
             this.reset();
+            this.form.blOpen='1';
+            this.form.curMoneyRate='100';
+
         }
-        // this.getTreeselect();
     },
     // 取消按钮
     cancel() {
@@ -171,6 +165,7 @@ export default {
         blLock: null,
         remark: null,
         tenantId: null,
+        transTypeIdArr:null,
       };
       this.resetForm("form");
     },
@@ -178,6 +173,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.form.transTypeIdArr){
+            this.form.transType=this.form.transTypeIdArr.join(",");
+          }
+
           if (this.form.id != null) {
             updateEmisCreditSalesmen(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
diff --git a/src/views/emis/emisCreditSalesmen/index.vue b/src/views/emis/emisCreditSalesmen/index.vue
index 7e4cc433..67bb4223 100644
--- a/src/views/emis/emisCreditSalesmen/index.vue
+++ b/src/views/emis/emisCreditSalesmen/index.vue
@@ -1,107 +1,44 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
     <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-   
-      <el-form-item label="" prop="salesmen">
-        <el-input
-          v-model="queryParams.salesmen"
-          :placeholder="$t('销售名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+      <el-form-item :label="$t('员工姓名')" prop="salesmen">
+        <SalemanPicker :placeholder="$t('员工姓名')" v-model="queryParams.salesmen"  ></SalemanPicker>
       </el-form-item>
-      <el-form-item label="" prop="curMoney">
-        <el-input
-          v-model="queryParams.curMoney"
-          :placeholder="$t('当前余额')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+      <el-form-item label="运输方式" prop="transType">
+        <el-select v-model="queryParams.transType" placeholder="运输方式" clearable filterable>
+                  <el-option
+                    v-for="item in dict.type.emis_biz_shipping_method"
+                    v-bind:key="item.value"
+                    v-bind:label="item.label"
+                    v-bind:value="item.value"
+                  />
+                </el-select>
       </el-form-item>
-      <el-form-item label="" prop="curMoneyRate">
-        <el-input
-          v-model="queryParams.curMoneyRate"
-          :placeholder="$t('余额比率')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+      <el-form-item label="剩余余额" prop="curMoney">
+        <NumberRangePicker style="width:200px" v-model="queryParams.params.curMoneyRange"> </NumberRangePicker>
       </el-form-item>
-      <el-form-item label="" prop="creditMoney">
-        <el-input
-          v-model="queryParams.creditMoney"
-          :placeholder="$t('信用额度')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+      <el-form-item label="启用状态" prop="blOpen">
+            <el-select v-model="queryParams.blOpen"  filterable placeholder="启用状态" @change="handleQuery">
+              <el-option key="1" label="启用" :value="1" />
+              <el-option key="0" label="停用" :value="0" />
+            </el-select>
       </el-form-item>
-      <el-form-item label="" prop="currency">
-        <el-input
-          v-model="queryParams.currency"
-          :placeholder="$t('币种')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="transType">
-        <el-input
-          v-model="queryParams.transType"
-          :placeholder="$t('运输方式')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="startDate">
-        <el-date-picker clearable
-          v-model="queryParams.startDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('开始日期')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="endDate">
-        <el-date-picker clearable
-          v-model="queryParams.endDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('结束日期')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="blOpen">
-        <el-input
-          v-model="queryParams.blOpen"
-          :placeholder="$t('是否启用')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blLock">
-        <el-input
-          v-model="queryParams.blLock"
-          :placeholder="$t('是否锁定')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+      <el-form-item label="剩余比率(%)" prop="curMoneyRate">
+        <NumberRangePicker style="width:200px" v-model="queryParams.params.curMoneyRateRange"> </NumberRangePicker>
       </el-form-item>
+
     </SearchForm>
 
-   
-    <XdTable v-loading="loading" 
+    <XdTable v-loading="loading"
+
+          ref="refTable"
+          storageName="emisCreditSalesmenList_main_250303"
+
            border stripe
            size="small"
            :data="emisCreditSalesmenList"
@@ -112,7 +49,7 @@
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
            >
-      
+
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
@@ -123,9 +60,8 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['emis:emisCreditSalesmen:add']"
-                >新增</el-button>
+                >新增额度</el-button>
               </el-col>
-              <!-- 
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -136,7 +72,7 @@
                   @click="handleUpdate"
                   v-hasPermi="['emis:emisCreditSalesmen:edit']"
                 >修改</el-button>
-              </el-col> -->
+              </el-col>
               <el-col :span="1.5">
                 <el-button
                   type="danger"
@@ -148,7 +84,7 @@
                   v-hasPermi="['emis:emisCreditSalesmen:remove']"
                 >删除</el-button>
               </el-col>
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
@@ -157,85 +93,53 @@
                   @click="handleExport"
                   v-hasPermi="['emis:emisCreditSalesmen:export']"
                 >导出</el-button>
-              </el-col> -->
+              </el-col>
           </el-row>
       </div>
-      
+
       <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-       
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
-      </el-table-column>
 
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
-      -->
-
-      <el-table-column :label="$t('销售名称')" align="center" prop="salesmen" min-width="100" />
-      <el-table-column :label="$t('当前余额')" align="center" prop="curMoney" min-width="100" />
-      <el-table-column :label="$t('余额比率')" align="center" prop="curMoneyRate" min-width="100" />
-      <el-table-column :label="$t('信用额度')" align="center" prop="creditMoney" min-width="100" />
-      <el-table-column :label="$t('币种')" align="center" prop="currency" min-width="100" />
-      <el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="100" />
-      <el-table-column :label="$t('开始日期')" align="center" prop="startDate" min-width="100" />
-      <el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="100" />
-      <el-table-column :label="$t('是否启用')" align="center" prop="blOpen" min-width="100" />
-      <el-table-column :label="$t('是否锁定')" align="center" prop="blLock" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('员工姓名')" align="center" prop="salesmen" min-width="100" />
+      <el-table-column :label="$t('固定额度')" align="center" prop="creditMoney" min-width="100" />
+      <el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="150">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisCreditSalesmen:edit']"
-          >修改</el-button>
-          <!-- 
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisCreditSalesmen:remove']"
-          >删除</el-button> -->
+          <dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
         </template>
       </el-table-column>
+      <el-table-column label="状态" align="center" prop="blOpen" width="100">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.blOpen"
+            active-value="1"
+            inactive-value="0"
+            @change="switchChange(scope.row)">
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('已使用额度')" align="center" prop="hasUseMoney" min-width="100" >
+        <template slot-scope="scope">
+          {{ scope.row.creditMoney - scope.row.curMoney }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('剩余比例(%)')" align="center" prop="curMoneyRate" min-width="100" />
+      <el-table-column :label="$t('开始日期')" align="center" prop="startDate" min-width="170" />
+      <el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="170" />
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <emisCreditSalesmenForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisCreditSalesmenForm>
     </el-dialog>
-    
+
 
     <!--
     <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@@ -243,7 +147,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -275,7 +179,7 @@ export default {
       total: 0,
       // 销售信用额度表格数据
       emisCreditSalesmenList: [],
-    
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -284,14 +188,9 @@ export default {
       id:null,
       titleView:"",
       openView: false,
-      // 更新网点时间范围
-      daterangeStartDate: [],
-      // 更新网点时间范围
-      daterangeEndDate: [],
-      // 更新网点时间范围
-      daterangeCreateTime: [],
-      // 更新网点时间范围
-      daterangeUpdateTime: [],
+
+      selectionList:null,
+
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -308,6 +207,10 @@ export default {
         blLock: null,
         remark: null,
         delFlag: null,
+        params:{
+          curMoneyRange:null,
+          curMoneyRateRange:null,
+        }
       },
     };
   },
@@ -318,30 +221,26 @@ export default {
     /** 查询销售信用额度列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeStartDate && '' != this.daterangeStartDate) {
-        this.queryParams.params["beginStartDate"] = this.daterangeStartDate[0];
-        this.queryParams.params["endStartDate"] = this.daterangeStartDate[1];
+
+      let qParam = {...this.queryParams};
+
+      if(qParam.params.curMoneyRange&&qParam.params.curMoneyRange.length>0){
+        qParam=this.addDateRange(this.qParam, qParam.params.curMoneyRange,'CurMoney')
       }
-      if (null != this.daterangeEndDate && '' != this.daterangeEndDate) {
-        this.queryParams.params["beginEndDate"] = this.daterangeEndDate[0];
-        this.queryParams.params["endEndDate"] = this.daterangeEndDate[1];
+
+      if(qParam.params.curMoneyRateRange&&qParam.params.curMoneyRateRange.length>0){
+        qParam=this.addDateRange(this.qParam, qParam.params.curMoneyRateRange,'CurMoneyRate')
       }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
-      listEmisCreditSalesmen(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+
+      console.log("====>listEmisCreditSalesmen==>",qParam);
+
+      listEmisCreditSalesmen(qParam).then(response => {
         this.emisCreditSalesmenList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -375,7 +274,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-       this.currentId= row.id;
+       this.currentId= row.id||this.ids[0];
        this.openForm = true;
        this.titleForm = "修改";
     },
@@ -403,48 +302,130 @@ export default {
       }).catch(() => {});
     },
     /** 导出按钮操作 */
+    /** 导出按钮操作 */
     handleExport() {
-    //   this.download('emis/emisCreditSalesmen/export', {
-    //     ...this.queryParams
-    //   }, `emisCreditSalesmen_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
+      const loadingInstance = this.$loading({
             text: '正在导出...'
-        })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
+      })
+      if(this.selectionList&&this.selectionList.length>0){
+        this.exportData(this.selectionList,loadingInstance);
+      }
+      else{
+          let qParam = {...this.queryParams};
 
-       listEmisCreditSalesmen(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
-        this.downloadLoading = false
-        if (response.code === 200) {
-                const curList = response.rows
-                import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','销售名称','当前余额','余额比率','信用额度','币种','运输方式','开始日期','结束日期','是否启用','是否锁定','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','update_time','创建网点','更新网点',];
-                  const filterVal = ['id','salesmen','curMoney','curMoneyRate','creditMoney','currency','transType','startDate','endDate','blOpen','blLock','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                  const data = this.formatJson(filterVal, curList, response.rows)
-                  excel.export_json_to_excel({
-                    header: tHeader,
-                    data,
-                    filename: '销售信用额度',
-                    autoWidth: true
-                  })
-                  loadingInstance.close()
-                })
-        }
-      });
+          if(qParam.params.curMoneyRange&&qParam.params.curMoneyRange.length>0){
+            qParam=this.addDateRange(this.qParam, qParam.params.curMoneyRange,'CurMoney')
+          }
+
+          if(qParam.params.curMoneyRateRange&&qParam.params.curMoneyRateRange.length>0){
+            qParam=this.addDateRange(this.qParam, qParam.params.curMoneyRateRange,'CurMoneyRate')
+          }
+          qParam.pageNum=1;
+          qParam.pageSize=20000;
+
+          listEmisCreditCustomer(qParam).then(response => {
+            if (response.code === 200) {
+              this.exportData(response.rows,loadingInstance);
+            }
+          });
+      }
+    },
+    exportData(selData,loadingInstance){
+      const curList =selData
+      import('@/vendor/Export2Excel').then(excel => {
+        const exportParam=this.$refs.refTable.getExportParam();
+        const tHeader = exportParam.header;
+        const filterVal = exportParam.filter;
+        const data = this.formatJson(filterVal, curList, selData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '月结客户额度列表',
+          autoWidth: true
+        })
+        loadingInstance.close()
+      })
     },
     formatJson(filterVal, jsonData, resData) {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
+
         if (j === 'index') {
           return ++index
         }
-        if (j === 'status') {
-          var statusStr='xxx'
-          if(v[j] == 10){
-              statusStr='xxx'
+        if (j === 'kjlx') {
+          return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
+        }
+        if (j === 'fjr') {
+          return v['sendName']+'--'+v['receiveName'];
+        }
+        if (j === 'custName') {
+          let paymentType=v['paymentType'];
+          if(paymentType==2 || paymentType==4 || paymentType==5 ){
+            return v['custName'];
+          }else{
+            return "";
           }
-          return statusStr;
+        }
+
+        if (j === 'sendMobile') {
+          return "";
+        }
+        if (j === 'paymentStatus') {
+          return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
+        }
+
+        if (j === 'pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
+        }
+        if (j === 'customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
+        }
+        if (j === 'customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
+        }
+        if (j === 'packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
+        }
+
+        if (j === 'dispatchMethod') {
+          if(v[j] == 1){
+            return '派送';
+          }else{
+            return '自提';
+          }
+        }
+        if (j === 'blUploadPic') {
+          if(v['goodsPics']!=null && v['goodsPics']!=''){
+            return '是';
+          }else{
+            return '否';
+          }
+        }
+
+        if (j === 'blMessage') {
+          if(v[j] == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'blAcceptMessage') {
+          if(v[j] == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'blSign') {
+          if(v[j] == 1){
+            return '已签收';
+          }else{
+            return '未签收';
+          }
+        }
+        if (j === 'paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
         }
         return v[j]
       }))