@@ -234,21 +224,22 @@ export default {
this.$message.error("输入单号后回车");
return;
}
- let bcList=this.formBatch.billCode.split(/[；\;\,\，]/)||[];
- let scanWeight = this.form.scanWeight
+ let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[];
+ // let scanWeight = this.form.scanWeight
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
+ let carNo = this.form.carNo;
let scList=bcList.map(function(code) {
return {
billCode:code,
- scanWeight:scanWeight,
- // scanWeight:null,
+ // scanWeight:scanWeight,
+ carNo:carNo,
dispatchOrSendManCode: dispatchOrSendManCode
}
}
)
let scanInfo = {
- scanType:"20",
+ scanType:"301",
opType:1,
scanData:scList
};
@@ -265,8 +256,8 @@ export default {
this.$modal.msgError(scanRstItem.message);
return;
}
-
- this.form.scanType = '20';
+
+ this.form.scanType = '301';
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
@@ -323,7 +314,9 @@ export default {
updateTime: null,
remark: null,
updateSite: null,
- createSite: null
+ createSite: null,
+ carNo:null,
+ bagNo:null
};
this.resetForm("form");
},
@@ -332,18 +325,6 @@ export default {
this.ids = selection.map(item => item.billCode)
this.single = selection.length!==1
this.multiple = !selection.length
-
- // this.checkedDetail = selection;
-
-
- // if (selection.length > 1) {
- // this.$refs.multipleTable.clearSelection();
- // this.$refs.multipleTable.toggleRowSelection(selection.pop());
- // } else {
- // //将选中行存入缓存中
- // this.checkedDetail = selection;
- // }
-
},
// 扫描上传
handleScanUpload(){
@@ -356,15 +337,17 @@ export default {
{
billCode:item.billCode,
scanWeight:item.scanWeight,
+ carNo:item.carNo,
preOrNextStationCode:item.preOrNextStationCode,
- scanDate:item.scanDate
+ scanDate:item.scanDate,
+ bagNo:item.bagNo
// dispatchOrSendManCode:item.dispatchOrSendManCode
}
);
});
// 检查
- let scanInfo = {scanType:"20",opType:2,scanData:scanData}
+ let scanInfo = {scanType:"301",opType:2,scanData:scanData}
console.log(scanInfo)
doScan(scanInfo).then(response => {
@@ -377,17 +360,6 @@ export default {
}
this.$modal.msgSuccess(scanRstItem.message);
-
-
- // this.form.scanType = '10';
- // this.form.scanDate = new Date();
- // let record =Object.assign({}, this.form);
- // console.log(record)
- // let indexBillCode=record.billCode;
- // this.dataMap[indexBillCode]=record;
- // this.emisTmsScanRecordList.push(record);
-
- // this.form.billCode =null;
});
@@ -406,13 +378,13 @@ export default {
// 检查
let scanInfo = {
- scanType:"20",
+ scanType:"301",
opType:1,
scanData:[
{
billCode:this.form.billCode,
- scanWeight:this.form.scanWeight,
- // dispatchOrSendManCode:this.form.dispatchOrSendManCode
+ carNo:this.form.carNo,
+ dispatchOrSendManCode:this.form.dispatchOrSendManCode
}
]
};
@@ -426,7 +398,7 @@ export default {
return;
}
- this.form.scanType = '20';
+ this.form.scanType = '301';
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
index d3f7499b..e237d2bb 100644
--- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
@@ -234,7 +234,7 @@ export default {
this.$message.error("输入单号后回车");
return;
}
- let bcList=this.formBatch.billCode.split(/[；\;\,\，]/)||[];
+ let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
let scList=bcList.map(function(code) {
diff --git a/src/views/emis/emisTmsScanRecord/positionScanning.vue b/src/views/emis/emisTmsScanRecord/positionScanning.vue
index 78926ed1..02b12c96 100644
--- a/src/views/emis/emisTmsScanRecord/positionScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/positionScanning.vue
@@ -244,7 +244,7 @@ export default {
this.$message.error("输入单号后回车");
return;
}
- let bcList=this.formBatch.billCode.split(/[；\;\,\，]/)||[];
+ let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
let scList=bcList.map(function(code) {
diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue
index 41a07bf1..91825e79 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue
@@ -239,7 +239,7 @@ export default {
this.$message.error("输入单号后回车");
return;
}
- let bcList=this.formBatch.billCode.split(/[；\;\,\，]/)||[];
+ let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
let scList=bcList.map(function(code) {
diff --git a/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue b/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
index f20f24d0..7a09284c 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
@@ -60,7 +60,7 @@
-
+
@@ -274,7 +274,7 @@ export default {
status: null,
delFlag: null,
remark: null,
- params:[],//扩展参数
+ params:{},//扩展参数
// scanSite:null,
queryType:"1",// 选择运单类型，默认为 运单号：1,订单号：2
@@ -319,11 +319,16 @@ export default {
console.log("---->this.queryParams,", this.queryParams);
// debugger;
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
- this.queryParams.params["beginScanDate"] = this.dateTimeRange[0];
- this.queryParams.params["endScanDate"] = this.dateTimeRange[1];
+ // this.queryParams.params["beginScanDate"] = this.dateTimeRange[0];
+ // this.queryParams.params["endScanDate"] = this.dateTimeRange[1];
+ this.queryParams.params.beginScanDate = this.dateTimeRange[0];
+ this.queryParams.params.endScanDate = this.dateTimeRange[1];
+ }else{
+ this.queryParams.params.beginScanDate = null;
+ this.queryParams.params.endScanDate = null;
}
- this.queryParams.params["queryType"] = this.queryParams.queryType;//1：yd;2：dd;
- this.queryParams.params["isSubBill"] = this.queryParams.isSubBill;//1：子单；0：主单
+ this.queryParams.params.queryType = this.queryParams.queryType;//1：yd;2：dd;
+ this.queryParams.params.isSubBill = this.queryParams.isSubBill;//1：子单；0：主单
let queryType = this.queryParams.queryType;
if(queryType == "1"){
@@ -340,6 +345,7 @@ export default {
// this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
// this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
// }
+ // console.log(this.addDateRange(this.queryParams, this.dateTimeRange))
// listEmisTmsScanRecord(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
listEmisTmsScanRecord(this.queryParams).then(response => {
// this.emisElectronicPagApplyList = response.rows;
@@ -383,16 +389,16 @@ export default {
this.resetModifyParams();
},
onScanSiteSelect(item){
- this.queryParams.scanSite=item.siteName;
- this.queryParams.scanSiteCode=item.siteCode;
+ this.queryParams.scanSite=item && item.siteName;
+ this.queryParams.scanSiteCode=item && item.siteCode;
},
onPreOrNextSiteSelect(item){
- this.queryParams.preOrNextStation=item.siteName;
- this.queryParams.preOrNextStationCode=item.siteCode;
+ this.queryParams.preOrNextStation=item && item.siteName;
+ this.queryParams.preOrNextStationCode=item && item.siteCode;
},
onDestinationSelect(item){
- this.queryParams.destCode=item.destCode;
- this.queryParams.destName=item.destName;
+ this.queryParams.destCode=item && item.destCode;
+ this.queryParams.destName=item && item.destName;
},
onDateSelect(value){
console.log("date picker---->", value)
@@ -621,7 +627,7 @@ export default {
this.queryParams.params["queryType"] = this.queryParams.queryType;//1：yd;2：dd;
this.queryParams.params["isSubBill"] = this.queryParams.isSubBill;//1：子单；0：主单
- listEmisTmsScanRecord(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+ listEmisTmsScanRecord(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = []
@@ -648,38 +654,26 @@ export default {
}
});
- listEmisTmsScanRecord(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
- // this.emisElectronicPagApplyList = response.rows;
- // this.loading = false;
- this.emisElectronicPagApplyList = [];
- // this.total = 0;
- this.loading = false;
- let rows = response.rows;
- this.total = response.total;
- if(!rows || rows.length == 0){
- this.$message.error("未查到单号");
- return;
- }
- for (let index = 0; index < rows.length; index++) {
- let scanRstItem = rows[index];
- console.log(scanRstItem);
+ // listEmisTmsScanRecord(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+ // this.emisElectronicPagApplyList = [];
+ // this.loading = false;
+ // let rows = response.rows;
+ // this.total = response.total;
+ // if(!rows || rows.length == 0){
+ // this.$message.error("未查到单号");
+ // return;
+ // }
+ // for (let index = 0; index < rows.length; index++) {
+ // let scanRstItem = rows[index];
+ // console.log(scanRstItem);
- let record =Object.assign({}, scanRstItem)
- // record.carNo=scanRstItem.carNo;
- // record.scanData=scanRstItem.scanData;
- // record.scanType=scanRstItem.scanType;
- record.orderType = this.queryParams.orderType;
- record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
- record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
- // record.createTime=scanRstItem.createTime;
- // record.scanWeight=scanRstItem.scanWeight;
- // console.log(record)
- // let indexBillCode=record.billCode;
- // this.dataMap[indexBillCode]=record;
- // this.emisTmsScanRecordList.push(record);
- this.emisElectronicPagApplyList.push(record);
- }
- });
+ // let record =Object.assign({}, scanRstItem)
+ // record.orderType = this.queryParams.orderType;
+ // record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
+ // record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
+ // this.emisElectronicPagApplyList.push(record);
+ // }
+ // });
},
@@ -704,9 +698,9 @@ export default {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
/** 时间搜索响应函数 */
- dateTimeChange(value){
- this.dateTimeRange=value;
- },
+ // dateTimeChange(value){
+ // this.dateTimeRange=value;
+ // },
}
};
diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
index e53997fd..ae7341bd 100644
--- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
@@ -300,7 +300,7 @@ export default {
this.openBatch=false;
},
submitFormBatch(){
- let bcList=this.formBatch.billCode.split(/[；\;\,\，]/)||[];
+ let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight
let dispatchOrSendMan = this.form.dispatchOrSendMan;
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
diff --git a/src/views/emis/emisTmsScanRecord/unloadingScan.vue b/src/views/emis/emisTmsScanRecord/unloadingScan.vue
index 663d3b21..2f7fecc3 100644
--- a/src/views/emis/emisTmsScanRecord/unloadingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/unloadingScan.vue
@@ -13,22 +13,13 @@
-
-
- KG
-
+
+
-
-
-
-
-
-
-
@@ -67,7 +58,7 @@
-
+
@@ -80,16 +71,8 @@
{{ parseTime(scope.row.scanDate) }}
-
-
-
-
-
@@ -120,7 +103,7 @@ import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
export default {
- name: "unLoadingScan",
+ name: "UnLoadingScan",
props:{
id:undefined
},
@@ -193,16 +176,6 @@ export default {
getRowSelect(row, column, event) {
// dosomething
},
-
- onSiteSelect(item){
- console.log(item)
- // this.form.dispatchOrSendMan=item.empName;
- // this.form.dispatchOrSendManCode=item.empCode;
- this.form.preOrNextStation=item.destSiteName;
- this.form.preOrNextStationCode=item.destSite;
-
- // Todo
- },
getRowsSelect(arr) {
this.form.ids= arr.map(item=>item.id)
},
@@ -229,26 +202,27 @@ export default {
this.openBatch=false;
},
submitFormBatch(){
-
if(this.formBatch.billCode==null || this.formBatch.billCode==''){
this.$message.error("输入单号后回车");
return;
}
- let bcList=this.formBatch.billCode.split(/[；\;\,\，]/)||[];
- let scanWeight = this.form.scanWeight
- let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
+ let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[];
+ // let scanWeight = this.form.scanWeight
+ // let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
+ let carNo = this.form.carNo;
let scList=bcList.map(function(code) {
return {
billCode:code,
- scanWeight:scanWeight,
+ carNo: carNo
+ // scanWeight:scanWeight,
// scanWeight:null,
- dispatchOrSendManCode: dispatchOrSendManCode
+ // dispatchOrSendManCode: dispatchOrSendManCode
}
}
)
let scanInfo = {
- scanType:"20",
+ scanType:"302",
opType:1,
scanData:scList
};
@@ -266,7 +240,7 @@ export default {
return;
}
- this.form.scanType = '20';
+ this.form.scanType = '302';
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
@@ -356,16 +330,16 @@ export default {
{
billCode:item.billCode,
scanWeight:item.scanWeight,
+ carNo:item.carNo,
preOrNextStationCode:item.preOrNextStationCode,
- scanDate:item.scanDate
- // dispatchOrSendManCode:item.dispatchOrSendManCode
+ scanDate:item.scanDate,
+ bagNo:item.bagNo
}
);
});
// 检查
- let scanInfo = {scanType:"20",opType:2,scanData:scanData}
- console.log(scanInfo)
+ let scanInfo = {scanType:"302",opType:2,scanData:scanData}
doScan(scanInfo).then(response => {
console.log(response);
@@ -377,17 +351,6 @@ export default {
}
this.$modal.msgSuccess(scanRstItem.message);
-
-
- // this.form.scanType = '10';
- // this.form.scanDate = new Date();
- // let record =Object.assign({}, this.form);
- // console.log(record)
- // let indexBillCode=record.billCode;
- // this.dataMap[indexBillCode]=record;
- // this.emisTmsScanRecordList.push(record);
-
- // this.form.billCode =null;
});
@@ -406,12 +369,13 @@ export default {
// 检查
let scanInfo = {
- scanType:"20",
+ scanType:"302",
opType:1,
scanData:[
{
billCode:this.form.billCode,
- scanWeight:this.form.scanWeight,
+ carNo:this.form.carNo,
+ // scanWeight:this.form.scanWeight,
// dispatchOrSendManCode:this.form.dispatchOrSendManCode
}
]
@@ -426,7 +390,7 @@ export default {
return;
}
- this.form.scanType = '20';
+ this.form.scanType = '302';
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
diff --git a/src/views/emis/emisTmsScanRecord/unpackScan.vue b/src/views/emis/emisTmsScanRecord/unpackScan.vue
index 066df5a4..ce9aa6cd 100644
--- a/src/views/emis/emisTmsScanRecord/unpackScan.vue
+++ b/src/views/emis/emisTmsScanRecord/unpackScan.vue
@@ -221,7 +221,7 @@ export default {
this.$message.error("输入单号后回车");
return;
}
- let bcList=this.formBatch.billCode.split(/[；\;\,\，]/)||[];
+ let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
let scList=bcList.map(function(code) {