|
|
@@ -277,7 +277,7 @@
|
|
|
transfer
|
|
|
clearable
|
|
|
filter-by-label
|
|
|
- v-model="matchedInfo.product_title "
|
|
|
+ v-model="matchedInfo.product_title"
|
|
|
:max-tag-count="2"
|
|
|
size="small"
|
|
|
style="width: 100px"
|
|
|
@@ -649,6 +649,24 @@ export default {
|
|
|
resizable: true,
|
|
|
},
|
|
|
{
|
|
|
+ title: "单位",
|
|
|
+ align: "center",
|
|
|
+ key: "unit",
|
|
|
+ resizable: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "饰面",
|
|
|
+ align: "center",
|
|
|
+ key: "finish",
|
|
|
+ resizable: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "备注",
|
|
|
+ align: "center",
|
|
|
+ key: "remark",
|
|
|
+ resizable: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
title: "金额",
|
|
|
align: "center",
|
|
|
key: "total_price",
|
|
|
@@ -731,6 +749,24 @@ export default {
|
|
|
resizable: true,
|
|
|
},
|
|
|
{
|
|
|
+ title: "单位",
|
|
|
+ align: "center",
|
|
|
+ key: "unit",
|
|
|
+ resizable: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "饰面",
|
|
|
+ align: "center",
|
|
|
+ key: "finish",
|
|
|
+ resizable: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "备注",
|
|
|
+ align: "center",
|
|
|
+ key: "remark",
|
|
|
+ resizable: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
title: "金额",
|
|
|
align: "center",
|
|
|
key: "total_price",
|
|
|
@@ -751,12 +787,12 @@ export default {
|
|
|
checkedContractList: [], //合同选择的数据
|
|
|
checkedDeepenList: [], //深化信息选择的
|
|
|
revocationList: [], //撤销匹配选中的列表
|
|
|
- search:{
|
|
|
- product_title_list:[],
|
|
|
- region_list:[]
|
|
|
+ search: {
|
|
|
+ product_title_list: [],
|
|
|
+ region_list: [],
|
|
|
},
|
|
|
- searchRegionList:[],
|
|
|
- searchProductTitleList:[]
|
|
|
+ searchRegionList: [],
|
|
|
+ searchProductTitleList: [],
|
|
|
};
|
|
|
},
|
|
|
// 生命周期 - 创建完成(可以访问当前this实例)
|
|
|
@@ -909,7 +945,7 @@ export default {
|
|
|
this.matchedSelectedList = "";
|
|
|
this.matchedTimeList = [];
|
|
|
this.handleMatchedListInit();
|
|
|
- this.isMatchedSelectAll = false
|
|
|
+ this.isMatchedSelectAll = false;
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -966,7 +1002,7 @@ export default {
|
|
|
this.contractData = res.data.data;
|
|
|
this.contractTotal = res.data.total;
|
|
|
this.searchRegionList = res.data.region_list;
|
|
|
- this.searchProductTitleList = res.data.product_title_list
|
|
|
+ this.searchProductTitleList = res.data.product_title_list;
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -975,11 +1011,13 @@ export default {
|
|
|
if (e == false) {
|
|
|
this.isMatchedSelectAll = e;
|
|
|
}
|
|
|
- this.matchedSelectedList = [];
|
|
|
+ // this.matchedSelectedList = [];
|
|
|
+ this.matchedSelectedList = "";
|
|
|
this.matchedTimeList = [];
|
|
|
this.matchedDetailList.forEach((v) => {
|
|
|
if (v.del_isSelect) {
|
|
|
- this.matchedSelectedList.push(v.order_no);
|
|
|
+ // this.matchedSelectedList.push(v.order_no);
|
|
|
+ this.matchedSelectedList = v.order_no;
|
|
|
this.matchedTimeList.push(v.crt_time);
|
|
|
}
|
|
|
});
|
|
|
@@ -1421,14 +1459,14 @@ export default {
|
|
|
},
|
|
|
handleMatchedSelectAll() {
|
|
|
this.isMatchedSelectAll = !this.isMatchedSelectAll;
|
|
|
- this.matchedSelectedList = [];
|
|
|
+ this.matchedSelectedList = "";
|
|
|
this.matchedTimeList = [];
|
|
|
this.matchedDetailList.forEach((e) => {
|
|
|
if (this.isMatchedSelectAll) {
|
|
|
e.del_isSelect = true;
|
|
|
e.isSelect = true;
|
|
|
// this.matchedSelectedList.push(e.order_no);
|
|
|
- this.matchedSelectedList = e.order_no
|
|
|
+ this.matchedSelectedList = e.order_no;
|
|
|
this.matchedTimeList.push(e.crt_time);
|
|
|
} else {
|
|
|
e.del_isSelect = false;
|
|
|
@@ -1444,7 +1482,7 @@ export default {
|
|
|
if (v.product_state == 0) {
|
|
|
if (v.isSelect) {
|
|
|
// this.matchedSelectedList.push(v.id);
|
|
|
- this.matchedSelectedList = v.id
|
|
|
+ this.matchedSelectedList = v.id;
|
|
|
} else {
|
|
|
flag = false;
|
|
|
}
|