|
@@ -657,8 +657,11 @@ export default {
|
|
var rowData = newObj.syShippingDetailsItemList[i];
|
|
var rowData = newObj.syShippingDetailsItemList[i];
|
|
for (var j=i+1;j<newObj.syShippingDetailsItemList.length; j++){
|
|
for (var j=i+1;j<newObj.syShippingDetailsItemList.length; j++){
|
|
var nextData = newObj.syShippingDetailsItemList[j];
|
|
var nextData = newObj.syShippingDetailsItemList[j];
|
|
- if (rowData.syOrderDataItemId == nextData.syOrderDataItemId){
|
|
|
|
- this.$message.error('第'+(i+1)+'行和第'+(j+1)+'行物订单子表id重复,无法保存');
|
|
|
|
|
|
+ if (rowData.smallPo == nextData.smallPo && rowData.orderNumber == nextData.orderNumber &&
|
|
|
|
+ rowData.preDeliveryDate == nextData.preDeliveryDate && rowData.preCompletionDate == nextData.preCompletionDate &&
|
|
|
|
+ rowData.itemNumber == nextData.itemNumber && rowData.inventoryCode == nextData.inventoryCode&&
|
|
|
|
+ rowData.colour == nextData.colour&& rowData.size == nextData.size){
|
|
|
|
+ this.$message.error('第'+(i+1)+'行和第'+(j+1)+'行数据相同,无法保存');
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -798,7 +801,6 @@ export default {
|
|
//输入手册纱单价或者手册纱占比时触发
|
|
//输入手册纱单价或者手册纱占比时触发
|
|
changeManualYarn(data,val){
|
|
changeManualYarn(data,val){
|
|
console.log(this.syShippingDetailsItemList)
|
|
console.log(this.syShippingDetailsItemList)
|
|
- debugger
|
|
|
|
this.syShippingDetailsItemList.map(item => {
|
|
this.syShippingDetailsItemList.map(item => {
|
|
if(data === 'Price'){item.manualYarnUnitPrice = val}
|
|
if(data === 'Price'){item.manualYarnUnitPrice = val}
|
|
else{item.manualYarnProportion = val}
|
|
else{item.manualYarnProportion = val}
|