|
@@ -164,6 +164,13 @@
|
|
|
</a-form-model-item>
|
|
|
</template>
|
|
|
|
|
|
+ <!-- 克重 -->
|
|
|
+ <template slot="gramWeight" slot-scope="text, record, index">
|
|
|
+ <a-form-model-item prop="gramWeight">
|
|
|
+ <a-input style="width:100%" type="text" v-model="record.gramWeight" @change="changeNetWeight(record)"/>
|
|
|
+ </a-form-model-item>
|
|
|
+ </template>
|
|
|
+
|
|
|
<!-- 匹数 -->
|
|
|
<template slot="rolls" slot-scope="text, record, index">
|
|
|
<a-form-model-item prop="rolls">
|
|
@@ -414,7 +421,7 @@ export default {
|
|
|
{
|
|
|
title: '门幅/Width',
|
|
|
dataIndex: 'width',
|
|
|
- // scopedSlots: { customRender: 'width' },
|
|
|
+ scopedSlots: { customRender: 'width' },
|
|
|
width: 140,
|
|
|
className: 'replacecolor',
|
|
|
ellipsis: true,
|
|
@@ -481,6 +488,7 @@ export default {
|
|
|
{
|
|
|
title: '克重/G',
|
|
|
dataIndex: 'gramWeight',
|
|
|
+ scopedSlots: { customRender: 'gramWeight' },
|
|
|
width: 120,
|
|
|
className: 'replacecolor',
|
|
|
ellipsis: true,
|
|
@@ -596,6 +604,20 @@ export default {
|
|
|
className: 'replacecolor',
|
|
|
ellipsis: true,
|
|
|
},
|
|
|
+ {
|
|
|
+ title: '价格',
|
|
|
+ dataIndex: 'price',
|
|
|
+ width: 120,
|
|
|
+ className: 'replacecolor',
|
|
|
+ ellipsis: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '总价',
|
|
|
+ dataIndex: 'totalPrice',
|
|
|
+ width: 120,
|
|
|
+ className: 'replacecolor',
|
|
|
+ ellipsis: true,
|
|
|
+ },
|
|
|
{
|
|
|
title: '备注(U8)',
|
|
|
dataIndex: 'remarks2',
|
|
@@ -669,6 +691,7 @@ export default {
|
|
|
if (res.success) {
|
|
|
var data = res.result
|
|
|
if(this.addFabricData.length == 0){
|
|
|
+ //表头信息
|
|
|
this.addFabric ={
|
|
|
// id:data.id,
|
|
|
// orderNumber:data.orderNumber,
|
|
@@ -693,19 +716,29 @@ export default {
|
|
|
this.addFabricData = this.addFabricData.concat(data.syPackingListFabricItem )
|
|
|
this.addFabricData.map(item =>{
|
|
|
// item.inventoryQuantity = 0
|
|
|
+ //初始米数0
|
|
|
item.meter = 0
|
|
|
+ //超发
|
|
|
item.excessQuantity = item.actualDeclaredQuantity - item.remainingQuantity
|
|
|
if(item.excessQuantity < 0){
|
|
|
item.excessQuantity = 0
|
|
|
}
|
|
|
+ //是否手册纱
|
|
|
if(item.manualYarnFlag == 0){
|
|
|
this.manualYarnDisabled = true
|
|
|
}else {
|
|
|
this.manualYarnDisabled = false
|
|
|
}
|
|
|
+ //判断是否为辅料
|
|
|
var code = item.inventoryCcode.slice(0,2)
|
|
|
- if(!((code =='03' || code == '04') && (item.inventoryCcode !== '0399' || item.inventoryCcode !== '0499'))){
|
|
|
- item.actualDeclaredQuantity = item.inventoryQuantity
|
|
|
+ if(!((code =='03' || code == '04'||code =='02') && (item.inventoryCcode !== '0399' || item.inventoryCcode !== '0499' ||item.inventoryCcode !== '0299'))){
|
|
|
+ item.actualDeclaredQuantity = item.inventoryQuantity
|
|
|
+ }
|
|
|
+ //判断单位是否为KG
|
|
|
+ if(item.masterMetering=='KG'){
|
|
|
+ item.totalPrice = item.netWeight*item.price
|
|
|
+ }else{
|
|
|
+ item.totalPrice = item.actualDeclaredQuantity*item.price
|
|
|
}
|
|
|
})
|
|
|
}else {
|
|
@@ -713,6 +746,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ //净重,克重,门幅值改变触发
|
|
|
changeNetWeight(event){
|
|
|
if(Number(event.netWeight) !==0 && Number(event.width) !== 0 && Number(event.gramWeight) !== 0 && event.netWeight!==null && event.netWeight!=="" && event.width !== "" && event.gramWeight !== ""){
|
|
|
event.meter = (event.netWeight/(event.width/100)/(event.gramWeight/1000)).toFixed(2)
|
|
@@ -720,9 +754,14 @@ export default {
|
|
|
event.meter = 0
|
|
|
}
|
|
|
var code = event.inventoryCcode.slice(0,2)
|
|
|
- if((code =='03' || code == '04') && (event.inventoryCcode !== '0399' || event.inventoryCcode !== '0499')){
|
|
|
+ //判断是否为面料
|
|
|
+ if(((code =='03' || code == '04'||code =='02') && (event.inventoryCcode !== '0399' || event.inventoryCcode !== '0499' ||event.inventoryCcode !== '0299'))){
|
|
|
event.actualDeclaredQuantity = event.meter
|
|
|
}
|
|
|
+ //判断是否为KG
|
|
|
+ if(event.masterMetering=='KG'){
|
|
|
+ event.totalPrice = event.netWeight*event.price
|
|
|
+ }
|
|
|
},
|
|
|
// 増行
|
|
|
handleAddColumn() {
|
|
@@ -758,8 +797,8 @@ export default {
|
|
|
totalVolume: '',
|
|
|
netNetWeight: '',
|
|
|
price: '',
|
|
|
- totalPrices: '',
|
|
|
note: '',
|
|
|
+ totalPrice:'',
|
|
|
operation: ''
|
|
|
}
|
|
|
this.addFabricData.push(addrow)
|
|
@@ -886,7 +925,7 @@ export default {
|
|
|
// this.close()
|
|
|
// this.getShipmentList() // 刷新 装箱单-面料
|
|
|
},
|
|
|
-
|
|
|
+ //表格校验
|
|
|
JudgeVluabled(data){
|
|
|
this.judge = 0
|
|
|
for (var i=0; i<data.syPackingListFabricItem.length;i++){
|
|
@@ -927,15 +966,21 @@ export default {
|
|
|
// - father------------------------------------
|
|
|
aa() {},
|
|
|
modalFormOk() {},
|
|
|
+ //入库数量改变
|
|
|
inventoryQuantityChange(record){
|
|
|
record.actualDeclaredQuantity = record.inventoryQuantity
|
|
|
},
|
|
|
+
|
|
|
+ //实际报关数量改变
|
|
|
actualDeclaredQuantityChange(record){
|
|
|
if(record.actualDeclaredQuantity !== '' || !record.actualDeclaredQuantity){
|
|
|
record.excessQuantity = record.actualDeclaredQuantity - record.remainingQuantity
|
|
|
if(record.excessQuantity < 0){
|
|
|
record.excessQuantity = 0}
|
|
|
}
|
|
|
+ if(record.masterMetering !=='KG'){
|
|
|
+ record.totalPrice = record.actualDeclaredQuantity*record.price
|
|
|
+ }
|
|
|
|
|
|
},
|
|
|
|