czg_team
/
management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz

This commit is contained in:
wwz 2024-12-19 14:47:09 +08:00
parent b69a95c92c b566eaf516
commit f62b1fde5d
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/product/add_shop.vue
View File

@ -666,8 +666,8 @@ export default {
singlePeopleLimit: 0, singlePeopleLimit: 0,
weight: '', weight: '',
days: couponEnum.cycle.map(item => item.value), days: couponEnum.cycle.map(item => item.value),
startTime: '', startTime: '00:00',
endTime: '' endTime: '23:59'
}, },
useTime: ['00:00', '23:59'], useTime: ['00:00', '23:59'],
imgList: [], imgList: [],

18
src/views/tool/Instead/components/transfertoPinpin.vue
View File

@ -123,14 +123,14 @@ export default {
return false; return false;
} }
// 判断全选增加课桌费 // 判断全选增加课桌费
var tzf = [] // var tzf = []
try { // try {
let one = this.itemdata.old.list.every((i, index) => i.info.length == this.multipleSelection[index].length) // let one = this.itemdata.old.list.every((i, index) => i.info.length == this.multipleSelection[index].length)
let tow = this.itemdata.list.every((icon) => icon.length == this.refcartSelection.length) // let tow = this.itemdata.list.every((icon) => icon.length == this.refcartSelection.length)
if (one && tow) { // if (one && tow) {
tzf = [999] // tzf = [999]
} // }
} catch (error) { } // } catch (error) { }
// 数据处理 增加cartId方便判断 // 数据处理 增加cartId方便判断
if (this.refcartSelection.length) { if (this.refcartSelection.length) {
this.refcartSelection.forEach((i) => { this.refcartSelection.forEach((i) => {
@ -141,7 +141,7 @@ export default {
await placeswitch({ await placeswitch({
masterId: this.masterId, masterId: this.masterId,
orderId: this.itemdata.orderId, //当前台桌订单id 可选 orderId: this.itemdata.orderId, //当前台桌订单id 可选
cartIds: this.isFull ? "" : [...cartIds.flatMap((subArray) => subArray.map((item) => item.cartId)), ...tzf], //转单的购物车商品 并桌时可不传 可选 cartIds: this.isFull ? "" : cartIds.flatMap((subArray) => subArray.map((item) => item.cartId)), //转单的购物车商品 并桌时可不传 可选
isFull: this.isFull, //并台会将全部购物车商品转入，默认为false 可选 isFull: this.isFull, //并台会将全部购物车商品转入，默认为false 可选
currentTableId: this.currentTableId, currentTableId: this.currentTableId,
targetTableId: this.targetTableId, targetTableId: this.targetTableId,