From acbb35eaaf9183857731501dcc8c072f0dddab0b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 10 Aug 2024 11:37:58 +0800
Subject: [PATCH] md

---
 .../panel/ChargeBillMoneyPanel.vue            | 153 +++++++++++------
 .../panel/ChargeBillMonthPanel.vue            | 156 ++++++++++--------
 .../emis/emisSettleBill/panel/MoneyPanel.vue  | 113 ++++++++-----
 .../emis/emisSettleBill/panel/MonthPanel.vue  |  64 +++++--
 .../emisSettleBill/panel/SiteConfimPanel.vue  |  21 +--
 .../panel/SiteWaitOpenBillPanel.vue           |   2 +-
 .../panel/PayRecordInput.vue                  |   5 +
 .../SubBillConfirmByMoneyList.vue             |  27 +--
 .../SubBillConfirmByMonthList.vue             |  28 ++--
 .../SubBillConfirmBySiteList.vue              |  34 ++--
 .../emisSettleSubBill/subBillMergeMgnt.vue    | 107 ++++++------
 .../emis/emisWaybill/waybillIsPrinted.vue     |   6 +-
 12 files changed, 435 insertions(+), 281 deletions(-)

diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
index c3fabef2..330dd1ca 100644
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
@@ -1,53 +1,71 @@
 <template>
   <XdPageContainer >
         <SearchForm  slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-          <el-form-item label="" prop="billCode" label-width="80px">
-                  <div slot="label">
-                      <el-radio-group class="query-label" v-model="queryOrderType">
-                        <el-radio :key="1" label="1">运单号</el-radio>
-                        <el-radio :key="2" label="2">账单号</el-radio>
-                      </el-radio-group>
-                  </div>
-                  <XdTextareaInput
-                    v-model="queryParams.settleBillNo"
-                    :placeholder="$t('多个流水号逗号或换行隔开')"
-                    clearable
-                    :rows="2"
-                  />
-                        <!-- @keyup.enter.native="handleQuery" -->
-                </el-form-item>
+          <el-form-item label="" prop="queryCode" label-width="80px">
+              <div slot="label">
+                  <el-radio-group class="query-label" v-model="queryOrderType">
+                    <el-radio :key="1" label="1">运单号</el-radio>
+                    <el-radio :key="2" label="2">账单号</el-radio>
+                  </el-radio-group>
+              </div>
+              <XdTextareaInput
+                v-model="queryParams.queryCode"
+                :placeholder="$t('多个流水号逗号或换行隔开')"
+                clearable
+                :rows="2"
+              />
+            </el-form-item>
+
+            <el-form-item label="账单生成时间" prop="dateTimeRange" label-width="110px">
+                  <elDateAdvPicker  placeholder="账单生成时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateAdvPicker>
+              </el-form-item>
+            <el-form-item label="账单月份" prop="billMonth">
+              <el-date-picker  size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
+            </el-form-item>
+
+            <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
+              <el-select  clearable v-model="queryParams.chargeStatus" placeholder="核销状态" style="width:100%">
+                  <el-option key="0" label="未核销" value="0"></el-option>
+                  <el-option key="1" label="已核销" value="1"></el-option>
+              </el-select>
+            </el-form-item>
 
-            <!-- <el-form-item :label="$t('收款网点')" prop="siteCode">
-              <EmisSiteSimplePicker1  v-model="queryParams.siteCode" ></EmisSiteSimplePicker1>
-            </el-form-item> -->
             <el-form-item :label="$t('开票状态')" prop="openBillStatus">
-              <el-select  clearable v-model="queryParams.openBillStatus" placeholder="">
+              <el-select  clearable v-model="queryParams.openBillStatus" placeholder="开票状态" style="width:100%">
                 <el-option key="1" label="已开票" value="1"></el-option>
                   <el-option key="0" label="未开票" value="0"></el-option>
                   <el-option key="3" label="不开票" value="3"></el-option>
                   <el-option key="2" label="部分开票" value="2"></el-option>
               </el-select>
             </el-form-item>
+            <!-- <el-form-item   :label="$t('确认状态')" prop="blConfirmSite">
+              <el-select  clearable v-model="queryParams.blConfirmSite" placeholder="确认状态">
+                  <el-option key="0" label="业务未确认" value="0"></el-option>
+                  <el-option key="1" label="业务已确认" value="1"></el-option>
+              </el-select>
+            </el-form-item> -->
             <el-form-item   :label="$t('收款状态')" prop="paymentStatus">
-              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="">
+              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="收款状态" style="width:100%">
                   <el-option key="0" label="未收款" value="0"></el-option>
                   <el-option key="1" label="已收款" value="1"></el-option>
                   <el-option key="2" label="部分收款" value="2"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
-              <el-select  clearable v-model="queryParams.chargeStatus" placeholder="">
-                  <el-option key="0" label="未核销" value="0"></el-option>
-                  <el-option key="1" label="已核销" value="1"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
+            <!-- <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
                   <elDateSimplePicker  placeholder="" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateSimplePicker>
-              </el-form-item>
+              </el-form-item> -->
             <el-form-item label="账单月份" prop="billMonth">
-              <el-date-picker  size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="" value-format="yyyy-MM"></el-date-picker>
+              <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>
+            </el-form-item>
+            <el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
+              <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
+            </el-form-item>
+          <el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="100px">
+            <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
+          </el-form-item>
           </SearchForm>
          <!-- 账单表 -->
           <XdTable
@@ -161,6 +179,28 @@
                   <div >{{scope.row.settleStartDate}}~{{scope.row.settleEndDate}}</div>
               </template>
             </el-table-column>
