diff --git a/src/components/DatePickerAdv/elDate7DayPicker.vue b/src/components/DatePickerAdv/elDate7DayPicker.vue
new file mode 100644
index 00000000..38b6064a
--- /dev/null
+++ b/src/components/DatePickerAdv/elDate7DayPicker.vue
@@ -0,0 +1,92 @@
+<template>
+ <div class="date-box">
+    <el-date-picker
+
+        v-model="dateRange"
+        :picker-options="pickerOptions"
+        type="datetimerange"
+        :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
+
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        ref="timeRangePicker"
+
+        @change="dateChange"
+        style="width: 100%;"
+      >
+      </el-date-picker>
+  </div>
+</template>
+
+<script>
+import dayjs from 'dayjs'
+import {timeFormat} from '@/utils/dateUtils'
+
+export default {
+  name: "ElDate7DayPicker",
+  props: {
+    value:{
+      type:Array
+    }
+  },
+  data() {
+    return {
+      dateRange: this.value,
+      pickerMinDate: null,
+      pickerOptions: {
+        onPick: ({ maxDate, minDate }) => {
+          this.pickerMinDate = new Date(minDate).getTime();
+        },
+        disabledDate: time => {
+          if (this.pickerMinDate) {
+            const day1 = 7 * 24 * 3600 * 1000;
+            let maxTime = this.pickerMinDate + day1;
+            let minTime = this.pickerMinDate - day1;
+            return time.getTime() > maxTime || time.getTime() < minTime;
+          }else{
+            return time.getTime() > Date.now()
+          }
+        }
+    },
+    }
+  },
+  watch: {
+      value(newVal) {
+        this.dateRange = this.value;
+        if(this.dateRange&&this.dateRange.length==2){
+          this.dateRange[0]=timeFormat(this.dateRange[0]);
+          this.dateRange[1]=timeFormat(this.dateRange[1]);
+        }
+      },
+  },
+  created() {
+  },
+  methods: {
+
+    dateChange(value) {
+      if(this.dateRange&&this.dateRange.length==2){
+        this.dateRange[0]=timeFormat(this.dateRange[0]);
+        this.dateRange[1]=timeFormat(this.dateRange[1]);
+      }
+      this.$emit("input", this.dateRange);
+      this.$emit('dateTimeChange', this.dateRange)
+		},
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.datetimepicker {
+  width: 300px;
+  .el-select .el-input__inner {
+    border-radius: 4px 0 0 4px;
+  }
+  .el-date-editor .el-input__inner {
+    border-left: none;
+    border-radius: 0 4px 4px 0;
+  }
+}
+</style>
+
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
new file mode 100644
index 00000000..82912761
--- /dev/null
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -0,0 +1,1099 @@
+<template>
+  <XdPageContainer class="app-container">
+
+    <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="9" label-width="100px"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+
+      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+        <!-- :span="6" -->
+        <el-col :span="9">
+          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+            <el-col :span="24">
+                <el-form-item label="" prop="billCode">
+                  <div slot="label">
+                      <el-radio-group class="query-label" v-model="queryOrderType">
+                        <el-radio :key="1" label="1">运单号</el-radio>
+                        <!-- <el-radio :key="0" label="0">订单号</el-radio> -->
+                      </el-radio-group>
+                  </div>
+                  <XdTextareaInput
+                    v-model="queryParams.billCode"
+                    :placeholder="$t('多个流水号逗号或换行隔开')"
+                    clearable
+                    :rows="4"
+                  />
+                        <!-- @keyup.enter.native="handleQuery" -->
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="查询时间范围" prop="">
+                  <div slot="label">
+                        <el-radio-group  class="query-label" v-model="queryOrderDateType">
+                              <el-radio :key="1" label="1">发货时间</el-radio>
+                        </el-radio-group>
+                  </div>
+                  <elDate7DayPicker      v-model="dateRange"  ></elDate7DayPicker>
+              </el-form-item>
+              <el-form-item label="" prop="queryExpireNotSign">
+                <el-checkbox style="font-size:400;margin-right:10px;" v-model="queryParams.params.expireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+
+        <el-col :span="5">
+          <el-form-item label="寄件网点" prop="productType">
+            <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
+          </el-form-item>
+          <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
+            <EmisSiteSimplePicker2  v-model="queryParams.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+            <el-form-item label="月结客户" prop="custNo">
+              <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
+            </el-form-item>
+            <el-form-item label="付款方式" prop="paymentType" >
+            <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
+                <el-option
+                  v-for="dict in dict.type.emis_payment_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+        </el-col>
+
+        <el-col :span="5">
+            <el-form-item label="线路" prop="transLineType">
+              <TransLinePicker v-model="queryParams.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
+            </el-form-item>
+            <el-form-item label="产品类型" prop="productType">
+              <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker>
+            </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+              <el-form-item label="寄件人" prop="sendName">
+                    <el-input
+                      v-model="queryParams.sendName"
+                      :placeholder="$t('寄件人')"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                    />
+                  </el-form-item>
+                  <el-form-item label="寄件电话" prop="sendMobile">
+              <el-input
+                v-model="queryParams.sendMobile"
+                :placeholder="$t('寄件人电话')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+              <el-form-item label="寄件公司" prop="sendCompany">
+                <el-input
+                  v-model="queryParams.sendCompany"
+                  :placeholder="$t('寄件公司')"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="寄件国家" prop="sendCountry">
+              <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" @onChange="handleQuery"></CountryPicker1>
+            </el-form-item>
+            <el-form-item label="录单备注" prop="remark">
+              <el-input
+                v-model="queryParams.remark"
+                :placeholder="$t('录单备注')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="费用备注" prop="feeRemark">
+              <el-input
+                v-model="queryParams.feeRemark"
+                :placeholder="$t('费用备注')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+
+
+
+        </el-col>
+        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+
+                  <el-form-item label="收件人" prop="receiveName">
+                  <el-input
+                    v-model="queryParams.receiveName"
+                    :placeholder="$t('收件人')"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+                <el-form-item label="收件电话" prop="receiveMobile">
+              <el-input
+                v-model="queryParams.receiveMobile"
+                :placeholder="$t('收件电话')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+
+
+            <el-form-item label="收件公司" prop="receiveCompany">
+                  <el-input
+                    v-model="queryParams.receiveCompany"
+                    :placeholder="$t('收件公司')"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+
+            <el-form-item label="目的国家" prop="sendCountry">
+              <CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2>
+            </el-form-item>
+
+            <el-form-item label="目的省份" prop="receiveProvince">
+              <ProvincePicker2  v-model="queryParams.receiveProvince" :countryCode="queryParams.receiveCountry"  style="margin-left:5px"  ></ProvincePicker2>
+            </el-form-item>
+
+            <el-form-item label="签收状态" prop="blSign">
+              <el-select clearable="" v-model="queryParams.blSign" placeholder="请选择">
+                <el-option label="已签收" :value="1"></el-option>
+                <el-option label="未签收" :value="0"></el-option>
+              </el-select>
+            </el-form-item>
+
+        </el-col>
+        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+
+          <!-- <el-form-item label="运单状态" prop="siteType">
+              <el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
+                    <el-option
+                      v-for="dict in dict.type.emis_waybill_status"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+              </el-select>
+            </el-form-item> -->
+
+            <el-form-item label="报关方式" prop="customsEclaration">
+                <el-select clearable v-model="queryParams.customsEclaration" placeholder="请选择">
+                  <el-option
+                    v-for="dict in dict.type.emis_declare_mode"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item  label="清关方式" prop="customsClear">
+              <el-select clearable v-model="queryParams.customsClear" placeholder="请选择">
+                <el-option
+                  v-for="dict in dict.type.emis_customs_clear"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="派送方式" prop="dispatchMethod" >
+                    <el-select clearable v-model="queryParams.dispatchMethod" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_tab_dispatch_mode"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                  </el-form-item>
+
+                  <el-form-item label="取件方式" prop="pickupMethod">
+                      <el-select v-model="queryParams.pickupMethod" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_qujian_fangshi"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+
+              <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
+                <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
+              </el-form-item>
+
+              <el-form-item label="收款状态" prop="pickupMethod">
+                      <el-select v-model="queryParams.paymentStatus" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_payment_status"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+
+
+        </el-col>
+        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+
+          <el-form-item label="问题件方式" prop="pickupMethod">
+            <el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
+              <el-option label="只查问题件类型" :value="1"></el-option>
+              <el-option label="剔除问题件类型" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="问题件类型" prop="problemType">
+            <ProblemTypePicker v-model="queryParams.problemType"  ></ProblemTypePicker>
+          </el-form-item>
+
+
+          <el-form-item :label="$t('回款联系人')" prop="payee">
+              <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
+            </el-form-item>
+          <el-form-item :label="$t('销售联系人')" prop="salesmen">
+            <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
+          </el-form-item>
+
+          <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
+              <EmisUserSimplePicker0  :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
+              </el-form-item>
+          <el-form-item :label="$t('录单员')" prop="registerManCode">
+                <EmisUserSimplePicker1  :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
+          </el-form-item>
+          <!-- <el-form-item label="是否问题件" prop="blIsQuestion" >
+              <el-select clearable v-model="queryParams.blIsQuestion" placeholder="请选择">
+                  <el-option :key="1" label="'1'" value="'1'">是</el-option>
+                  <el-option :key="0" label="'0'" value="'0'">否</el-option>
+                </el-select>
+            </el-form-item> -->
+
+          <!-- <el-form-item label="问题件原因" prop="problemCause">
+            <el-input
+              v-model="queryParams.problemCause"
+              :placeholder="$t('问题件原因')"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item> -->
+
+              <!-- <el-form-item :label="$t('派件员')" prop="dispatchManCode">
+                <EmisUserSimplePicker2  :placeholder="$t('派件员')" v-model="queryParams.dispatchManCode"></EmisUserSimplePicker2>
+              </el-form-item> -->
+
+        </el-col>
+      </el-row>
+
+    </SearchForm>
+
+    <!-- :row-class-name="tableRowClassName" -->
+    <!-- @row-dblclick="handleShowTraceInfo" -->
+
+
+    <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          storageName="sendWaybillList_main"
+           v-loading="loading"
+           border
+           size="mini"
+           :data="emisWaybillList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           @selection-change="handleSelectionChange"
+           @sort-change="handleSortChange"
+           >
+
+      <div slot="toolbar">
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['emis:emisWaybill:export']"
+                >导出</el-button>
+              </el-col>
+          </el-row>
+      </div>
+
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+             <span> {{scope.row.billCode}} </span>
+              <i v-if="scope.row.billCode"
+              style="margin-left: 4px; cursor: pointer"
+              class="el-icon-document-copy"
+              @click="handleCopy(scope.row,$event)"></i>
+
+            </template>
+      </el-table-column>
+
+
+      <el-table-column :label="$t('快件跟踪')" align="left" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" >
+        <template slot-scope="scope">
+              <div  class="link-type" @click="handleShowTraceInfo(scope.row)">{{scope.row.lastTraceInfo}}</div>
+            </template>
+      </el-table-column>
+      <el-table-column :label="$t('跟踪预警')" align="center" prop="traceWaring" min-width="100" :show-overflow-tooltip="true" >
+        <template slot-scope="scope">
+              <div v-if="scope.row.blSign=='1'" class="link-type" @click="handleShowTraceInfo(scope.row)">
+                {{calcDeliveryTime(scope.row.sendDate,scope.row.scanDate)}}天
+              </div>
+              <div v-else class="link-type" @click="handleShowTraceInfo(scope.row)">
+                  <span v-if="calcDeliveryTime(scope.row.sendDate,scope.row.scanDate)>2" style="color: red" >
+                        轨迹异常:停留超时{{calcDeliveryTime(scope.row.sendDate,scope.row.scanDate)}}天
+                  </span>
+                  <span v-else  >
+                    {{calcDeliveryTime(scope.row.sendDate,scope.row.scanDate)}}天
+                  </span>
+              </div>
+         </template>
+      </el-table-column>
+
+      <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_status" :value="scope.row.paymentStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" width="100" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
+          </template>
+       </el-table-column>
+       <el-table-column :label="$t('发件人')" align="center" prop="pickupMethod" width="180" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sendName }}--{{ scope.row.receiveName }}</span>
+          </template>
+       </el-table-column>
+       <el-table-column :label="$t('快件类型')" align="center" prop="pickupMethod" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+            <span>{{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}</span>
+          </template>
+       </el-table-column>
+       <el-table-column :label="$t('预计送达时间')" align="center" prop="estimateDate" min-width="100" >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件员')"  align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+             <span v-if="scope.row.pickupMethod==2">{{scope.row.takePieceEmployeeName}}</span>
+             <span v-else></span>
+          </template>
+      </el-table-column>
+            <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/> -->
+
+      <el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作员')"   align="center" prop="operateEmployeeName" min-width="100" >
+        <template slot-scope="scope">
+             <span v-if="scope.row.pickupMethod==1">{{scope.row.operateEmployeeName}}</span>
+             <span v-else></span>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('报关方式')" align="center" prop="customsEclaration" min-width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_declare_mode" :value="scope.row.customsEclaration"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.customsClear"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="80" :show-overflow-tooltip="true" />
+
+      <!-- <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/> -->
+
+      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="80" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+             <span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.customerName}}</span>
+             <span v-else></span>
+          </template>
+        </el-table-column>
+      <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
+      <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
+
+      <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
+              <el-tag v-else type="info">否</el-tag>
+          </template>
+        </el-table-column>
+      <el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="80" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column :label="$t('延期天数')" align="center" prop="problemDelayDays" width="80" :show-overflow-tooltip="true"/> -->
+      <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('寄件财务中心')" align="center" prop="sendSiteFincailName" min-width="80" :show-overflow-tooltip="true"/>
+
+
+      <!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
+        </template>
+      </el-table-column> -->
+
+
+        <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="80" :show-overflow-tooltip="true" />
+        <el-table-column :label="$t('寄件省')" align="center" prop="sendProvinceName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件市')" align="center" prop="sendCityName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件区')" align="center" prop="sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="150" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <div v-if="scope.row.blMessage==1" >发送</div>
+              <div v-else>不发送</div>
+          </template>
+        </el-table-column>
+      <!-- <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/> -->
+<!--
+        <el-table-column :label="$t('起始国')" align="center" prop="sendCountryName" width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" 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="receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派货短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+                <div v-if="scope.row.blAcceptMessage==1" >发送</div>
+                <div v-else>不发送</div>
+            </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" 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" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_tab_packing_type" :value="scope.row.packType"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="80" />
+        <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="80" />
+        <el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="80" />
+        <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="80" />
+        <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="80" />
+
+        <el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
+          <template slot-scope="scope">
+              <div v-if="scope.row.dispatchMethod==1" >派送</div>
+              <div v-else>自提</div>
+          </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('支付类型')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" >
+          <template slot-scope="scope">
+             <span v-if="scope.row.paymentType==3">{{scope.row.freight}}</span>
+             <span v-else>0</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
+        <el-table-column :label="$t('保价金额')" align="center" prop="insureValue" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('费用备注')" align="center" prop="feeRemark" min-width="80" :show-overflow-tooltip="true"/>
+
+
+        <el-table-column :label="$t('签收状态')" align="center" prop="blSign" width="80" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blSign=='1'" type="success">已签收</el-tag>
+              <el-tag v-else type="danger">未签收</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="80" :show-overflow-tooltip="true"/>
+
+        <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
+
+<!--
+        <el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
+              <el-tag v-else type="danger">未打印</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="80" />
+
+        <el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-width="80" :show-overflow-tooltip="true"/> -->
+
+        <el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
+        <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
+
+      <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
+
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+
+    </XdTable>
+
+
+    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+      <TraceWaybillDetailView  :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
+    </el-dialog>
+<!--
+    <el-dialog title="查看运单" :visible.sync="openView" width="100%" :destroy-on-close="true"  :close-on-click-modal="false"  v-dialogDrag append-to-body>
+      <WaybillDetailReadOnly :billCode="currentTraceBillCode"></WaybillDetailReadOnly>
+    </el-dialog> -->
+
+
+  </XdPageContainer>
+</template>
+
+<script>
+// import 'element-ui/lib/theme-chalk/display.css';
+import { listEmisWaybill, getEmisWaybill, delEmisWaybill, addEmisWaybill, updateEmisWaybill } from "@/api/emis/emisWaybill";
+import elDate7DayPicker from '@/components/DatePickerAdv/elDate7DayPicker';
+
+// import emisWaybillView from '@/views/emis/emisWaybill/emisWaybillView';
+import emisWaybillForm from '@/views/emis/emisWaybill/emisWaybillForm';
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+
+import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+
+import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
+
+
+import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
+import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
+
+
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+
+import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+
+import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+
+import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
+
+import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
+
+import TraceDetail from '@/views/emis/customerService/traceDetail.vue';
+
+import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue';
+
+import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
+
+
+
+
+import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
+import { formatSearchStr,deepClone } from '@/utils/index'
+import clip from '@/utils/clipboard'
+
+export default {
+  name: "SendWaybillListNew",
+  // name: "DispatchWaybillList",
+
+  components: {
+    TraceWaybillDetailView,
+    EmisMonthpayAccountPicker,
+    elDate7DayPicker,emisWaybillForm,
+    CountryPicker1,
+    CountryPicker2,ProvincePicker2,
+    TransLinePicker,TransProductPicker,
+    PayeePicker,
+    SalemanPicker,
+    EmisUserSimplePicker0,
+    EmisUserSimplePicker1,
+    EmisUserSimplePicker2,
+
+    EmisSiteSimplePicker1,
+    EmisSiteSimplePicker2,
+    ProblemTypePicker,
+
+    TraceDetail,
+
+    WaybillDetailReadOnly,
+
+  },
+  dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
+        'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
+  ],
+  data() {
+    return {
+      tableHeight: 200,
+
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+
+      // 总条数
+      total: 0,
+      // 运单列表表格数据
+      emisWaybillList: [],
+
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+      billCode:null,
+
+      openTraceInfo:false,
+      currentTraceBillItem:null,
+      currentTraceBillCode:null,
+
+      queryOrderType:null,
+      queryOrderDateType:null,
+      queryExpireNotSign:null,
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+
+      // 时间搜索
+      dateRange:[],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        orderSn: null,
+        billCode: null,
+        billCodeSub: null,
+        orderStatus: null,
+        waybillStatus: null,
+        orderType: null,
+        orderDate: null,
+        customerCode: null,
+        customerName: null,
+        receiveCustomerCode: null,
+        receiveCustomerName: null,
+        thirdCustomerCode: null,
+        thirdCustomerName: null,
+        receiveName: null,
+        receiveCompany: null,
+        receiveMobile: null,
+        receiveTel: null,
+        receiveCountry: null,
+        receiveProvince: null,
+        receiveCity: null,
+        receiveCounty: null,
+        receiveTown: null,
+        receiveAddress: null,
+        receivePostcode: null,
+        receivePcd: null,
+        sendName: null,
+        sendCompany: null,
+        sendMobile: null,
+        sendTel: null,
+        sendCountry: null,
+        sendProvince: null,
+        sendCity: null,
+        sendCounty: null,
+        sendTown: null,
+        sendAddress: null,
+        sendPostcode: null,
+        sendPcd: null,
+        paymentType: null,
+        calcFeeType: null,
+        custNo: null,
+        transLineType: null,
+        productType: null,
+        timeType: null,
+        meterType: null,
+        customsClear: null,
+        customsEclaration: null,
+        estimateDate: null,
+        packType: null,
+        dispatchMethod: null,
+        pickupMethod: null,
+        pickStartDate: null,
+        pickFinishDate: null,
+        pickFailReason: null,
+        intoWarehouseCode: null,
+        intoWarehouseName: null,
+        intoWarehouseAddress: null,
+        intoWarehouseContact: null,
+        intoWarehousePhone: null,
+        intoWarehouseBillCode: null,
+        warehouseInNo: null,
+        customerDeliveryBeginTime: null,
+        customerDeliveryEndTime: null,
+        goodsType: null,
+        goodsInfo: null,
+        goodsPics: null,
+        blPrepareInFreight: null,
+        prepareInEstFee: null,
+        prepareInRealFee: null,
+        prepareInExpress: null,
+        prepareInBillCode: null,
+        prepareInRemark: null,
+        prepareInSupplier: null,
+        totalWeight: null,
+        totalVolume: null,
+        parcelQty: null,
+        billWeight: null,
+        volumeWeight: null,
+        currency: null,
+        settlementWeight: null,
+        feeWeight: null,
+        freight: null,
+        blOverLong: null,
+        blBill: null,
+        blOverWeight: null,
+        overWeightNumber: null,
+        feeRemark: null,
+        thirdCode: null,
+        realValue: null,
+        blInsure: null,
+        insureValue: null,
+        insureValueCurrency: null,
+        insureFeeCurrency: null,
+        insureFee: null,
+        insureRemark: null,
+        insureSiteCode: null,
+        insureDate: null,
+        blPrint: null,
+        printManCode: null,
+        printSite: null,
+        printDate: null,
+        printCount: null,
+        blDispFd: null,
+        transferCode: null,
+        transferBillcode: null,
+        dispFdDate: null,
+        dispFdReason: null,
+        currentSiteCode: null,
+        lastSiteCode: null,
+        registerSiteCode: null,
+        registerDate: null,
+        registerManCode: null,
+        takePieceEmployeeCode: null,
+        sendSiteCode: null,
+        sendDate: null,
+        dispatchManCode: null,
+        dispatchDate: null,
+        dispatchSiteCode: null,
+        produceBillDate: null,
+        produceBillSiteCode: null,
+        produceBillManCode: null,
+        destinationCode: null,
+        destinationProvince: null,
+        destinationCity: null,
+        destinationCounty: null,
+        dispatchUnderlingSiteCode: null,
+        destinationCenterCode: null,
+        marketManCode: null,
+        payee: null,
+        salesmen: null,
+        operateEmployeeCode: null,
+        blIsQuestion: null,
+        problemType: null,
+        problemCause: null,
+        problemDelayDays: null,
+        blMessage: null,
+        blAcceptMessage: null,
+        blGenSubbill: null,
+        signMan: null,
+        signManCode: null,
+        signSiteCode: null,
+        signDate: null,
+        billPicSendRmk: null,
+        billPicDispatchRmk: null,
+        timezoneOffset: null,
+        delFlag: null,
+        remark: null,
+        blSign:null,
+        params:{
+          expireNotSign:null,
+          problemQueryType:null,
+        }
+      },
+    };
+  },
+  created() {
+    if(this.$store.getters.ownerSiteCode!='88888'){
+      this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
+    }
+    const end = new Date()
+    const start = new Date()
+    start.setHours(0,0,0,0)
+    end.setHours(23,59,59,0)
+    this.dateRange=[timeFormat(start), timeFormat(end)]
+
+    this.queryOrderType="1";
+    this.queryOrderDateType="1";
+    // this.queryExpireNotSign="1"
+
+    this.getList();
+  },
+  mounted() {
+
+  },
+  methods: {
+    handleCopy(row, event) {
+      clip(row.billCode, event)
+    },
+    calcDeliveryTime(startData,endDate){
+        return timeDiffTime(startData,endDate)
+    },
+      //标红table指定行
+    tableRowClassName({row, rowIndex}) {
+
+      if (row.blSign=='1') {
+        return 'success-row';
+      }
+      else if (row.blIsQuestion=='1') {
+        return 'warning-row';
+      }
+
+      return '';
+    },
+    handleShowTraceInfo(row){
+        this.currentTraceBillCode=row.billCode;
+        this.currentTraceBillItem=row;
+        this.openTraceInfo=true;
+    },
+    handleView(row){
+
+        this.currentTraceBillCode=row.billCode;
+        console.log("x==>x1==>billCode:",this.currentTraceBillCode)
+        this.openView=true;
+    },
+    /** 查询运单列表列表 */
+    getList() {
+      this.loading = true;
+
+    //   this.queryOrderType="1";
+    // this.queryOrderDateType="1";
+      if(this.queryParams.billCode){
+        if(this.queryOrderType != "1"){
+          this.queryParams.orderSn=formatSearchStr(this.queryParams.billCode);
+          this.queryParams.billCode=null;
+        }else{
+          // 处理子单号
+          let qBillCode=formatSearchStr(this.queryParams.billCode);
+          let billArr = qBillCode.split(",");
+          let newBillCodeStr="";
+          billArr.forEach(item=>{
+              if(item.startsWith("T")){
+                let mainBillCode=item.substr(0,14);
+                newBillCodeStr=newBillCodeStr+mainBillCode+",";
+              }else{
+                newBillCodeStr=newBillCodeStr+item+",";
+              }
+          });
+          this.queryParams.billCode=newBillCodeStr;
+
+        }
+      }
+      this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
+
+      listEmisWaybill(this.queryParams).then(response => {
+        this.emisWaybillList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    onDateSelect(value){
+      // this.dateTimeRange=value;
+      // scanDate
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      if(selection!=null){
+        this.billCode=selection[0].billCode;
+      }
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    // handleAdd(row) {
+    //   // <router-link :to="'/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
+    //   this.$router.push({ path: '/d24/waybillManagement/WaybillEntry', query: { action:"add"} });
+    // },
+
+    /** 修改按钮操作 */
+    // handleUpdate(row) {
+    //   // const waybill = this.emisWaybillList.find(item => item.id === id)
+    //    this.$router.push({ path: '/d24/waybillManagement/WaybillModify', query: { action:"modify",billCode: this.billCode }})
+    // },
+    // handleView(row) {
+    //    this.$router.push({ path: '/d24/waybillManagement/WaybillDetail', query: { billCode: this.billCode }})
+    // },
+    handleFormChanged(){
+        this.openForm = false;
+        this.getList();
+    },
+    cancelForm(){
+      this.openForm = false;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除').then(function() {
+        return delEmisWaybill(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+    //   this.download('emis/emisWaybill/export', {
+    //     ...this.queryParams
+    //   }, `emisWaybill_${new Date().getTime()}.xlsx`)
+     const loadingInstance = this.$loading({
+            text: '正在导出...'
+        })
+       var qParam = {...this.queryParams};
+       qParam.pageNum=1;
+       qParam.pageSize=5000;
+
+       listEmisWaybill(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+        this.downloadLoading = false
+        if (response.code === 200) {
+                const curList = response.rows
+                import('@/vendor/Export2Excel').then(excel => {
+                  const tHeader = ['id','订单号','客户单号，合同号','运单号','子单号,逗号隔开','订单状态','运单状态','订单类型','下单时间','客户ID','客户编号2502021','客户名称','收件客户编号2502021','收件客户客户名称','第三方客户客户编号','第三方客户客户名称','wx','收货人名','收货公司','收货人手机号','收货人电话','收货人国家','省','市','区','县','收货地址','邮编','寄件人省市区名称，逗号分隔','寄件人名','寄件公司','寄件人手机号','寄件人电话','寄件人国家','寄件省','寄件市','寄件区','寄件县','寄件地址','寄件邮编','发件人省市区名称，逗号分隔','支付方式','计费方式','支付月结编号','快递线路','快递产品类型','时效','计泡比例','清关方式','报关方式','预计到达时间','包装类型','派件方式:1-送货上门','取件方式:1-上门取件','预计上门取件开始时间','预计上门取件结束时间','取货失败原因','入仓代码','入仓名称','入仓地址','入仓联系人','入仓联系人电话','入仓单号','实际进仓单关联','客户发货开始时间','客户发货截止时间','货物大类','货物描述','货物图片，逗号隔开','预入仓代垫运费','预入仓代垫运费','预入仓实际运费','预入仓快递公司','预入仓快递单号','预入仓自定义标识','预入仓供应商','总重量','总体积','件数','实际重量','体积重量','费用币种','结算重量','计费重量','运费','是否超长','是否出账','账单备注','是否超重','超重重量','费用备注','三段码','实际货值','是否投保','投保货值','投保货值币种','保费币种','保费','保险备注','保险站点代码','投保日期','是否打印','打印人编号','打印站点','打印时间','打印次数','是否同行转单','转单代码','转单单号','转单时间','转单原因','当前网点编号','下一网点编号','上一网点点号','寄件站点代码','寄件日期','寄件人编号','取件员代码','发件网点代码','发货时间','派件人代码','派件时间','派件网点代码','生成账单时间','生成账单站点代码','生成账单人代码','目的地编号','目的省','目的城市','目的国家','目的地网点代码','目的地财务中心代码','业务人代码','销售回款人','销售联系人','操作员代码','是否问题件','问题件类型','问题件原因','问题件延期天数','是否备注消息','是否发送收件人短信','是否生成子单','签收人','签收人代码','签收站点代码','签收时间','揽收图片备注','签收底单图片','时区偏差','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','备注','创建网点','更新网点',];
+                  const filterVal = ['id','orderSn','custOrderId','billCode','billCodeSub','orderStatus','waybillStatus','orderType','orderDate','userId','customerCode','customerName','receiveCustomerCode','receiveCustomerName','thirdCustomerCode','thirdCustomerName','openId','receiveName','receiveCompany','receiveMobile','receiveTel','receiveCountry','receiveProvince','receiveCity','receiveCounty','receiveTown','receiveAddress','receivePostcode','receivePcd','sendName','sendCompany','sendMobile','sendTel','sendCountry','sendProvince','sendCity','sendCounty','sendTown','sendAddress','sendPostcode','sendPcd','paymentType','calcFeeType','custNo','transLineType','productType','timeType','meterType','customsClear','customsEclaration','estimateDate','packType','dispatchMethod','pickupMethod','pickStartDate','pickFinishDate','pickFailReason','intoWarehouseCode','intoWarehouseName','intoWarehouseAddress','intoWarehouseContact','intoWarehousePhone','intoWarehouseBillCode','warehouseInNo','customerDeliveryBeginTime','customerDeliveryEndTime','goodsType','goodsInfo','goodsPics','blPrepareInFreight','prepareInEstFee','prepareInRealFee','prepareInExpress','prepareInBillCode','prepareInRemark','prepareInSupplier','totalWeight','totalVolume','parcelQty','billWeight','volumeWeight','currency','settlementWeight','feeWeight','freight','blOverLong','blBill','blBillText','blOverWeight','overWeightNumber','feeRemark','thirdCode','realValue','blInsure','insureValue','insureValueCurrency','insureFeeCurrency','insureFee','insureRemark','insureSiteCode','insureDate','blPrint','printManCode','printSite','printDate','printCount','blDispFd','transferCode','transferBillcode','dispFdDate','dispFdReason','currentSiteCode','nextSiteCode','lastSiteCode','registerSiteCode','registerDate','registerManCode','takePieceEmployeeCode','sendSiteCode','sendDate','dispatchManCode','dispatchDate','dispatchSiteCode','produceBillDate','produceBillSiteCode','produceBillManCode','destinationCode','destinationProvince','destinationCity','destinationCounty','dispatchUnderlingSiteCode','destinationCenterCode','marketManCode','payee','salesmen','operateEmployeeCode','blIsQuestion','problemType','problemCause','problemDelayDays','blMessage','blAcceptMessage','blGenSubbill','signMan','signManCode','signSiteCode','signDate','billPicSendRmk','billPicDispatchRmk','timezoneOffset','delFlag','createBy','createTime','updateBy','updateTime','remark','createSite','updateSite',];
+                  const data = this.formatJson(filterVal, curList, response.rows)
+                  excel.export_json_to_excel({
+                    header: tHeader,
+                    data,
+                    filename: '运单列表',
+                    autoWidth: true
+                  })
+                  loadingInstance.close()
+                })
+        }
+      });
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'status') {
+          var statusStr='xxx'
+          if(v[j] == 10){
+              statusStr='xxx'
+          }
+          return statusStr;
+        }
+        return v[j]
+      }))
+    },
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+:deep .el-form-item__label-wrap {
+  margin-left: 0 !important;
+  }
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+
+
+   .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
+
+  .queryForm .el-form-item {
+    margin-bottom: 0px !important;
+  }
+
+  :deep .el-table .success-row {
+    color: rgb(21, 174, 31) !important;
+  }
+
+  :deep .el-table .warning-row {
+    color: #f51f1f !important;
+  }
+
+  :deep .el-form-item__label {
+    text-align: left;
+  }
+</style>