Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

src/api/emis/emisTmsScanRecord.js

@@ -18,6 +18,14 @@ export function queryWaybillTraceInfo(appId,trackingNo,lang,sign) {
   })
 }
 
+export function getTraceListByBillCode(query) {
+  return request({
+    url: '/emis/emisTmsScanRecord/getTraceListByBillCode',
+    method: 'get',
+    params:query
+  })
+}
+
 // 签收异常数据对比
 export function queryStatList(query){
   return request({

src/api/emis/emisWaybill.js

@@ -17,6 +17,14 @@ export function listSimpleEmisWaybill(query) {
   })
 }
 
+export function selectEmisWaybillByMutiBillCode(query) {
+  return request({
+    url: '/emis/emisWaybill/selectEmisWaybillByMutiBillCode',
+    method: 'get',
+    params: query
+  })
+}
+
 
 
 // 检查单号是否已存在

src/views/emis/customerService/billPicList.vue

@@ -1,12 +1,10 @@
 <template>
   <div class="">
 
-    <!-- <div>
+    <div v-for="(item,index) in dataList" :key="index">
-
+      <ImagePreview height="80px" v-for="(pic,index2) in (item.fileUrl||'').split(',')" :key="index2" :src="pic" ></ImagePreview>
-      <ImagePreview height="50px" v-for="pic in (scope.row.picUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
+    </div>
-
+    <!-- <xd-table v-loading="loading"
-    </div> -->
-    <xd-table v-loading="loading"
            border stripe
            size="mini"
            height="300px"
@@ -33,100 +31,16 @@
           <ImagePreview height="50px" v-for="pic in (scope.row.picUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
         </template>
       </el-table-column>
-      <!-- <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
-      <el-table-column :label="$t('签收状态')" align="center" prop="status" min-width="100">
-        {{ $t("已签收") }}
-      </el-table-column>/> -->
-      <!-- <el-table-column :label="$t('签收地址')" align="center" prop="signAddress" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" />
-      <el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="170" >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.scanDate) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="170">
-        <template slot-scope="scope">
-          <span>{{ scope.row.waybillDetail.dispatchManName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="170" >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.waybillDetail.sendDate) }}</span>
-          </template>
-      </el-table-column>
-      <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="150" >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.waybillDetail.estimateDate) }}</span>
-          </template>
-      </el-table-column>
-      <el-table-column :label="$t('线路')" align="center" prop="" min-width="100">
-        <template slot-scope="scope">
-          <span>{{ scope.row.waybillDetail.transLineTypeName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('产品类型')" align="center" prop="" min-width="100">
-        <template slot-scope="scope">
-          <span>{{ scope.row.waybillDetail.productTypeName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="100">
-        <template slot-scope="scope">
-          <span>{{ scope.row.waybillDetail.timeType }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="150">
-        <template slot-scope="scope">
-          <span>{{ scope.row.waybillDetail.registerManName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('录入网点')" align="center" prop="recordSiteCode" min-width="100">
-        <template slot-scope="scope">
-          <span>{{ scope.row.waybillDetail.registerSiteName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('录入时间')" align="center" prop="waybillDetail.registerDate" min-width="170" >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.waybillDetail.registerDate) }}</span>
-          </template>
-      </el-table-column> -->
-      <!-- <el-table-column :label="$t('签收网点')" align="center" prop="signSite" min-width="100" />
-      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="150">
-        <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.waybillDetail.customerName }}</span>
-          </template>
-      </el-table-column>
-      <el-table-column :label="$t('数据产生来源')" align="center" prop="waybillDetail.dataFrom" min-width="150">
-        <template slot-scope="scope">
-          <span>{{ scope.row.waybillDetail.dataFrom }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('签收信息备注')" align="center" prop="remark" min-width="150">
-        <template slot-scope="scope">
-          <span class="ellipsis">{{ scope.row.remark }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('收件国家')" align="center" prop="waybillDetail.receiveCountryName" min-width="150">
-        <template slot-scope="scope">
-          <span class="ellipsis">{{ scope.row.waybillDetail.receiveCountryName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('收件省份')" align="center" prop="waybillDetail.receiveProvinceName" min-width="150">
-        <template slot-scope="scope">
-          <span class="ellipsis">{{ scope.row.waybillDetail.receiveProvinceName }}</span>
-        </template>
-      </el-table-column> -->
 
-
+    </xd-table> -->
-
-    </xd-table>
   </div>
 </template>
 
 <script>
-import { listEmisTmsScanRecord } from "@/api/emis/emisTmsScanRecord";
+import { listEmisWaybillAttachment } from "@/api/emis/emisWaybillAttachment";
 
 export default {
-  name: "TraceInfoView",
+  name: "BillPicList",
    props:{
     billCode:{
       type: String,
@@ -163,7 +77,7 @@ export default {
             pageSize:1000,
             billCode:this.billCode
          }
-         listEmisTmsScanRecord(this.queryParams).then(response => {
+         listEmisWaybillAttachment(this.queryParams).then(response => {
           this.dataList = response.rows;
           this.total=response.total;
           this.loading = false;

src/views/emis/customerService/traceRecordList.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import {  listEmisTmsScanRecord } from "@/api/emis/emisTmsScanRecord";
+import {  getTraceListByBillCode } from "@/api/emis/emisTmsScanRecord";
 export default {
   name: "TraceInfoView",
    props:{
@@ -93,7 +93,7 @@ export default {
             pageSize:1000,
             billCode:this.billCode
          }
-         listEmisTmsScanRecord(this.queryParams).then(response => {
+         getTraceListByBillCode(this.queryParams).then(response => {
           this.scanRecordList = response.rows;
           this.total=response.total;
           console.log(this.scanRecordList);
@@ -149,11 +149,11 @@ export default {
          }
          // 报关扫描
          else if(scanType=="800"){
-             content='报关扫描，快件已报关<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往【span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
+             content='报关扫描，快件已报关<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
          }
          // 清关扫描
          else if(scanType=="900"){
-             content='清关扫描，快件已清关<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往【span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
+             content='清关扫描，快件已清关<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
          }
         //  content='<span style="color: #C53144;">'+content+'</span>';
          return content;

src/views/emis/customerService/waybillTracking copy.vue

@@ -1,393 +0,0 @@
-<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>

src/views/emis/customerService/waybillTracking.vue

@@ -46,7 +46,7 @@
 
 <script>
 import 'element-ui/lib/theme-chalk/display.css';
-import { listSimpleEmisWaybill } from "@/api/emis/emisWaybill";
+import { listSimpleEmisWaybill,selectEmisWaybillByMutiBillCode} from "@/api/emis/emisWaybill";
 import { formatSearchStr,deepClone } from '@/utils/index'
 
 import CardWithHeader from '@/components/CardWithHeader/index.vue';
@@ -100,7 +100,7 @@ export default {
           this.queryParams.billCode=newBillCodeStr;
       }
 
-      listSimpleEmisWaybill(this.queryParams).then(response => {
+      selectEmisWaybillByMutiBillCode(this.queryParams).then(response => {
         this.emisWaybillList = response.rows;
         this.loading = false;
       });

src/views/emis/emisWaybill/waybillDetailReadOnly.vue

@@ -42,9 +42,9 @@
             <!-- <el-descriptions-item label="寄件县">{{ form.sendTown }}</el-descriptions-item> -->
             <el-descriptions-item label="寄件地址"  :span="4">{{ form.sender.address }}</el-descriptions-item>
 
-            <el-descriptions-item label="收件人">{{ form.reciever.name }}</el-descriptions-item>
+            <el-descriptions-item label="收件人" :span="1">{{ form.reciever.name }}</el-descriptions-item>
-            <el-descriptions-item label="收件电话">{{ form.reciever.phone }}</el-descriptions-item>
+            <el-descriptions-item label="收件电话" :span="1">{{ form.reciever.phone }}</el-descriptions-item>
-            <el-descriptions-item label="收件公司">{{ form.reciever.company }}</el-descriptions-item>
+            <el-descriptions-item label="收件公司" :span="1">{{ form.reciever.company }}</el-descriptions-item>
             <!-- <el-descriptions-item label="收件客户">{{  }}</el-descriptions-item> -->
             <el-descriptions-item label="收件地址"  :span="4">{{ form.reciever.address }}</el-descriptions-item>
 
@@ -64,11 +64,10 @@
             <!-- <el-descriptions-item label="费用币种">{{ form.currency }}</el-descriptions-item> -->
             <el-descriptions-item label="结算重量">{{ form.settlementWeight }}(kg)</el-descriptions-item>
             <el-descriptions-item label="货物名称">{{ form.goodsInfo }}</el-descriptions-item>
-            <el-descriptions-item label="销售联系人">{{ form.payee }}</el-descriptions-item>
+            <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
             <el-descriptions-item label="取件员/操作员">{{ form.takePieceEmployeeName }}/{{ form.operateEmployeeName }}</el-descriptions-item>
 
             <el-descriptions-item label="包装类型">
-
               <dict-tag v-if="form.packType&&form.packType!=''" :options="dict.type.emis_tab_packing_type" :value="form.packType.split(',')"/>
             </el-descriptions-item>
 

src/views/emis/emisWaybill/waybillRecord.vue

@@ -1493,7 +1493,7 @@ methods: {
         // 新开单才需要打印
         if(this.action == "add"){
           // 做揽收扫描记录
-          this.handDoGotScan();
+          // this.handDoGotScan();
 
           // 弹出打印预览界面
           this.handlePrintPreview();