diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue
index 7f23dcd2..bfecc59b 100644
--- a/src/views/emis/emisSettlePayRecord/index.vue
+++ b/src/views/emis/emisSettlePayRecord/index.vue
@@ -131,7 +131,6 @@
                   plain
                   icon="el-icon-download"
                   size="mini"
-                  :disabled="single"
                   @click="handleCustomExport"
                   v-hasPermi="['emis:emisSettlePayRecord:customExport']"
                 >定制导出</el-button>
@@ -183,6 +182,10 @@
     <el-table-column :label="$t('失败原因')" align="center" prop="payStatusDesc" width="100" :show-overflow-tooltip="true"/>
 
     <el-table-column :label="$t('支付金额')" align="center" prop="payMoney" width="100" />
+    <el-table-column label="账单编号" align="center" prop="settleBillNo"  width="100" :show-overflow-tooltip="true"/>
+    <el-table-column label="运单号" align="center" prop="billCodes"  width="100" :show-overflow-tooltip="true"/>
+    <el-table-column label="账单金额" align="center" prop="billAmount"  width="80" :show-overflow-tooltip="true"/>
+    <el-table-column label="开票金额" align="center" prop="invoiceAmount"  width="80" :show-overflow-tooltip="true"/>
 
     <el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" width="100" :show-overflow-tooltip="true"/>
     <el-table-column :label="$t('折让金额')" align="center" prop="allowanceMoney" width="100" :show-overflow-tooltip="true"/>
@@ -193,16 +196,11 @@
     <el-table-column :label="$t('折让原因')" align="center" prop="allowanceReason" width="100"  :show-overflow-tooltip="true"/>
     <el-table-column :label="$t('抵扣原因')" align="center" prop="deductionReason" width="100"  :show-overflow-tooltip="true"/>
     <el-table-column :label="$t('其他原因')" align="center" prop="otherReason" width="100"  :show-overflow-tooltip="true" />
-
-      <el-table-column :label="$t('备注')" align="center" prop="remark" width="100" :show-overflow-tooltip="true"/>
-      <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="settleBillNo"  width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="运单号" align="center" prop="billCodes"  width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="账单金额" align="center" prop="billAmount"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="开票金额" align="center" prop="invoiceAmount"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="开票状态" align="center" prop="invoiceStatus"  width="80" :show-overflow-tooltip="true"/>
+    <el-table-column label="开票状态" align="center" prop="invoiceStatus"  width="80" :show-overflow-tooltip="true"/>
+    <el-table-column :label="$t('备注')" align="center" prop="remark" width="100" :show-overflow-tooltip="true"/>
+    <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"/>
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
@@ -822,10 +820,10 @@ export default {
     },
     //定制导出
     handleCustomExport(){
-      let settleBillNo = this.selectList[0].settleBillNo;
+      let qParam=this.initQueryParams();
       //获取选中
       this.download('emis/emisSettlePayRecord/customExport', {
-        'settleBillNo':settleBillNo
+        ...qParam
       }, `定制收款明细列表.xlsx`)
     },
   }
diff --git a/src/views/emis/emisSpecialCalcWeight/index.vue b/src/views/emis/emisSpecialCalcWeight/index.vue
index 8f201810..3e3d5f29 100644
--- a/src/views/emis/emisSpecialCalcWeight/index.vue
+++ b/src/views/emis/emisSpecialCalcWeight/index.vue
@@ -26,6 +26,23 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="是否过期"  prop="expireStatus" >
+       <el-select v-model="queryParams.expireStatus" :placeholder="$t('是否过期')" clearable>
+        <el-option
+          label="全部"
+          value="0"
+        />
+        <el-option
+          label="过期"
+          value="1"
+        />
+        <el-option
+          label="未过期"
+          value="2"
+        />
+       </el-select>
+      </el-form-item>
+      
     </SearchForm>
 
 
@@ -108,17 +125,17 @@
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.prodName}}</div>
          </template>
       </el-table-column>
-      <el-table-column label="所属路线" align="center" prop="lineName" min-width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="所属国家" align="center" prop="countryName" min-width="100" />
-      <el-table-column :label="$t('取重方式')" align="center" prop="carryType" width="100" >
+      <el-table-column label="所属路线" align="center" prop="lineName" min-width="120" :show-overflow-tooltip="true" sortable/>
+      <el-table-column label="所属国家" align="center" prop="countryName" min-width="120" sortable/>
+      <el-table-column :label="$t('取重方式')" align="center" prop="carryType" width="120" sortable>
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_take_weight_method" :value="scope.row.carryType"/>
           </template>
        </el-table-column>
       <el-table-column :label="$t('起始重量')" align="center" prop="beginWeight" width="80" />
       <el-table-column :label="$t('结束重量')" align="center" prop="endWeight" width="80" />
-      <el-table-column :label="$t('生效时间')" align="center" prop="beginDate" min-width="170" />
-      <el-table-column :label="$t('失效时间')" align="center" prop="endDate" min-width="170" />
+      <el-table-column :label="$t('生效时间')" align="center" prop="beginDate" min-width="170" sortable/>
+      <el-table-column :label="$t('失效时间')" align="center" prop="endDate" min-width="170" sortable/>
       <!-- <el-table-column :label="$t('启用状态')" align="center" prop="status" min-width="100" /> -->
       <!-- <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"/>
@@ -230,6 +247,7 @@ export default {
         prodName: null,
         status: null,
         carryType: null,
+        expireStatus:null,
       },
     };
   },
diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue
index c5b6fb28..28431f23 100644
--- a/src/views/emis/emisTmsSiteBatchMiss/index.vue
+++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue
@@ -79,7 +79,15 @@
       <el-form-item :label="$t('寄件网点')" prop="sendSiteCode" >
         <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode"  ></EmisSiteSimplePicker1>
       </el-form-item> 
-
+      <el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="85px">
+        <EmpNamePicker3 :placeholder="$t('请选择')" v-model="queryParams.salesmen"  ></EmpNamePicker3>
+      </el-form-item> 
+      <el-form-item :label="$t('回款联系人')" prop="payee" label-width="85px">
+        <EmpNamePicker4 :placeholder="$t('请选择')" v-model="queryParams.payee"  ></EmpNamePicker4>
+      </el-form-item> 
+      <el-form-item :label="$t('录入人')" prop="registerManName">
+        <EmpNamePicker5 :placeholder="$t('请选择')" v-model="queryParams.registerManName"  ></EmpNamePicker5>
+      </el-form-item> 
 
     </SearchForm>
 
@@ -193,7 +201,9 @@
               <el-tag v-else type="info">否</el-tag>
           </template>
       </el-table-column>
-
+      <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
+      <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
+      <el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="100" />
       <!-- <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" /> -->
       <el-table-column :label="$t('录单备注')" align="center" prop="waybillRemark" min-width="200" :show-overflow-tooltip="true"/>
       <!-- <el-table-column :label="$t('创建人')" align="center" prop="createByName" min-width="100" /> -->
@@ -242,6 +252,10 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
 import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker4 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker5 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+
 import {timeFormat} from '@/utils/dateUtils'
 import confirmForm from "@/views/emis/emisTmsSiteBatchMiss/confirmForm.vue";
 
@@ -253,6 +267,9 @@ export default {
     EmisSupplierPicker,
     EmisSiteSimplePicker1,
     EmisSiteSimplePicker2,
+    EmpNamePicker3,
+    EmpNamePicker4,
+    EmpNamePicker5,
     TransLinePicker,
     TransProductPicker,
     EmpNamePicker1,