feat: 增加点歌配置列表页面,修复转桌报错导致页面无反应问题，去除添加耗材的库存数量以及弹窗关闭表单重置失败问题

src/views/tool/Instead/components/popup-rottable.vue

@@ -78,18 +78,22 @@ function getTableList() {
     tableList.value = res.records.filter((v) => v.tableCode);
   });
 }
-
+const emits = defineEmits(["success"]);
 function confirm() {
   refForm.value.validate((valid, fields) => {
     if (valid) {
       console.log("submit!");
-      const detailIds = refTable.value.getSelectionRows().map((v) => v.id);
+      const detailIds = !rottableType.value
+        ? refTable.value.getSelectionRows().map((v) => v.id)
+        : props.cartGoods.map((v) => v.id);
       orderApi
         .mergeOrder({
           ...form,
           detailIds,
         })
         .then((res) => {
+          emits("success", form.targetTableCode);
+          close();
           ElNotification({
             title: "成功",
             message: "合并成功",

src/views/tool/Instead/components/popup-taocan-goods.vue

@@ -5,12 +5,12 @@
         <div class="box">
           <h2 class="boxspan">{{ item.title }}</h2>
           <h4 class="boxspan">本组菜品{{ item.count }}选{{ item.number || 1 }}</h4>
-          <!-- <el-alert
+          <el-alert
             v-if="item.alertshow"
             title="错误：请按照规定选择套餐"
             type="warning"
             :closable="false"
-          ></el-alert> -->
+          ></el-alert>
         </div>
         <el-table
           ref="refdialogpackagetable"