|
|
|
|
@ -103,7 +103,6 @@
|
|
|
|
|
<!-- v-for="item in this.deliveryWayData"--> |
|
|
|
|
<el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData"> |
|
|
|
|
<el-radio |
|
|
|
|
|
|
|
|
|
:label="item.dictKey" |
|
|
|
|
:value="item.dictKey">{{item.dictValue}}  |
|
|
|
|
</el-radio> |
|
|
|
|
@ -117,15 +116,15 @@
|
|
|
|
|
<el-input v-model="form.otherFee" placeholder="请输入其他费用"/> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="10"> |
|
|
|
|
<el-form-item label="服务类型:" prop="serveType" label-width="120px"> |
|
|
|
|
<el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData"> |
|
|
|
|
<el-checkbox :label="item.dictKey" |
|
|
|
|
:value="item.dictKey">{{item.dictValue}}  |
|
|
|
|
</el-checkbox> |
|
|
|
|
</el-checkbox-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<!-- <el-col :span="10">--> |
|
|
|
|
<!-- <el-form-item label="服务类型:" prop="serveType" label-width="120px">--> |
|
|
|
|
<!-- <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">--> |
|
|
|
|
<!-- <el-checkbox :label="item.dictKey"--> |
|
|
|
|
<!-- :value="item.dictKey">{{item.dictValue}} --> |
|
|
|
|
<!-- </el-checkbox>--> |
|
|
|
|
<!-- </el-checkbox-group>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- </el-col>--> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="10"> |
|
|
|
|
@ -591,7 +590,7 @@
|
|
|
|
|
// { required: true, message: '请选择启用状态!', trigger: 'change' } |
|
|
|
|
// ], |
|
|
|
|
}, |
|
|
|
|
obj:{}, |
|
|
|
|
obj: {} |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
@ -610,7 +609,7 @@
|
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
this.getDictionary(); |
|
|
|
|
}, |
|
|
|
|
watch:{ |
|
|
|
|
watch: { |
|
|
|
|
'$route.query.reservationId': { |
|
|
|
|
handler(newVal, oldVal) { |
|
|
|
|
console.log(newVal, oldVal); |
|
|
|
|
@ -688,125 +687,9 @@
|
|
|
|
|
//查询出所有的市配订单 |
|
|
|
|
handleAddOrder() { |
|
|
|
|
this.loading = true; |
|
|
|
|
console.log('$$$$$$', this.orderData); |
|
|
|
|
this.query.typeService = 2; |
|
|
|
|
this.query.genre = '1'; |
|
|
|
|
const params = {}; |
|
|
|
|
const page = this.page; |
|
|
|
|
if (this.reservationId){ |
|
|
|
|
console.log("------------>",'预约编辑'); |
|
|
|
|
//编辑和新增不一样的处理方式 |
|
|
|
|
//这里需要查询出未被预约的订单和该预约自己本身的订单 |
|
|
|
|
// selectUpdateAvailableStockArticle(this.reservationId).then(res=>{ |
|
|
|
|
// console.log('res------------>', res); |
|
|
|
|
// const data = res.data.data; |
|
|
|
|
// this.stockArticleInfo = data |
|
|
|
|
// this.stockArticleInfo.forEach((item, index) => { |
|
|
|
|
// //检查订单是否冻结 |
|
|
|
|
// this.checkOrder(item, index); |
|
|
|
|
// if (this.orderData) { |
|
|
|
|
// this.orderData.forEach(o => { |
|
|
|
|
// if (o.id === item.id) { |
|
|
|
|
// this.$nextTick(() => { |
|
|
|
|
// this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true); |
|
|
|
|
// }); |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
// }else { |
|
|
|
|
// this.orderList = []; |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
// }) |
|
|
|
|
this.onLoadEditOrder(this.page); |
|
|
|
|
}else { |
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
// selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => { |
|
|
|
|
// console.log('res------------>', res); |
|
|
|
|
// const data = res.data.data; |
|
|
|
|
// this.stockArticleInfo = data.records; |
|
|
|
|
// this.stockArticleInfo.forEach((item, index) => { |
|
|
|
|
// //检查订单是否冻结 |
|
|
|
|
// this.checkOrder(item, index); |
|
|
|
|
// // if (this.orderData) { |
|
|
|
|
// // this.orderData.forEach(o => { |
|
|
|
|
// // if (o.id === item.id) { |
|
|
|
|
// // this.$nextTick(() => { |
|
|
|
|
// // this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true); |
|
|
|
|
// // }); |
|
|
|
|
// // } |
|
|
|
|
// // }); |
|
|
|
|
// // }else { |
|
|
|
|
// // this.orderList = []; |
|
|
|
|
// // } |
|
|
|
|
// }); |
|
|
|
|
// this.orderList = []; |
|
|
|
|
// |
|
|
|
|
// }); |
|
|
|
|
} |
|
|
|
|
//这里只需要对订单进行正常的搜索即可 |
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
this.loading = false; |
|
|
|
|
console.log("this.stockArticleInfo------------->",this.stockArticleInfo); |
|
|
|
|
// if (this.reservationId) { |
|
|
|
|
// //这里需要编辑，那么这里就需要在订单列表中回显已使用包件，禁用勾选其他预约使用的包件细信息 |
|
|
|
|
// this.query.typeService = 2; |
|
|
|
|
// this.query.genre = '1'; |
|
|
|
|
// //查询所有订单列表信息 |
|
|
|
|
// let page = this.page; |
|
|
|
|
// let params = {}; |
|
|
|
|
// selectStockArticleInfoList(Object.assign(params, this.query)).then(res => { |
|
|
|
|
// let orderListData = res.data.data; |
|
|
|
|
// this.stockArticleInfo = orderListData; |
|
|
|
|
// //这里进行订单的勾选回显 |
|
|
|
|
// let a = this.orderData; |
|
|
|
|
// for (let i = 0; i < orderListData.length; i++) { |
|
|
|
|
// for (let j = 0; j < a.length; j++) { |
|
|
|
|
// if (orderListData[i].id === a[j].id){ |
|
|
|
|
// orderListData[i] = a[j]; |
|
|
|
|
// this.$nextTick(()=> { |
|
|
|
|
// this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[i],true); |
|
|
|
|
// }) |
|
|
|
|
// } |
|
|
|
|
// this.checkOrder(this.stockArticleInfo[i],i); |
|
|
|
|
// } |
|
|
|
|
// } |
|
|
|
|
// this.loading = false; |
|
|
|
|
// this.selectionClear(); |
|
|
|
|
// }); |
|
|
|
|
// } else { |
|
|
|
|
// this.query.typeService = 2; |
|
|
|
|
// this.query.genre = '1'; |
|
|
|
|
// let page = this.page; |
|
|
|
|
// let params = {}; |
|
|
|
|
// selectStockArticleAndParcel(Object.assign(params, this.query)).then(res => { |
|
|
|
|
// let orderData = res.data.data; |
|
|
|
|
// orderData.forEach((item, index) => { |
|
|
|
|
// item.reservationNum = item.handQuantity; |
|
|
|
|
// item.reservationNum = '0'; |
|
|
|
|
// }); |
|
|
|
|
// this.stockArticleInfo = orderData; |
|
|
|
|
// //转预约单的操作会带出订单 |
|
|
|
|
// if (this.orderData){ |
|
|
|
|
// this.stockArticleInfo.forEach((item,index)=>{ |
|
|
|
|
// this.orderData.forEach(o=>{ |
|
|
|
|
// if (item.id === o.id){ |
|
|
|
|
// this.$nextTick(()=> { |
|
|
|
|
// this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index],true); |
|
|
|
|
// }) |
|
|
|
|
// } |
|
|
|
|
// }) |
|
|
|
|
// // if (item.reservationStatus === '30'){ |
|
|
|
|
// // this.$nextTick(()=> { |
|
|
|
|
// // this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index],true); |
|
|
|
|
// // }) |
|
|
|
|
// // } |
|
|
|
|
// this.checkOrder(item,index); |
|
|
|
|
// }) |
|
|
|
|
// }else { |
|
|
|
|
// //这里是通过新增预约的按钮进入的页面 |
|
|
|
|
// } |
|
|
|
|
// this.loading = false; |
|
|
|
|
// this.selectionClear(); |
|
|
|
|
// }); |
|
|
|
|
// } |
|
|
|
|
this.orderShow = true; |
|
|
|
|
}, |
|
|
|
|
checkOrder(row, index) { |
|
|
|
|
@ -930,29 +813,29 @@
|
|
|
|
|
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row); |
|
|
|
|
if (this.reservationId) { |
|
|
|
|
//这里就是编辑的数据回显问题 |
|
|
|
|
let packageInfo = row.parcelListVOS |
|
|
|
|
let packageInfo = row.parcelListVOS; |
|
|
|
|
// this.packageData = row.parcelListVOS; |
|
|
|
|
let packageListData = this.packageData; |
|
|
|
|
if (row.packageList) { |
|
|
|
|
let packageListInfo = row.packageList; |
|
|
|
|
packageInfo.forEach((item,index)=>{ |
|
|
|
|
packageListInfo.forEach(p=>{ |
|
|
|
|
if (item.id===p.id){ |
|
|
|
|
this.$nextTick( ()=> { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index],true); |
|
|
|
|
}) |
|
|
|
|
packageInfo.forEach((item, index) => { |
|
|
|
|
packageListInfo.forEach(p => { |
|
|
|
|
if (item.id === p.id) { |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index], true); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
}else { |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
//新增订单，默认全选 |
|
|
|
|
packageInfo.forEach((item,index)=>{ |
|
|
|
|
this.$nextTick( ()=> { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index],true); |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
packageInfo.forEach((item, index) => { |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index], true); |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
this.packageData =row.parcelListVOS; |
|
|
|
|
this.packageData = row.parcelListVOS; |
|
|
|
|
} else { |
|
|
|
|
this.packageData = row.parcelListVOS; |
|
|
|
|
//这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选 |
|
|
|
|
@ -995,12 +878,11 @@
|
|
|
|
|
let page = this.page; |
|
|
|
|
this.query.typeService = 2; |
|
|
|
|
this.query.genre = 1; |
|
|
|
|
if (this.reservationId){ |
|
|
|
|
this.onLoadEditOrder(this.page) |
|
|
|
|
}else { |
|
|
|
|
this.onLoadOrder(this.page) |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
// if (this.reservationId) { |
|
|
|
|
// this.onLoadEditOrder(this.page); |
|
|
|
|
// } else { |
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
// } |
|
|
|
|
// selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
// const data = res.data.data; |
|
|
|
|
// data.records.forEach(item => { |
|
|
|
|
@ -1042,11 +924,11 @@
|
|
|
|
|
this.$message.warning('请选择包件!!!'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
this.orderData.forEach(item=>{ |
|
|
|
|
if (item.id===this.obj.id){ |
|
|
|
|
this.orderData.forEach(item => { |
|
|
|
|
if (item.id === this.obj.id) { |
|
|
|
|
item.packageList = this.packageList; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
console.log('this.orderData------------>', this.orderData); |
|
|
|
|
this.isaddvalue = false; |
|
|
|
|
}, |
|
|
|
|
@ -1076,11 +958,11 @@
|
|
|
|
|
this.form.inventoryList = inventoryList; |
|
|
|
|
console.log('-------------->', this.orderData); |
|
|
|
|
let order = this.orderData; |
|
|
|
|
order.forEach(o=>{ |
|
|
|
|
if (!o.packageListInfo){ |
|
|
|
|
order.forEach(o => { |
|
|
|
|
if (!o.packageListInfo) { |
|
|
|
|
o.packageListInfo = o.packageList; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
this.form.stockArticleList = order; |
|
|
|
|
this.deliveryWayData.forEach(item => { |
|
|
|
|
if (this.form.deliveryWay === item.dictValue) { |
|
|
|
|
@ -1117,7 +999,7 @@
|
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
this.form.reservationStatus = '20' |
|
|
|
|
this.form.reservationStatus = '20'; |
|
|
|
|
autonomouslySave(this.form).then(() => { |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'success', |
|
|
|
|
@ -1224,12 +1106,12 @@
|
|
|
|
|
this.$message.warning('请选择至少一条数据'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
this.inventoryList.forEach(item=>{ |
|
|
|
|
if (item.reservationNum > item.applyNum){ |
|
|
|
|
this.inventoryList.forEach(item => { |
|
|
|
|
if (item.reservationNum > item.applyNum) { |
|
|
|
|
this.$message.warning('该库存品数量输入有误!!!'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
this.inventoryData = this.inventoryList; |
|
|
|
|
|
|
|
|
|
// if (this.orderData.length) { |
|
|
|
|
@ -1250,40 +1132,71 @@
|
|
|
|
|
*/ |
|
|
|
|
onSubmitOrder() { |
|
|
|
|
console.log('-------------》', this.orderList); |
|
|
|
|
if (this.orderList.length === 0) { |
|
|
|
|
this.$message.warning('请选择至少一条数据'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
const list = this.orderList; |
|
|
|
|
console.log("list--------",list); |
|
|
|
|
let j = 0; |
|
|
|
|
let name = list[0].customerName; |
|
|
|
|
let address = list[0].customerAddress; |
|
|
|
|
let phone = list[0].customerTelephone; |
|
|
|
|
let name = list[0].customerName; |
|
|
|
|
let address = list[0].customerAddress; |
|
|
|
|
let phone = list[0].customerTelephone; |
|
|
|
|
if (!!this.form.consignee) { |
|
|
|
|
if (this.form.consignee !== name) { |
|
|
|
|
this.$message.warning('请选择统一顾客订单!!!'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (!!this.form.customerAddress) { |
|
|
|
|
if (this.form.customerAddress !== address) { |
|
|
|
|
this.$message.warning('请选择统一顾客订单!!!'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (!!this.form.customerTelephone) { |
|
|
|
|
if (this.form.customerTelephone !== phone) { |
|
|
|
|
this.$message.warning('请选择统一顾客订单!!!'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
//市配 --- 最终客户校验 |
|
|
|
|
for (let i = 1; i < list.length; i++) { |
|
|
|
|
if (list[i].customerName !== name || list[i].customerAddress !== address || list[i].customerTelephone !== phone){ |
|
|
|
|
if (list[i].customerName !== name || list[i].customerAddress !== address || list[i].customerTelephone !== phone) { |
|
|
|
|
this.$message.warning('请选择统一顾客订单!!!'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
this.form.consignee = name; |
|
|
|
|
this.form.deliveryAddress = address; |
|
|
|
|
this.form.deliveryPhone = phone; |
|
|
|
|
this.orderData = this.orderList; |
|
|
|
|
let info = []; |
|
|
|
|
// if (this.orderData){ |
|
|
|
|
// let a = this.orderData; |
|
|
|
|
// data.forEach(item=>{ |
|
|
|
|
// a.forEach(order=>{ |
|
|
|
|
// if (item.id === order.id){ |
|
|
|
|
console.log("orderData----------------->",this.orderData); |
|
|
|
|
// item = order; |
|
|
|
|
// } |
|
|
|
|
// }) |
|
|
|
|
// info.push(item); |
|
|
|
|
// }) |
|
|
|
|
// } |
|
|
|
|
// this.orderData = info; |
|
|
|
|
//这里需要对选择的订单进行筛选 |
|
|
|
|
const info = []; |
|
|
|
|
this.stockArticleInfo.forEach((item, index) => { |
|
|
|
|
this.orderList.forEach(order => { |
|
|
|
|
// const newDate1 = this.orderData.map(item => { // map遍历本地数据 |
|
|
|
|
// if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据 |
|
|
|
|
// return item; |
|
|
|
|
// }); |
|
|
|
|
// } info.push(order); |
|
|
|
|
//清理原来订单列表的订单数据 |
|
|
|
|
info.push(order); |
|
|
|
|
this.stockArticleInfo.splice(index, 1); |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
if (this.orderData.length >= 1) { |
|
|
|
|
let newDate1 = this.orderData.map(item => { // map遍历本地数据 |
|
|
|
|
if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据 |
|
|
|
|
return item; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
console.log('newDate1-------------->', newDate1.length); |
|
|
|
|
if (newDate1.length >= 1) { |
|
|
|
|
console.log('newDate1-------------->', newDate1); |
|
|
|
|
newDate1.forEach(a => { |
|
|
|
|
this.orderData.push(a); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
console.log('this.orderData------------->', this.orderData); |
|
|
|
|
} else { |
|
|
|
|
this.orderData = this.orderList; |
|
|
|
|
} |
|
|
|
|
// this.orderData.push(info); |
|
|
|
|
this.orderShow = false; |
|
|
|
|
}, |
|
|
|
|
selectionClear() { |
|
|
|
|
@ -1293,28 +1206,39 @@
|
|
|
|
|
}, |
|
|
|
|
currentOrderChange(currentPage) { |
|
|
|
|
this.page.currentPage = currentPage; |
|
|
|
|
if (this.reservationId){ |
|
|
|
|
this.onLoadEditOrder(this.page,this.reservationId); |
|
|
|
|
}else { |
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
} |
|
|
|
|
// if (this.reservationId) { |
|
|
|
|
// this.onLoadEditOrder(this.page, this.reservationId); |
|
|
|
|
// } else { |
|
|
|
|
// this.onLoadOrder(this.page); |
|
|
|
|
// } |
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
}, |
|
|
|
|
sizeOrderChange(pageSize) { |
|
|
|
|
this.page.pageSize = pageSize; |
|
|
|
|
if (this.reservationId){ |
|
|
|
|
this.onLoadEditOrder(this.page,this.reservationId); |
|
|
|
|
|
|
|
|
|
}else { |
|
|
|
|
// if (this.reservationId) { |
|
|
|
|
// this.onLoadEditOrder(this.page, this.reservationId); |
|
|
|
|
// } else { |
|
|
|
|
// this.onLoadOrder(this.page); |
|
|
|
|
// } |
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
|
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
onLoadEditOrder(arg,params = {}){ |
|
|
|
|
const page = arg; |
|
|
|
|
selectUpdateAvailableStockArticle(page.currentPage, page.pageSize,this.reservationId,Object.assign(params, this.query)).then(res=>{ |
|
|
|
|
onLoadEditOrder(params = {}) { |
|
|
|
|
this.query.typeService = 2; |
|
|
|
|
this.query.genre = '1'; |
|
|
|
|
const page = this.page; |
|
|
|
|
let a = []; |
|
|
|
|
if (this.orderData) { |
|
|
|
|
this.orderData.forEach(item => { |
|
|
|
|
a.push(item.id); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
this.query.orderIds = a.join(','); |
|
|
|
|
this.query.reservationId = this.reservationId; |
|
|
|
|
selectUpdateAvailableStockArticle(page.currentPage, page.pageSize, this.reservationId, Object.assign(params, this.query)).then(res => { |
|
|
|
|
console.log('res------------>', res); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.stockArticleInfo = data.records; |
|
|
|
|
this.stockArticleInfo = data.records; |
|
|
|
|
this.stockArticleInfo.forEach((item, index) => { |
|
|
|
|
//检查订单是否冻结 |
|
|
|
|
this.checkOrder(item, index); |
|
|
|
|
@ -1327,24 +1251,30 @@
|
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}else { |
|
|
|
|
} else { |
|
|
|
|
this.orderList = []; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.page.total = data.total; |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
// this.query = {}; |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
onLoadOrder(arg,params={}){ |
|
|
|
|
console.log("------------->arg",arg); |
|
|
|
|
const page = arg; |
|
|
|
|
console.log("------------->page",page); |
|
|
|
|
selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => { |
|
|
|
|
onLoadOrder(page, params = {}) { |
|
|
|
|
this.query.typeService = 2; |
|
|
|
|
this.query.genre = '1'; |
|
|
|
|
// const page = this.page; |
|
|
|
|
let a = []; |
|
|
|
|
if (this.orderData) { |
|
|
|
|
this.orderData.forEach(item => { |
|
|
|
|
a.push(item.id); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
this.query.orderIds = a.join(','); |
|
|
|
|
console.log('-------------->', this.query); |
|
|
|
|
selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
console.log('res------------>', res); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.stockArticleInfo = data.records; |
|
|
|
|
this.stockArticleInfo = data.records; |
|
|
|
|
this.stockArticleInfo.forEach((item, index) => { |
|
|
|
|
//检查订单是否冻结 |
|
|
|
|
this.checkOrder(item, index); |
|
|
|
|
@ -1362,7 +1292,6 @@
|
|
|
|
|
this.page.total = data.total; |
|
|
|
|
}); |
|
|
|
|
this.orderList = []; |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
