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-15 22:03:29 +08:00
commit 417e34fdce
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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",
@ -303,7 +304,9 @@ export default {
} }
// this.form.scanType = '10'; // 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) let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode; record.billCode=scanRstItem.billCode;
record.scanType = "30"; record.scanType = "30";
@ -422,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") {
@ -440,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()),
} }
); );
} }
@ -552,7 +555,8 @@ export default {
} }
// this.form.scanType = '10'; // 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) let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode; record.billCode=scanRstItem.billCode;
record.scanType = '30'; record.scanType = '30';

7
src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
View File

@ -543,7 +543,6 @@ export default {
let that = this; let that = this;
// let newList = []; // let newList = [];
this.$modal.confirm('是否确认删除').then(async function(isPass) { this.$modal.confirm('是否确认删除').then(async function(isPass) {
debugger;
console.log(that.form) console.log(that.form)
if(isPass){ if(isPass){
for(let i=0; i < ids.length; i++){ for(let i=0; i < ids.length; i++){
@ -554,15 +553,9 @@ export default {
return; return;
} }
} }
// that.tmsScanList.forEach(item => {
// if(ids.indexOf(item.id) == -1){
// newList.push(item)
// }
// });
if(that.form.delChecked){ if(that.form.delChecked){
that.form.delRemark = null; that.form.delRemark = null;
} }
// that.tmsScanList = newList;
that.getList(); that.getList();
that.ids = []; that.ids = [];
that.single = true; that.single = true;