|
@@ -67,11 +67,11 @@
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
|
|
- <a-col :md="6" :sm="8">
|
|
|
|
|
|
+ <!-- <a-col :md="6" :sm="8">
|
|
<a-form-model-item label="成衣工厂" prop="clothesFactory">
|
|
<a-form-model-item label="成衣工厂" prop="clothesFactory">
|
|
<a-input placeholder="请输入成衣工厂" v-model="clothesAdd.clothesFactory"></a-input>
|
|
<a-input placeholder="请输入成衣工厂" v-model="clothesAdd.clothesFactory"></a-input>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
- </a-col>
|
|
|
|
|
|
+ </a-col> -->
|
|
|
|
|
|
<a-col :md="6" :sm="8">
|
|
<a-col :md="6" :sm="8">
|
|
<a-form-model-item label="外销发票号" prop="exportInvoiceNo">
|
|
<a-form-model-item label="外销发票号" prop="exportInvoiceNo">
|
|
@@ -492,7 +492,7 @@ export default {
|
|
containerCode: data.containerCode,
|
|
containerCode: data.containerCode,
|
|
containerNo: data.containerNumber,
|
|
containerNo: data.containerNumber,
|
|
note: data.memo,
|
|
note: data.memo,
|
|
- clothesFactory: data.garmentFactory,
|
|
|
|
|
|
+ // clothesFactory: data.garmentFactory,
|
|
exportInvoiceNo: data.exportInvoiceNo,
|
|
exportInvoiceNo: data.exportInvoiceNo,
|
|
bookNum: data.depositaryReceiptNo
|
|
bookNum: data.depositaryReceiptNo
|
|
}
|
|
}
|
|
@@ -610,11 +610,11 @@ export default {
|
|
if (dataRow.outerBoxLength != "" && dataRow.outerBoxLength != undefined &&
|
|
if (dataRow.outerBoxLength != "" && dataRow.outerBoxLength != undefined &&
|
|
dataRow.outerBoxWidth != "" && dataRow.outerBoxWidth != undefined &&
|
|
dataRow.outerBoxWidth != "" && dataRow.outerBoxWidth != undefined &&
|
|
dataRow.outerBoxHeight != "" && dataRow.outerBoxHeight != undefined){
|
|
dataRow.outerBoxHeight != "" && dataRow.outerBoxHeight != undefined){
|
|
- dataRow.totalVolume = dataRow.outerBoxLength * dataRow.outerBoxWidth * dataRow.outerBoxHeight * dataRow.boxNumber
|
|
|
|
|
|
+ dataRow.totalVolume = (dataRow.outerBoxLength * dataRow.outerBoxWidth * dataRow.outerBoxHeight * dataRow.boxNumber).toFixed(3)
|
|
console.log(dataRow)
|
|
console.log(dataRow)
|
|
}
|
|
}
|
|
if (dataRow.unitPrice != undefined && dataRow.unitPrice != ""){
|
|
if (dataRow.unitPrice != undefined && dataRow.unitPrice != ""){
|
|
- dataRow.totalPrice = dataRow.unitPrice*dataRow.total
|
|
|
|
|
|
+ dataRow.totalPrice = (dataRow.unitPrice*dataRow.total).toFixed(2)
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|
|
@@ -651,7 +651,7 @@ export default {
|
|
newObj.containerCode = this.clothesAdd.containerCode
|
|
newObj.containerCode = this.clothesAdd.containerCode
|
|
newObj.containerNumber = this.clothesAdd.containerNo
|
|
newObj.containerNumber = this.clothesAdd.containerNo
|
|
newObj.memo = this.clothesAdd.note
|
|
newObj.memo = this.clothesAdd.note
|
|
- newObj.garmentFactory = this.clothesAdd.clothesFactory
|
|
|
|
|
|
+ // newObj.garmentFactory = this.clothesAdd.clothesFactory
|
|
newObj.exportInvoiceNo = this.clothesAdd.exportInvoiceNo
|
|
newObj.exportInvoiceNo = this.clothesAdd.exportInvoiceNo
|
|
newObj.shippingOrderNumber = this.clothesAdd.bookNum
|
|
newObj.shippingOrderNumber = this.clothesAdd.bookNum
|
|
newObj.id = this.clothesAdd.id
|
|
newObj.id = this.clothesAdd.id
|