md

src/views/emis/customerService/traceRecordList.vue

@@ -23,7 +23,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('描述')" align="left" prop="desc" min-width="320" :show-overflow-tooltip="true">
+      <el-table-column :label="$t('描述')" align="left" prop="desc" min-width="340" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span style="color: #C53144;" v-html="cvtScanRecordToTraceStr(scope.row)"></span>
         </template>
@@ -191,7 +191,11 @@ export default {
          }
          // 派送扫描
          else if(scanType=="40"){
-             content='派件，快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>开始派送,已分配派件员<span class="siteOrManHighlight" >['+scanRecord.dispatchOrSendMan+']</span>';
+              let carNoStr=scanRecord.carNo+'';
+              if(carNoStr){
+                carNoStr=',车牌号:<span class="siteOrManHighlight">['+carNoStr+']</span>';
+              }
+             content='派件，快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>开始派送,已分配派件员<span class="siteOrManHighlight" >['+scanRecord.dispatchOrSendMan+']</span>'+ carNoStr;
          }
          // 签收扫描
          else if(scanType=="50"){

src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue

@@ -98,6 +98,7 @@
        </el-table-column>
         <el-table-column :label="$t('上一站')" align="center" prop="preOrNextStation" min-width="100" />
         <el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="100" />
+        <el-table-column :label="$t('车牌号')" align="center" prop="carNo" min-width="100" />
         <el-table-column :label="$t('重量')" align="center" prop="scanWeight" min-width="100" />
      </xd-table>
 
@@ -209,6 +210,7 @@ export default {
      // dosomething
     },
     onStaffSelect(item){
+      this.form.carNo=item.carNo;
       this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
       this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
     },
@@ -388,6 +390,7 @@ export default {
         recordManCode: null,
         recordManPhone: null,
         recordSiteCode: null,
+        carNo:null,
         truckMan: null,
         truckCode: null,
         dataFrom: null,
@@ -568,6 +571,7 @@ export default {
         record.scanType = '30';
         record.dispatchOrSendMan=null;
         record.dispatchOrSendManCode=null;
+        record.carNo=null;
         console.log(record)
         let indexBillCode=record.billCode;
         this.dataMap[indexBillCode+record.scanType]=record;

src/views/emis/emisTmsScanRecord/deliveryScan.vue

@@ -86,15 +86,16 @@
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_scan_type" :value="scope.row.scanType"/>
           </template>
-       </el-table-column>
+        </el-table-column>
         <el-table-column :label="$t('扫描网点')" align="center" prop="scanSite" min-width="100" />
         <el-table-column :label="$t('扫描员')" align="center" prop="scanMan" min-width="150" />
         <el-table-column :label="$t('扫描时间')" align="center" prop="scanDate" min-width="170" >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.scanDate) }}</span>
           </template>
-       </el-table-column>
+        </el-table-column>
         <el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="100" />
+        <el-table-column :label="$t('车牌号')" align="center" prop="carNo" min-width="100" />
         <el-table-column :label="$t('重量')" align="center" prop="scanWeight" min-width="100" />
      </xd-table>
 
@@ -212,6 +213,7 @@ export default {
         // this.form.dispatchOrSendMan=item.empName;
         // this.form.dispatchOrSendManCode=item.empCode;
 
+        this.form.carNo=item.carNo;
         this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
         this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
     },
@@ -339,6 +341,7 @@ export default {
         recordManCode: null,
         recordManPhone: null,
         recordSiteCode: null,
+        carNo:null,
         truckMan: null,
         truckCode: null,
         dataFrom: null,
@@ -363,8 +366,6 @@ export default {
       this.multiple = !selection.length
 
       // this.checkedDetail = selection;
-
-
       // if (selection.length > 1) {
       //   this.$refs.multipleTable.clearSelection();
       //   this.$refs.multipleTable.toggleRowSelection(selection.pop());
@@ -396,6 +397,7 @@ export default {
 
        // 检查
       let scanInfo = {scanType:"40",opType:2,scanData:scanData}
+
       console.log(scanInfo)
 
       doScan(scanInfo).then(response => {