|
@@ -656,24 +656,6 @@ export default {
|
|
|
this.tableSelection = val;
|
|
|
},
|
|
|
|
|
|
- // 数组去重
|
|
|
- delRepeat(arr1, arr2) {
|
|
|
- let allArr = arr1.concat(arr2); // 两个数组对象合并
|
|
|
- let newArr = []; // 存放去重后数据的新数组
|
|
|
- for(let i=0; i<allArr.length; i++){ // 循环allArr数组对象的内容
|
|
|
- let flag = true; // 建立标记,判断数据是否重复,true为不重复
|
|
|
- for(let j=0; j<newArr.length; j++){ // 循环新数组的内容
|
|
|
- if(allArr[i].orderId == newArr[j].orderId){ // 让allArr数组对象的内容与新数组的内容作比较,相同的话,改变标记为false
|
|
|
- flag = false;
|
|
|
- }
|
|
|
- }
|
|
|
- if(flag){ // 判断是否重复
|
|
|
- newArr.push(allArr[i]); // 不重复的放入新数组。 新数组的内容会继续进行上边的循环。
|
|
|
- }
|
|
|
- }
|
|
|
- return newArr;
|
|
|
- },
|
|
|
-
|
|
|
// 检查是否一致
|
|
|
isAllEqual(array) {
|
|
|
if (array.length > 0) {
|
|
@@ -699,27 +681,12 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // let allList = this.tableGoodsList;
|
|
|
- // let selectList = this.tableSelection;
|
|
|
- // let submitList = [];
|
|
|
-
|
|
|
- // for(let i = 0; i < allList.length; i++) {
|
|
|
- // for(let j = 0; j < selectList.length; j++) {
|
|
|
- // if(selectList[j].enginOrderNo == allList[i].enginOrderNo){
|
|
|
- // submitList.push(allList[i]);
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
- // this.goodsList = this.delRepeat(submitList, this.goodsList);
|
|
|
this.isShowDialog = false;
|
|
|
this.tableGoodsList = [];
|
|
|
|
|
|
-
|
|
|
this.goodsList = this.goodsList.concat(this.tableSelection);
|
|
|
|
|
|
this.getEnginGoodsDetail(this.tableSelection[0].enginOrderNo);
|
|
|
- // this.getEnginGoodsDetail(submitList[0].enginOrderNo);
|
|
|
},
|
|
|
|
|
|
getEnginGoodsDetail(enginOrderNo) {
|
|
@@ -787,7 +754,7 @@ export default {
|
|
|
customerNumber: this.mainForm.jxsNum,
|
|
|
customerName: this.mainForm.jxsName,
|
|
|
remark: this.mainForm.remark,
|
|
|
- enginOrderNo: this.mainForm.loginNum,
|
|
|
+ refEnginRecordNo: this.mainForm.loginNum,
|
|
|
refProjectName: this.mainForm.refProjectCategory,
|
|
|
refProjectCategory:this.mainForm.refProjectCategory,
|
|
|
enginOrderType: this.mainForm.loginType,
|