diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index d1cb8f74..4ac65d6f 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -143,8 +143,11 @@
-
-
+
+
+
+
+
@@ -597,7 +600,7 @@
下单时间
- 录单时间
+
@@ -649,8 +652,11 @@
-
-
+
+
+
+
+
@@ -782,7 +788,10 @@ export default {
wayBillData: {
pageNum: 1,
pageSize: 20,
- params:{}
+ params:{
+ queryOrderType:'1',
+ dataTimeType:'1'
+ }
},
// 追加的运单数据
emisWayBillList:[],
@@ -1046,6 +1055,29 @@ export default {
this.wayBillData.params.endCreateTime = dateToStr(new Date(this.wayBillData.dateTimeRange[1]));
}
}
+ if(this.wayBillData.billCode){
+ let qBillCode=formatSearchStr(this.wayBillData.billCode);
+ let billArr = qBillCode.split(",");
+ let newBillCodeStr="";
+ billArr.forEach(item=>{
+ if(item.startsWith("T")){
+ let mainBillCode=item.substr(0,14);
+ newBillCodeStr=newBillCodeStr+mainBillCode+",";
+ }else if(item == ""){
+
+ }else{
+ newBillCodeStr=newBillCodeStr+item+",";
+ }
+ });
+ if(this.wayBillData.params.queryOrderType == "0"){
+ this.wayBillData.orderSN=newBillCodeStr;
+ this.wayBillData.billCode=null;
+ }else{
+ // 处理子单号
+ this.wayBillData.billCode=newBillCodeStr;
+ this.wayBillData.orderSN=null;
+ }
+ }
this.wayBillData.params.isNeedPack = 1;
listEmisWaybill(this.wayBillData).then(response => {
this.loading2 = false;
diff --git a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
index 4583b834..c2b83fc1 100644
--- a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
+++ b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
@@ -54,7 +54,7 @@
下单时间
- 录单时间
+
@@ -138,7 +138,11 @@
-
+
+
+
+
+
@@ -165,7 +169,11 @@
-
+
+
+ {{ scope.row.receiveName }}
+
+
{{ scope.row.receiveCompany }}
@@ -215,7 +223,11 @@
-
+
+
+
+
+
@@ -356,42 +368,42 @@
-
+
-
+
-
+
-
+
-
+
+
+ {{ $t('航空单号') }}
+
+
+ {{ $t('起飞时间') }}
+
+
+ {{ $t('船次号') }}
+
+
+ {{ $t('开船时间') }}
+
+
+ {{ $t('车牌号') }}
+
+
+ {{ $t('发车时间') }}
+
-
+
-
+
@@ -683,7 +713,7 @@
下单时间
- 录单时间
+
@@ -735,9 +765,9 @@
-
+
-
+
@@ -819,7 +849,7 @@ import { formatSearchStr } from '@/utils/index'
export default {
name: "CenterGenBatchMgnt",
components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
- dicts: ['emis_pack_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status'],
+ dicts: ['emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status'],
data() {
return {
// 遮罩层
@@ -869,7 +899,10 @@ export default {
wayBillData: {
pageNum: 1,
pageSize: 20,
- params:{}
+ params:{
+ dataTimeType: '1',
+ queryOrderType: '1'
+ }
},
// 追加的运单数据
emisWayBillList:[],
@@ -933,6 +966,7 @@ export default {
// delFlag: null,
params:{
queryOrderType: '0',
+ queryOrderDateType: '1'
},
},
queryCoParams: {
@@ -1154,6 +1188,29 @@ export default {
this.wayBillData.params.endCreateTime = dateToStr(new Date(this.wayBillData.dateTimeRange[1]));
}
}
+ if(this.wayBillData.billCode){
+ let qBillCode=formatSearchStr(this.wayBillData.billCode);
+ let billArr = qBillCode.split(",");
+ let newBillCodeStr="";
+ billArr.forEach(item=>{
+ if(item.startsWith("T")){
+ let mainBillCode=item.substr(0,14);
+ newBillCodeStr=newBillCodeStr+mainBillCode+",";
+ }else if(item == ""){
+
+ }else{
+ newBillCodeStr=newBillCodeStr+item+",";
+ }
+ });
+ if(this.wayBillData.params.queryOrderType == "0"){
+ this.wayBillData.orderSN=newBillCodeStr;
+ this.wayBillData.billCode=null;
+ }else{
+ // 处理子单号
+ this.wayBillData.billCode=newBillCodeStr;
+ this.wayBillData.orderSN=null;
+ }
+ }
this.wayBillData.params.isNeedBatch = 1;
listEmisWaybill(this.wayBillData).then(response => {
this.loading2 = false;