diff --git a/src/views/emis/customerService/traceDetail.vue b/src/views/emis/customerService/traceDetail.vue
new file mode 100644
index 00000000..b4099fe6
--- /dev/null
+++ b/src/views/emis/customerService/traceDetail.vue
@@ -0,0 +1,85 @@
+<template>
+  <div class="">
+      <el-scrollbar style="height:400px;">
+        <div  v-for="(item, index) in traceInfoList" :key="index">
+          <div style="font-weight: 600;margin-bottom: 20px;padding-left: 40px;">运单号:{{ item.billCode }}</div>
+          <el-timeline :reverse="reverse">
+              <el-timeline-item
+                v-for="(step, stepIndex) in item.steps"
+                :key="stepIndex"
+                :timestamp="step.time"
+                :type="stepIndex==0?'primary ':''"
+                >
+                {{step.content}}
+              </el-timeline-item>
+          </el-timeline>
+        </div>
+      </el-scrollbar>
+  </div>
+</template>
+
+<script>
+import {  queryWaybillTraceInfo } from "@/api/emis/emisTmsScanRecord";
+export default {
+  name: "TraceInfoView",
+   props:{
+    billCode:{
+      type: String,
+    }
+  },
+  dicts: [],
+  data() {
+    return {
+      reverse: false,
+      // 遮罩层
+      loading: true,
+      // 地球洲表格数据
+      traceInfoList: []
+
+    };
+  },
+  created() {
+    this.queryData();
+  },
+  watch: {
+      "billCode": {
+      handler (newValue, oldValue) {
+        this.queryData();
+      },
+      deep: true
+    }
+  },
+  methods: {
+    /** 查询地球洲列表 */
+    queryData() {
+         this.loading = true;
+         queryWaybillTraceInfo("inner",this.billCode,"zh","123").then(response => {
+          this.traceInfoList = response.data;
+          console.log(this.traceInfoList);
+          this.loading = false;
+        });
+
+    },
+
+  }
+};
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss">
+
+.margin-top{
+  margin-top: 20px;
+}
+
+.el-descriptions-item__label.is-bordered-label {
+    min-width: 80px;
+}
+
+.printMeClass {
+  font-family: SimHei;
+  label {
+    font-weight: normal;
+  }
+}
+</style>
diff --git a/src/views/emis/customerService/waybillTracking copy.vue b/src/views/emis/customerService/waybillTracking copy.vue
new file mode 100644
index 00000000..c2aeb354
--- /dev/null
+++ b/src/views/emis/customerService/waybillTracking copy.vue	
@@ -0,0 +1,393 @@
+<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">
+      <!-- label-width="100px" -->
+      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+        <!-- :span="6" -->
+        <el-col  :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+          <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"
+                  />
+                </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+
+    </SearchForm>
+
+
+
+    <el-table v-loading="loading" :data="emisWaybillList" @selection-change="handleSelectionChange">
+
+      <el-table-column label="入库单编号" align="center" prop="receiptNo" min-width="100" />
+
+    </el-table>
+
+
+
+  </XdPageContainer>
+</template>
+
+<script>
+import 'element-ui/lib/theme-chalk/display.css';
+import { listEmisWaybill, getEmisWaybill, delEmisWaybill, addEmisWaybill, updateEmisWaybill } from "@/api/emis/emisWaybill";
+import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+// 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 {dateToStr} from '@/utils/custom'
+import { formatSearchStr,deepClone } from '@/utils/index'
+
+export default {
+  name: "SendWaybillList",
+  // name: "DispatchWaybillList",
+
+  components: {
+    EmisMonthpayAccountPicker,
+    elDateAdvPicker,emisWaybillForm,
+    CountryPicker1,
+    CountryPicker2,ProvincePicker2,
+    TransLinePicker,TransProductPicker,
+    PayeePicker,
+    SalemanPicker,
+    EmisUserSimplePicker0,
+    EmisUserSimplePicker1,
+    EmisUserSimplePicker2,
+
+    EmisSiteSimplePicker1,
+    EmisSiteSimplePicker2,
+    ProblemTypePicker
+
+  },
+  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,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 运单列表表格数据
+      emisWaybillList: [],
+
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+      billCode:null,
+
+      queryOrderType:null,
+      queryOrderDateType:null,
+      queryExpireNotSign:null,
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 更新网点时间范围
+      daterangeOrderDate: [],
+      // 更新网点时间范围
+      daterangeEstimateDate: [],
+      // 更新网点时间范围
+      daterangePickStartDate: [],
+      // 更新网点时间范围
+      daterangePickFinishDate: [],
+      // 更新网点时间范围
+      daterangeDispFdDate: [],
+      // 更新网点时间范围
+      daterangeRegisterDate: [],
+      // 更新网点时间范围
+      daterangeSendDate: [],
+      // 更新网点时间范围
+      daterangeProduceBillDate: [],
+      // 更新网点时间范围
+      daterangeCreateTime: [],
+      // 更新网点时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 1000,
+        orderSn: null,
+        billCode: null,
+
+      },
+    };
+  },
+  created() {
+    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.getList();
+    this.queryOrderType="1";
+    this.queryOrderDateType="1";
+    // this.queryExpireNotSign="1"
+
+  },
+  mounted() {
+    const end = new Date()
+    const start = new Date()
+    start.setHours(0,0,0,0)
+    end.setHours(23,59,59,0)
+    this.dateTimeRange=[start,end];
+  },
+  methods: {
+    /** 查询运单列表列表 */
+    getList() {
+      this.loading = true;
+
+      let queryParams=deepClone(this.queryParams);
+
+    //   this.queryOrderType="1";
+    // this.queryOrderDateType="1";
+      if(queryParams.billCode){
+        if(this.queryOrderType != "1"){
+            queryParams.orderSn=formatSearchStr(queryParams.billCode);
+            queryParams.billCode=null;
+        }else{
+          // 处理子单号
+          let qBillCode=formatSearchStr(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+",";
+              }
+          });
+          queryParams.billCode=newBillCodeStr;
+
+        }
+      }
+      if(this.dateTimeRange&&this.dateTimeRange.length==2){
+
+        let startDate = new Date(this.dateTimeRange[0]);
+        let endDate= new Date(this.dateTimeRange[1]);
+        startDate=dateToStr(startDate);
+        endDate=dateToStr(endDate)
+
+        if(this.queryOrderDateType != "1"){
+          queryParams.params["beginCreateTime"] = startDate;
+          queryParams.params["endCreateTime"] =  endDate;
+        }else{
+          queryParams.params["beginSendDate"] = startDate;
+          queryParams.params["endSendDate"] = endDate;
+        }
+      }
+
+      console.log(queryParams);
+
+      listEmisWaybill(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
+    },
+    /** 时间搜索响应函数 */
+    dateTimeChange(value){
+        this.dateTimeRange=value;
+    },
+  }
+};
+</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;
+}
+
+</style>
diff --git a/src/views/emis/emisWaybill/waybillDetail.vue b/src/views/emis/emisWaybill/waybillDetail.vue
new file mode 100644
index 00000000..d4604ca7
--- /dev/null
+++ b/src/views/emis/emisWaybill/waybillDetail.vue
@@ -0,0 +1,862 @@
+<template>
+  <div class="r" >
+    <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} from "@/api/emis/emisWaybill";
+
+
+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>
+
diff --git a/src/views/emis/emisWaybill/waybillTraceInfo.vue b/src/views/emis/emisWaybill/waybillTraceInfo.vue
new file mode 100644
index 00000000..e69de29b