+
+            <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" width="80" />
+            <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" width="80" />
+            <el-table-column :label="$t('结算重量')" align="center" prop="feeWeight" width="80" />
+            <el-table-column :label="$t('账单应收金额')" align="center" prop="recMoney" width="150" />
+            <el-table-column :label="$t('账单已收金额')" align="center" prop="recedMoney" width="150" />
+            <el-table-column :label="$t('账单退款金额')" align="center" prop="refundMoney" width="150" />
+            <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"/>
+            <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="100" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="100" :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="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="otherReason" width="170"  :show-overflow-tooltip="true"/>
+            <!-- <el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" width="100" :show-overflow-tooltip="true"/> -->
+
+            <el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
+            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" />
+
+            <el-table-column :label="$t('生成时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
+
             <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
@@ -183,26 +223,17 @@
                 <el-tag v-if="scope.row.chargeStatus=='1'" type="success">已核销</el-tag>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" width="80" />
-            <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" width="80" />
-            <el-table-column :label="$t('重量')" align="center" prop="feeWeight" width="80" />
-            <el-table-column :label="$t('账单应收金额')" align="center" prop="recMoney" width="150" />
-            <el-table-column :label="$t('账单已收金额')" align="center" prop="recedMoney" width="150" />
-            <el-table-column :label="$t('账单退款金额')" align="center" prop="refundMoney" width="150" />
-            <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"/>
-            <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="100" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="100" :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="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="otherReason" width="170"  :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" width="100" :show-overflow-tooltip="true"/>
-
-            <el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
-            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" />
-
-            <el-table-column :label="$t('生成时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
+                <template slot-scope="scope">
+                  <span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
+                  <el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
+                  <el-tag v-if="scope.row.blConfirmSite=='2'" type="error">确认不出账</el-tag>
+                  <el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
+            <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
+            <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
 
           </XdTable>
 
