|
@@ -210,6 +210,12 @@
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-model-item label="体积" prop="totalVolume">
|
|
|
+ <a-input placeholder="请输入体积" v-model="addBook.totalVolume" readOnly></a-input>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+
|
|
|
|
|
|
|
|
|
<!-- <a-col :md="6" :sm="8">
|
|
@@ -259,7 +265,7 @@
|
|
|
<!-- 集装箱号 输入框-->
|
|
|
<template slot="containerNumber" slot-scope="text, record, index">
|
|
|
<a-form-model-item prop="containerNumber" :rules="rules.containerNumber">
|
|
|
- <a-input style="width:100%" type="text" v-model="record.containerNumber" />
|
|
|
+ <a-input style="width:100%" type="text" v-model="record.containerNumber" @blur="changeContainerNumber"/>
|
|
|
</a-form-model-item>
|
|
|
</template>
|
|
|
|
|
@@ -596,7 +602,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
// 参照装箱单
|
|
|
- referPackingList(data) {
|
|
|
+ referPackingList(data) {
|
|
|
console.log('打开参照装箱单')
|
|
|
if(data === '0'){
|
|
|
this.$refs.packingListModal.packingListModVis = true
|
|
@@ -614,7 +620,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- referCallback(data){
|
|
|
+ referCallback(data,text){
|
|
|
data.map(item=>{
|
|
|
item.readyFabric=item.readyFabric
|
|
|
item.tailoringFabricItemId=item.itemId
|
|
@@ -622,13 +628,14 @@ export default {
|
|
|
item.clientAbbreviation = item.customerAbbreviation
|
|
|
item.styleNumber = item.itemNumber
|
|
|
item.boxNumber = item.planQuantity
|
|
|
- var str = item.preDeliveryDate
|
|
|
- var n=str.split(" ");
|
|
|
- item.preDeliveryDate = n[0]
|
|
|
- item.price = (item.totalPrice/item.netWeight).toFixed(2)
|
|
|
+
|
|
|
item.netWeight = (Number(item.netWeight)).toFixed(2)
|
|
|
item.grossWeight = (Number(item.grossWeight)).toFixed(2)
|
|
|
item.number = (Number(item.number)).toFixed(2)
|
|
|
+ //参照面料时,单价许计算 金额/净重
|
|
|
+ if(item.readyFabric == '面料'){
|
|
|
+ item.price = (item.totalPrice/item.netWeight).toFixed(2)
|
|
|
+ }
|
|
|
})
|
|
|
// var subList = this.convertReferToSub(data);
|
|
|
this.addBookData = this.addBookData.concat(data);
|
|
@@ -637,6 +644,29 @@ export default {
|
|
|
this.addBook.exportPort='宁波'
|
|
|
var dd = moment(new Date()).format('YYYY-MM-DD')
|
|
|
this.$set( this.addBook,'shippingOrderDate',dd)
|
|
|
+ //参照成衣是表头数据默认值
|
|
|
+ if(text == '成衣'){
|
|
|
+ var transitionData = data[0]
|
|
|
+ this.addBook = {
|
|
|
+ shippingOrderNumber:transitionData.depositaryReceiptNo,
|
|
|
+ shippingOrderDate:transitionData.shippingOrderDate,
|
|
|
+ unitInOperation:transitionData.unitInOperation,
|
|
|
+ unitInOperationAddress:transitionData.unitInOperationAddress,
|
|
|
+ latestDateOfShipment:transitionData.latestDateOfShipment,
|
|
|
+ theFinalShippingDate:transitionData.theFinalShippingDate,
|
|
|
+ tradeCountry:transitionData.tradeCountry,
|
|
|
+ arriveInCountry:transitionData.arriveInCountry,
|
|
|
+ consignee:transitionData.consignee,
|
|
|
+ consigneeAddress:transitionData.consigneeAddress,
|
|
|
+ notifyParty:transitionData.notifyParty,
|
|
|
+ notifyPartyAddress:transitionData.notifyPartyAddress,
|
|
|
+ exportPort:transitionData.exportPort,
|
|
|
+ destinationPort:transitionData.destinationPort,
|
|
|
+ exchangeEarningsValue:transitionData.exchangeEarningsValue,
|
|
|
+ termsOfDeliveryvalue:transitionData.termsOfDeliveryvalue,
|
|
|
+ totalVolume:transitionData.totalVolume,
|
|
|
+ }
|
|
|
+ }
|
|
|
this.setHeadCalField()
|
|
|
},
|
|
|
|
|
@@ -719,17 +749,34 @@ export default {
|
|
|
},
|
|
|
// 设置表头计算值,直接设置表头值对象不能刷新,把表头对象换了就可以了
|
|
|
setHeadCalField(){
|
|
|
+ var containerNumberArr = [],
|
|
|
+ readyFabricArr = []
|
|
|
var headData = JSON.parse(JSON.stringify(this.addBook));
|
|
|
var moneyAll = 0;
|
|
|
for (var i=0; i<this.addBookData.length; i++){
|
|
|
var rowData = this.addBookData[i];
|
|
|
+ if(rowData.readyFabric == '面料'){
|
|
|
+ containerNumberArr.push(rowData.containerNumber)
|
|
|
+ readyFabricArr.push(rowData.readyFabric)
|
|
|
+ }
|
|
|
+
|
|
|
if (rowData.totalPrice != undefined && rowData.totalPrice != ""){
|
|
|
moneyAll += rowData.totalPrice*1;
|
|
|
}
|
|
|
}
|
|
|
+ containerNumberArr = [...new Set(containerNumberArr)]
|
|
|
+ readyFabricArr = [...new Set(readyFabricArr)]
|
|
|
+ if(readyFabricArr.length == 1 && readyFabricArr[0] == '面料'){
|
|
|
+ headData.totalVolume = (containerNumberArr.length)*68;
|
|
|
+ }
|
|
|
headData.money = moneyAll;
|
|
|
this.addBook = headData;
|
|
|
},
|
|
|
+
|
|
|
+ //集装箱号修改
|
|
|
+ changeContainerNumber(){
|
|
|
+ this.setHeadCalField()
|
|
|
+ },
|
|
|
// // 新增托书 子表合计
|
|
|
// addBookFooterShow(data) {
|
|
|
// console.log('新增托书 子表 ----合计行')
|