wilson
/
xujiecloud-vue
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

托书品名类型（仅硬标/Alpha/天线生效）

master
han\hanst 18 hours ago
parent
3078ff36a2
commit
944106ecca
1 changed files with 48 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 56
      src/views/modules/ecss/declaration.vue

56
src/views/modules/ecss/declaration.vue
View File

@ -543,16 +543,22 @@
<el-input v-model="exportGoods.salesMethod"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="5">
<el-form-item :label="'货物产地'" >
<el-input v-model="exportGoods.madeArea"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="5">
<el-form-item :label="'发货港'" >
<el-input v-model="exportGoods.sendPort"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-show="hasBookingHsCodeDescTypeBu()">
<el-form-item :label="'托书品名类型'" >
<el-radio v-model="exportGoods.hsCodeDescTypeBooking" label="N">英文</el-radio>
<el-radio style="margin-left: 50px;" v-model="exportGoods.hsCodeDescTypeBooking" label="Y">中文</el-radio>
</el-form-item>
</el-col>
<el-col :span="2" v-show="hasOrderNoCheckboxBu()">
<el-form-item :label="'订单号'" >
<el-checkbox v-model="exportGoods.showOrderNoFlag"></el-checkbox>
@ -564,7 +570,7 @@
</el-form-item>
</el-col>
<el-col :span="hasOrderNoCheckboxBu()?4:8" v-show="hasMexicoShippingMarkBu()">
<el-form-item :label="'墨西哥唛头'" >
<el-form-item :label="'西班牙唛头'" >
<el-checkbox v-model="exportGoods.mexicoShippingMarkFlag"></el-checkbox>
</el-form-item>
</el-col>
@ -987,8 +993,8 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item :label="'品名类型'" >
<el-radio v-model="exportGoods.hsCodeDescType" label="Y">中文</el-radio>
<el-radio v-model="exportGoods.hsCodeDescType" label="N">英文</el-radio>
<el-radio v-model="singleExportGoodsHsCodeDescType" label="Y">中文</el-radio>
<el-radio v-model="singleExportGoodsHsCodeDescType" label="N">英文</el-radio>
</el-form-item>
</el-col>
<el-col :span="12">
@ -1017,7 +1023,7 @@
</el-form-item>
</el-col>
<el-col :span="hasOrderNoCheckboxBu()?6:(hasPickupAddressBu()?24:12)" v-show="hasMexicoShippingMarkBu()">
<el-form-item :label="'墨西哥唛头'" >
<el-form-item :label="'西班牙唛头'" >
<el-checkbox v-model="exportGoods.mexicoShippingMarkFlag"></el-checkbox>
</el-form-item>
</el-col>
@ -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

Write Preview
Loading…
Cancel
Save