|
|
|
|
@ -6,7 +6,7 @@
|
|
|
|
|
:model="form" |
|
|
|
|
prop="consignee" |
|
|
|
|
label-width="80px" |
|
|
|
|
:rules="reservationRules"> |
|
|
|
|
:rules="reservationRules"> |
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="10"> |
|
|
|
|
<el-form-item label="收货人:" prop="consignee" label-width="100px"> |
|
|
|
|
@ -77,8 +77,8 @@
|
|
|
|
|
<el-form-item label="配送方式:" prop="serveType" label-width="100px"> |
|
|
|
|
<!-- v-for="item in this.deliveryWayData"--> |
|
|
|
|
<el-radio-group v-model="form.deliveryWay"> |
|
|
|
|
<el-radio :label="'1'" |
|
|
|
|
:value="'1'">送货  |
|
|
|
|
<el-radio :label="'10'" |
|
|
|
|
:value="'10'">送货  |
|
|
|
|
</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
@ -112,7 +112,6 @@
|
|
|
|
|
</el-col> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="10"> |
|
|
|
|
<el-form-item label="其他费用:" prop="collectFee" label-width="100px"> |
|
|
|
|
<el-input v-model="form.otherFee" placeholder="请输入其他费用"/> |
|
|
|
|
@ -164,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}"> |
|
|
|
|
@ -263,14 +262,17 @@
|
|
|
|
|
</el-form> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-table ref="table" |
|
|
|
|
<el-table ref="orderList" |
|
|
|
|
v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
:data="stockArticleInfo" |
|
|
|
|
:height="height" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:border="option.border"> |
|
|
|
|
<el-table-column type="selection" v-if="option.selection" width="55" |
|
|
|
|
<el-table-column type="selection" |
|
|
|
|
v-if="option.selection" |
|
|
|
|
:selectable="checkOrder" |
|
|
|
|
width="55" |
|
|
|
|
align="center"></el-table-column> |
|
|
|
|
<el-table-column v-if="option.index" label="序号" type="index" width="80px" |
|
|
|
|
align="center"></el-table-column> |
|
|
|
|
@ -318,9 +320,9 @@
|
|
|
|
|
<el-button icon="el-icon-delete" @click="stockListSearchReset()">清 空</el-button> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
<el-table ref="table" |
|
|
|
|
<el-table ref="inventoryTable" |
|
|
|
|
v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
@selection-change="selectionInventoryChange" |
|
|
|
|
:data="inventoryInfo" |
|
|
|
|
:height="height" |
|
|
|
|
style="width: 90%;height: 100%" |
|
|
|
|
@ -355,16 +357,22 @@
|
|
|
|
|
title="包件信息" |
|
|
|
|
width="100%" |
|
|
|
|
:model="addvalue" |
|
|
|
|
:before-close="handleClose"> |
|
|
|
|
> |
|
|
|
|
<!-- 列表模块 --> |
|
|
|
|
<el-table ref="table" v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
<el-table ref="packageList" |
|
|
|
|
v-loading="loading" |
|
|
|
|
@selection-change="selectionPackageChange" |
|
|
|
|
:data="packageData" |
|
|
|
|
:height="height" |
|
|
|
|
style="width: 100%" |
|
|
|
|
|
|
|
|
|
:border="option.border"> |
|
|
|
|
<el-table-column type="selection" v-if="option.selection" width="55" |
|
|
|
|
align="center"></el-table-column> |
|
|
|
|
<el-table-column type="selection" |
|
|
|
|
v-if="option.selection" |
|
|
|
|
:selectable="checkPackage" |
|
|
|
|
align="center" |
|
|
|
|
width="55" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column> |
|
|
|
|
<el-table-column v-if="option.index" label="序号" type="index" width="60" align="center"> |
|
|
|
|
</el-table-column> |
|
|
|
|
@ -461,11 +469,10 @@
|
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { add, update, remove, getReservationInfo } from '@/api/distribution/distributionReservation'; |
|
|
|
|
import { getList, getStockArticleList, selectStockArticleList } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getList, getStockArticleList, selectStockArticleList,selectStockArticleAndParcel } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getDetailDelivery, addDelivery } from '@/api/distribution/distributionDelivery'; |
|
|
|
|
import { addIncrement } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getInventoryList } from '@/api/distribution/distributionStockList'; |
|
|
|
|
import { getListOwn } from '@/api/distribution/distributionParcelList'; |
|
|
|
|
|
|
|
|
|
// import option from "@/option/distribution/distributionDelivery"; |
|
|
|
|
import option from '@/option/distribution/distributionStockArticle'; |
|
|
|
|
@ -510,7 +517,7 @@
|
|
|
|
|
addvalueServeTypeData: [], |
|
|
|
|
//配送方式字典列表 |
|
|
|
|
deliveryWayData: [], |
|
|
|
|
whetherData:[], |
|
|
|
|
whetherData: [], |
|
|
|
|
//配送类型字典列表 |
|
|
|
|
deliveryTypeData: [], |
|
|
|
|
//增值服务列表 |
|
|
|
|
@ -546,6 +553,9 @@
|
|
|
|
|
isaddvalue: false, |
|
|
|
|
packageData: [], |
|
|
|
|
packageList: [], |
|
|
|
|
inventoryList: [], |
|
|
|
|
orderList: [], |
|
|
|
|
inventoryTable:[], |
|
|
|
|
reservationRules: { |
|
|
|
|
consignee: [ |
|
|
|
|
{ required: true, message: '请填写收货人名称!!!', trigger: 'change' } |
|
|
|
|
@ -555,11 +565,11 @@
|
|
|
|
|
], |
|
|
|
|
deliveryPhone: [ |
|
|
|
|
{ required: true, message: '请填写收货人电话!!!', trigger: 'change' } |
|
|
|
|
], |
|
|
|
|
] |
|
|
|
|
// enableStatus: [ |
|
|
|
|
// { required: true, message: '请选择启用状态!', trigger: 'change' } |
|
|
|
|
// ], |
|
|
|
|
}, |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
@ -642,30 +652,34 @@
|
|
|
|
|
}, |
|
|
|
|
//查询出所有的市配订单 |
|
|
|
|
handleAddOrder() { |
|
|
|
|
console.log('$$$$$$', this.reservationId); |
|
|
|
|
console.log('$$$$$$', this.orderData); |
|
|
|
|
if (this.reservationId) { |
|
|
|
|
//这里需要编辑，那么这里就需要在订单列表中回显已使用包件，禁用勾选其他预约使用的包件细信息 |
|
|
|
|
|
|
|
|
|
this.query.typeService = 2; |
|
|
|
|
this.query.genre = '1'; |
|
|
|
|
//查询所有订单列表信息 |
|
|
|
|
|
|
|
|
|
let page = this.page; |
|
|
|
|
let params = {}; |
|
|
|
|
selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
selectStockArticleAndParcel(Object.assign(params, this.query)).then(res => { |
|
|
|
|
console.log('$$$$$$$$>', res); |
|
|
|
|
let orderData = res.data.data; |
|
|
|
|
console.log('$$$$$$$$', orderData); |
|
|
|
|
orderData.records.forEach((item, index) => { |
|
|
|
|
item.reservationNum = item.handQuantity; |
|
|
|
|
// if () |
|
|
|
|
//订单已预约 |
|
|
|
|
// if (item.reservationStatus !== '30' ){ |
|
|
|
|
// a.push(item) |
|
|
|
|
// } |
|
|
|
|
}); |
|
|
|
|
this.page.total = orderData.total; |
|
|
|
|
this.stockArticleInfo = orderData; |
|
|
|
|
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(); |
|
|
|
|
}); |
|
|
|
|
@ -674,28 +688,51 @@
|
|
|
|
|
this.query.genre = '1'; |
|
|
|
|
let page = this.page; |
|
|
|
|
let params = {}; |
|
|
|
|
selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
let data = res.data.data; |
|
|
|
|
let a = []; |
|
|
|
|
console.log('$$$$$$$$', data); |
|
|
|
|
data.records.forEach((item, index) => { |
|
|
|
|
selectStockArticleAndParcel(Object.assign(params, this.query)).then(res => { |
|
|
|
|
console.log('$$$$$$$$>', res); |
|
|
|
|
let orderData = res.data.data; |
|
|
|
|
orderData.forEach((item, index) => { |
|
|
|
|
item.reservationNum = item.handQuantity; |
|
|
|
|
//订单已预约 |
|
|
|
|
if (item.reservationStatus !== '30') { |
|
|
|
|
a.push(item); |
|
|
|
|
} |
|
|
|
|
item.reservationNum = '0'; |
|
|
|
|
}); |
|
|
|
|
console.log('$$$$$$$$', a); |
|
|
|
|
this.page.total = data.total; |
|
|
|
|
this.stockArticleInfo = a; |
|
|
|
|
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.checkOrder(item,index); |
|
|
|
|
}) |
|
|
|
|
}else { |
|
|
|
|
//这里是通过新增预约的按钮进入的页面 |
|
|
|
|
} |
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
}); |
|
|
|
|
this.selectionList = []; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
this.orderShow = true; |
|
|
|
|
}, |
|
|
|
|
checkOrder(row,index){ |
|
|
|
|
|
|
|
|
|
if (row.reservationStatus === '30' || row.reservationStatusName === '已预约' || row.freezeStatus === '30' || row.freezeStatusName === '已冻结' ){ |
|
|
|
|
return false; |
|
|
|
|
}else { |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
return false; |
|
|
|
|
}, |
|
|
|
|
handleAddInventory() { |
|
|
|
|
let page = this.page; |
|
|
|
|
let params = {}; |
|
|
|
|
@ -705,14 +742,29 @@
|
|
|
|
|
inventoryList.records.forEach(item => { |
|
|
|
|
item.reservationNum = '0'; |
|
|
|
|
item.applyNum = item.quantityStock - item.quantityOccupied; |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
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){ |
|
|
|
|
item = inventory; |
|
|
|
|
this.$nextTick(()=> { |
|
|
|
|
this.$refs.inventoryTable.toggleRowSelection(this.inventoryInfo[index],true); |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
console.log("------------->",this.inventoryData); |
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
}); |
|
|
|
|
this.query = {}; |
|
|
|
|
this.selectionList = []; |
|
|
|
|
this.inventoryList = []; |
|
|
|
|
this.stockListShow = true; |
|
|
|
|
}, |
|
|
|
|
handleCheckedCitiesChange(value) { |
|
|
|
|
@ -789,14 +841,66 @@
|
|
|
|
|
}, |
|
|
|
|
viewStockArticlePackage(row) { |
|
|
|
|
this.loading = true; |
|
|
|
|
this.packageList = row.packageList; |
|
|
|
|
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row); |
|
|
|
|
if (this.reservationId){ |
|
|
|
|
//这里就是编辑的数据回显问题 |
|
|
|
|
this.packageData = row.parcelListVOS; |
|
|
|
|
let packageListData = this.packageData; |
|
|
|
|
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]) |
|
|
|
|
this.$nextTick( ()=> { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[i],true); |
|
|
|
|
}) |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
// this.checkPackage(packageListData[i],i); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>', row); |
|
|
|
|
|
|
|
|
|
// this.packageList = packageListInfo; |
|
|
|
|
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', this.packageList); |
|
|
|
|
} |
|
|
|
|
}else { |
|
|
|
|
this.packageData = row.parcelListVOS; |
|
|
|
|
//这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选 |
|
|
|
|
let data = row.parcelListVOS; |
|
|
|
|
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.isaddvalue = true; |
|
|
|
|
getListOwn('1', '10', { stockArticleId: row.id }).then(res => { |
|
|
|
|
const packages = res.data.data; |
|
|
|
|
console.log('>>>>>>>', packages); |
|
|
|
|
this.packageData = packages.records; |
|
|
|
|
this.loading = false; |
|
|
|
|
}); |
|
|
|
|
this.loading = false; |
|
|
|
|
}, |
|
|
|
|
checkPackage(row,index) { |
|
|
|
|
//区分编辑还是新增 |
|
|
|
|
//编辑需要对这个预约单下的包件信息均可进行调整 |
|
|
|
|
if (!this.reservationId){ |
|
|
|
|
if (row.orderPackageReservationStatusName === '已预约' || row.orderPackageReservationStatusName === '20'){ |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (row.orderPackageFreezeStatus === '20' || row.orderPackageFreezeStatusName === '已冻结' ){ |
|
|
|
|
return false; |
|
|
|
|
}else { |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
//搜索订单 |
|
|
|
|
searchStockArticle() { |
|
|
|
|
@ -841,15 +945,40 @@
|
|
|
|
|
this.handleAddInventory(); |
|
|
|
|
}, |
|
|
|
|
onSubmitPackage() { |
|
|
|
|
this.orderData.forEach(item => { |
|
|
|
|
item.reservationNum = 0; |
|
|
|
|
this.selectionList.forEach(list => { |
|
|
|
|
if (item.id === list.stockArticleId) { |
|
|
|
|
item.reservationNum += list.quantity; |
|
|
|
|
} |
|
|
|
|
console.log('>>>>>>>>>>', this.packageList); |
|
|
|
|
console.log('>>>>>>>>>>', this.orderData); |
|
|
|
|
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.packageList = this.selectionList; |
|
|
|
|
}); |
|
|
|
|
}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.packageList = a; |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
console.log("this.orderData------------>",this.orderData); |
|
|
|
|
this.isaddvalue = false; |
|
|
|
|
}, |
|
|
|
|
onSubmit() { |
|
|
|
|
@ -859,18 +988,17 @@
|
|
|
|
|
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); |
|
|
|
|
item.reservationNum = item.reservationNum; |
|
|
|
|
stockArticleList.push(item); |
|
|
|
|
}); |
|
|
|
|
// 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({ |
|
|
|
|
@ -888,7 +1016,7 @@
|
|
|
|
|
this.form.stockArticleIds = orderIds.toString(); |
|
|
|
|
this.form.inventoryIds = inventoryIds.toString(); |
|
|
|
|
this.form.inventoryList = inventoryList; |
|
|
|
|
this.form.stockArticleList = stockArticleList; |
|
|
|
|
this.form.stockArticleList = this.orderData; |
|
|
|
|
this.deliveryWayData.forEach(item => { |
|
|
|
|
if (this.form.deliveryWay === item.dictValue) { |
|
|
|
|
this.form.deliveryWay = item.dictKey; |
|
|
|
|
@ -907,9 +1035,8 @@
|
|
|
|
|
this.form.serveType = this.serveType.join(','); |
|
|
|
|
//服务号 |
|
|
|
|
|
|
|
|
|
// this.form.packageList = this.packageList; |
|
|
|
|
// this.form.stockArticleList = this.packageList; |
|
|
|
|
console.log('>>>>>>>>', this.form); |
|
|
|
|
if (operation) { |
|
|
|
|
if (this.reservationId) { |
|
|
|
|
update(this.form).then(() => { |
|
|
|
|
this.$router.go(-1); |
|
|
|
|
@ -927,7 +1054,6 @@
|
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
handleClose(done) { |
|
|
|
|
this.$confirm('确认关闭？') |
|
|
|
|
@ -986,25 +1112,63 @@
|
|
|
|
|
this.view = false; |
|
|
|
|
}, |
|
|
|
|
selectionChange(list) { |
|
|
|
|
this.selectionList = list; |
|
|
|
|
let a = []; |
|
|
|
|
list.forEach(item=>{ |
|
|
|
|
if (item.reservationStatus !== '30'){ |
|
|
|
|
a.push(item) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
this.orderList = a; |
|
|
|
|
}, |
|
|
|
|
selectionPackageChange(list) { |
|
|
|
|
if (this.reservationId){ |
|
|
|
|
console.log("-----------<>",list); |
|
|
|
|
this.packageList = list; |
|
|
|
|
}else { |
|
|
|
|
//新增 |
|
|
|
|
let a = []; |
|
|
|
|
list.forEach(item=>{ |
|
|
|
|
if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约'){ |
|
|
|
|
a.push(item); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
this.packageList = a; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
selectionInventoryChange(list) { |
|
|
|
|
// if (this.reservationId){ |
|
|
|
|
console.log("-----------<>",list); |
|
|
|
|
this.inventoryList = list; |
|
|
|
|
// }else { |
|
|
|
|
// //新增 |
|
|
|
|
// let a = []; |
|
|
|
|
// list.forEach(item=>{ |
|
|
|
|
// if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约'){ |
|
|
|
|
// a.push(item); |
|
|
|
|
// } |
|
|
|
|
// }) |
|
|
|
|
// this.inventoryList = a; |
|
|
|
|
// } |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 增加库存品 |
|
|
|
|
onSubmitInventory() { |
|
|
|
|
if (this.selectionList.length === 0) { |
|
|
|
|
if (this.inventoryList.length === 0) { |
|
|
|
|
this.$message.warning('请选择至少一条数据'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if (this.orderData.length) { |
|
|
|
|
this.selectionList.some(i => { |
|
|
|
|
let a = this.inventoryData.filter((ele) => ele.id == i.id).length >= 1; |
|
|
|
|
if (!a) { |
|
|
|
|
this.inventoryData.push(i); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
this.inventoryData = this.selectionList; |
|
|
|
|
} |
|
|
|
|
this.inventoryData = this.inventoryList; |
|
|
|
|
|
|
|
|
|
// if (this.orderData.length) { |
|
|
|
|
// this.inventoryList.some(i => { |
|
|
|
|
// let a = this.inventoryData.filter((ele) => ele.id == i.id).length >= 1; |
|
|
|
|
// if (!a) { |
|
|
|
|
// this.inventoryData.push(i); |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
// } else { |
|
|
|
|
// this.inventoryData = this.selectionList; |
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
this.stockListShow = false; |
|
|
|
|
}, |
|
|
|
|
@ -1012,14 +1176,14 @@
|
|
|
|
|
* 增加订单提交 |
|
|
|
|
*/ |
|
|
|
|
onSubmitOrder() { |
|
|
|
|
if (this.selectionList.length === 0) { |
|
|
|
|
if (this.orderList.length === 0) { |
|
|
|
|
this.$message.warning('请选择至少一条数据'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
let a = []; |
|
|
|
|
a = this.selectionList; |
|
|
|
|
a = this.orderList; |
|
|
|
|
let b = false; |
|
|
|
|
this.selectionList.forEach(item => { |
|
|
|
|
this.orderList.forEach(item => { |
|
|
|
|
a.forEach(a => { |
|
|
|
|
if (item.customerName !== a.customerName || item.customerTelephone !== a.customerTelephone || item.customerAddress !== a.customerAddress) { |
|
|
|
|
b = true; |
|
|
|
|
@ -1033,41 +1197,8 @@
|
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if (this.orderData.length >= 1) { |
|
|
|
|
let flag = false; |
|
|
|
|
this.selectionList.some(i => { |
|
|
|
|
//过滤选择数据中不是同一用户的数据 |
|
|
|
|
let b = this.orderData.filter(a => { |
|
|
|
|
return i.customerName !== a.customerName && i.customerTelephone !== a.customerTelephone && i.customerAddress !== a.customerAddress; |
|
|
|
|
}).length >= 1; |
|
|
|
|
console.log('>>>>>>>>>>>>>>>', b); |
|
|
|
|
//控制选择记录是否插入订单列表中 |
|
|
|
|
let a = this.orderData.filter((ele) => ele.id == i.id).length >= 1; |
|
|
|
|
|
|
|
|
|
if (!b) { |
|
|
|
|
if (!a) { |
|
|
|
|
this.orderData.push(i); |
|
|
|
|
} else { |
|
|
|
|
flag = true; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
if (flag) { |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'warning', |
|
|
|
|
message: '请选择同一顾客订单!' |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
this.orderData = this.selectionList; |
|
|
|
|
let a = 0; |
|
|
|
|
this.orderData.forEach(item => { |
|
|
|
|
if (item.collectFee) { |
|
|
|
|
a += parseInt(item.collectFee); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.form.collectFee = a; |
|
|
|
|
} |
|
|
|
|
console.log(">>>>>>>>>>>>",a); |
|
|
|
|
this.orderData = a; |
|
|
|
|
this.orderShow = false; |
|
|
|
|
}, |
|
|
|
|
selectionClear() { |
|
|
|
|
@ -1086,12 +1217,12 @@
|
|
|
|
|
onLoad(page, params = {}) { |
|
|
|
|
this.loading = true; |
|
|
|
|
this.form.deliveryType = '1'; |
|
|
|
|
this.form.deliveryWay = '1'; |
|
|
|
|
this.form.deliveryWay = '10'; |
|
|
|
|
this.form.periodOfTime = '3'; |
|
|
|
|
this.form.otherFee = 0; |
|
|
|
|
this.form.replaceFee = 0; |
|
|
|
|
this.form.collectionFee = 0; |
|
|
|
|
this.form.isUrgent = "1"; |
|
|
|
|
this.form.isUrgent = '1'; |
|
|
|
|
this.form.reservationDate = new Date(); |
|
|
|
|
if (this.orderIds) { |
|
|
|
|
getStockArticleList(this.orderIds).then(res => { |
|
|
|
|
@ -1121,7 +1252,13 @@
|
|
|
|
|
if (this.reservationId) { |
|
|
|
|
getReservationInfo(this.reservationId).then(res => { |
|
|
|
|
const reservation = res.data.data; |
|
|
|
|
const stockArticleListInfo = res.data.data.stockArticleList; |
|
|
|
|
// stockArticleListInfo.forEach(item=>{ |
|
|
|
|
// |
|
|
|
|
// }) |
|
|
|
|
console.log(">>>>>>>>",reservation); |
|
|
|
|
this.orderData = reservation.stockArticleList; |
|
|
|
|
|
|
|
|
|
this.inventoryData = reservation.inventoryList; |
|
|
|
|
this.inventoryData.forEach(item => { |
|
|
|
|
item.applyNum = item.quantityStock - item.quantityOccupied; |
|
|
|
|
|
pref_mail@163.com
2 years ago