From f83fc9da7e5219f38476f5323870e623df259764 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 14 Sep 2024 13:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=B0=E6=A1=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E9=A4=90=E4=BD=8D=E8=B4=B9=E4=B8=8E?=
 =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/table/components/addTable.vue      | 18 ++++++++----
 src/views/table/components/table-diancan.vue | 31 ++++++++++++++------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/views/table/components/addTable.vue b/src/views/table/components/addTable.vue
index adf97ab..7ed3aba 100644
--- a/src/views/table/components/addTable.vue
+++ b/src/views/table/components/addTable.vue
@@ -32,13 +32,13 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="台桌标识">
+      <el-form-item label="台桌标识" >
         <div class="u-flex">
             <div class="u-flex" style="width: 57px;">
-                <el-input
-            v-model="form.sign"
-            placeholder="A"
-          ></el-input>
+                  <el-input
+              v-model="form.sign"
+              placeholder="A"
+            ></el-input>
             </div>
       
           <div class="u-flex u-m-l-30" >
@@ -140,6 +140,7 @@ export default {
       form: {
         id: "",
         areaId: "",
+        sign:'',
         start:1,
         end:10,
         capacity: 0,
@@ -157,6 +158,13 @@ export default {
             trigger: "blur",
           },
         ],
+        sign: [
+          {
+            required: true,
+            message: "请输入台桌标识",
+            trigger: "blur",
+          },
+        ],
       },
       areaList: [],
     };
diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue
index 32a2c07..84d5750 100644
--- a/src/views/table/components/table-diancan.vue
+++ b/src/views/table/components/table-diancan.vue
@@ -1374,15 +1374,15 @@ export default {
     },
   },
   watch: {
-    perpole(newval) {
-      if (newval&&this.table.tableId) {
-        $choseCount({
-          masterId: this.masterId,
-          tableId: this.table.tableId,
-          num: newval,
-        }).then(res=>{
-          this.order.seatFee=res
-        })
+    perpole(newval,oldval) {
+      if (!oldval&&newval&&this.table.tableId) {
+        // $choseCount({
+        //   masterId: this.masterId,
+        //   tableId: this.table.tableId,
+        //   num: newval,
+        // }).then(res=>{
+        //   this.order.seatFee=res
+        // })
       }
     },
     table(oldval, newval) {
@@ -1535,6 +1535,16 @@ export default {
     // this.refToggle("refDiscount", true);
   },
   methods: {
+    //更改就餐人数
+    changePerpole(){
+      $choseCount({
+          masterId: this.masterId,
+          tableId: this.table.tableId,
+          num: this.perpole,
+        }).then(res=>{
+          this.order.seatFee=res
+        })
+    },
     //台桌变化时重新获取取餐号、购物车数据，如果是正在结账状态，创建订单到待支付页面
     async onTableChange() {
       const res = await this.getMasterId();
@@ -1597,6 +1607,8 @@ export default {
     },
     chooseDinersNumberConfirm(e) {
       this.perpole = e;
+      this.changePerpole()
+      
     },
     //扫码支付弹窗确认
     scanPayConfirm(code) {
@@ -2726,6 +2738,7 @@ export default {
       // if(this.key!=='isPayOrder'){
       //   this.getCart();
       // }
+      this.changePerpole()
       this.getCart();
       this.getGoods();
       this.getCategory();