aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复日期格式

Browse Source
This commit is contained in:
liuyp 2024-06-15 13:58:14 +08:00
parent 774e38d6d0
commit a50242c882
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
View File

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