更新订单列表详情，更新商品管理，更新代客下单

pagesOrder/detail/detail.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="min-page bg-gray u-font-28 u-p-30">
-		<user-vue></user-vue>
+		<user-vue :orderInfo="orderDetail.info"></user-vue>
 		<view class="default-box-padding bg-fff border-r-12 u-m-t-20">
 			<text class="color-666">桌位号：</text>
-			<text class="font-bold">{{options.name}}</text>
+			<text class="font-bold">{{orderDetail.info.tableName}}</text>
 		</view>
-		<goods-list :data="orderDetail.goodsList" :seatFee="orderDetail.seatFee.totalAmount"
+		<goods-list @printOrder="onPrintOrder"  @tuikuan="onTuikuan" :orderInfo="orderDetail.info" :data="orderDetail.goodsList" :seatFee="orderDetail.seatFee.totalAmount"
 			@tuicai="onTuiCai"></goods-list>
 		<extra-vue :data="orderDetail.seatFee"></extra-vue>
 		<order-vue :data="orderDetail.info" :table="options" :seatFee="orderDetail.seatFee"></order-vue>
@@ -23,7 +23,7 @@
 							type="primary">结账</my-button>
 					</view>
 				</template>
-				
+
 			</view>
 		</view>
 
@@ -34,6 +34,9 @@
 <script setup>
 	import * as Api from '@/http/yskApi/Instead.js'
 	import * as orderApi from '@/http/yskApi/order.js'
+	import {
+		objToArrary
+	} from '@/commons/utils/returrn-data.js'
 	import userVue from './components/user.vue';
 	import orderVue from './components/order.vue';
 	import goodsList from './components/list.vue';
@@ -41,13 +44,14 @@
 	import extraVue from './components/extra.vue';
 	import tuicaiVue from './components/tuicai.vue';
 	import go from '@/commons/utils/go.js'
+	import infoBox from '@/commons/utils/infoBox.js'
 	import {
 		onLoad,
 		onShow,
 		onHide
 	} from '@dcloudio/uni-app';
 	import {
-		reactive
+		reactive, ref
 	} from 'vue';
 	import OrderDetail from './page.js'
 	const tuicai = reactive({
@@ -59,13 +63,42 @@
 		tuicai.show = true
 		tuicai.selGoods = goods
 	}
+	async function printDishes(){
+		try{
+			const res= await Api.$printDishes({
+				tableId:orderDetail.info.tableId
+			})
+			infoBox.showToast('已发送打印请求')
+		}catch(e){
+			infoBox.showToast('发送打印请求失败')
+			//TODO handle the exception
+		}
+		
+	}
+	function onPrintOrder(){
+		uni.showModal({
+			title:'提示',
+			content:'是否打印当前台桌菜品',
+			success(res) {
+				if(res.confirm){
+					printDishes()
+				}
+			}
+		})
+	}
+	function onTuikuan(goods, index){
+		go.to('PAGES_ORDER_TUIKUAN',{
+			
+		})
+		
+	}
 
 	async function tuicaiConfirm() {
-		const res=await Api.$returnCart({
-			cartId: tuicai.selGoods.id,
-			tableId:options.tableId,
+		const res = await Api.$returnCart({
+			cartId: tuicai.selGoods.cartId,
+			tableId: orderDetail.info.tableId,
 		})
-		tuicai.selGoods.status='return'
+		tuicai.selGoods.status = 'return'
 		tuicai.show = false
 	}
 	const uiPage = new OrderDetail()
@@ -84,7 +117,7 @@
 	}
 
 	function toPay() {
-		go.to('PAGES_CRESATE_ORDER_PAY', {
+		go.to('PAGES_ORDER_PAY', {
 			tableId: options.tableId,
 			tableName: options.name,
 			masterId: options.masterId,
@@ -102,22 +135,48 @@
 	})
 	const options = reactive({})
 	async function init() {
-		const res= await orderApi.tbOrderInfoDetail(options.id)
-		const masterId=res.masterId
+		const res = await orderApi.tbOrderInfoDetail(options.id)
+		const masterId = res.masterId
 		options.masterId = res.masterId
-		if(res.status=='unpaid'){
+		if (res.status == 'unpaid') {
+			// if (false) {
 			const {
 				records,
 				seatFee
 			} = await Api.getCart({
 				masterId,
-				tableId:res.tableId
+				tableId: res.tableId,
+				page: 1,
+				size: 200
 			})
 			orderDetail.goodsList = records
-			orderDetail.seatFee = seatFee
-		}else{
-			orderDetail.goodsList = res.detailList
+			orderDetail.seatFee = seatFee ? seatFee : orderDetail.seatFee
+		} else {
+			const goodsMap = {}
+			for (let i in res.detailList) {
+				const goods = res.detailList[i]
+				if (goods.productName != '客座费') {
+					if (goodsMap.hasOwnProperty(goods.placeNum)) {
+						goodsMap[goods.placeNum].push(goods)
+					} else {
+						goodsMap[goods.placeNum] = [goods]
+					}
+				}
+
+			}
+			orderDetail.seatFee = {
+				name: '餐位费',
+				number: res.seatCount,
+				totalNumber: res.seatCount,
+				totalAmount: res.seatAmount
+			}
+			orderDetail.goodsList = Object.entries(goodsMap).map(([key, value]) => ({
+				info: value,
+				placeNum: key
+			}))
+			console.log(orderDetail.goodsList);
 		}
+		console.log(orderDetail);
 		orderDetail.info = res
 	}
 
@@ -128,8 +187,32 @@
 			init()
 		})
 	}
+	
+	// 监听选择用户事件
+	let user = ref(null)
+	//更新选择用户
+	function setUser(par) {
+		const submitPar = {
+			masterId: option.masterId,
+			tableId: option.tableId,
+			vipUserId: user.value.id ? user.value.id : '',
+			type: user.value.id ? 0 : 1 //0 设置 1 取消
+		}
+		Object.assign(submitPar, par)
+		return Api.$setUser(submitPar)
+	}
+	function watchChooseuser() {
+		uni.$off('choose-user')
+		uni.$on('choose-user', (data) => {
+			console.log(data);
+			user.value = data
+			setUser()
+		})
+	}
+	
 	onShow(() => {
 		watchEmit()
+		watchChooseuser()
 	})
 	onLoad((opt) => {
 		Object.assign(options, opt)