diff --git a/src/views/emis/emisTmsScanRecord/customsClearScan.vue b/src/views/emis/emisTmsScanRecord/customsClearScan.vue
index 9d1173a4..483f68d6 100644
--- a/src/views/emis/emisTmsScanRecord/customsClearScan.vue
+++ b/src/views/emis/emisTmsScanRecord/customsClearScan.vue
@@ -84,7 +84,7 @@
-
+
@@ -131,6 +131,7 @@
import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
import { parseTime } from "@/utils/custom";
+import { getWaybillDetail} from "@/api/emis/emisWaybill";
export default {
name: "CustomsClearScan",
@@ -301,15 +302,29 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
- console.log(record)
- let indexBillCode=record.billCode;
- this.dataMap[indexBillCode]=record;
- this.emisTmsScanRecordList.push(record);
+ // console.log(record)
+ // let indexBillCode=record.billCode;
+ // this.dataMap[indexBillCode]=record;
+ // this.emisTmsScanRecordList.push(record);
+ this.addItem(record);
+
}
});
this.openBatch=false;
},
+ async addItem(item){
+ let res=await getWaybillDetail(item.billCode);
+ // this.loading = false;
+ if(res.code != 200){
+ this.$message.error(res.msg);
+ return;
+ }
+ item.dispatchUnderlingSiteName = res.data.dispatchUnderlingSiteName;
+ let indexBillCode=item.billCode;
+ this.dataMap[indexBillCode]=item;
+ this.emisTmsScanRecordList.push(item);
+ },
// 表单重置
reset() {
this.form = {
@@ -466,10 +481,11 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
- console.log(record)
- let indexBillCode=record.billCode;
- this.dataMap[indexBillCode]=record;
- this.emisTmsScanRecordList.push(record);
+ // console.log(record)
+ // let indexBillCode=record.billCode;
+ // this.dataMap[indexBillCode]=record;
+ // this.emisTmsScanRecordList.push(record);
+ this.addItem(record);
});
diff --git a/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue b/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
index fa574109..e4b886fb 100644
--- a/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
+++ b/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
@@ -82,7 +82,7 @@
-
+
@@ -129,6 +129,7 @@
import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
import { parseTime } from "@/utils/custom";
+import { getWaybillDetail} from "@/api/emis/emisWaybill";
export default {
name: "CustomsDeclearScan",
@@ -304,15 +305,28 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
- console.log(record)
- let indexBillCode=record.billCode;
- this.dataMap[indexBillCode]=record;
- this.emisTmsScanRecordList.push(record);
+ // console.log(record)
+ // let indexBillCode=record.billCode;
+ // this.dataMap[indexBillCode]=record;
+ // this.emisTmsScanRecordList.push(record);
+ this.addItem(record);
}
});
this.openBatch=false;
},
+ async addItem(item){
+ let res=await getWaybillDetail(item.billCode);
+ // this.loading = false;
+ if(res.code != 200){
+ this.$message.error(res.msg);
+ return;
+ }
+ item.dispatchUnderlingSiteName = res.data.dispatchUnderlingSiteName;
+ let indexBillCode=item.billCode;
+ this.dataMap[indexBillCode]=item;
+ this.emisTmsScanRecordList.push(item);
+ },
// 表单重置
reset() {
this.form = {
@@ -469,10 +483,11 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
- console.log(record)
- let indexBillCode=record.billCode;
- this.dataMap[indexBillCode]=record;
- this.emisTmsScanRecordList.push(record);
+ // console.log(record)
+ // let indexBillCode=record.billCode;
+ // this.dataMap[indexBillCode]=record;
+ // this.emisTmsScanRecordList.push(record);
+ this.addItem(record);
});
diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
index 731af2af..33087559 100644
--- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
@@ -82,7 +82,7 @@
-
+
@@ -129,6 +129,7 @@
import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
import { parseTime } from "@/utils/custom";
+import { getWaybillDetail} from "@/api/emis/emisWaybill";
export default {
name: "OutgoingScan",
@@ -303,15 +304,27 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
- console.log(record)
- let indexBillCode=record.billCode;
- this.dataMap[indexBillCode]=record;
- this.emisTmsScanRecordList.push(record);
+ // let indexBillCode=record.billCode;
+ // this.dataMap[indexBillCode]=record;
+ // this.emisTmsScanRecordList.push(record);
+ this.addItem(record);
}
});
this.openBatch=false;
},
+ async addItem(item){
+ let res=await getWaybillDetail(item.billCode);
+ // this.loading = false;
+ if(res.code != 200){
+ this.$message.error(res.msg);
+ return;
+ }
+ item.dispatchUnderlingSiteName = res.data.dispatchUnderlingSiteName;
+ let indexBillCode=item.billCode;
+ this.dataMap[indexBillCode]=item;
+ this.emisTmsScanRecordList.push(item);
+ },
// 表单重置
reset() {
this.form = {
@@ -467,10 +480,11 @@ export default {
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
- console.log(record)
- let indexBillCode=record.billCode;
- this.dataMap[indexBillCode]=record;
- this.emisTmsScanRecordList.push(record);
+ // console.log(record)
+ // let indexBillCode=record.billCode;
+ // this.dataMap[indexBillCode]=record;
+ // this.emisTmsScanRecordList.push(record);
+ this.addItem(record);
});
diff --git a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
index 9cbcdafa..e0eb5c30 100644
--- a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
@@ -699,8 +699,17 @@ export default {
let rsItem = rows[index];
console.log(rsItem);
let record =Object.assign({}, rsItem)
- record.notifySiteCode = record.sendSiteCode;
- record.notifySiteName = record.sendSiteName;
+ // record.notifySiteCode = record.sendSiteCode;
+ // record.notifySiteName = record.sendSiteName;
+
+ if(record.sendSiteCode == this.$store.getters.ownerSiteCode){
+ record.notifySiteCode = record.dispatchUnderlingSiteCode;
+ record.notifySiteName = record.dispatchUnderlingSiteName;
+ }else{
+ record.notifySiteCode = record.sendSiteCode;
+ record.notifySiteName = record.sendSiteName;
+ }
+
record.scanSiteCode=this.form.scanSiteCode;
record.scanSite=this.form.scanSite;
record.scanDate=scanDate;