|
|
|
|
@ -58,8 +58,8 @@
|
|
|
|
|
<!-- v-for="item in this.deliveryTypeData"--> |
|
|
|
|
<el-radio-group v-model="form.deliveryType"> |
|
|
|
|
<el-radio |
|
|
|
|
:label="'2'" |
|
|
|
|
:value="'2'">市配  |
|
|
|
|
:label="'20'" |
|
|
|
|
:value="'20'">市配  |
|
|
|
|
</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
@ -163,12 +163,12 @@
|
|
|
|
|
|
|
|
|
|
</el-table-column> |
|
|
|
|
</template> |
|
|
|
|
<!-- <el-table-column label="包件数量" type="index" width="100px">--> |
|
|
|
|
<!-- <template #="{row}">--> |
|
|
|
|
<!-- <el-input v-model="row.reservationNum" type="number" :disabled="true"--> |
|
|
|
|
<!-- placeholder="请输入内容"></el-input>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
<!-- <el-table-column label="包件数量" type="index" width="100px">--> |
|
|
|
|
<!-- <template #="{row}">--> |
|
|
|
|
<!-- <el-input v-model="row.reservationNum" type="number" :disabled="true"--> |
|
|
|
|
<!-- placeholder="请输入内容"></el-input>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
<!-- 操作栏模块 --> |
|
|
|
|
<el-table-column prop="menu" label="操作" :width="220" align="center"> |
|
|
|
|
<template #="{row}"> |
|
|
|
|
@ -357,7 +357,7 @@
|
|
|
|
|
title="包件信息" |
|
|
|
|
width="100%" |
|
|
|
|
:model="addvalue" |
|
|
|
|
> |
|
|
|
|
> |
|
|
|
|
<!-- 列表模块 --> |
|
|
|
|
<el-table ref="packageList" |
|
|
|
|
v-loading="loading" |
|
|
|
|
@ -469,14 +469,16 @@
|
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { add, update, remove, getReservationInfo } from '@/api/distribution/distributionReservation'; |
|
|
|
|
import { getList, getStockArticleList, selectStockArticleList,selectStockArticleAndParcel } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getDetailDelivery, addDelivery } from '@/api/distribution/distributionDelivery'; |
|
|
|
|
import { |
|
|
|
|
getStockArticleList, |
|
|
|
|
selectStockArticleList, |
|
|
|
|
selectStockArticleInfoList |
|
|
|
|
} from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getDetailDelivery } from '@/api/distribution/distributionDelivery'; |
|
|
|
|
import { addIncrement } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getInventoryList } from '@/api/distribution/distributionStockList'; |
|
|
|
|
|
|
|
|
|
// import option from "@/option/distribution/distributionDelivery"; |
|
|
|
|
import option from '@/option/distribution/distributionStockArticle'; |
|
|
|
|
import StockList from '@/option/distribution/distributionStockList'; |
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
|
|
|
|
|
@ -555,7 +557,7 @@
|
|
|
|
|
packageList: [], |
|
|
|
|
inventoryList: [], |
|
|
|
|
orderList: [], |
|
|
|
|
inventoryTable:[], |
|
|
|
|
inventoryTable: [], |
|
|
|
|
reservationRules: { |
|
|
|
|
consignee: [ |
|
|
|
|
{ required: true, message: '请填写收货人名称!!!', trigger: 'change' } |
|
|
|
|
@ -569,7 +571,8 @@
|
|
|
|
|
// enableStatus: [ |
|
|
|
|
// { required: true, message: '请选择启用状态!', trigger: 'change' } |
|
|
|
|
// ], |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
obj:{}, |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
@ -652,84 +655,104 @@
|
|
|
|
|
}, |
|
|
|
|
//查询出所有的市配订单 |
|
|
|
|
handleAddOrder() { |
|
|
|
|
this.loading = true; |
|
|
|
|
|
|
|
|
|
console.log('$$$$$$', this.orderData); |
|
|
|
|
if (this.reservationId) { |
|
|
|
|
//这里需要编辑，那么这里就需要在订单列表中回显已使用包件，禁用勾选其他预约使用的包件细信息 |
|
|
|
|
this.query.typeService = 2; |
|
|
|
|
this.query.genre = '1'; |
|
|
|
|
//查询所有订单列表信息 |
|
|
|
|
let page = this.page; |
|
|
|
|
let params = {}; |
|
|
|
|
selectStockArticleAndParcel(Object.assign(params, this.query)).then(res => { |
|
|
|
|
console.log('$$$$$$$$>', res); |
|
|
|
|
let orderListData = res.data.data; |
|
|
|
|
console.log('$$$$$$$$', orderListData); |
|
|
|
|
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){ |
|
|
|
|
console.log("@@@@@@@@@@",a[j]); |
|
|
|
|
console.log("@@@@@@@@@@",orderListData[i]); |
|
|
|
|
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 => { |
|
|
|
|
console.log('$$$$$$$$>', res); |
|
|
|
|
let orderData = res.data.data; |
|
|
|
|
orderData.forEach((item, index) => { |
|
|
|
|
item.reservationNum = item.handQuantity; |
|
|
|
|
item.reservationNum = '0'; |
|
|
|
|
}); |
|
|
|
|
console.log('$$$$$$$$', orderData); |
|
|
|
|
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.query.typeService = 2; |
|
|
|
|
this.query.genre = '1'; |
|
|
|
|
const params = {}; |
|
|
|
|
const page = 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); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
this.checkOrder(item,index); |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
}else { |
|
|
|
|
//这里是通过新增预约的按钮进入的页面 |
|
|
|
|
this.orderList = []; |
|
|
|
|
} |
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
}); |
|
|
|
|
this.selectionList = []; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
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){ |
|
|
|
|
|
|
|
|
|
if (row.reservationStatus === '30' || row.reservationStatusName === '已预约' || row.freezeStatus === '30' || row.freezeStatusName === '已冻结' ){ |
|
|
|
|
checkOrder(row, index) { |
|
|
|
|
if (row.freezeStatus === '30' || row.freezeStatusName === '已冻结') { |
|
|
|
|
return false; |
|
|
|
|
}else { |
|
|
|
|
return true; |
|
|
|
|
} else { |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
return false; |
|
|
|
|
}, |
|
|
|
|
@ -747,19 +770,19 @@
|
|
|
|
|
this.page.total = inventoryList.total; |
|
|
|
|
this.inventoryInfo = inventoryList.records; |
|
|
|
|
//存在库存品，需要将库存品进行回显勾选 |
|
|
|
|
if (this.inventoryData){ |
|
|
|
|
this.inventoryInfo.forEach((item,index)=>{ |
|
|
|
|
this.inventoryData.forEach(inventory=>{ |
|
|
|
|
if (item.id === inventory.id){ |
|
|
|
|
if (this.inventoryData) { |
|
|
|
|
this.inventoryInfo.forEach((item, index) => { |
|
|
|
|
this.inventoryData.forEach(inventory => { |
|
|
|
|
if (item.id === inventory.id) { |
|
|
|
|
item = inventory; |
|
|
|
|
this.$nextTick(()=> { |
|
|
|
|
this.$refs.inventoryTable.toggleRowSelection(this.inventoryInfo[index],true); |
|
|
|
|
}) |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$refs.inventoryTable.toggleRowSelection(this.inventoryInfo[index], true); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
console.log("------------->",this.inventoryData); |
|
|
|
|
console.log('------------->', this.inventoryData); |
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
}); |
|
|
|
|
@ -842,63 +865,66 @@
|
|
|
|
|
viewStockArticlePackage(row) { |
|
|
|
|
this.loading = true; |
|
|
|
|
this.packageList = row.packageList; |
|
|
|
|
this.obj = row; |
|
|
|
|
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row); |
|
|
|
|
if (this.reservationId){ |
|
|
|
|
if (this.reservationId) { |
|
|
|
|
//这里就是编辑的数据回显问题 |
|
|
|
|
this.packageData = row.parcelListVOS; |
|
|
|
|
let packageInfo = row.parcelListVOS |
|
|
|
|
// this.packageData = row.parcelListVOS; |
|
|
|
|
let packageListData = this.packageData; |
|
|
|
|
if (row.packageList){ |
|
|
|
|
if (row.packageList) { |
|
|
|
|
let packageListInfo = row.packageList; |
|
|
|
|
for (let i = 0; i < packageListData.length; i++) { |
|
|
|
|
for (let j = 0; j < packageListInfo.length; j++) { |
|
|
|
|
if (packageListData[i].id === packageListInfo[j].id){ |
|
|
|
|
// row.packageList.push(packageListData[i]) |
|
|
|
|
packageInfo.forEach((item,index)=>{ |
|
|
|
|
packageListInfo.forEach(p=>{ |
|
|
|
|
if (item.id===p.id){ |
|
|
|
|
this.$nextTick( ()=> { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[i],true); |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index],true); |
|
|
|
|
}) |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
// this.checkPackage(packageListData[i],i); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>', row); |
|
|
|
|
|
|
|
|
|
// this.packageList = packageListInfo; |
|
|
|
|
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', this.packageList); |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
}else { |
|
|
|
|
//新增订单，默认全选 |
|
|
|
|
packageInfo.forEach((item,index)=>{ |
|
|
|
|
this.$nextTick( ()=> { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index],true); |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
}else { |
|
|
|
|
this.packageData =row.parcelListVOS; |
|
|
|
|
} else { |
|
|
|
|
this.packageData = row.parcelListVOS; |
|
|
|
|
//这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选 |
|
|
|
|
let data = row.parcelListVOS; |
|
|
|
|
data.forEach((item,index)=>{ |
|
|
|
|
if (item.orderPackageReservationStatusName === '已预约' || item.orderPackageReservationStatus === '20'){ |
|
|
|
|
data.forEach((item, index) => { |
|
|
|
|
if (item.orderPackageReservationStatusName === '已预约' || item.orderPackageReservationStatus === '20') { |
|
|
|
|
// //这里就是表示包件此时状态处于已预约，表示该订单下的这个包件信息被其他的预约信息使用，此时应该处于勾选禁用状态 |
|
|
|
|
this.$nextTick( ()=> { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index],true); |
|
|
|
|
}) |
|
|
|
|
console.log("::",item); |
|
|
|
|
this.checkPackage(item,index); |
|
|
|
|
}else if(item.orderPackageFreezeStatusName !== '已冻结' || item.orderPackageFreezeStatus !== '20'){ |
|
|
|
|
this.$nextTick( ()=> { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index],true); |
|
|
|
|
}) |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index], true); |
|
|
|
|
}); |
|
|
|
|
console.log('::', item); |
|
|
|
|
this.checkPackage(item, index); |
|
|
|
|
} else if (item.orderPackageFreezeStatusName !== '已冻结' || item.orderPackageFreezeStatus !== '20') { |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index], true); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
this.isaddvalue = true; |
|
|
|
|
this.loading = false; |
|
|
|
|
}, |
|
|
|
|
checkPackage(row,index) { |
|
|
|
|
checkPackage(row, index) { |
|
|
|
|
//区分编辑还是新增 |
|
|
|
|
//编辑需要对这个预约单下的包件信息均可进行调整 |
|
|
|
|
if (!this.reservationId){ |
|
|
|
|
if (row.orderPackageReservationStatusName === '已预约' || row.orderPackageReservationStatusName === '20'){ |
|
|
|
|
if (!this.reservationId) { |
|
|
|
|
if (row.orderPackageReservationStatusName === '已预约' || row.orderPackageReservationStatusName === '20') { |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (row.orderPackageFreezeStatus === '20' || row.orderPackageFreezeStatusName === '已冻结' ){ |
|
|
|
|
if (row.orderPackageFreezeStatus === '20' || row.orderPackageFreezeStatusName === '已冻结') { |
|
|
|
|
return false; |
|
|
|
|
}else { |
|
|
|
|
} else { |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
@ -945,47 +971,16 @@
|
|
|
|
|
this.handleAddInventory(); |
|
|
|
|
}, |
|
|
|
|
onSubmitPackage() { |
|
|
|
|
console.log('>>>>>>>>>>', this.packageList); |
|
|
|
|
console.log('>>>>>>>>>>', this.orderData); |
|
|
|
|
if (this.packageList.length === 0) { |
|
|
|
|
this.$message.warning('请选择包件!!!'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if (this.reservationId){ |
|
|
|
|
this.orderData.forEach(item => { |
|
|
|
|
item.reservationNum = 0; |
|
|
|
|
let a = []; |
|
|
|
|
this.packageList.forEach(list => { |
|
|
|
|
console.log("##########",item); |
|
|
|
|
console.log("list------------>",list); |
|
|
|
|
//TODO 这里订单选择包件遵循的规则应该是这个预约所选择是包件不管包件状态，其他的已预约包件不能被选取 |
|
|
|
|
if (item.id === list.stockArticleId && list.orderPackageFreezeStatus !== '20') { |
|
|
|
|
item.reservationNum += list.quantity; |
|
|
|
|
a.push(list); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
// console.log("a------------>",a); |
|
|
|
|
// item.packageList = a; |
|
|
|
|
item.packageListInfo = a; |
|
|
|
|
return item |
|
|
|
|
}); |
|
|
|
|
}else { |
|
|
|
|
this.orderData.forEach(item => { |
|
|
|
|
item.reservationNum = 0; |
|
|
|
|
let a = []; |
|
|
|
|
this.packageList.forEach(list => { |
|
|
|
|
console.log("##########",list); |
|
|
|
|
if (item.id === list.stockArticleId && list.orderPackageReservationStatus === '10' && list.orderPackageFreezeStatus=== '10') { |
|
|
|
|
item.reservationNum += list.quantity; |
|
|
|
|
a.push(list); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
item.packageListInfo = a; |
|
|
|
|
// item.packageList = a; |
|
|
|
|
return item |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
console.log("this.orderData------------>",this.orderData); |
|
|
|
|
this.orderData.forEach(item=>{ |
|
|
|
|
if (item.id===this.obj.id){ |
|
|
|
|
item.packageList = this.packageList; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
console.log('this.orderData------------>', this.orderData); |
|
|
|
|
this.isaddvalue = false; |
|
|
|
|
}, |
|
|
|
|
onSubmit() { |
|
|
|
|
@ -995,17 +990,6 @@
|
|
|
|
|
let inventoryList = []; |
|
|
|
|
let stockArticleList = []; |
|
|
|
|
let operation = true; |
|
|
|
|
// this.orderData.forEach(item => { |
|
|
|
|
// // if (item.reservationNum === '0') { |
|
|
|
|
// // this.$message({ |
|
|
|
|
// // type: 'warning', |
|
|
|
|
// // message: '请选择' + item.orderCode + '包件数量!' |
|
|
|
|
// // }); |
|
|
|
|
// // operation = false; |
|
|
|
|
// // } |
|
|
|
|
// orderIds.push(item.id); |
|
|
|
|
// stockArticleList.push(item); |
|
|
|
|
// }); |
|
|
|
|
this.inventoryData.forEach(item => { |
|
|
|
|
if (item.reservationNum === '0' || item.reservationNum > item.quantityStock) { |
|
|
|
|
this.$message({ |
|
|
|
|
@ -1023,8 +1007,14 @@
|
|
|
|
|
this.form.stockArticleIds = orderIds.toString(); |
|
|
|
|
this.form.inventoryIds = inventoryIds.toString(); |
|
|
|
|
this.form.inventoryList = inventoryList; |
|
|
|
|
console.log("-------------->",this.orderData); |
|
|
|
|
this.form.stockArticleList = this.orderData; |
|
|
|
|
console.log('-------------->', this.orderData); |
|
|
|
|
let order = this.orderData; |
|
|
|
|
order.forEach(o=>{ |
|
|
|
|
if (!o.packageListInfo){ |
|
|
|
|
o.packageListInfo = o.packageList; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
this.form.stockArticleList = order; |
|
|
|
|
this.deliveryWayData.forEach(item => { |
|
|
|
|
if (this.form.deliveryWay === item.dictValue) { |
|
|
|
|
this.form.deliveryWay = item.dictKey; |
|
|
|
|
@ -1040,33 +1030,34 @@
|
|
|
|
|
this.form.periodOfTime = item.dictKey; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.form.serveType = this.serveType.join(','); |
|
|
|
|
this.form.serveType = this.serveType.sort().join(','); |
|
|
|
|
//服务号 |
|
|
|
|
this.orderData.forEach(item=>{ |
|
|
|
|
console.log("-------------->item",item); |
|
|
|
|
if (!item.packageListInfo){ |
|
|
|
|
this.orderData.forEach(item => { |
|
|
|
|
console.log('-------------->item', item); |
|
|
|
|
if (!item.packageListInfo) { |
|
|
|
|
item.packageListInfo = item.packageList; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
// this.form.stockArticleList = this.packageList; |
|
|
|
|
console.log('>>>>>>>>', this.form); |
|
|
|
|
if (this.reservationId) { |
|
|
|
|
update(this.form).then(() => { |
|
|
|
|
this.$router.go(-1); |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'success', |
|
|
|
|
message: '操作成功!' |
|
|
|
|
}); |
|
|
|
|
if (this.reservationId) { |
|
|
|
|
this.form.id = this.reservationId; |
|
|
|
|
update(this.form).then(() => { |
|
|
|
|
this.$router.go(-1); |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'success', |
|
|
|
|
message: '操作成功!' |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
add(this.form).then(() => { |
|
|
|
|
this.$router.go(-1); |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'success', |
|
|
|
|
message: '操作成功!' |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
add(this.form).then(() => { |
|
|
|
|
this.$router.go(-1); |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'success', |
|
|
|
|
message: '操作成功!' |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
handleClose(done) { |
|
|
|
|
this.$confirm('确认关闭？') |
|
|
|
|
@ -1125,34 +1116,28 @@
|
|
|
|
|
this.view = false; |
|
|
|
|
}, |
|
|
|
|
selectionChange(list) { |
|
|
|
|
let a = []; |
|
|
|
|
list.forEach(item=>{ |
|
|
|
|
if (item.reservationStatus !== '30'){ |
|
|
|
|
a.push(item) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
this.orderList = a; |
|
|
|
|
this.orderList = list; |
|
|
|
|
}, |
|
|
|
|
selectionPackageChange(list) { |
|
|
|
|
console.log("-----------<>",list); |
|
|
|
|
if (this.reservationId){ |
|
|
|
|
console.log('-----------<>', list); |
|
|
|
|
if (this.reservationId) { |
|
|
|
|
this.packageList = list; |
|
|
|
|
}else { |
|
|
|
|
} else { |
|
|
|
|
//新增 |
|
|
|
|
let a = []; |
|
|
|
|
list.forEach(item=>{ |
|
|
|
|
console.log("--------------->",item); |
|
|
|
|
if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约'){ |
|
|
|
|
list.forEach(item => { |
|
|
|
|
console.log('--------------->', item); |
|
|
|
|
if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约') { |
|
|
|
|
a.push(item); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
this.packageList = a; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
selectionInventoryChange(list) { |
|
|
|
|
// if (this.reservationId){ |
|
|
|
|
console.log("-----------<>",list); |
|
|
|
|
this.inventoryList = list; |
|
|
|
|
console.log('-----------<>', list); |
|
|
|
|
this.inventoryList = list; |
|
|
|
|
// }else { |
|
|
|
|
// //新增 |
|
|
|
|
// let a = []; |
|
|
|
|
@ -1190,29 +1175,41 @@
|
|
|
|
|
* 增加订单提交 |
|
|
|
|
*/ |
|
|
|
|
onSubmitOrder() { |
|
|
|
|
console.log('-------------》', this.orderList); |
|
|
|
|
if (this.orderList.length === 0) { |
|
|
|
|
this.$message.warning('请选择至少一条数据'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
let a = []; |
|
|
|
|
a = this.orderList; |
|
|
|
|
let b = false; |
|
|
|
|
this.orderList.forEach(item => { |
|
|
|
|
a.forEach(a => { |
|
|
|
|
if (item.customerName !== a.customerName || item.customerTelephone !== a.customerTelephone || item.customerAddress !== a.customerAddress) { |
|
|
|
|
b = true; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
if (b) { |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'warning', |
|
|
|
|
message: '请选择同一顾客订单!' |
|
|
|
|
}); |
|
|
|
|
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; |
|
|
|
|
for (let i = 1; i < list.length; i++) { |
|
|
|
|
if (list[i].customerName !== name || list[i].customerAddress !== address || list[i].customerTelephone !== phone){ |
|
|
|
|
this.$message.warning('请选择统一顾客订单!!!'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
console.log(">>>>>>>>>>>>",a); |
|
|
|
|
this.orderData = a; |
|
|
|
|
const data = this.orderList; |
|
|
|
|
let info = []; |
|
|
|
|
if (this.orderData){ |
|
|
|
|
let a = this.orderData; |
|
|
|
|
data.forEach(item=>{ |
|
|
|
|
a.forEach(order=>{ |
|
|
|
|
if (item.id === order.id){ |
|
|
|
|
console.log("order----------------->",order); |
|
|
|
|
item = order; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
info.push(item); |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
console.log("orderList------------------->",this.orderList); |
|
|
|
|
console.log("list------------------->",list); |
|
|
|
|
console.log("orderData------------------->",this.orderData); |
|
|
|
|
this.orderData = info; |
|
|
|
|
this.orderShow = false; |
|
|
|
|
}, |
|
|
|
|
selectionClear() { |
|
|
|
|
@ -1230,7 +1227,7 @@
|
|
|
|
|
}, |
|
|
|
|
onLoad(page, params = {}) { |
|
|
|
|
this.loading = true; |
|
|
|
|
this.form.deliveryType = '1'; |
|
|
|
|
this.form.deliveryType = '10'; |
|
|
|
|
this.form.deliveryWay = '10'; |
|
|
|
|
this.form.periodOfTime = '3'; |
|
|
|
|
this.form.otherFee = 0; |
|
|
|
|
@ -1270,7 +1267,7 @@
|
|
|
|
|
// stockArticleListInfo.forEach(item=>{ |
|
|
|
|
// |
|
|
|
|
// }) |
|
|
|
|
console.log(">>>>>>>>",reservation); |
|
|
|
|
console.log('>>>>>>>>', reservation); |
|
|
|
|
this.orderData = reservation.stockArticleList; |
|
|
|
|
this.inventoryData = reservation.inventoryList; |
|
|
|
|
this.inventoryData.forEach(item => { |
|
|
|
|
@ -1287,11 +1284,9 @@
|
|
|
|
|
this.form = reservation; |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
this.form.deliveryType = '2'; |
|
|
|
|
this.form.deliveryType = '20'; |
|
|
|
|
} |
|
|
|
|
this.loading = false; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
kilo
2 years ago