diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 922718c..e6e69da 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -562,7 +562,12 @@
-
+
+
+
+
+
+
@@ -971,11 +976,16 @@
-
+
+
+
+
+
+
@@ -1128,6 +1138,7 @@
shippingDate:'',
hsCodeDescType:'N',
mexicoShippingMarkFlag: false,
+ showOrderNoFlag: false,
shipper:'Checkpoint Commercial (Shanghai) Co., Ltd. 保点贸易(上海)有限公司\t\t\t\t\t\t\n' +
'Room 1411, No. 31, Lane 2419, Hunan Road, Pudong New Area, Shanghai\t\t\t\t\t\t\n' +
'电话/Tel: (86-21)38112888 传真/Fax: (86-21)38112990\t\t\t\t\t\t\n' +
@@ -1258,7 +1269,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80
+ columnWidth: 90
},
{
userId: this.$store.state.user.name,
@@ -2409,6 +2420,7 @@
this.exportGoods.deliveryGoodsDate = ''
this.exportGoods.voyage = this.buildDefaultVoyage()
this.exportGoods.shippingDate = ''
+ this.exportGoods.showOrderNoFlag = false
this.loadPickupAddressList(this.currentRow.buNo)
this.exportGoodsFlag = true
},
@@ -2424,6 +2436,12 @@
}
return ['05-Alpha', '04-MHM', '02-Hardtag'].includes(this.currentRow.buNo)
},
+ hasOrderNoCheckboxBu() {
+ if (!this.currentRow || !this.currentRow.buNo) {
+ return false
+ }
+ return ['05-Alpha', '02-Hardtag'].includes(this.currentRow.buNo)
+ },
buildDefaultVoyage() {
if (!this.currentRow || !this.currentRow.buNo) {
return ''
@@ -2606,6 +2624,7 @@
exportParam.pickupAddress=this.exportGoods.pickupAddress
exportParam.pickupAddressValue=this.exportGoods.pickupAddressValue
exportParam.mexicoShippingMarkFlag=this.exportGoods.mexicoShippingMarkFlag
+ exportParam.showOrderNoFlag=this.exportGoods.showOrderNoFlag
exportParam.brandType = this.brandType
exportParam.hsCodeDescType=this.hsCodeDescType
@@ -2797,6 +2816,7 @@
this.exportGoods.deliveryGoodsDate = ''
this.exportGoods.voyage = this.buildDefaultVoyage()
this.exportGoods.shippingDate = '';
+ this.exportGoods.showOrderNoFlag = false
await this.loadPickupAddressList(this.currentRow.buNo)
//this.templateData.type='出口货物委托书'
//await this.searchTemplateOne();
@@ -2848,6 +2868,7 @@
exportParam.pickupAddress=this.exportGoods.pickupAddress
exportParam.pickupAddressValue=this.exportGoods.pickupAddressValue
exportParam.mexicoShippingMarkFlag=this.exportGoods.mexicoShippingMarkFlag
+ exportParam.showOrderNoFlag=this.exportGoods.showOrderNoFlag
exportParam.brandType = this.brandType
exportParam.hsCodeDescType=this.hsCodeDescType