diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue index 6dbb56d1..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", @@ -303,7 +304,9 @@ export default { } // this.form.scanType = '10'; - this.form.scanDate = new Date(); + let currentDate = new Date(); + 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; record.scanType = "30"; @@ -422,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") { @@ -440,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()), } ); } @@ -552,7 +555,8 @@ export default { } // this.form.scanType = '10'; - this.form.scanDate = new Date(); + let currentDate = new Date(); + this.form.scanDate = new Date(currentDate.setMinutes(currentDate.getMinutes() - 10)); let record =Object.assign({}, this.form) record.billCode=scanRstItem.billCode; record.scanType = '30'; diff --git a/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue b/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue index 42f1728b..036238f8 100644 --- a/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue +++ b/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue @@ -543,7 +543,6 @@ export default { let that = this; // let newList = []; this.$modal.confirm('是否确认删除').then(async function(isPass) { - debugger; console.log(that.form) if(isPass){ for(let i=0; i < ids.length; i++){ @@ -554,15 +553,9 @@ export default { return; } } - // that.tmsScanList.forEach(item => { - // if(ids.indexOf(item.id) == -1){ - // newList.push(item) - // } - // }); if(that.form.delChecked){ that.form.delRemark = null; } - // that.tmsScanList = newList; that.getList(); that.ids = []; that.single = true;