md

src/api/emis/emisTmsScanRecord.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { data } from 'jquery'
 
 // 扫描操作记录
 export function doScan(data) {
@@ -9,6 +10,14 @@ export function doScan(data) {
   })
 }
 
+export function queryWaybillTraceInfo(appId,trackingNo,lang,sign) {
+  return request({
+    url: '/emis/emisTmsScanRecord/queryWaybillTraceInfo',
+    method: 'get',
+    params:{appId:appId,trackingNo:trackingNo,lang:lang,sign:sign}
+  })
+}
+
 // 签收异常数据对比
 export function queryStatList(query){
   return request({

src/components/DatePickerAdv/elDateAdvPicker.vue

@@ -2,37 +2,33 @@
  <div class="date-box">
     <el-date-picker
         :default-time="['00:00:00', '23:59:59']"
-        v-model="datetimeRange"
+        v-model="dateRange"
         type="datetimerange"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
         ref="timeRangePicker"
         :picker-options="pickerOptions"
-        @change="dateTimeChange"
+        @change="dateChange"
         style="width: 100%;"
       >
       </el-date-picker>
   </div>
-
 </template>
+
 <script>
-import {dateToStr} from '@/utils/custom'
+import {timeFormat} from '@/utils/dateUtils'
+
 export default {
-  name: "elDateAdvPicker",
+  name: "ElDateAdvPicker",
   props: {
     value:{
-        type: [Array],
+      type:Array
-        required: false
-      },
-      isDefaultCurrentDay:{
-        type: [Boolean],
-        default: false
     }
   },
   data() {
     return {
       selectType: '1', // 时间选择器当前选择
-      datetimeRange: [],
+      dateRange: this.value,
       pickerOptions: {
         shortcuts: [
            {
@@ -163,47 +159,39 @@ export default {
   },
   watch: {
       value(newVal) {
-        this.datetimeRange = this.value;
+        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() {
-    // if(this.isDefaultCurrentDay){
-    //   const end = new Date()
-    //   const start = new Date()
-    //   start.setHours(0,0,0,0)
-    //   end.setHours(23,59,59,0)
-    //   this.datetimeRange=[start, end]
-    //   this.formatThisDate();
-    //   this.$emit("input", this.datetimeRange);
-    // }
   },
   methods: {
-		dateTimeChange(value) {
+    dateChange(value) {
-      console.log("===datetimeRange====>")
+      if(this.dateRange&&this.dateRange.length==2){
-      console.log(this.datetimeRange)
+        this.dateRange[0]=timeFormat(this.dateRange[0]);
-      this.formatThisDate();
+        this.dateRange[1]=timeFormat(this.dateRange[1]);
-      this.$emit("input", this.datetimeRange);
+      }
-      this.$emit('dateTimeChange', this.datetimeRange)
+      this.$emit("input", this.dateRange);
+      this.$emit('dateTimeChange', this.dateRange)
 		},
-    formatThisDate(){
+
-      if(this.datetimeRange&&this.datetimeRange.length==2){
-        this.datetimeRange[0]=dateToStr(this.datetimeRange[0]);
-        this.datetimeRange[1]=dateToStr(this.datetimeRange[1]);
-      }
-    }
   }
 }
 </script>
 
-
 <style lang="scss" scoped>
-// .date-box >>> .el-date-editor.el-input,.el-date-editor.el-input__inner {
+.datetimepicker {
-//   width: 146px;
+  width: 300px;
-//   margin: 0 10px;
+  .el-select .el-input__inner {
-// }
+    border-radius: 4px 0 0 4px;
-// .date-input >>> .el-input__inner {
+  }
-//   width: 146px;
+  .el-date-editor .el-input__inner {
-//   height: 40px;
+    border-left: none;
-// }
+    border-radius: 0 4px 4px 0;
-
+  }
+}
 </style>
+

src/utils/dateUtils.js

@@ -40,7 +40,11 @@ export function timeAdd(date, num = 1, nuit = "day", format = "YYYY-MM-DD") {
  * date 需要格式化的数据
  * format 格式化的格式
  */
-export function timeFormat(date, format = "YYYY-MM-DD") {
+export function timeFormat(date, format = "YYYY-MM-DD HH:mm:ss") {
+  return dayjs(date).format(format);
+}
+
+export function timeFormatDay(date, format = "YYYY-MM-DD") {
   return dayjs(date).format(format);
 }
 

src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue

@@ -71,6 +71,9 @@ export default {
         type: [String, Number],
         required: false
       },
+      useSiteCode:{
+        type:[String,Number]
+      },
       addressType:{
        type:[String,Number]
       },
@@ -115,6 +118,7 @@ export default {
          pageNum:1,
          pageSize:5,
          searchValue:null,
+         useSiteCode:this.useSiteCode,
          addressType: this.addressType,
          country:this.countryCode,
        }

src/views/emis/emisWaybill/centerWaybillList.vue

@@ -65,7 +65,7 @@
 
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
         <el-col :span="10">
-              <el-form-item label="查询时间范围" prop="dateTimeRange">
+              <el-form-item label="查询时间范围" prop="dateRange">
                   <div slot="label">
 
                           <el-radio-group  class="query-label" v-model="queryOrderDateType">
@@ -73,7 +73,7 @@
                         </el-radio-group>
 
                   </div>
-                  <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+                  <elDateAdvPicker clearable v-model="dateRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
               </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>
@@ -338,7 +338,27 @@
 
       <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column :label="$t('快件当前最新状态')" align="center" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" />
+      <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">
@@ -546,11 +566,10 @@
 
     </XdTable>
 
-    <!--
+
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-        <emisWaybillView :id="id" ></EmisWaybillView>
+      <TraceDetail :billCode="currentTraceBillCode"></TraceDetail>
     </el-dialog>
-    -->
 
   </XdPageContainer>
 </template>
@@ -586,8 +605,10 @@ 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 {dateToStr} from '@/utils/custom'
+import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
+import { formatSearchStr,deepClone } from '@/utils/index'
 
 export default {
   name: "SendWaybillList",
@@ -607,7 +628,9 @@ export default {
 
     EmisSiteSimplePicker1,
     EmisSiteSimplePicker2,
-    ProblemTypePicker
+    ProblemTypePicker,
+
+    TraceDetail
 
   },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
@@ -640,6 +663,10 @@ export default {
       titleForm: "",
       billCode:null,
 
+      openTraceInfo:false,
+      currentTraceBillCode:null,
+      dateRange:[],
+
       queryOrderType:null,
       queryOrderDateType:null,
       queryExpireNotSign:null,
@@ -827,23 +854,21 @@ export default {
     };
   },
   created() {
-    const end = new Date()
+    if(this.$store.getters.ownerSiteCode!='88888'){
+      this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
+    }
     const start = new Date()
+    const end = new Date()
+
     start.setHours(0,0,0,0)
     end.setHours(23,59,59,0)
-    this.dateTimeRange=[start,end];
+    this.dateRange=[timeFormat(start), timeFormat(end)]
 
-    this.getList();
     this.queryOrderType="1";
     this.queryOrderDateType="1";
      // this.queryExpireNotSign="1"
 
-    // 调整表格的高度，不允许滚动
+    this.getList();
-    this.$nextTick(function() {
-      let queryFormEl = this.$refs.queryForm.$el;
-      let tableH = queryFormEl.offsetHeight+190;
-      this.tableHeight = window.innerHeight - tableH;
-    });
   },
   mounted() {
     const end = new Date()
@@ -853,17 +878,25 @@ export default {
     this.dateTimeRange=[start,end];
   },
   methods: {
+    calcDeliveryTime(startData,endDate){
+        return timeDiffTime(startData,endDate)
+    },
       //标红table指定行
     tableRowClassName({row, rowIndex}) {
-      if (row.blIsQuestion=='1') {
+
-        return 'warning-row';
+      if (row.blSign=='1') {
-      }
-      else if (row.waybillStatus=='50') {
         return 'success-row';
       }
+      else if (row.blIsQuestion=='1') {
+        return 'warning-row';
+      }
 
       return '';
     },
+    handleShowTraceInfo(row){
+        this.currentTraceBillCode=row.billCode;
+        this.openTraceInfo=true;
+    },
     /** 查询运单列表列表 */
     getList() {
       this.loading = true;
@@ -873,11 +906,12 @@ export default {
     // this.queryOrderDateType="1";
     if(this.queryParams.billCode){
         if(this.queryOrderType != "1"){
-            this.queryParams.orderSn=this.queryParams.billCode+"";
+          this.queryParams.orderSn=formatSearchStr(this.queryParams.billCode);
           this.queryParams.billCode=null;
         }else{
           // 处理子单号
-          let billArr = this.queryParams.billCode.split(",");
+          let qBillCode=formatSearchStr(this.queryParams.billCode);
+          let billArr = qBillCode.split(",");
           let newBillCodeStr="";
           billArr.forEach(item=>{
               if(item.startsWith("T")){
@@ -891,21 +925,8 @@ export default {
 
         }
       }
-      if(this.dateTimeRange&&this.dateTimeRange.length==2){
+      this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
 
-        let startDate = new Date(this.dateTimeRange[0]);
-        let endDate= new Date(this.dateTimeRange[1]);
-        startDate=dateToStr(startDate);
-        endDate=dateToStr(endDate)
-
-        if(this.queryOrderDateType != "1"){
-          this.queryParams.params["beginCreateTime"] = startDate;
-          this.queryParams.params["endCreateTime"] =  endDate;
-        }else{
-          this.queryParams.params["beginSendDate"] = startDate;
-          this.queryParams.params["endSendDate"] = endDate;
-        }
-      }
 
       listEmisWaybill(this.queryParams).then(response => {
         this.emisWaybillList = response.rows;

src/views/emis/emisWaybill/dispatchWaybillList.vue

@@ -22,13 +22,13 @@
                 </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="查询时间范围" prop="dateTimeRange">
+              <el-form-item label="查询时间范围" prop="dateRange">
                   <div slot="label">
                         <el-radio-group  class="query-label" v-model="queryOrderDateType">
                               <el-radio :key="1" label="1">发货时间</el-radio>
                         </el-radio-group>
                   </div>
-                  <elDateAdvPicker clearable v-model="dateTimeRange" :isDefaultCurrentDay="false" ></elDateAdvPicker>
+                  <elDateAdvPicker clearable v-model="dateRange"  ></elDateAdvPicker>
               </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>
@@ -332,7 +332,28 @@
 
       <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column :label="$t('快件当前最新状态')" align="center" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" />
+      <!-- <el-table-column :label="$t('快件当前最新状态')" align="center" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" /> -->
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" />
+      <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">
@@ -368,7 +389,6 @@
       </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="billCode" min-width="120" :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"/>
@@ -540,11 +560,9 @@
 
     </XdTable>
 
-    <!--
+    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+      <TraceDetail :billCode="currentTraceBillCode"></TraceDetail>
-        <emisWaybillView :id="id" ></EmisWaybillView>
     </el-dialog>
-    -->
 
   </XdPageContainer>
 </template>
@@ -578,8 +596,10 @@ 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 {dateToStr} from '@/utils/custom'
+import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
+import { formatSearchStr,deepClone } from '@/utils/index'
 
 export default {
   // name: "SendWaybillList",
@@ -599,7 +619,9 @@ export default {
 
     EmisSiteSimplePicker1,
     EmisSiteSimplePicker2,
-    ProblemTypePicker
+    ProblemTypePicker,
+
+    TraceDetail
 
   },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
@@ -632,6 +654,9 @@ export default {
       titleForm: "",
       billCode:null,
 
+      openTraceInfo:false,
+      currentTraceBillCode:null,
+
       queryOrderType:null,
       queryOrderDateType:null,
       queryExpireNotSign:null,
@@ -640,26 +665,9 @@ export default {
       id:null,
       titleView:"",
       openView: false,
-      // 更新网点时间范围
+
-      daterangeOrderDate: [],
+      dateRange:[],
-      // 更新网点时间范围
+
-      daterangeEstimateDate: [],
-      // 更新网点时间范围
-      daterangePickStartDate: [],
-      // 更新网点时间范围
-      daterangePickFinishDate: [],
-      // 更新网点时间范围
-      daterangeDispFdDate: [],
-      // 更新网点时间范围
-      daterangeRegisterDate: [],
-      // 更新网点时间范围
-      daterangeSendDate: [],
-      // 更新网点时间范围
-      daterangeProduceBillDate: [],
-      // 更新网点时间范围
-      daterangeCreateTime: [],
-      // 更新网点时间范围
-      daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -819,7 +827,17 @@ export default {
     };
   },
   created() {
-    this.queryParams.dispatchSiteCode=this.$store.getters.ownerSiteCode;
+
+    if(this.$store.getters.ownerSiteCode!='88888'){
+      this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
+    }
+    const start = new Date()
+    const end = 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"
@@ -827,12 +845,18 @@ export default {
     this.getList();
 
 
-
   },
   mounted() {
 
   },
   methods: {
+    calcDeliveryTime(startData,endDate){
+        return timeDiffTime(startData,endDate)
+    },
+    handleShowTraceInfo(row){
+        this.currentTraceBillCode=row.billCode;
+        this.openTraceInfo=true;
+    },
        //标红table指定行
     tableRowClassName({row, rowIndex}) {
       if (row.blIsQuestion=='1') {
@@ -848,15 +872,15 @@ export default {
     /** 查询运单列表列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
 
       if(this.queryParams.billCode){
         if(this.queryOrderType != "1"){
-            this.queryParams.orderSn=this.queryParams.billCode+"";
+          this.queryParams.orderSn=formatSearchStr(this.queryParams.billCode);
           this.queryParams.billCode=null;
         }else{
           // 处理子单号
-          let billArr = this.queryParams.billCode.split(",");
+          let qBillCode=formatSearchStr(this.queryParams.billCode);
+          let billArr = qBillCode.split(",");
           let newBillCodeStr="";
           billArr.forEach(item=>{
               if(item.startsWith("T")){
@@ -870,13 +894,8 @@ export default {
 
         }
       }
-      if(this.dateTimeRange&&this.dateTimeRange.length==2){
+      this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
-        if(this.queryOrderDateType != "1"){
+
-          this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime");
-        }else{
-          this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate");
-        }
-      }
 
       listEmisWaybill(this.queryParams).then(response => {
         this.emisWaybillList = response.rows;

src/views/emis/emisWaybill/emisWaybillDetail.vue

@@ -1,864 +0,0 @@
-<template>
-  <div class="app-container" >
-    <el-form ref="form"  size="mini" :model="form" :rules="rules" label-width="100px">
-        <el-collapse v-model="activeNames">
-          <el-collapse-item title="" name="1">
-            <template slot="title">
-              <div class="form-group-title"><span class="title">{{ $t('发货信息') }}</span></div>
-            </template>
-            <div>
-              <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-                <el-col :span="6">
-                    <el-form-item label="运单号:" prop="billCode"  >
-                      <div  style="font-weight:600;color:black">
-                        {{form.billCode}}
-                      </div>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="订单号:" prop="orderSn"  >
-                      <div  style="font-weight:600;color:black">
-                        {{form.orderSn}}
-                      </div>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="发货时间:" prop="sendDate"  >
-                      <div  style="font-weight:600;color:black">
-                        {{form.sendDate}}
-                      </div>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="运单状态:" prop="waybillStatus"  >
-                      <dict-tag :options="dict.type.emis_waybill_status" :value="form.waybillStatus"/>
-                    </el-form-item>
-                </el-col>
-
-                  <el-col :span="6">
-                    <el-form-item label="目的国" prop="reciever.country">
-                      <div  style="font-weight:600;color:black">
-                        {{form.reciever.countryName}}
-                      </div>
-                        <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
-                    </el-form-item>
-                  </el-col>
-
-                  <el-col :span="8">
-                    <el-form-item label="产品类型" prop="productType">
-                      <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
-                      <!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="5">
-                    <el-form-item label="报关方式" prop="customsEclaration">
-                      <el-select v-model="form.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-col>
-                  <el-col :span="5">
-                    <el-form-item label="清关方式" prop="customsClear">
-                      <el-select v-model="form.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-col>
-
-                  <el-col :span="6">
-                    <el-form-item label="取件方式" prop="pickupMethod">
-                      <el-select v-model="form.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-col>
-                  <el-col :span="6" v-if="form.pickupMethod==2">
-                    <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
-                      <EmisUserSimplePicker0  :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6" v-if="form.pickupMethod==1">
-                    <el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
-                      <EmisUserSimplePicker1 :placeholder="$t('操作员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
-                    </el-form-item>
-                  </el-col>
-
-                  <el-col :span="24">
-                    <el-form-item label="派件方式" prop="dispatchMethod">
-                      <el-radio-group v-model="form.dispatchMethod">
-                        <el-radio
-                          v-for="dict in dict.type.emis_tab_dispatch_mode"
-                          :key="dict.value"
-                          :label="dict.value"
-                        >
-                        <!-- style="font-size:10px" -->
-                        <span  >{{dict.label}}</span>
-                      </el-radio>
-                      </el-radio-group>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                      <el-form-item label="寄件网点" prop="sendSiteName">
-                        <el-input v-model="form.sendSiteName" placeholder="" disabled />
-                      </el-form-item>
-                  </el-col>
-
-                  <el-col :span="18">
-                    <el-form-item label="打印选项:" prop="sendSiteName">
-                      <el-checkbox-group v-model="printTypeCheckList">
-                        <el-checkbox
-                          v-for="dict in dict.type.emis_print_type"
-                          :key="dict.value"
-                          :label="dict.label"
-                        >
-                          <span style="font-size:13px" >{{dict.label}}</span>
-                        </el-checkbox>
-                      </el-checkbox-group>
-                    </el-form-item>
-                    <!-- <div style="display:flex;padding-left: 30px;">
-                      <el-checkbox-group v-model="printTypeCheckList">
-                        <el-checkbox
-                          v-for="dict in dict.type.emis_print_type"
-                          :key="dict.value"
-                          :label="dict.label"
-                        >
-                          <span style="font-size:13px" >{{dict.label}}</span>
-                        </el-checkbox>
-                      </el-checkbox-group>
-                    </div> -->
-                  </el-col>
-
-                  <!-- <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}">
-                    <el-form-item label="寄件客户" prop="customerCode">
-                          <customer-picker0 v-model="form.customerCode"></customer-picker0>
-                    </el-form-item>
-                  </el-col> -->
-              </el-row>
-
-            </div>
-          </el-collapse-item>
-          <el-collapse-item title="" name="2">
-            <template slot="title">
-              <div class="form-group-title"><span class="title">{{ $t('收寄件信息') }}</span></div>
-            </template>
-            <el-row :gutter="0" style="display: flex;flex-wrap: wrap;border: 1px dotted #f5f7fa;border-radius: 5px;">
-                <el-col :span="12">
-                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;background: #fdfdfd;padding:15px">
-                    <el-col :span="24" style="display:inline-flex; margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
-                      <div class="form-group-title" style="width:50%">
-                          <span style="border-radius: 15px;
-                            padding: 5px 15px;
-                            background: black;
-                            font-size: 13px;
-                            color: white;">寄件信息</span>
-                      </div>
-                      <div style="width:50%;text-align:right;padding-right: 15px;">
-                          <!-- icon="el-icon-edit" -->
-                        <el-button
-                        size="mini"
-                        type="text"
-                        style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;color: black;"
-                        class="iconfont icon-dizhibao"
-                        @click="handleSelectCustomerAddress(1)"
-                      >寄件地址薄</el-button>
-                      </div>
-                    </el-col>
-
-                    <el-col :span="12">
-                      <el-form-item label="寄件人" prop="sender.name">
-                        <CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="寄件电话" prop="sender.phone">
-                        <el-input v-model="form.sender.phone" placeholder="" />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="国家地区" prop="sender.province"  >
-                        <div style="display:inline-flex">
-                          <country-picker1 v-model="form.sender.country" ></country-picker1>
-                          <province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
-                          <city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
-                          <district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
-                        </div>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="寄件地址" prop="sender.address">
-                        <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="寄件公司" prop="sender.company">
-                        <el-input v-model="form.sender.company" placeholder="" />
-                      </el-form-item>
-                    </el-col>
-
-                    <el-col :span="24">
-                      <el-form-item label="" prop="blMessage">
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
-                      </el-form-item>
-                    </el-col>
-
-                  </el-row>
-                </el-col>
-
-                <el-col :span="12">
-                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
-                      <el-col :span="24" style="display:inline-flex;margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
-                        <div class="form-group-title" style="width:50%">
-                          <span style="border-radius: 15px;
-                              padding: 5px 15px;
-                              background: #b12e29;
-                              font-size: 13px;
-                              color: white;">收件信息</span>
-                          </div>
-                        <div style="width:50%;text-align:right;padding-right: 15px;">
-                          <el-button
-                          size="mini"
-                          type="text"
-                          style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
-                          class="iconfont icon-dizhibao"
-                          @click="handleSelectCustomerAddress(2)"
-                        >收件地址薄</el-button>
-                        </div>
-                      </el-col>
-
-                      <el-col :span="12">
-                        <el-form-item label="收件人" prop="reciever.name">
-                          <CustomerAddressSimplePicker1 addressType="2"  :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="12">
-                        <el-form-item label="收件电话" prop="reciever.phone">
-                          <el-input v-model="form.reciever.phone" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="国家地区" prop="reciever.province">
-                          <div style="display:inline-flex">
-                            <country-picker2 v-model="form.reciever.country" ></country-picker2>
-                            <ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country"  style="margin-left:5px"></ProvincePicker2>
-                            <city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"></city-picker2>
-                            <district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"></district-picker2>
-                          </div>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="收件地址" prop="reciever.address">
-                          <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="收件公司" prop="reciever.company">
-                          <el-input v-model="form.reciever.company" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="目的地" prop="destinationCode">
-                          <DestinationPicker v-model="form.destinationCode" :countryCode="form.reciever.country" :lineCode="form.transLine" @onChange="onDestinationChange"></DestinationPicker>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="派件网点" prop="dispatchSite">
-                          <el-input v-model="form.dispatchSite" placeholder="" disabled />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="" prop="blAcceptMessage">
-                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blAcceptMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">派件短信</span></el-checkbox>
-                        </el-form-item>
-                      </el-col>
-                      <!-- <el-col :span="12">
-                        <el-form-item label="邮编" prop="receivePostcode">
-                          <el-input v-model="form.receivePostcode" placeholder="请输入邮编" />
-                        </el-form-item>
-                      </el-col> -->
-                  </el-row>
-                </el-col>
-            </el-row>
-          </el-collapse-item>
-          <el-collapse-item title="" name="3">
-            <template slot="title">
-              <div class="form-group-title"><span class="title">{{ $t('重量收费信息') }}</span>
-              </div>
-            </template>
-            <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-              <el-col :span="12">
-
-                <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
-                    <el-col :span="24"><div style="font-weight:600">货物信息</div></el-col>
-                    <el-col :span="24">
-                        <el-form-item label="" prop="goodsType" label-width="0px">
-                          <GoodsSimplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsSimplePicker>
-                            <el-table
-                            class="cargoList"
-                            :cell-style="{
-                              'padding': '0px!important',
-                              'padding-left': '0px!important',
-                              'padding-right': '0px!important',
-                              'font-size':'11px'
-                            }"
-                            :header-cell-style="{
-                              'font-size':'11px'
-                            }"
-                            border
-                            stripe
-                            :data="form.cargoList"
-                            size="small"
-                            style="width: 100%"
-                            max-height="300px"
-                          >
-
-
-                          <el-table-column prop="goodsName" label="描述" align="center" min-width="100">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.goodsName" @input="(val)=>handleCalcQty(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-
-                            <el-table-column prop="length" label="长(cm)" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.length" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="width" label="宽(cm)" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.width" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="height" label="高(cm)" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.height" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="volume" label="体积(m³)" align="center" width="80">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="cargoQty" label="件数" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.cargoQty" @input="(val)=>handleCalcQty(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-
-
-                            <el-table-column label="操作" align="center" width="50">
-                                  <template slot-scope="scope">
-                                    <span class="icon iconfont"
-                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
-                                    @click="()=>deleteGoodsItem(scope.row)">&#xe7ae;</span>
-                                  </template>
-                            </el-table-column>
-
-                          </el-table>
-
-                          <el-input v-model="form.goodsInfo" type="textarea"  placeholder="" disabled />
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="12">
-                        <el-form-item label="实际重量" prop="billWeight" label-width="70px">
-                          <el-input v-model="form.billWeight" @blur="reCalcSettlementWeight" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
-                            <span slot="suffix">(kg)</span>
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="总体积" prop="totalVolume" label-width="70px" >
-                          <div style="">
-                            <el-input v-model="form.totalVolume"  style="text-align: right;width: 120px" placeholder="体积" >
-                              <span slot="suffix">(m³)</span>
-                            </el-input>
-                          </div>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="总件数" prop="parcelQty" label-width="70px">
-                          <el-input v-model="form.parcelQty" style="text-align: right;" placeholder=""  />
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="12">
-                        <el-form-item label="体积重量" prop="volumeWeight" label-width="70px">
-                          <el-input v-model="form.volumeWeight" placeholder="" disabled>
-                            <span slot="suffix">(kg)</span>
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="12">
-                        <el-form-item label="结算重量" prop="settlementWeight" label-width="70px">
-                          <el-input v-model="form.settlementWeight" placeholder="" disabled >
-                            <span slot="suffix">(kg)</span>
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="包装类型" prop="packType" label-width="70px"">
-                            <el-select v-model="form.packType" placeholder="请选择">
-                              <el-option
-                                v-for="dict in dict.type.emis_tab_packing_type"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              ></el-option>
-                            </el-select>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="" prop="blOverWeight">
-                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blOverWeight" :true-label="'1'" :false-label="'0'" ><span style="font-size:10px">是否超重</span></el-checkbox>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12" v-if="form.blOverWeight==1">
-                        <el-form-item label="超重件数" prop="overWeightNumber" label-width="70px">
-                          <el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="超重件数" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="生成子单" prop="blGenSubbill" label-width="70px" v-if="this.form.billCode && this.form.parcelQty>0">
-                          <el-radio-group v-model="form.blGenSubbill" @change="handleGenSubbill">
-                            <el-radio :key="1"  :label="1">是</el-radio>
-                            <el-radio :key="0"  :label="0">否</el-radio>
-                          </el-radio-group>
-
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24" v-if="form.blGenSubbill==1">
-                        <el-form-item label="子单号" prop="billCodeSub" label-width="70px">
-                          <el-input v-model="form.billCodeSub" rows="5" type="textarea" placeholder="" disabled />
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="12">
-                        <el-form-item label="进仓单" prop="warehouseInNo" label-width="70px">
-                          <WarehouseInNoPicker v-model="form.warehouseInNo"></WarehouseInNoPicker>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="合同号" prop="custOrderId" label-width="70px">
-                          <el-input v-model="form.custOrderId" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="运单备注" prop="remark" label-width="70px">
-                          <el-input v-model="form.remark" type="textarea" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                  </el-row>
-
-              </el-col>
-               <el-col :span="12" >
-                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
-
-                    <el-col :span="24">
-                      <el-form-item label="计费方式" prop="calcFeeType" label-width="70px">
-                        <!-- <el-input v-model="form.calcFeeType" placeholder="请输入计费方式" /> -->
-                        <el-radio-group v-model="form.calcFeeType" >
-                          <el-radio
-                            v-for="dict in dict.type.emis_calc_fee_type"
-                            :key="dict.value"
-                            :label="dict.value"
-                            >{{dict.label}}</el-radio>
-                        </el-radio-group>
-
-                      </el-form-item>
-                    </el-col>
-
-                    <el-col :span="24">
-                        <el-form-item label="" prop="goodsType" label-width="0px">
-                            <el-table
-                            class="cargoList"
-                            :cell-style="{
-                              'padding': '0px!important',
-                              'padding-left': '0px!important',
-                              'padding-right': '0px!important',
-                              'font-size':'11px'
-                            }"
-                            :header-cell-style="{
-                              'font-size':'11px'
-                            }"
-                            border
-                            stripe
-                            :data="form.feeItems"
-                            size="mini"
-                            max-height="300px"
-                            style="width: 100%"
-                          >
-
-
-                            <el-table-column prop="feeName" label="收费项" align="center" width="70">
-                              <template slot-scope="scope">
-                                <span style="font-weight:600;color:red">{{ scope.row.feeName }}</span>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="fee" label="应收" align="center" width="50">
-                              <template slot-scope="scope">
-                                <span>{{ scope.row.fee }}</span>
-                              </template>
-                            </el-table-column>
-
-                            <el-table-column prop="initialWeightFee" label="首重费" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.initialWeightFee" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="addWeightPrice" label="续重单价" align="center" width="70">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.addWeightPrice" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="realFee" label="实收"  align="center" width="50">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="remark" label="描述" align="center" min-width="50">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.remark" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column label="操作" align="center" width="50">
-                                  <template slot-scope="scope">
-                                    <span class="icon iconfont"
-                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
-                                    v-if="scope.row.blAutoGen==0"
-                                    @click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
-                                  </template>
-                            </el-table-column>
-
-                          </el-table>
-                          <div>
-                            <el-popover
-                                trigger="click"
-                                ref="popoverFeeRef"
-                                placement="top"
-                                :width="400"
-                                effect="light"
-                                :show-arrow="false"
-                              >
-                                <feeItemForm :triggerCount="triggerCount" :feeList="this.form.feeItems" @on-changed="onFeeItemChange" @on-cancel="onFeeItemChange"></feeItemForm>
-                                <el-button
-                                     slot="reference"
-                                      style="padding: 0px;font-size: 12px;"
-                                      size="mini"
-                                      type="text"
-                                      icon="el-icon-plus"
-                                      @click="handleAddFee"
-                                    >增加自定义费用</el-button>
-                              </el-popover>
-                          </div>
-
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="总运费" prop="freight" label-width="70px">
-                            <el-input v-model="form.freight" placeholder="" >
-                        </el-input>
-                      </el-form-item>
-                      <el-form-item label="费用备注" prop="feeRemark" label-width="70px">
-                            <el-input v-model="form.feeRemark" type="textarea" placeholder="" >
-                        </el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="付款方式" prop="paymentType" label-width="70px">
-                        <el-select v-model="form.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="12">
-                    </el-col>
-                    <el-col :span="24" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
-                      <el-form-item label="月结账号" prop="thirdCustomerCode" label-width="70px">
-                        <EmisMonthpayAccountPicker v-model="form.custNo"></EmisMonthpayAccountPicker>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="回款联系人" prop="payee" label-width="80px">
-                        <EmisUserSimplePicker2 :placeholder="$t('回款联系人')" v-model="form.payee"  ></EmisUserSimplePicker2>
-
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="销售联系人" prop="salesmen" label-width="80px">
-                        <EmisUserSimplePicker3 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker3>
-                      </el-form-item>
-                    </el-col>
-
-
-
-
-
-                  </el-row>
-
-               </el-col>
-            </el-row>
-          </el-collapse-item>
-
-      </el-collapse>
-
-    </el-form>
-    <div style="text-align: center;margin-top: 10px;margin-bottom: 10px;">
-      <el-button type="primary" @click="back">返回</el-button>
-    </div>
-
-
-</div>
-</template>
-
-<script>
-import { getWaybillDetail,realSubmitOrder,calcWaybillFee,calcSetteldWeight,calcVolumeWeight} from "@/api/emis/emisWaybill";
-import { parseTime } from "@/utils/custom";
-import { getDestSite } from "@/api/emis/emisDestination";
-
-
-export default {
-  name: "WaybillDetail",
-  // props:{
-  //   billCode:{
-  //     type:String
-  //   }
-  // },
-  components: {
-
-  },
-  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'],
-  data() {
-    return {
-      activeNames:['1','2','3','4'],
-      billCode:null,
-      emisWaybillOptions: [],
-      addressType:null,
-      // 遮罩层
-      loading: true,
-      isNeedSave:false,
-      triggerCount:0,
-      printTypeCheckList:['1','2','5'],
-      // 表单参数
-      form: {
-        id:null,
-        reciever: {
-            country: null,
-            name: null,
-            phone:null,
-            province: null,
-            city: null,
-            district: null,
-            town: null,
-            address: null,
-            postCode: null,
-            email: null,
-            company: null,
-        },
-        sender: {
-            country: null,
-            name: null,
-            phone:null,
-            province: null,
-            city: null,
-            district: null,
-            town: null,
-            address: null,
-            postCode: null,
-            email: null,
-            company: null,
-        },
-        feeItems: [],
-        cargoList: [],
-        attachmentList: [],
-        printTypeCheckList:[],
-        billCode: null,
-        orderDate:  null,
-        openId: null,
-        customerCode: null,
-        paymentType: null,
-        calcFeeType: '1',
-        custNo:  null,
-        productTypeSelArr: null,
-        transLine:  null,
-        productType: null,
-        customsClear: null,
-        customsEclaration: null,
-        packType: null,
-        dispatchMethod: "1",
-        pickupMethod: null,
-        pickStartDate: null,
-        pickFinishDate: null,
-        intoWarehouseCode: null,
-        intoWarehouseName: null,
-        intoWarehouseAddress: null,
-        intoWarehouseContact: null,
-        intoWarehousePhone:  null,
-        intoWarehouseBillCode: null,
-        customerDeliveryBeginTime: null,
-        goodsType:null,
-        goodsInfo: null,
-        length:null,
-        width:null,
-        height:null,
-        totalWeight: null,
-        totalVolume: null,
-        parcelQty: null,
-        billWeight: null,
-        volumeWeight: null,
-        settlementWeight: null,
-        feeWeight: null,
-        freight: null,
-        blOverLong: null,
-        blOverWeight: null,
-        overWeightNumber: null,
-        feeRemark: null,
-        realValue: null,
-        takePieceEmployeeCode: null,
-        sendSiteCode: null,
-        sendSiteName: null,
-        destinationCode:  null,
-        dispatchUnderlingSiteCode: null,
-        destinationCenterCode: null,
-        marketManCode: null,
-        payee: null,
-        salesmen: null,
-        operateEmployeeCode: null,
-        blMessage: null,
-        blAcceptMessage: null,
-        meterType:null,
-        blGenSubbill:null,
-        billCodeSub:null,
-      },
-      timer:null,
-      isNeedCalc:false,
-      titleSelectAddress:'',
-      openSelectAddress:false,
-      // 表单校验
-      rules: {
-
-      }
-    };
-  },
-  created() {
-    this.billCode=this.$route.query.billCode;
-    this.initData();
-  },
-  methods: {
-    initData() {
-        if(this.billCode !=null) {
-          this.loading = true;
-          getWaybillDetail(this.billCode).then(response => {
-            this.form = response.data;
-            this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
-            this.loading = false;
-          });
-        }
-    },
-  }
-};
-</script>
-
-<style lang="scss">
-
-.el-form-item__label {
-    color: #000;
-}
-
-.el-input-group__append {
-    padding: 0 4px;
-}
-
-.el-row{
-      display:flex;
-      flex-wrap: wrap;
-      // padding-right: 10px;
- }
-
-.el-form-item__label {
-  font-size: 12px!important;
-}
-
-
- .platform-auto-complete {
-  .el-autocomplete-suggestion__wrap {
-    padding: 5px 0;
-    ul li {
-      pointer-events: none; // 阻止可点击事件
-      .default {
-        text-align: center;
-        color: #999;
-      }
-      &:hover {
-        background-color: #fff;
-      }
-    }
-  }
-}
-
-.el-collapse {
-    border-top: none!important;
-    border-bottom: none!important;
-}
-
-.el-table .el-table__cell:first-child .cell {
-  padding: 0px;
-}
-
-.el-table .cell {
-    padding: 0px;
-}
-
-.cargoList{
-  .el-input__inner {
-      height: 28px;
-      line-height: 28px;
-      border: none;
-      background: #ffffcd;
-      font-size: 10px;
-      padding: 0px;
-      text-align: center;
-  }
-}
-
-  .el-collapse-item__content {
-      padding-bottom: 0px;
-  }
-  .el-collapse-item__header{
-    pointer-events: none;
-  }
-
-  .el-collapse-item__arrow {
-    pointer-events: auto;
-  }
-
-
-
-
-
-
-</style>
-

src/views/emis/emisWaybill/sendWaybillList.vue

@@ -25,13 +25,13 @@
                 </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="查询时间范围" prop="dateTimeRange">
+              <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>
-                  <elDateAdvPicker clearable v-model="dateTimeRange" :isDefaultCurrentDay="true" ></elDateAdvPicker>
+                  <elDateAdvPicker      v-model="dateRange"  ></elDateAdvPicker>
               </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>
@@ -330,8 +330,28 @@
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-
+      <!-- <el-table-column :label="$t('快件当前最新状态')" align="center" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" /> -->
-      <el-table-column :label="$t('快件当前最新状态')" align="center" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" />
+      <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">
@@ -367,7 +387,6 @@
       </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="billCode" min-width="120" :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"/>
@@ -539,11 +558,11 @@
 
     </XdTable>
 
-    <!--
+
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-        <emisWaybillView :id="id" ></EmisWaybillView>
+      <TraceDetail :billCode="currentTraceBillCode"></TraceDetail>
     </el-dialog>
-    -->
+
 
   </XdPageContainer>
 </template>
@@ -580,8 +599,11 @@ 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 {dateToStr} from '@/utils/custom'
+
+
+import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 import { formatSearchStr,deepClone } from '@/utils/index'
 
 export default {
@@ -602,7 +624,9 @@ export default {
 
     EmisSiteSimplePicker1,
     EmisSiteSimplePicker2,
-    ProblemTypePicker
+    ProblemTypePicker,
+
+    TraceDetail
 
   },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
@@ -623,8 +647,7 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
-      // 创建时间搜索
+
-      dateTimeRange:[],
       // 总条数
       total: 0,
       // 运单列表表格数据
@@ -635,6 +658,9 @@ export default {
       titleForm: "",
       billCode:null,
 
+      openTraceInfo:false,
+      currentTraceBillCode:null,
+
       queryOrderType:null,
       queryOrderDateType:null,
       queryExpireNotSign:null,
@@ -643,26 +669,9 @@ export default {
       id:null,
       titleView:"",
       openView: false,
-      // 更新网点时间范围
+
-      daterangeOrderDate: [],
+      // 时间搜索
-      // 更新网点时间范围
+      dateRange:[],
-      daterangeEstimateDate: [],
-      // 更新网点时间范围
-      daterangePickStartDate: [],
-      // 更新网点时间范围
-      daterangePickFinishDate: [],
-      // 更新网点时间范围
-      daterangeDispFdDate: [],
-      // 更新网点时间范围
-      daterangeRegisterDate: [],
-      // 更新网点时间范围
-      daterangeSendDate: [],
-      // 更新网点时间范围
-      daterangeProduceBillDate: [],
-      // 更新网点时间范围
-      daterangeCreateTime: [],
-      // 更新网点时间范围
-      daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -829,11 +838,7 @@ export default {
     const start = new Date()
     start.setHours(0,0,0,0)
     end.setHours(23,59,59,0)
-    this.datetimeRange=[start, end]
+    this.dateRange=[timeFormat(start), timeFormat(end)]
-    this.datetimeRange[0]=dateToStr(this.datetimeRange[0]);
-    this.datetimeRange[1]=dateToStr(this.datetimeRange[1]);
-    console.log(this.datetimeRange)
-
 
     this.queryOrderType="1";
     this.queryOrderDateType="1";
@@ -845,23 +850,29 @@ export default {
 
   },
   methods: {
+    calcDeliveryTime(startData,endDate){
+        return timeDiffTime(startData,endDate)
+    },
       //标红table指定行
     tableRowClassName({row, rowIndex}) {
-      if (row.blIsQuestion=='1') {
+
-        return 'warning-row';
+      if (row.blSign=='1') {
-      }
-      else if (row.waybillStatus=='50') {
         return 'success-row';
       }
+      else if (row.blIsQuestion=='1') {
+        return 'warning-row';
+      }
 
       return '';
     },
+    handleShowTraceInfo(row){
+        this.currentTraceBillCode=row.billCode;
+        this.openTraceInfo=true;
+    },
     /** 查询运单列表列表 */
     getList() {
       this.loading = true;
 
-
-
     //   this.queryOrderType="1";
     // this.queryOrderDateType="1";
       if(this.queryParams.billCode){
@@ -885,18 +896,7 @@ export default {
 
         }
       }
-      console.log(this.dateTimeRange);
+      this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
-      // if(this.dateTimeRange&&this.dateTimeRange.length==2){
-        // this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime");
-        this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate");
-
-        // if(this.queryOrderDateType != "1"){
-        // }else{
-        // }
-      // }
-
-
-      console.log(this.queryParams);
 
       listEmisWaybill(this.queryParams).then(response => {
         this.emisWaybillList = response.rows;
@@ -906,7 +906,7 @@ export default {
     },
 
     onDateSelect(value){
-      this.dateTimeRange=value;
+      // this.dateTimeRange=value;
       // scanDate
     },
     /** 搜索按钮操作 */
@@ -1016,10 +1016,7 @@ export default {
     getIndex($index) {
           return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
     },
-    /** 时间搜索响应函数 */
+
-    dateTimeChange(value){
-        this.dateTimeRange=value;
-    },
   }
 };
 </script>