|
@@ -1072,27 +1072,17 @@ export default {
|
|
|
console.log(value);
|
|
|
// row.productNo = value;
|
|
|
if (value) {
|
|
|
- let target = this.productionOptions.find((item) =>
|
|
|
+ let target = [];
|
|
|
+ // 在全部列表中查找
|
|
|
+ target = this.allProductionOptions.filter((item) =>
|
|
|
item.productName.includes(value)
|
|
|
);
|
|
|
console.log(target);
|
|
|
- if (target) {
|
|
|
- this.productionOptions = [target];
|
|
|
- //找到
|
|
|
+ if (target.length) {
|
|
|
+ this.productionOptions = target;
|
|
|
return true;
|
|
|
} else {
|
|
|
- //前100个没找到
|
|
|
- // 在全部列表中查找
|
|
|
- target = this.allProductionOptions.find((item) =>
|
|
|
- item.productName.includes(value)
|
|
|
- );
|
|
|
- console.log(target);
|
|
|
- if (target) {
|
|
|
- this.productionOptions = [target];
|
|
|
- return true;
|
|
|
- } else {
|
|
|
- return false;
|
|
|
- }
|
|
|
+ return false;
|
|
|
}
|
|
|
} else {
|
|
|
this.productionOptions = this.allProductionOptions.slice(0, 500);
|
|
@@ -1119,6 +1109,7 @@ export default {
|
|
|
|
|
|
// 产品名称改变
|
|
|
handleProductChange(productNo, row) {
|
|
|
+ console.log(productNo);
|
|
|
if (!productNo) {
|
|
|
this.productionOptions = this.allProductionOptions.slice(0, 500);
|
|
|
return;
|
|
@@ -1706,6 +1697,12 @@ export default {
|
|
|
delete item.sliceTypeLabel;
|
|
|
delete item.colourNumberLabel;
|
|
|
delete item.productType; //删除类型
|
|
|
+ delete item.taskProcessKey;
|
|
|
+ delete item.processKey;
|
|
|
+ delete item.onBoardState;
|
|
|
+ delete item.taskNodeKey;
|
|
|
+ delete item.productionLineNo;
|
|
|
+ delete item.status;
|
|
|
const matchedOption = this.colourNumberOptions.find(
|
|
|
(option) => option.materielCode === item.colourNumber
|
|
|
);
|
|
@@ -1720,6 +1717,8 @@ export default {
|
|
|
this.productionTableData.forEach((item) => {
|
|
|
delete item.productType; //删除产品类型
|
|
|
});
|
|
|
+ console.log(this.productionTableData);
|
|
|
+ // return;
|
|
|
let productData = {
|
|
|
//货品表新增数据
|
|
|
basicMap: {
|
|
@@ -2960,7 +2959,7 @@ export default {
|
|
|
amountTotal += Number(item.productNumber);
|
|
|
singlTotal += Number(item.productUnitPrice);
|
|
|
moneyTotal += Number(item.productAmounts);
|
|
|
- let productData = this.productionOptions.find(
|
|
|
+ let productData = this.allProductionOptions.find(
|
|
|
(pro) => pro.productNo == item.productNo
|
|
|
);
|
|
|
console.log("item", item);
|