diff --git a/src/api/emis/emisTmsScanRecord.js b/src/api/emis/emisTmsScanRecord.js index 02ace5ee..2f9f5567 100644 --- a/src/api/emis/emisTmsScanRecord.js +++ b/src/api/emis/emisTmsScanRecord.js @@ -35,6 +35,13 @@ export function queryLastRecord(billCode) { }) } +export function getNormalLastScanRecord(billCode) { + return request({ + url: '/emis/emisTmsScanRecord/getNormalLastScanRecord', + method: 'get', + params:{billCode:billCode} + }) +} diff --git a/src/views/emis/customerService/traceWaybillDetailView.vue b/src/views/emis/customerService/traceWaybillDetailView.vue index 7e9666fa..ae70dd82 100644 --- a/src/views/emis/customerService/traceWaybillDetailView.vue +++ b/src/views/emis/customerService/traceWaybillDetailView.vue @@ -76,7 +76,7 @@ import BillPicList from './billPicList.vue'; import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue'; import { getWaybillDetail } from "@/api/emis/emisWaybill"; -import { queryLastRecord,getTraceListByBillCode } from "@/api/emis/emisTmsScanRecord"; +import { getNormalLastScanRecord,getTraceListByBillCode } from "@/api/emis/emisTmsScanRecord"; import {timeDiffTime,timeFormat} from '@/utils/dateUtils' @@ -156,30 +156,52 @@ export default { this.canViewDetail=true; } - if(this.billDetail.waybillStatus=='10'){ - this.active=1; - } - else if(this.billDetail.waybillStatus=='20'){ - this.active=2; - } - else if(this.billDetail.waybillStatus=='30'){ - this.active=3; - } - else if(this.billDetail.waybillStatus=='40'){ - this.active=4; - } - else if(this.billDetail.waybillStatus=='50'){ - this.active=5; + // if(this.billDetail.waybillStatus=='10'){ + // this.active=1; + // } + // else if(this.billDetail.waybillStatus=='20'){ + // this.active=2; + // } + // else if(this.billDetail.waybillStatus=='30'){ + // this.active=3; + // } + // else if(this.billDetail.waybillStatus=='40'){ + // this.active=4; + // } + // else if(this.billDetail.waybillStatus=='50'){ + // this.active=5; + // }else{ + // this.active=2; + // } + this.setLastStepFlag(); + }); + }, + setLastStepFlag(){ + getNormalLastScanRecord(this.scanBillCode).then(response => { + let scanRecord=response.data; + if(scanRecord){ + if(scanRecord.scanType=='10'){ + this.active=1; + } + else if(scanRecord.scanType=='20'){ + this.active=2; + } + else if(scanRecord.scanType=='30'){ + this.active=3; + } + else if(scanRecord.scanType=='40'){ + this.active=4; + } + else if(scanRecord.scanType=='50'){ + this.active=5; + }else{ + this.active=2; + } }else{ this.active=2; } }); }, - showLastTrace(billCode){ - queryLastRecord(item.billCode).then(response => { - let data=response.data; - }); - }, onCanSeeBillDetail(isCan){ console.log("======>onCanSeeBillDetail=====>",isCan);