diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index d4ac93e..15d40f2 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -543,16 +543,22 @@
-
+
-
+
+
+
+ 英文
+ 中文
+
+
@@ -564,7 +570,7 @@
-
+
@@ -987,8 +993,8 @@
- 中文
- 英文
+ 中文
+ 英文
@@ -1017,7 +1023,7 @@
-
+
@@ -1182,6 +1188,7 @@
voyage :'',
shippingDate:'',
hsCodeDescType:'N',
+ hsCodeDescTypeBooking:'N',
mexicoShippingMarkFlag: false,
showOrderNoFlag: false,
showInvoiceFlag: false,
@@ -2173,6 +2180,23 @@
this.height = (window.innerHeight - 240)/2;
})
},
+ computed: {
+ singleExportGoodsHsCodeDescType: {
+ get() {
+ if (this.hasBookingHsCodeDescTypeBu()) {
+ return this.exportGoods.hsCodeDescTypeBooking || 'N'
+ }
+ return this.exportGoods.hsCodeDescType || 'N'
+ },
+ set(value) {
+ if (this.hasBookingHsCodeDescTypeBu()) {
+ this.exportGoods.hsCodeDescTypeBooking = value
+ } else {
+ this.exportGoods.hsCodeDescType = value
+ }
+ }
+ }
+ },
methods: {
shouldShowDetailColumn(item) {
const isLabelOrRfid = this.currentRow && (this.currentRow.buNo === '01-Label' || this.currentRow.buNo === '03-RFID')
@@ -2554,6 +2578,7 @@
return
}
this.exportGoods.hsCodeDescType = 'N'
+ this.exportGoods.hsCodeDescTypeBooking = 'N'
this.exportGoods.salesMethod = 'EXW'
this.exportGoods.currency = this.dataList2.length>0?this.dataList2[0].currency:'USD'
this.exportGoods.madeArea = 'Nantong, China'
@@ -2584,6 +2609,18 @@
}
return ['05-Alpha', '02-Hardtag'].includes(this.currentRow.buNo)
},
+ hasBookingHsCodeDescTypeBu() {
+ if (!this.currentRow || !this.currentRow.buNo) {
+ return false
+ }
+ return ['05-Alpha', '04-MHM', '02-Hardtag'].includes(this.currentRow.buNo)
+ },
+ getBookingHsCodeDescType() {
+ if (this.hasBookingHsCodeDescTypeBu()) {
+ return this.exportGoods.hsCodeDescTypeBooking || 'N'
+ }
+ return this.exportGoods.hsCodeDescType || 'N'
+ },
buildDefaultVoyage() {
if (!this.currentRow || !this.currentRow.buNo) {
return ''
@@ -2717,6 +2754,7 @@
this.$message.warning('请选择报关单!')
return
}
+ this.exportGoods.hsCodeDescTypeBooking = this.getBookingHsCodeDescType()
let exportParam=this.exportGoods
exportParam.declarationNo = this.currentRow.declarationNo
exportParam.site = this.currentRow.site
@@ -2760,7 +2798,7 @@
exportParam.deliveryGoodsDate=this.exportGoods.deliveryGoodsDate
exportParam.voyage=this.exportGoods.voyage
exportParam.shippingDate=this.exportGoods.shippingDate
- exportParam.hsCodeDescType=this.exportGoods.hsCodeDescType
+ exportParam.hsCodeDescTypeBooking=this.getBookingHsCodeDescType()
exportParam.shipper=this.exportGoods.shipper
exportParam.pickupCompany=this.exportGoods.pickupCompany
exportParam.pickupAddress=this.exportGoods.pickupAddress
@@ -2932,6 +2970,8 @@
this.exportGoods.deliveryGoodsDate = ''
this.exportGoods.voyage = this.buildDefaultVoyage()
this.exportGoods.shippingDate = '';
+ this.exportGoods.hsCodeDescType = 'N'
+ this.exportGoods.hsCodeDescTypeBooking = 'N'
this.exportGoods.showOrderNoFlag = false
this.exportGoods.showInvoiceFlag = false
await this.loadPickupAddressList(this.currentRow.buNo)
@@ -2979,7 +3019,7 @@
exportParam.deliveryGoodsDate=this.exportGoods.deliveryGoodsDate
exportParam.voyage=this.exportGoods.voyage
exportParam.shippingDate=this.exportGoods.shippingDate
- exportParam.hsCodeDescType=this.exportGoods.hsCodeDescType
+ exportParam.hsCodeDescTypeBooking=this.getBookingHsCodeDescType()
exportParam.shipper=this.exportGoods.shipper
exportParam.pickupCompany=this.exportGoods.pickupCompany
exportParam.pickupAddress=this.exportGoods.pickupAddress