diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue index 7457512b..6fd0b68d 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue @@ -124,6 +124,7 @@ import { doScan } from "@/api/emis/emisTmsScanRecord"; import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import EmisGetPreSitePicker from '@/views/emis/EmisBaseTools/EmisGetPreSitePicker.vue'; +import { parseTime, dateToStr } from "@/utils/custom"; export default { name: "ArrivalAndDispathScan", @@ -304,7 +305,7 @@ export default { // this.form.scanType = '10'; let currentDate = new Date(); - this.form.scanDate = currentDate.setMinutes(currentDate.getMinutes() - 10); + this.form.scanDate = new Date(currentDate.setMinutes(currentDate.getMinutes() - 10)); // this.form.scanDate = new Date(); let record =Object.assign({}, this.form) record.billCode=scanRstItem.billCode; @@ -424,16 +425,16 @@ export default { var selData = this.selection; let newList = Array.from(this.emisTmsScanRecordList); let dataMap = this.dataMap; - let scanArrivalData=[]; let scanDispathData=[]; selData.forEach(item=>{ if (item.scanType=="30") { + // console.log(dateToStr(item.scanDate || new Date())) scanArrivalData.push( { billCode:item.billCode, scanWeight:item.scanWeight, - scanDate:item.scanDate || new Date(), + scanDate:dateToStr(item.scanDate || new Date()), } ); }else if(item.scanType=="40") { @@ -442,7 +443,7 @@ export default { billCode:item.billCode, scanWeight:item.scanWeight, dispatchOrSendManCode:item.dispatchOrSendManCode, - scanDate:item.scanDate || new Date(), + scanDate:dateToStr(item.scanDate || new Date()), } ); } @@ -555,7 +556,7 @@ export default { // this.form.scanType = '10'; let currentDate = new Date(); - this.form.scanDate = currentDate.setMinutes(currentDate.getMinutes() - 10); + this.form.scanDate = new Date(currentDate.setMinutes(currentDate.getMinutes() - 10)); let record =Object.assign({}, this.form) record.billCode=scanRstItem.billCode; record.scanType = '30';