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

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

Browse Source
This commit is contained in:
linfso 2024-06-25 11:55:39 +08:00
commit 635424d077
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/emis/emisTmsScanRecord/signAndRecord.vue
View File

@ -204,6 +204,7 @@ import { getWaybillDetail } from "@/api/emis/emisWaybill";
import { doScan } from "@/api/emis/emisTmsScanRecord"; import { doScan } from "@/api/emis/emisTmsScanRecord";
import CustomerSimplePicker from '@/views/emis/EmisBaseTools/CustomerSimplePicker.vue'; import CustomerSimplePicker from '@/views/emis/EmisBaseTools/CustomerSimplePicker.vue';
import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import { parseTime } from "@/utils/custom";
export default { export default {
name: "SignAndRecord", name: "SignAndRecord",
@ -515,7 +516,7 @@ export default {
// customerName:item.customerName, // customerName:item.customerName,
// dispatchOrSendManCode:item.dispatchOrSendManCode, // dispatchOrSendManCode:item.dispatchOrSendManCode,
// scanDate:item.scanDate // 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.picUrls=record.picUrl.split(",");
record.scanSite=this.form.scanSite; record.scanSite=this.form.scanSite;
record.scanMan=this.form.scanMan; record.scanMan=this.form.scanMan;
record.scanDate=parseTime(new Date());
let indexBillCode=record.billCode; let indexBillCode=record.billCode;
this.dataMap[indexBillCode]=record; this.dataMap[indexBillCode]=record;
this.emisTmsScanRecordList.push(record); this.emisTmsScanRecordList.push(record);