|
|
|
|
@ -128,6 +128,7 @@
|
|
|
|
|
<el-tab-pane label="订单"> |
|
|
|
|
<el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button> |
|
|
|
|
<tablecmt |
|
|
|
|
class="tablesc" |
|
|
|
|
:columnList="columnList" |
|
|
|
|
:tableData="orderData" |
|
|
|
|
:loading="loading" |
|
|
|
|
@ -176,6 +177,7 @@
|
|
|
|
|
<el-tab-pane label="库存品"> |
|
|
|
|
<el-button class="el-btn-xz" link @click="handleAddInventory">新 增</el-button> |
|
|
|
|
<tablecmt |
|
|
|
|
class="tablesc" |
|
|
|
|
:columnList="stockcolumnList" |
|
|
|
|
:tableData="inventoryData" |
|
|
|
|
:loading="loading" |
|
|
|
|
@ -563,7 +565,7 @@ import { mapGetters } from 'vuex';
|
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber'; |
|
|
|
|
import { setNodeHeight } from '@/utils/util.js'; |
|
|
|
|
import { setNodeHeight, removeZeroWidth } from '@/utils/util.js'; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
data() { |
|
|
|
|
@ -2020,6 +2022,8 @@ export default {
|
|
|
|
|
|
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
this.getDictionary(); |
|
|
|
|
|
|
|
|
|
this.setTableHeight(); |
|
|
|
|
}, |
|
|
|
|
watch: { |
|
|
|
|
'$route.query.reservationId': { |
|
|
|
|
@ -2043,6 +2047,12 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
/** 设置表格高度 */ |
|
|
|
|
async setTableHeight() { |
|
|
|
|
await this.$nextTick(); |
|
|
|
|
const _node = document.querySelectorAll('.tablesc'); |
|
|
|
|
setNodeHeight(_node, '600px'); |
|
|
|
|
}, |
|
|
|
|
handleToggleAllSelection() { |
|
|
|
|
this.$refs.selecttable.toggleAllSelection(); |
|
|
|
|
}, |
|
|
|
|
@ -2063,6 +2073,7 @@ export default {
|
|
|
|
|
tableAllSelection() {}, |
|
|
|
|
handleClick(tab, event) { |
|
|
|
|
this.query = {}; |
|
|
|
|
this.setTableHeight(); |
|
|
|
|
}, |
|
|
|
|
//查询出所有的市配订单 |
|
|
|
|
async handleAddOrder() { |
|
|
|
|
@ -2077,6 +2088,8 @@ export default {
|
|
|
|
|
console.log('_node :>> ', _node); |
|
|
|
|
_node.style.transition = 'all 0.3s'; |
|
|
|
|
setNodeHeight(_node, '500px'); |
|
|
|
|
|
|
|
|
|
this.setTableHeight(); |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
checkOrder(row, index) { |
|
|
|
|
@ -2128,6 +2141,8 @@ export default {
|
|
|
|
|
const _node = document.querySelector('.stockListShow .maboxhi'); |
|
|
|
|
_node.style.transition = 'all 0.3s'; |
|
|
|
|
setNodeHeight(_node, '500px'); |
|
|
|
|
|
|
|
|
|
this.setTableHeight(); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
); |
|
|
|
|
@ -2470,6 +2485,7 @@ export default {
|
|
|
|
|
inventoryIds.push(item.id); |
|
|
|
|
inventoryList.push(item); |
|
|
|
|
}); |
|
|
|
|
if (!operation) return; |
|
|
|
|
orderIds.join(','); |
|
|
|
|
inventoryIds.join(','); |
|
|
|
|
this.form.stockArticleIds = orderIds.toString(); |
|
|
|
|
@ -2520,6 +2536,8 @@ export default {
|
|
|
|
|
operation = false; |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if (!operation) return; |
|
|
|
|
|
|
|
|
|
// this.form.stockArticleList = this.packageList; |
|
|
|
|
console.log('>>>>>>>>', this.form); |
|
|
|
|
if (this.reservationId) { |
|
|
|
|
@ -2571,7 +2589,7 @@ export default {
|
|
|
|
|
if (item.id === row.id) { |
|
|
|
|
this.orderData.splice(index, 1); |
|
|
|
|
} |
|
|
|
|
console.log(this.orderData,'当前存在的数据'); |
|
|
|
|
console.log(this.orderData, '当前存在的数据'); |
|
|
|
|
}); |
|
|
|
|
// 当两个列表没有数据时, 清空限制 |
|
|
|
|
if (this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = ''; |
|
|
|
|
@ -2819,17 +2837,22 @@ export default {
|
|
|
|
|
// } |
|
|
|
|
// return true; |
|
|
|
|
// }); |
|
|
|
|
console.log('this.inventoryList :>> ', this.inventoryList); |
|
|
|
|
|
|
|
|
|
const stockArr = [...this.inventoryData, ...this.inventoryList]; |
|
|
|
|
|
|
|
|
|
// 检测商场是否选择统一商场 |
|
|
|
|
const _isUnifyMarketName = stockArr.every(value => { |
|
|
|
|
// 设置同一商场 |
|
|
|
|
if (this.marketName === '') this.marketName = value.marketName; |
|
|
|
|
if (this.marketName === '') this.marketName = removeZeroWidth(value.marketName); |
|
|
|
|
|
|
|
|
|
if (this.marketName !== value.marketName) { |
|
|
|
|
this.$message.warning('请选择统一商场!!!'); |
|
|
|
|
return false; |
|
|
|
|
} else if (value.reservationNum > value.applyNum) { |
|
|
|
|
} else if (Number(value.reservationNum) > Number(value.applyNum)) { |
|
|
|
|
console.log('value >>>>>>>>', value); |
|
|
|
|
console.log('Number(value.reservationNum) :>> ', Number(value.reservationNum)); |
|
|
|
|
console.log('Number(value.applyNum) :>> ', Number(value.applyNum), value.applyNum); |
|
|
|
|
this.$message.warning('该库存品数量输入有误!!!'); |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
@ -2840,7 +2863,6 @@ export default {
|
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
console.log('this.inventoryList :>> ', this.inventoryList); |
|
|
|
|
this.inventoryData = stockArr; |
|
|
|
|
|
|
|
|
|
this.stockListShow = false; |
|
|
|
|
@ -2852,10 +2874,10 @@ export default {
|
|
|
|
|
console.log('orderList-------------》', this.orderList); |
|
|
|
|
if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!'); |
|
|
|
|
const list = [...this.orderData, ...this.orderList]; |
|
|
|
|
let _name = list[0].customerName.trim(); |
|
|
|
|
let _address = list[0].customerAddress.trim(); |
|
|
|
|
let _phone = list[0].customerTelephone.trim(); |
|
|
|
|
if (this.marketName === '') this.marketName = list[0].mallName.trim(); |
|
|
|
|
let _name = removeZeroWidth(list[0].customerName.trim()); |
|
|
|
|
let _address = removeZeroWidth(list[0].customerAddress.trim()); |
|
|
|
|
let _phone = removeZeroWidth(list[0].customerTelephone.trim()); |
|
|
|
|
if (this.marketName === '') this.marketName = removeZeroWidth(list[0].mallName.trim()); |
|
|
|
|
|
|
|
|
|
// 设置商场名称 |
|
|
|
|
if (this.marketName === '') this.marketName = this.marketName; |
|
|
|
|
@ -2867,10 +2889,20 @@ export default {
|
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if ( |
|
|
|
|
item.customerName.trim() !== _name || |
|
|
|
|
item.customerAddress.trim() !== _address || |
|
|
|
|
console.log(' item.customerName.trim() !== _name :>> ', item.customerName.trim() !== _name); |
|
|
|
|
console.log( |
|
|
|
|
' item.customerName.trim() !== _name :>> ', |
|
|
|
|
item.customerAddress.trim() !== _address |
|
|
|
|
); |
|
|
|
|
console.log( |
|
|
|
|
' item.customerName.trim() !== _name :>> ', |
|
|
|
|
item.customerTelephone.trim() !== _phone |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
if ( |
|
|
|
|
removeZeroWidth(item.customerName.trim()) !== _name || |
|
|
|
|
removeZeroWidth(item.customerAddress.trim()) !== _address || |
|
|
|
|
removeZeroWidth(item.customerTelephone.trim()) !== _phone |
|
|
|
|
) { |
|
|
|
|
console.log('123'); |
|
|
|
|
this.$message.warning('请选择统一顾客订单!!!'); |
|
|
|
|
@ -3176,6 +3208,7 @@ export default {
|
|
|
|
|
this.orderData = reservation.stockArticleList; |
|
|
|
|
this.inventoryData = reservation.inventoryList; |
|
|
|
|
this.inventoryData.forEach(item => { |
|
|
|
|
item.quantityOccupied -= item.reservationNum; |
|
|
|
|
item.applyNum = item.quantityStock - item.quantityOccupied; |
|
|
|
|
}); |
|
|
|
|
this.form.deliveryType = reservation.deliveryType; |
|
|
|
|
|
