修复转桌问题，餐位费问题，台桌增加显示更多信息，修复添加耗材第二单位

components/change-table.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<up-popup :show="show" mode="center">
+		<up-popup :show="show" mode="center" @close="close">
 
 			<view class="bg-fff u-p-30 box">
 				<scroll-view direction="vertical" scroll-y style="max-height: 80vh;">
@@ -20,18 +20,20 @@
 					<template v-if="form.type==1">
 						<view class=" u-m-t-32 ">
 							<view class="u-m-b-24">购物车商品</view>
-			<!-- 				<goodsTable :data="nowCartData" :columns="columnsCheck1" row-key="id"
-								@selection-change="handleSelectionChange($event,'now')"></goodsTable> -->
-							<u-table2 :data="nowCartData" :columns="columnsCheck1" row-key="id"
-								@selection-change="handleSelectionChange($event,'now')" />
+							<goodsTable :data="nowCartData" :columns="columnsCheck1" row-key="id"
+								@selection-change="handleSelectionChange($event,'now')"></goodsTable>
+							<!-- 		<u-table2 :data="nowCartData" :columns="columnsCheck1" row-key="id"
+								@selection-change="handleSelectionChange($event,'now')" /> -->
 
 						</view>
 						<view class=" u-m-t-50 ">
 							<view class="u-m-b-24">历史订单商品</view>
 							<view v-for="(order,orderIndex) in goodsList" class="u-m-t-32" :key="index">
 								<view>第{{ orderIndex }}次下单</view>
-								<u-table2 :data="order" :columns="columnsCheck" row-key="id"
+								<goodsTable :data="order" :columns="columnsCheck" row-key="id"
 									@selection-change="handleSelectionChange($event,'old')" />
+								<!-- <u-table2 :data="order" :columns="columnsCheck" row-key="id"
+									@selection-change="handleSelectionChange($event,'old')" /> -->
 							</view>
 
 
@@ -84,6 +86,8 @@
 	})
 
 	function close() {
+		console.log('close');
+		form.mewTable = {id: ''}
 		show.value = false
 	}
 	const form = reactive({
@@ -131,6 +135,7 @@
 
 
 	const handleSelectionChange = (selection, key) => {
+		console.log('handleSelectionChange', selection);
 		if (key === 'old') {
 			form.old = selection
 		}
@@ -171,12 +176,11 @@
 						title: '转桌成功',
 						icon: 'none'
 					})
-					close()
 					emits('update', 1)
+					close()
 
 				})
 			} else {
-				close()
 				emits('confirm', {
 					targetTableCode: form.mewTable.tableCode,
 					old: {
@@ -193,6 +197,7 @@
 						cart_id: props.nowCartData.map(v => v.id)
 					}
 				})
+				close()
 			}
 
 			return
@@ -215,12 +220,10 @@
 					title: '转桌成功',
 					icon: 'none'
 				})
-				close()
 				emits('update', allMerge)
-
+				close()
 			})
 		} else {
-			close()
 			emits('confirm', {
 				targetTableCode: form.mewTable.tableCode,
 				old: {
@@ -234,6 +237,7 @@
 					cart_id: form.now.map(v => v.id)
 				}
 			})
+			close()
 		}
 
 	}