增加table组件

components/change-table.vue

@@ -20,6 +20,8 @@
 					<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')" />
 
@@ -55,9 +57,11 @@
 </template>
 
 <script setup>
+	import goodsTable from './goods-table.vue'
 	import {
 		reactive,
-		ref
+		ref,
+		watch
 	} from 'vue';
 	import chooseTable from './choose-table.vue'
 	import {
@@ -73,6 +77,11 @@
 		},
 		nowCartData: []
 	})
+	watch(() => props.nowCartData, (newval) => {
+		console.log('props.nowCartData', props.nowCartData)
+	}, {
+		deep: true
+	})
 
 	function close() {
 		show.value = false
@@ -151,7 +160,7 @@
 			if (props.nowCartData.length <= 0) {
 				mergeOrder({
 					allMerge: 1,
-					sourceOrderId:props.order? props.order.id:'',
+					sourceOrderId: props.order ? props.order.id : '',
 					targetTableCode: form.mewTable.tableCode,
 					detailIds: Object.entries(props.goodsList).reduce((prve, cur) => {
 						prve.push(...cur.map(v => v.id))
@@ -171,8 +180,8 @@
 				emits('confirm', {
 					targetTableCode: form.mewTable.tableCode,
 					old: {
-						allMerge:1,
-						sourceOrderId:props.order? props.order.id:'',
+						allMerge: 1,
+						sourceOrderId: props.order ? props.order.id : '',
 						targetTableCode: form.mewTable.tableCode,
 						detailIds: Object.entries(props.goodsList).reduce((prve, cur) => {
 							prve.push(...cur.map(v => v.id))
@@ -180,8 +189,8 @@
 						}, [])
 					},
 					now: {
-						allMerge:1,
-						cart_id: props.nowCartData.map(v=>v.id)
+						allMerge: 1,
+						cart_id: props.nowCartData.map(v => v.id)
 					}
 				})
 			}
@@ -198,7 +207,7 @@
 		if (props.nowCartData.length <= 0) {
 			mergeOrder({
 				allMerge,
-				sourceOrderId:props.order? props.order.id:'',
+				sourceOrderId: props.order ? props.order.id : '',
 				targetTableCode: form.mewTable.tableCode,
 				detailIds: form.old.map(v => v.id)
 			}).then(res => {
@@ -216,7 +225,7 @@
 				targetTableCode: form.mewTable.tableCode,
 				old: {
 					allMerge,
-					sourceOrderId:props.order? props.order.id:'',
+					sourceOrderId: props.order ? props.order.id : '',
 					targetTableCode: form.mewTable.tableCode,
 					detailIds: form.old.map(v => v.id)
 				},