diff --git a/src/views/emis/customerService/traceRecordList.vue b/src/views/emis/customerService/traceRecordList.vue index f14f6641..8d50f289 100644 --- a/src/views/emis/customerService/traceRecordList.vue +++ b/src/views/emis/customerService/traceRecordList.vue @@ -23,7 +23,7 @@ - + @@ -191,7 +191,11 @@ export default { } // 派送扫描 else if(scanType=="40"){ - content='派件,快件在['+scanRecord.scanSite+']开始派送,已分配派件员['+scanRecord.dispatchOrSendMan+']'; + let carNoStr=scanRecord.carNo+''; + if(carNoStr){ + carNoStr=',车牌号:['+carNoStr+']'; + } + content='派件,快件在['+scanRecord.scanSite+']开始派送,已分配派件员['+scanRecord.dispatchOrSendMan+']'+ carNoStr; } // 签收扫描 else if(scanType=="50"){ diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue index 67b0879e..62098a9d 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue @@ -98,6 +98,7 @@ + @@ -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; diff --git a/src/views/emis/emisTmsScanRecord/deliveryScan.vue b/src/views/emis/emisTmsScanRecord/deliveryScan.vue index b7a6f0b2..85e268f7 100644 --- a/src/views/emis/emisTmsScanRecord/deliveryScan.vue +++ b/src/views/emis/emisTmsScanRecord/deliveryScan.vue @@ -86,15 +86,16 @@ - + - + + @@ -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 => {