Browse Source

硬标/Alpha复选框(显示订单号),默认不勾选,勾选了就显示PO号

master
han\hanst 18 hours ago
parent
commit
93c79473fd
  1. 27
      src/views/modules/ecss/declaration.vue

27
src/views/modules/ecss/declaration.vue

@ -562,7 +562,12 @@
<el-input v-model="exportGoods.sendPort"></el-input> <el-input v-model="exportGoods.sendPort"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-show="hasMexicoShippingMarkBu()">
<el-col :span="4" v-show="hasOrderNoCheckboxBu()">
<el-form-item :label="'显示订单号'" >
<el-checkbox v-model="exportGoods.showOrderNoFlag"></el-checkbox>
</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-checkbox v-model="exportGoods.mexicoShippingMarkFlag"></el-checkbox>
</el-form-item> </el-form-item>
@ -971,11 +976,16 @@
<el-input type="textarea" :rows="3" v-model="exportGoods.voyage"></el-input> <el-input type="textarea" :rows="3" v-model="exportGoods.voyage"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="hasPickupAddressBu()?24:12" v-show="hasMexicoShippingMarkBu()">
<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-checkbox v-model="exportGoods.mexicoShippingMarkFlag"></el-checkbox>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-show="hasOrderNoCheckboxBu()">
<el-form-item :label="'显示订单号'" >
<el-checkbox v-model="exportGoods.showOrderNoFlag"></el-checkbox>
</el-form-item>
</el-col>
<el-col v-show="!hasPickupAddressBu()" :span="12"> <el-col v-show="!hasPickupAddressBu()" :span="12">
<el-form-item :label="'提/送货日期'" > <el-form-item :label="'提/送货日期'" >
<el-input v-model="exportGoods.deliveryGoodsDate"></el-input> <el-input v-model="exportGoods.deliveryGoodsDate"></el-input>
@ -1128,6 +1138,7 @@
shippingDate:'', shippingDate:'',
hsCodeDescType:'N', hsCodeDescType:'N',
mexicoShippingMarkFlag: false, mexicoShippingMarkFlag: false,
showOrderNoFlag: false,
shipper:'Checkpoint Commercial (Shanghai) Co., Ltd. 保点贸易(上海)有限公司\t\t\t\t\t\t\n' + 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' + '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' + '电话/Tel: (86-21)38112888 传真/Fax: (86-21)38112990\t\t\t\t\t\t\n' +
@ -1258,7 +1269,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80
columnWidth: 90
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -2409,6 +2420,7 @@
this.exportGoods.deliveryGoodsDate = '' this.exportGoods.deliveryGoodsDate = ''
this.exportGoods.voyage = this.buildDefaultVoyage() this.exportGoods.voyage = this.buildDefaultVoyage()
this.exportGoods.shippingDate = '' this.exportGoods.shippingDate = ''
this.exportGoods.showOrderNoFlag = false
this.loadPickupAddressList(this.currentRow.buNo) this.loadPickupAddressList(this.currentRow.buNo)
this.exportGoodsFlag = true this.exportGoodsFlag = true
}, },
@ -2424,6 +2436,12 @@
} }
return ['05-Alpha', '04-MHM', '02-Hardtag'].includes(this.currentRow.buNo) 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() { buildDefaultVoyage() {
if (!this.currentRow || !this.currentRow.buNo) { if (!this.currentRow || !this.currentRow.buNo) {
return '' return ''
@ -2606,6 +2624,7 @@
exportParam.pickupAddress=this.exportGoods.pickupAddress exportParam.pickupAddress=this.exportGoods.pickupAddress
exportParam.pickupAddressValue=this.exportGoods.pickupAddressValue exportParam.pickupAddressValue=this.exportGoods.pickupAddressValue
exportParam.mexicoShippingMarkFlag=this.exportGoods.mexicoShippingMarkFlag exportParam.mexicoShippingMarkFlag=this.exportGoods.mexicoShippingMarkFlag
exportParam.showOrderNoFlag=this.exportGoods.showOrderNoFlag
exportParam.brandType = this.brandType exportParam.brandType = this.brandType
exportParam.hsCodeDescType=this.hsCodeDescType exportParam.hsCodeDescType=this.hsCodeDescType
@ -2797,6 +2816,7 @@
this.exportGoods.deliveryGoodsDate = '' this.exportGoods.deliveryGoodsDate = ''
this.exportGoods.voyage = this.buildDefaultVoyage() this.exportGoods.voyage = this.buildDefaultVoyage()
this.exportGoods.shippingDate = ''; this.exportGoods.shippingDate = '';
this.exportGoods.showOrderNoFlag = false
await this.loadPickupAddressList(this.currentRow.buNo) await this.loadPickupAddressList(this.currentRow.buNo)
//this.templateData.type='' //this.templateData.type=''
//await this.searchTemplateOne(); //await this.searchTemplateOne();
@ -2848,6 +2868,7 @@
exportParam.pickupAddress=this.exportGoods.pickupAddress exportParam.pickupAddress=this.exportGoods.pickupAddress
exportParam.pickupAddressValue=this.exportGoods.pickupAddressValue exportParam.pickupAddressValue=this.exportGoods.pickupAddressValue
exportParam.mexicoShippingMarkFlag=this.exportGoods.mexicoShippingMarkFlag exportParam.mexicoShippingMarkFlag=this.exportGoods.mexicoShippingMarkFlag
exportParam.showOrderNoFlag=this.exportGoods.showOrderNoFlag
exportParam.brandType = this.brandType exportParam.brandType = this.brandType
exportParam.hsCodeDescType=this.hsCodeDescType exportParam.hsCodeDescType=this.hsCodeDescType

Loading…
Cancel
Save