|
|
|
@ -465,7 +465,7 @@
|
|
|
|
|
class="addTable" |
|
|
|
|
ref="multipleTable" |
|
|
|
|
:columnList="columnList" |
|
|
|
|
:tableData="dataOrder" |
|
|
|
|
:tableData="dataOrder" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
@ -2270,14 +2270,21 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
//订单选择确定 |
|
|
|
|
callFordeliveryOrder() { |
|
|
|
|
if(!this.selectionList.length){ |
|
|
|
|
this.$message.warning('请选择订单'); |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
console.log(this.selectionList, 'this.selectionList'); |
|
|
|
|
let scID = this.selectionList[0].mallId; //获取第一个商场DI用于匹配后面的是否选择的一样 |
|
|
|
|
let mallIdState = this.selectionList.find(res => res.mallId != scID); |
|
|
|
|
if (mallIdState) { |
|
|
|
|
let dataListscID = null; |
|
|
|
|
if(this.dataList.length){ |
|
|
|
|
dataListscID = this.dataList.find(res=>res.mallId != scID) |
|
|
|
|
} |
|
|
|
|
if (mallIdState || dataListscID) { |
|
|
|
|
this.$message.warning('请选择同一商场'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
console.log('111 :>> ', 111); |
|
|
|
|
let st = false; |
|
|
|
|
let sts = false; |
|
|
|
|