Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend
This commit is contained in:
commit
635424d077
@ -204,6 +204,7 @@ import { getWaybillDetail } from "@/api/emis/emisWaybill";
|
||||
import { doScan } from "@/api/emis/emisTmsScanRecord";
|
||||
import CustomerSimplePicker from '@/views/emis/EmisBaseTools/CustomerSimplePicker.vue';
|
||||
import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
|
||||
import { parseTime } from "@/utils/custom";
|
||||
|
||||
export default {
|
||||
name: "SignAndRecord",
|
||||
@ -515,7 +516,7 @@ export default {
|
||||
// customerName:item.customerName,
|
||||
// dispatchOrSendManCode:item.dispatchOrSendManCode,
|
||||
// scanDate:item.scanDate
|
||||
scanDate:item.scanDate || new Date()
|
||||
scanDate:item.scanDate//parseTime(item.scanDate || new Date())
|
||||
}
|
||||
);
|
||||
});
|
||||
@ -613,6 +614,7 @@ export default {
|
||||
record.picUrls=record.picUrl.split(",");
|
||||
record.scanSite=this.form.scanSite;
|
||||
record.scanMan=this.form.scanMan;
|
||||
record.scanDate=parseTime(new Date());
|
||||
let indexBillCode=record.billCode;
|
||||
this.dataMap[indexBillCode]=record;
|
||||
this.emisTmsScanRecordList.push(record);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user