|
|
@@ -84,6 +84,36 @@
|
|
|
<a-input placeholder="请输入托书号" v-model="clothesAdd.bookNum"></a-input>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-model-item label="总箱数" prop="totalBoxes">
|
|
|
+ <a-input placeholder="请输入总箱数" v-model="clothesAdd.totalBoxes"></a-input>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-model-item label="总毛重" prop="totalGrossWeight">
|
|
|
+ <a-input placeholder="请输入总毛重" v-model="clothesAdd.totalGrossWeight"></a-input>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-model-item label="总净重" prop="totalNetWeight">
|
|
|
+ <a-input placeholder="请输入总净重" v-model="clothesAdd.totalNetWeight"></a-input>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-model-item label="总体积" prop="totalVolume">
|
|
|
+ <a-input placeholder="请输入总体积" v-model="clothesAdd.totalVolume"></a-input>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-model-item label="总价" prop="totalPrice">
|
|
|
+ <a-input placeholder="请输入总价" v-model="clothesAdd.totalPrice"></a-input>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-model-item label="总件数" prop="total">
|
|
|
+ <a-input placeholder="请输入总件数" v-model="clothesAdd.total"></a-input>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
</a-row>
|
|
|
</a-form-model>
|
|
|
</div>
|
|
|
@@ -365,7 +395,6 @@ export default {
|
|
|
width: 240,
|
|
|
type: JVXETypes.normal ,
|
|
|
},
|
|
|
-
|
|
|
{
|
|
|
title: '总件数',
|
|
|
key: 'total',
|
|
|
@@ -507,8 +536,9 @@ export default {
|
|
|
note: data.u8Remarks,
|
|
|
// clothesFactory: data.garmentFactory,
|
|
|
exportInvoiceNo: data.exportInvoiceNo,
|
|
|
- bookNum: data.depositaryReceiptNo
|
|
|
+ bookNum: data.depositaryReceiptNo,
|
|
|
}
|
|
|
+ this.setHeadCalField(data.syPackingListTailoringItemList)
|
|
|
this.dynamicColumns(data.sizeTables)
|
|
|
this.clothesAddData = data.syPackingListTailoringItemList
|
|
|
this.clothesAddData.map(item =>{
|
|
|
@@ -553,7 +583,42 @@ export default {
|
|
|
this.clothesAddColumns = newColumns
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
+ //计算主表中所需计算的值
|
|
|
+ setHeadCalField(data){
|
|
|
+ var totalBoxes = 0;
|
|
|
+ var totalNetWeight = 0;
|
|
|
+ var totalGrossWeight = 0;
|
|
|
+ var totalVolume = 0;
|
|
|
+ var totalPrice = 0;
|
|
|
+ var total = 0
|
|
|
+ for(var i =0;i<data.length;i++){
|
|
|
+ var rowData = data[i];
|
|
|
+ totalBoxes += rowData.boxNumber;
|
|
|
+ if (rowData.totalNetWeight != undefined && rowData.totalNetWeight != ""){
|
|
|
+ totalNetWeight += rowData.totalNetWeight*1;
|
|
|
+ }
|
|
|
+ if (rowData.totalGrossWeight != undefined && rowData.totalGrossWeight != ""){
|
|
|
+ totalGrossWeight += rowData.totalGrossWeight*1;
|
|
|
+ }
|
|
|
+ if (rowData.totalVolume != undefined && rowData.totalVolume != ""){
|
|
|
+ totalVolume += rowData.totalVolume*1;
|
|
|
+ }
|
|
|
+ if (rowData.totalPrice != undefined && rowData.totalPrice != ""){
|
|
|
+ totalPrice += rowData.totalPrice*1;
|
|
|
+ }
|
|
|
+ if (rowData.total != undefined && rowData.total != ""){
|
|
|
+ total += rowData.total*1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.clothesAdd.totalBoxes = totalBoxes
|
|
|
+ this.clothesAdd.totalGrossWeight = totalGrossWeight
|
|
|
+ this.clothesAdd.totalNetWeight = totalNetWeight
|
|
|
+ this.clothesAdd.totalVolume = totalVolume
|
|
|
+ this.clothesAdd.totalPrice = totalPrice
|
|
|
+ this.clothesAdd.total = total
|
|
|
+ this.$forceUpdate()
|
|
|
+ },
|
|
|
// 参照预装箱单
|
|
|
referadvancePackingList() {
|
|
|
console.log('打开参照订单数据')
|
|
|
@@ -609,6 +674,7 @@ export default {
|
|
|
var delectId = ind.rowIndex
|
|
|
this.clothesAddData.splice(delectId, 1);
|
|
|
console.log(this.clothesAddData)
|
|
|
+ this.setHeadCalField(this.clothesAddData)
|
|
|
},
|
|
|
|
|
|
handleValueChange(event) {
|
|
|
@@ -636,6 +702,7 @@ export default {
|
|
|
if (dataRow.unitPrice != undefined && dataRow.unitPrice != ""){
|
|
|
dataRow.totalPrice = (dataRow.unitPrice*dataRow.total).toFixed(2)
|
|
|
}
|
|
|
+ this.setHeadCalField(this.clothesAddData)
|
|
|
},
|
|
|
|
|
|
// 操作按钮 复制
|
|
|
@@ -643,6 +710,7 @@ export default {
|
|
|
var newRow = JSON.parse(JSON.stringify(record.row));
|
|
|
newRow.isAdd = 1
|
|
|
this.clothesAddData.push(newRow);
|
|
|
+ this.setHeadCalField(this.clothesAddData)
|
|
|
},
|
|
|
// -------------------------------------
|
|
|
|
|
|
@@ -675,6 +743,12 @@ export default {
|
|
|
newObj.exportInvoiceNo = this.clothesAdd.exportInvoiceNo
|
|
|
newObj.shippingOrderNumber = this.clothesAdd.bookNum
|
|
|
newObj.id = this.clothesAdd.id
|
|
|
+ newObj.totalBoxes = this.clothesAdd.totalBoxes
|
|
|
+ newObj.totalGrossWeight = this.clothesAdd.totalGrossWeight
|
|
|
+ newObj.totalNetWeight = this.clothesAdd.totalNetWeight
|
|
|
+ newObj.totalVolume = this.clothesAdd.totalVolume
|
|
|
+ newObj.totalPrice = this.clothesAdd.totalPrice
|
|
|
+ newObj.total = this.clothesAdd.total
|
|
|
newObj.syPackingListTailoringItemList = this.clothesAddData
|
|
|
var sort = 0;
|
|
|
for (var i=0; i<newObj.syPackingListTailoringItemList.length;i++){
|
|
|
@@ -874,7 +948,18 @@ export default {
|
|
|
width: 120,
|
|
|
type: JVXETypes.normal
|
|
|
},
|
|
|
-
|
|
|
+ {
|
|
|
+ title: '计划尺码数量',
|
|
|
+ key: 'planSize',
|
|
|
+ width: 240,
|
|
|
+ type: JVXETypes.normal ,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '计划装箱数量',
|
|
|
+ key: 'planQuantity',
|
|
|
+ width: 240,
|
|
|
+ type: JVXETypes.normal ,
|
|
|
+ },
|
|
|
{
|
|
|
title: '总件数',
|
|
|
key: 'total',
|
jbb