@@ -217,11 +248,17 @@
 <script>
 import { listEmisSettleBill, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
 import PayRecordInput from '@/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue';
-import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+
+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';
+
 
 export default {
   name: "ChargeBillMoneyPanel",
-  components: { PayRecordInput,elDateSimplePicker },
+  components: { PayRecordInput,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
+
   dicts: [
   ],
   data() {
@@ -243,6 +280,7 @@ export default {
       // 结算总账单表格数据
       emisSettleBillList: [],
 
+      queryCode:null,
       queryOrderType:null,
 
       currentId:null,
@@ -332,17 +370,22 @@ export default {
   /** 查询结算总账单列表 */
   getList() {
       this.loading = true;
+
       // 按运单查询时的处理
-      if(this.queryOrderType==1){
-        this.queryParams.params.billCode=this.queryParams.settleBillNo;
+      if(this.queryOrderType=='1'){
+        this.queryParams.params.billCode=this.queryParams.queryCode;
         this.queryParams.settleBillNo=null;
       }
+      else if(this.queryOrderType=='2'){
+        this.queryParams.params.billCode=null;
+        this.queryParams.settleBillNo=this.queryParams.queryCode;
+      }
 
       // 必须业务已确认后才可以做收款和开票
       this.queryParams.blSiteConfirm="1"
 
 
-      listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange,'createTime')).then(response => {
         this.emisSettleBillList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
index 909b1ced..bc9e6214 100644
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
@@ -1,61 +1,71 @@
 <template>
   <XdPageContainer >
         <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-          <el-form-item label="" prop="billCode" label-width="80px">
-                  <div slot="label">
-                      <el-radio-group class="query-label" v-model="queryOrderType">
-                        <el-radio :key="1" label="1">运单号</el-radio>
-                        <el-radio :key="2" label="2">账单号</el-radio>
-                      </el-radio-group>
-                  </div>
-                  <XdTextareaInput
-                    v-model="queryParams.settleBillNo"
-                    :placeholder="$t('多个流水号逗号或换行隔开')"
-                    clearable
-                    :rows="2"
-                  />
-                        <!-- @keyup.enter.native="handleQuery" -->
-                </el-form-item>
+          <el-form-item label="" prop="queryCode" label-width="80px">
+              <div slot="label">
+                  <el-radio-group class="query-label" v-model="queryOrderType">
+                    <el-radio :key="1" label="1">运单号</el-radio>
+                    <el-radio :key="2" label="2">账单号</el-radio>
+                  </el-radio-group>
+              </div>
+              <XdTextareaInput
+                v-model="queryParams.queryCode"
+                :placeholder="$t('多个流水号逗号或换行隔开')"
+                clearable
+                :rows="2"
+              />
+            </el-form-item>
+
+            <el-form-item label="账单生成时间" prop="dateTimeRange" label-width="110px">
+                  <elDateAdvPicker  placeholder="账单生成时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateAdvPicker>
+              </el-form-item>
+            <el-form-item label="账单月份" prop="billMonth">
+              <el-date-picker  size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
+            </el-form-item>
+
+            <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
+              <el-select  clearable v-model="queryParams.chargeStatus" placeholder="核销状态" style="width:100%">
+                  <el-option key="0" label="未核销" value="0"></el-option>
+                  <el-option key="1" label="已核销" value="1"></el-option>
+              </el-select>
+            </el-form-item>
 
-            <!-- <el-form-item :label="$t('收款网点')" prop="siteCode">
-              <EmisSiteSimplePicker1  v-model="queryParams.siteCode" ></EmisSiteSimplePicker1>
-            </el-form-item> -->
             <el-form-item :label="$t('开票状态')" prop="openBillStatus">
-              <el-select  clearable v-model="queryParams.openBillStatus" placeholder="">
+              <el-select  clearable v-model="queryParams.openBillStatus" placeholder="开票状态" style="width:100%">
                 <el-option key="1" label="已开票" value="1"></el-option>
                   <el-option key="0" label="未开票" value="0"></el-option>
                   <el-option key="3" label="不开票" value="3"></el-option>
                   <el-option key="2" label="部分开票" value="2"></el-option>
               </el-select>
             </el-form-item>
+            <!-- <el-form-item   :label="$t('确认状态')" prop="blConfirmSite">
+              <el-select  clearable v-model="queryParams.blConfirmSite" placeholder="确认状态">
+                  <el-option key="0" label="业务未确认" value="0"></el-option>
+                  <el-option key="1" label="业务已确认" value="1"></el-option>
+              </el-select>
+            </el-form-item> -->
             <el-form-item   :label="$t('收款状态')" prop="paymentStatus">
-              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="">
+              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="收款状态" style="width:100%">
                   <el-option key="0" label="未收款" value="0"></el-option>
                   <el-option key="1" label="已收款" value="1"></el-option>
                   <el-option key="2" label="部分收款" value="2"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
-              <el-select  clearable v-model="queryParams.chargeStatus" placeholder="">
-                  <el-option key="0" label="未核销" value="0"></el-option>
-                  <el-option key="1" label="已核销" value="1"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item   :label="$t('退款数据')" prop="chargeStatus">
-              <el-select  clearable v-model="queryParams.params.refundAmountType" placeholder="退款数据">
-                  <el-option key="1" label="退款金额不为0" value="1"></el-option>
-                  <el-option key="2" label="退款金额大于0" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-              <el-form-item label="月结客户" prop="custNo">
-                <EmisMonthpayAccountPicker v-model="queryParams.custNo"></EmisMonthpayAccountPicker>
-              </el-form-item>
-            <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
-                  <elDateSimplePicker  placeholder="账单生成时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateSimplePicker>
-              </el-form-item>
+            <!-- <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
+                  <elDateSimplePicker  placeholder="" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateSimplePicker>
+              </el-form-item> -->
             <el-form-item label="账单月份" prop="billMonth">
-              <el-date-picker  size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
+              <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>
+            </el-form-item>
+            <el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
+              <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
+            </el-form-item>
+          <el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="100px">
+            <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
+          </el-form-item>
 
           </SearchForm>
          <!-- 账单表 -->
@@ -81,7 +91,7 @@
                  :summary-method="getSummaries"
                 >
             <div slot="toolbar">
-            <el-row :gutter="10" class="mb8">
+                  <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
                       <el-button
                         type="primary"
@@ -172,6 +182,28 @@
                   <div >{{scope.row.settleStartDate}}~{{scope.row.settleEndDate}}</div>
               </template>
             </el-table-column>
+
+            <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" width="80" />
+            <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" width="80" />
+            <el-table-column :label="$t('结算重量')" align="center" prop="feeWeight" width="80" />
+            <el-table-column :label="$t('账单应收金额')" align="center" prop="recMoney" width="150" />
+            <el-table-column :label="$t('账单已收金额')" align="center" prop="recedMoney" width="150" />
+            <el-table-column :label="$t('账单退款金额')" align="center" prop="refundMoney" width="150" />
+            <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"/>
+            <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="100" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="100" :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="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="otherReason" width="170"  :show-overflow-tooltip="true"/>
+            <!-- <el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" width="100" :show-overflow-tooltip="true"/> -->
+
+            <el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
+            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" />
+
+            <el-table-column :label="$t('生成时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
+
             <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
@@ -194,29 +226,17 @@
                 <el-tag v-if="scope.row.chargeStatus=='1'" type="success">已核销</el-tag>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" width="80" />
-            <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" width="80" />
-            <el-table-column :label="$t('重量')" align="center" prop="feeWeight" width="80" />
-            <el-table-column :label="$t('账单应收金额')" align="center" prop="recMoney" width="150" />
-            <el-table-column :label="$t('账单已收金额')" align="center" prop="recedMoney" width="150" />
-            <el-table-column :label="$t('账单退款金额')" align="center" prop="refundMoney" width="150" />
-            <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"/>
-            <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="100" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="100" :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="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="otherReason" width="170"  :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" width="100" :show-overflow-tooltip="true"/>
-
-            <el-table-column :label="$t('月结编号')" align="center" prop="custNo" width="100" />
-            <el-table-column :label="$t('月结客户')" align="center" prop="custName" width="100" />
-
-            <el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
-            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" />
-
-            <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
+                <template slot-scope="scope">
+                  <span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
+                  <el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
+                  <el-tag v-if="scope.row.blConfirmSite=='2'" type="error">确认不出账</el-tag>
+                  <el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
+            <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
+            <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
 
           </XdTable>
           <!-- :settleBillObj="currentSettleBillObj" -->
@@ -231,12 +251,16 @@
 <script>
 import { listEmisSettleBill, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
 import PayRecordInput from '@/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue';
-import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
 
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+
+
 export default {
-  name: "MoneyPanel",
-  components: { PayRecordInput,EmisMonthpayAccountPicker,elDateSimplePicker },
+  name: "ChargeBillMonthPanel",
+  components: { PayRecordInput,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
   dicts: [
   ],
   data() {
diff --git a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
index 7755e321..d905e502 100644
--- a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
@@ -1,56 +1,71 @@
 <template>
   <XdPageContainer >
         <SearchForm slot="pageHeader"   :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-            <el-form-item label="" prop="billCode" label-width="80px">
-                  <div slot="label">
-                      <el-radio-group class="query-label" v-model="queryOrderType">
-                        <el-radio :key="1" label="1">运单号</el-radio>
-                        <el-radio :key="2" label="2">账单号</el-radio>
-                      </el-radio-group>
-                  </div>
-                  <XdTextareaInput
-                    v-model="queryParams.settleBillNo"
-                    :placeholder="$t('多个流水号逗号或换行隔开')"
-                    clearable
-                    :rows="2"
-                  />
-                        <!-- @keyup.enter.native="handleQuery" -->
+          <el-form-item label="" prop="queryCode" label-width="80px">
+              <div slot="label">
+                  <el-radio-group class="query-label" v-model="queryOrderType">
+                    <el-radio :key="1" label="1">运单号</el-radio>
+                    <el-radio :key="2" label="2">账单号</el-radio>
+                  </el-radio-group>
+              </div>
+              <XdTextareaInput
+                v-model="queryParams.queryCode"
+                :placeholder="$t('多个流水号逗号或换行隔开')"
+                clearable
+                :rows="2"
+              />
             </el-form-item>
 
-            <!-- <el-form-item :label="$t('收款网点')" prop="siteCode">
-              <EmisSiteSimplePicker1  v-model="queryParams.siteCode" ></EmisSiteSimplePicker1>
-            </el-form-item> -->
-
-            <el-form-item   :label="$t('收款状态')" prop="paymentStatus">
-              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="">
-                  <el-option key="0" label="未收款" value="0"></el-option>
-                  <el-option key="1" label="已收款" value="1"></el-option>
-                  <el-option key="2" label="部分收款" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item :label="$t('开票状态')" prop="openBillStatus">
-              <el-select  clearable v-model="queryParams.openBillStatus" placeholder="">
-                 <el-option key="0" label="未开票" value="0"></el-option>
-                  <el-option key="1" label="已开票" value="1"></el-option>
-                  <el-option key="2" label="部分开票" value="2"></el-option>
-                  <el-option key="3" label="不开票" value="3"></el-option>
-              </el-select>
+            <el-form-item label="账单生成时间" prop="dateTimeRange" label-width="110px">
+                  <elDateAdvPicker  placeholder="账单生成时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateAdvPicker>
+              </el-form-item>
+            <el-form-item label="账单月份" prop="billMonth">
+              <el-date-picker  size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
             </el-form-item>
 
             <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
-              <el-select  clearable v-model="queryParams.chargeStatus" placeholder="">
+              <el-select  clearable v-model="queryParams.chargeStatus" placeholder="核销状态" style="width:100%">
                   <el-option key="0" label="未核销" value="0"></el-option>
                   <el-option key="1" label="已核销" value="1"></el-option>
               </el-select>
             </el-form-item>
 
-            <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
-                  <elDateSimplePicker  placeholder="" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateSimplePicker>
-              </el-form-item>
-            <el-form-item label="账单月份" prop="billMonth">
-              <el-date-picker  size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="" value-format="yyyy-MM"></el-date-picker>
+            <el-form-item :label="$t('开票状态')" prop="openBillStatus">
+              <el-select  clearable v-model="queryParams.openBillStatus" placeholder="开票状态" style="width:100%">
+                <el-option key="1" label="已开票" value="1"></el-option>
+                  <el-option key="0" label="未开票" value="0"></el-option>
+                  <el-option key="3" label="不开票" value="3"></el-option>
+                  <el-option key="2" label="部分开票" value="2"></el-option>
+              </el-select>
             </el-form-item>
+            <!-- <el-form-item   :label="$t('确认状态')" prop="blConfirmSite">
+              <el-select  clearable v-model="queryParams.blConfirmSite" placeholder="确认状态">
+                  <el-option key="0" label="业务未确认" value="0"></el-option>
+                  <el-option key="1" label="业务已确认" value="1"></el-option>
+              </el-select>
+            </el-form-item> -->
+            <el-form-item   :label="$t('收款状态')" prop="paymentStatus">
+              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="收款状态" style="width:100%">
+                  <el-option key="0" label="未收款" value="0"></el-option>
+                  <el-option key="1" label="已收款" value="1"></el-option>
+                  <el-option key="2" label="部分收款" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
+                  <elDateSimplePicker  placeholder="" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateSimplePicker>
+              </el-form-item> -->
+            <el-form-item label="账单月份" prop="billMonth">
+              <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>
+            </el-form-item>
+            <el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
+              <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
+            </el-form-item>
+          <el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="100px">
+            <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
+          </el-form-item>
 
           </SearchForm>
          <!-- 账单表 -->
@@ -206,9 +221,15 @@ import { listEmisSettleBill, getEmisSettleBill, delEmisSettleBill, addEmisSettle
 import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 
+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';
+
+
 export default {
   name: "MoneyPanel",
-  components: { MergeBillForm,elDateSimplePicker },
+  components: { MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
   dicts: [
   ],
   data() {
@@ -230,6 +251,7 @@ export default {
       // 结算总账单表格数据
       emisSettleBillList: [],
 
+      queryCode:null,
       queryOrderType:null,
 
       currentId:null,
@@ -312,7 +334,6 @@ export default {
   },
   created() {
     this.queryOrderType="1"
-
     this.getList();
   },
 
@@ -322,12 +343,16 @@ export default {
       this.loading = true;
 
       // 按运单查询时的处理
-      if(this.queryOrderType==1){
-        this.queryParams.params.billCode=this.queryParams.settleBillNo;
+      if(this.queryOrderType=='1'){
+        this.queryParams.params.billCode=this.queryParams.queryCode;
         this.queryParams.settleBillNo=null;
       }
+      else if(this.queryOrderType=='2'){
+        this.queryParams.params.billCode=null;
+        this.queryParams.settleBillNo=this.queryParams.queryCode;
+      }
 
-      listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange,'createTime')).then(response => {
         this.emisSettleBillList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/src/views/emis/emisSettleBill/panel/MonthPanel.vue b/src/views/emis/emisSettleBill/panel/MonthPanel.vue
index e4670409..7b5b02c8 100644
--- a/src/views/emis/emisSettleBill/panel/MonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/MonthPanel.vue
@@ -16,34 +16,56 @@
               />
             </el-form-item>
 
+            <el-form-item label="账单生成时间" prop="dateTimeRange" label-width="110px">
+                  <elDateAdvPicker  placeholder="账单生成时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateAdvPicker>
+              </el-form-item>
+            <el-form-item label="账单月份" prop="billMonth">
+              <el-date-picker  size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
+            </el-form-item>
+
+            <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
+              <el-select  clearable v-model="queryParams.chargeStatus" placeholder="核销状态" style="width:100%">
+                  <el-option key="0" label="未核销" value="0"></el-option>
+                  <el-option key="1" label="已核销" value="1"></el-option>
+              </el-select>
+            </el-form-item>
+
             <el-form-item :label="$t('开票状态')" prop="openBillStatus">
-              <el-select  clearable v-model="queryParams.openBillStatus" placeholder="">
+              <el-select  clearable v-model="queryParams.openBillStatus" placeholder="开票状态" style="width:100%">
                 <el-option key="1" label="已开票" value="1"></el-option>
                   <el-option key="0" label="未开票" value="0"></el-option>
                   <el-option key="3" label="不开票" value="3"></el-option>
                   <el-option key="2" label="部分开票" value="2"></el-option>
               </el-select>
             </el-form-item>
+            <!-- <el-form-item   :label="$t('确认状态')" prop="blConfirmSite">
+              <el-select  clearable v-model="queryParams.blConfirmSite" placeholder="确认状态">
+                  <el-option key="0" label="业务未确认" value="0"></el-option>
+                  <el-option key="1" label="业务已确认" value="1"></el-option>
+              </el-select>
+            </el-form-item> -->
             <el-form-item   :label="$t('收款状态')" prop="paymentStatus">
-              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="">
+              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="收款状态" style="width:100%">
                   <el-option key="0" label="未收款" value="0"></el-option>
                   <el-option key="1" label="已收款" value="1"></el-option>
                   <el-option key="2" label="部分收款" value="2"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
-              <el-select  clearable v-model="queryParams.chargeStatus" placeholder="">
-                  <el-option key="0" label="未核销" value="0"></el-option>
-                  <el-option key="1" label="已核销" value="1"></el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
+            <!-- <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
                   <elDateSimplePicker  placeholder="" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateSimplePicker>
-              </el-form-item>
+              </el-form-item> -->
             <el-form-item label="账单月份" prop="billMonth">
-              <el-date-picker  size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="" value-format="yyyy-MM"></el-date-picker>
+              <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>
+            </el-form-item>
+            <el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
+              <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
+            </el-form-item>
+          <el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="100px">
+            <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
+          </el-form-item>
 
           </SearchForm>
          <!-- 账单表 -->
@@ -195,9 +217,15 @@ import { listEmisSettleBill, getEmisSettleBill, delEmisSettleBill, addEmisSettle
 import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 
+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';
+
+
 export default {
   name: "MoneyPanel",
-  components: { MergeBillForm,elDateSimplePicker },
+  components: { MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
   dicts: [
   ],
   data() {
@@ -219,6 +247,7 @@ export default {
       // 结算总账单表格数据
       emisSettleBillList: [],
 
+      queryCode:null,
       queryOrderType:null,
 
       currentId:null,
@@ -311,10 +340,15 @@ export default {
       this.loading = true;
 
       // 按运单查询时的处理
-      if(this.queryOrderType==1){
-        this.queryParams.params.billCode=this.queryParams.settleBillNo;
+      if(this.queryOrderType=='1'){
+        this.queryParams.params.billCode=this.queryParams.queryCode;
         this.queryParams.settleBillNo=null;
       }
+      else if(this.queryOrderType=='2'){
+        this.queryParams.params.billCode=null;
+        this.queryParams.settleBillNo=this.queryParams.queryCode;
+      }
+
 
       listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisSettleBillList = response.rows;
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
index 40edf3ce..477b7525 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@@ -158,16 +158,16 @@
                         type="primary"
                         plain
                         size="mini"
-                        :disabled="multiple"
-                        @click="handleConfirmBySite"
+                        :disabled="single"
+                        @click="handleGenPayCode"
                       >微信收款码</el-button>
                     </el-col>
                 </el-row>
             </div>
 
             <el-table-column type="selection" width="55" align="center" />
-            <el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" width="170" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('账单名称')" align="left" prop="settleBillName" width="200" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" width="170" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('账单月份')" align="center" prop="billMonth" width="80" />
             <el-table-column :label="$t('账单期间')" align="center" prop="billMonth" width="200" :show-overflow-tooltip="true">
               <template slot-scope="scope">
@@ -410,14 +410,15 @@ export default {
        this.$modal.msgSuccess("操作成功");
      }).catch(() => {});
    },
-   handleConfirmBySite(row) {
+   handleGenPayCode(row) {
+    this.$modal.msgSuccess("暂不支持");
      const ids = row.id || this.ids;
-     this.$modal.confirm('请仔细确认,确认后不可撤销').then(function() {
-       return confirmSettleBillBySite(ids);
-     }).then(() => {
-       this.getList();
-       this.$modal.msgSuccess("操作成功");
-     }).catch(() => {});
+    //  this.$modal.confirm('').then(function() {
+    //    return confirmSettleBillBySite(ids);
+    //  }).then(() => {
+    //    this.getList();
+    //    this.$modal.msgSuccess("操作成功");
+    //  }).catch(() => {});
    },
 
     handleSendDbClick(row){
diff --git a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
index ff149a0c..43116bea 100644
--- a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
@@ -380,7 +380,7 @@ export default {
         this.queryParams.settleBillNo=this.queryParams.queryCode;
       }
 
-      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange);
+      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,'createTime');
       listEmisSettleBill(this.queryParams).then(response => {
         this.emisSettleBillList = response.rows;
         this.total = response.total;
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue
index d0b92b1a..bd3525a9 100644
--- a/src/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue
+++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue
@@ -23,6 +23,11 @@
               <el-input v-model="settleBillItem.settleBillName" disabled />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="客户名称" prop="custName">
+              <el-input v-model="settleBillItem.custName" disabled />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="应收金额" prop="recMoney">
               <el-input v-model="settleBillItem.recMoney" disabled />
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index 88a411cc..8cb0780a 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -128,7 +128,6 @@
           :total="total"
           @queryTable="getList"
           @selection-change="handleSelectionChange"
-          @sort-change="handleSortChange"
 
           :row-style="tableRowClassName"
 
@@ -233,7 +232,8 @@
        </template>
      </el-table-column>
 
-     <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sort-orders="['descending','ascending']" sortable="custom"   />
+     <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sortable="true"  />
+     <el-table-column :label="$t('子账单')" align="center" prop="billNo" width="130" :show-overflow-tooltip="true"/>
      <el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150"   :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.blConfirmCenter=='0'" style="color:red;font-weight:500">财务未确认,</span>
@@ -245,37 +245,37 @@
             <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
           </template>
        </el-table-column>
-      <el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150"     :show-overflow-tooltip="true">
+      <el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="80"     :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
             <span v-else>否</span>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150"     :show-overflow-tooltip="true">
+      <el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="80" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
           </template>
       </el-table-column>
-     <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sortable="true"    :show-overflow-tooltip="true"/>
      <el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150"     :show-overflow-tooltip="true"/>
-     <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :sortable="true"   :show-overflow-tooltip="true"/>
 
-     <el-table-column  :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true">
+     <!-- <el-table-column  :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
            <span  v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custNo }}</span>
          </template>
-     </el-table-column>
+     </el-table-column> -->
 
-     <el-table-column  :label="$t('月结客户')" align="center" prop="customerName" min-width="150"  :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true">
+     <el-table-column  :label="$t('月结客户')" align="center" prop="custName" min-width="150"  :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
            <span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
          </template>
      </el-table-column>
 
 
-     <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sortable="true"   :show-overflow-tooltip="true"/>
 
-     <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true">
+     <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
             <span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
          </template>
@@ -287,7 +287,7 @@
        <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80"    />
        <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80"    />
        <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80"   />
-       <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" :sort-orders="['descending','ascending']" sortable="custom"   />
+       <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="120" :sortable="true"  />
        <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80"    >
             <template slot-scope="scope">
                 <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
@@ -311,7 +311,7 @@
                <span v-else >/</span>
            </template>
          </el-table-column>
-       <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sort-orders="['descending','ascending']" sortable="custom"   />
+       <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sortable="true"  />
        <el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"   />
 
        <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120"    >
@@ -337,6 +337,7 @@
      <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170"    />
      <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100"    />
      <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100"   />
+     <el-table-column :label="$t('出账日期')" align="center" prop="createTime" min-width="170"    />
 
 
    </XdTable>
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index 386be97b..49c7f9eb 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -150,7 +150,6 @@
           :total="total"
           @queryTable="getList"
           @selection-change="handleSelectionChange"
-          @sort-change="handleSortChange"
 
           :row-style="tableRowClassName"
 
@@ -258,7 +257,9 @@
        </template>
      </el-table-column>
 
-     <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sort-orders="['descending','ascending']" sortable="custom"   />
+     <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sortable="true"  />
+     <el-table-column :label="$t('子账单')" align="center" prop="billNo" width="130" :show-overflow-tooltip="true"/>
+
      <el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150"   :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.blConfirmCenter=='0'" style="color:red;font-weight:500">财务未确认,</span>
@@ -270,37 +271,37 @@
             <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
           </template>
        </el-table-column>
-      <el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150"     :show-overflow-tooltip="true">
+      <el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="80"     :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
             <span v-else>否</span>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150"     :show-overflow-tooltip="true">
+      <el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="80" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
           </template>
       </el-table-column>
-     <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sortable="true"    :show-overflow-tooltip="true"/>
      <el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150"     :show-overflow-tooltip="true"/>
-     <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :sortable="true"   :show-overflow-tooltip="true"/>
 
-     <el-table-column  :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true">
+     <!-- <el-table-column  :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
            <span  v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custNo }}</span>
          </template>
-     </el-table-column>
+     </el-table-column> -->
 
-     <el-table-column  :label="$t('月结客户')" align="center" prop="customerName" min-width="150"  :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true">
+     <el-table-column  :label="$t('月结客户')" align="center" prop="custName" min-width="150"  :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
            <span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
          </template>
      </el-table-column>
 
 
-     <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sortable="true"   :show-overflow-tooltip="true"/>
 
-     <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sort-orders="['descending','ascending']" sortable="custom"    :show-overflow-tooltip="true">
+     <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
             <span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
          </template>
@@ -312,7 +313,7 @@
        <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80"    />
        <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80"    />
        <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80"   />
-       <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" :sort-orders="['descending','ascending']" sortable="custom"   />
+       <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="120" :sortable="true"  />
        <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80"    >
             <template slot-scope="scope">
                 <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
@@ -336,7 +337,7 @@
                <span v-else >/</span>
            </template>
          </el-table-column>
-       <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sort-orders="['descending','ascending']" sortable="custom"   />
+       <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sortable="true"  />
        <el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"   />
 
        <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120"    >
@@ -362,6 +363,7 @@
      <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170"    />
      <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100"    />
      <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100"   />
+     <el-table-column :label="$t('出账日期')" align="center" prop="createTime" min-width="170"    />
 
 
    </XdTable>
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index c043734f..7e2c2bc3 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -149,7 +149,7 @@
           :total="total"
           @queryTable="getList"
           @selection-change="handleSelectionChange"
-          @sort-change="handleSortChange"
+
 
           :row-style="tableRowClassName"
 
@@ -158,6 +158,7 @@
            show-summary :summary-method="getSummaries"
           >
 
+          <!-- @sort-change="handleSortChange" -->
           <!-- :default-sort="{prop: 'sendDate', order: 'descending'}" -->
 
 
@@ -235,7 +236,9 @@
        </template>
      </el-table-column>
 
-     <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" sortable="custom"   />
+     <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sortable="true"  />
+     <el-table-column :label="$t('子账单')" align="center" prop="billNo" width="130" :show-overflow-tooltip="true"/>
+
      <el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150"   :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.blConfirmCenter=='0'" style="color:red;font-weight:500">财务未确认,</span>
@@ -247,37 +250,37 @@
             <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
           </template>
        </el-table-column>
-      <el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150"     :show-overflow-tooltip="true">
+      <el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="80"     :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
             <span v-else>否</span>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150"     :show-overflow-tooltip="true">
+      <el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="80" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
           </template>
       </el-table-column>
-     <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" sortable="custom"    :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sortable="true"    :show-overflow-tooltip="true"/>
      <el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150"     :show-overflow-tooltip="true"/>
-     <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" sortable="custom"    :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :sortable="true"   :show-overflow-tooltip="true"/>
 
-     <el-table-column  :label="$t('月结编号')" align="center" prop="customerName" min-width="150" sortable="custom"    :show-overflow-tooltip="true">
+     <!-- <el-table-column  :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
            <span  v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custNo }}</span>
          </template>
-     </el-table-column>
+     </el-table-column> -->
 
-     <el-table-column  :label="$t('月结客户')" align="center" prop="customerName" min-width="150"  sortable="custom"    :show-overflow-tooltip="true">
+     <el-table-column  :label="$t('月结客户')" align="center" prop="custName" min-width="150"  :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
            <span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
          </template>
      </el-table-column>
 
 
-     <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" sortable="custom"    :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sortable="true"   :show-overflow-tooltip="true"/>
 
-     <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" sortable="custom"    :show-overflow-tooltip="true">
+     <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
             <span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
          </template>
@@ -289,7 +292,7 @@
        <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80"    />
        <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80"    />
        <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80"   />
-       <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" sortable="custom"   />
+       <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="120" :sortable="true"  />
        <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80"    >
             <template slot-scope="scope">
                 <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
@@ -313,7 +316,7 @@
                <span v-else >/</span>
            </template>
          </el-table-column>
-       <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" sortable="custom"   />
+       <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sortable="true"  />
        <el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"   />
 
        <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120"    >
@@ -339,6 +342,7 @@
      <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170"    />
      <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100"    />
      <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100"   />
+     <el-table-column :label="$t('出账日期')" align="center" prop="createTime" min-width="170"    />
 
 
    </XdTable>
@@ -1044,7 +1048,9 @@ export default {
           this.emisSettleSubBillList = this.emisSettleSubBillList.sort(this.sortFun(column.prop, column.order === 'ascending'));
           console.log(this.emisSettleSubBillList);
       } else if (column.prop === 'waybillDetail.sendDate') {
-          this.emisSettleSubBillList = this.emisSettleSubBillList.sort(this.sortFun(column.prop, column.order === 'ascending'));
+          this.emisSettleSubBillList = this.emisSettleSubBillList.sort(
+            this.sortFun(column.prop, column.order === 'ascending')
+          );
           console.log(this.emisSettleSubBillList);
       }else if (column.prop === 'priority') {
           this.emisSettleSubBillList = this.emisSettleSubBillList.sort(this.sortFun(column.prop, column.order === 'ascending'));
diff --git a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
index 6b475e9d..69ce895a 100644
--- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
+++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
@@ -2,7 +2,7 @@
   <XdPageContainer class="app-container">
     <!-- slot="pageTabs" -->
    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
-     size="mini" :maxShow="8"  label-width="80px"
+     size="mini" :maxShow="20"  label-width="80px"
      v-show="showSearch"
      @search="handleQuery"
      @reset="resetQuery"
@@ -218,9 +218,21 @@
        </template>
      </el-table-column>
 
+     <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sortable="true"  />
      <el-table-column :label="$t('子账单')" align="center" prop="billNo" width="130" :show-overflow-tooltip="true"/>
-     <el-table-column :label="$t('运单号')" align="center" prop="billCode" width="130" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="80" :show-overflow-tooltip="true">
+
+     <el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150"   :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span v-if="scope.row.blConfirmCenter=='0'" style="color:red;font-weight:500">财务未确认,</span>
+            <span v-if="scope.row.blConfirmSite=='0'" style="color:red;font-weight:500">业务未确认</span>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+            <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
+          </template>
+       </el-table-column>
+      <el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="80"     :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
             <span v-else>否</span>
@@ -231,70 +243,65 @@
             <dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
           </template>
       </el-table-column>
-     <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" width="170" :show-overflow-tooltip="true"/>
-      <!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
-         <template slot-scope="scope">
-           <span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
-         </template>
-      </el-table-column> -->
-     <el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" width="120" :show-overflow-tooltip="true"/>
-     <el-table-column :label="$t('目的网点')" align="center" prop="waybillDetail.dispatchUnderlingSiteName" width="120" :show-overflow-tooltip="true"/>
-     <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" width="150" :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sortable="true"    :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150"     :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :sortable="true"   :show-overflow-tooltip="true"/>
 
-     <el-table-column  :label="$t('月结编号')" align="center" prop="custNo" width="80" :show-overflow-tooltip="true">
+     <!-- <el-table-column  :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
-           <span  type="normal">{{ scope.row.custNo }}</span>
+           <span  v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custNo }}</span>
          </template>
-     </el-table-column>
+     </el-table-column> -->
 
-     <el-table-column  :label="$t('月结客户')" align="center" prop="custName" width="120" :show-overflow-tooltip="true">
+     <el-table-column  :label="$t('月结客户')" align="center" prop="custName" min-width="150"  :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
            <span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
          </template>
      </el-table-column>
 
-     <!-- <el-table-column :label="$t('取件员/操作员')"  align="center" prop="takePieceEmployeeName" min-width="170" :show-overflow-tooltip="true">
-       <template slot-scope="scope">
-            <span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
-            <span v-if="scope.row.pickupMethod==2">{{scope.row.waybillDetail.takePieceEmployeeName}}</span>
-            <span v-else></span>
-         </template>
-     </el-table-column> -->
-     <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" width="80" :show-overflow-tooltip="true"/>
-     <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" width="120" :show-overflow-tooltip="true">
+
+     <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sortable="true"   :show-overflow-tooltip="true"/>
+
+     <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sortable="true"   :show-overflow-tooltip="true">
        <template slot-scope="scope">
             <span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
          </template>
      </el-table-column>
 
 
-       <el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" width="80" :show-overflow-tooltip="true"/>
-       <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" width="80" />
-       <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" width="80" />
-       <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" width="80" />
-       <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" width="80" />
-       <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" width="80" />
-       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" width="80" />
-       <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" width="80" :show-overflow-tooltip="true"/>
-       <el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" width="80" :show-overflow-tooltip="true" >
+       <el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80"    :show-overflow-tooltip="true"/>
+       <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80"      />
+       <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80"    />
+       <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80"    />
+       <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80"   />
+       <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="120" :sortable="true"  />
+       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80"    >
+            <template slot-scope="scope">
+                <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
+                <span v-else>{{scope.row.waybillDetail.freight}}</span>
+            </template>
+          </el-table-column>
+       <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80"    />
+       <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"   />
+       <el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true"   >
          <template slot-scope="scope">
-           <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
+           <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
          </template>
        </el-table-column>
-       <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" width="80" :show-overflow-tooltip="true" />
-       <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" width="100" />
-       <el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" width="100" />
+       <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true"  />
+       <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100"   />
+       <el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100"    />
 
-       <el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" width="150" >
+       <el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150"  >
            <template slot-scope="scope">
                <el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
                <span v-else >/</span>
            </template>
          </el-table-column>
-       <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
-       <el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
+       <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sortable="true"  />
+       <el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"   />
 
-       <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" width="120" >
+       <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120"    >
          <template slot-scope="scope">
            <span v-if="scope.row.blConfirmCenter=='0'" >未确认</span>
            <el-tag v-if="scope.row.blConfirmCenter=='1'" type="success">已确认</el-tag>
@@ -302,11 +309,11 @@
            <el-tag v-if="scope.row.blConfirmCenter=='3'" type="error">账单异常</el-tag>
          </template>
        </el-table-column>
-       <el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" width="100" />
-       <el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" width="170" />
-       <el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" width="100" />
+       <el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100"    />
+       <el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170"    />
+       <el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100"  />
 
-       <el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" width="120" >
+       <el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120"   >
          <template slot-scope="scope">
            <span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
            <el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
@@ -314,9 +321,11 @@
            <el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
          </template>
      </el-table-column>
-     <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" width="170" />
-     <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" width="100" />
-     <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" width="100" />
+     <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170"    />
+     <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100"    />
+     <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100"   />
+     <el-table-column :label="$t('出账日期')" align="center" prop="createTime" min-width="170"    />
+
 
 
    </XdTable>
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index f19260b6..52725b83 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -201,7 +201,6 @@
           </template>
         </el-table-column>
 
-
         <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
@@ -210,7 +209,12 @@
         <el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
 
         <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件国家')" align="center" prop="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件省')" align="center" prop="receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column :label="$t('收件市')" align="center" prop="receiveCityName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('收件区')" align="center" prop="receiveCountyName" min-width="80" :show-overflow-tooltip="true"/> -->
 
         <el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" >