diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index 2ecfb1df..a7af07da 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -203,11 +203,12 @@
-
+
{{ $t('生成网点') }}
-
+
+
@@ -361,7 +362,7 @@
-
+
@@ -484,7 +485,7 @@
-
+
@@ -595,7 +596,7 @@ export default {
destCountry: null,
destCountryName: null,
blUnpack: null,
- sendStiteCode: null,
+ sendSiteCode: null,
totalParcelQty: null,
totalWaybillQty: null,
totalVolume: null,
@@ -611,6 +612,7 @@ export default {
};
},
created() {
+
},
mounted() {
@@ -672,7 +674,7 @@ export default {
this.wayBillData.dateTimeRange=value;
},
async handleAddCoPack(){
- if(!this.coData.destCountry || !this.coData.sendStiteCode || !this.coData.nextSiteCode || !this.blUnpack){
+ if(!this.coData.destCountry || !this.coData.sendSiteCode || !this.coData.nextSiteCode || !this.blUnpack){
this.$modal.msgError("请先选择必填项")
return;
}
@@ -688,7 +690,8 @@ export default {
nextSiteCode: this.coData.nextSiteCode,
// destCountryName: this.coData.,
blUnpack: this.coData.blUnpack,
- sendStiteCode: this.coData.sendStiteCode,
+ sendSiteCode: this.coData.sendSiteCode,
+ sendSiteName: this.coData.sendSiteName,
totalParcelQty: this.coData.totalParcelQty,
totalWaybillQty: this.coData.totalWaybillQty,
totalVolume: this.coData.totalVolume,
@@ -726,7 +729,7 @@ export default {
}else if(this.coPackType == "edit"){// 修改
//第一步：处理合包信息的更新；
if(this.tempCoPackInfo.destCountry != this.coData.destCountry
- || this.tempCoPackInfo.sendStiteCode != this.coData.sendStiteCode
+ || this.tempCoPackInfo.sendSiteCode != this.coData.sendSiteCode
|| this.tempCoPackInfo.nextSiteCode != this.coData.nextSiteCode
|| this.tempCoPackInfo.blUnpack != this.blUnpack
|| this.tempCoPackInfo.totalWaybillQty != this.coData.totalWaybillQty
@@ -735,7 +738,7 @@ export default {
|| this.tempCoPackInfo.totalVolume != this.coData.totalVolume
){
this.tempCoPackInfo.destCountry = this.coData.destCountry;
- this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode;
+ this.tempCoPackInfo.sendSiteCode = this.coData.sendSiteCode;
this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
this.tempCoPackInfo.blUnpack = this.blUnpack;
this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
@@ -909,7 +912,7 @@ export default {
totalWeight +=item.billWeight;
totalVolume +=item.totalVolume;
item.destCountry = this.coData.destCountry;
- item.sendStiteCode = this.coData.sendStiteCode;
+ item.sendSiteCode = this.coData.sendSiteCode;
item.nextSiteCode = this.coData.nextSiteCode;
item.blUnpack = this.blUnpack;
})
@@ -939,10 +942,13 @@ export default {
this.coData.createTime = parseTime(new Date());
this.coData.destCountry = null;
this.coData.destCountryName = null;
- this.coData.sendStiteCode = null;
+ // this.coData.sendSiteCode = null;
this.coData.nextSiteCode = null;
this.coData.nextStation = null;
this.blUnpack = "1";
+
+ this.coData.sendSiteCode = this.$store.getters.ownerSiteCode;
+ this.coData.sendSiteName=this.$store.getters.ownerSiteName;
this.currentId=null;
this.openForm= true;
@@ -968,7 +974,8 @@ export default {
this.coData.createTime = resData.createTime;
this.coData.destCountry = resData.destCountry;
// this.coData.destCountryName = null;
- this.coData.sendStiteCode = resData.sendStiteCode;
+ this.coData.sendSiteCode = resData.sendSiteCode;
+ this.coData.sendSiteCode = resData.sendSiteName;
this.coData.nextSiteCode = resData.nextSiteCode;
// this.coData.nextStation = null;
this.blUnpack = resData.blUnpack;
@@ -982,13 +989,6 @@ export default {
this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
this.tempCoPackInfo = resData;
for(let p = 0; p < resList.rows.length;p++){
- // let resd = await getWaybillDetail(resList.rows[p].billCode);
- // if(!resd || resd.code != 200){
- // this.$message.error(resd && resd.msg || "未知错误");
- // return;
- // }
- // this.emisCoPackDetail.push(resd.data);
- ;
this.emisCoPackDetail.push(resList.rows[p].waybillDetail);
}
this.coData.packStatus = this.tempCoPackInfo.packStatus;
@@ -1039,7 +1039,7 @@ export default {
const curList = response.rows
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['id','合包号','合包名称','合包时间','目的国家','目的国家名称','是否可拆','发出网点','下一网点','下一站','总件数','总运单数','总体积','总重量','合包状态','扩展数据','操作员','ext1','ext2','ext3','ext4','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
- const filterVal = ['id','packNo','packName','packDate','destCountry','destCountryName','blUnpack','sendStiteCode','nextSiteCode','nextStation','totalParcelQty','totalWaybillQty','totalVolume','totalWeight','packStatus','extData','opMan','ext1','ext2','ext3','ext4','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+ const filterVal = ['id','packNo','packName','packDate','destCountry','destCountryName','blUnpack','sendSiteCode','nextSiteCode','nextStation','totalParcelQty','totalWaybillQty','totalVolume','totalWeight','packStatus','extData','opMan','ext1','ext2','ext3','ext4','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
const data = this.formatJson(filterVal, curList, response.rows)
excel.export_json_to_excel({
header: tHeader,
diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
index 7e3a2c54..6dbb56d1 100644
--- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
+++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
@@ -109,9 +109,6 @@
-
- T0123219321 有问题
-