Merge branch 'lyz_dev'

src/renderer/views/cashier/components/hangUpDialog.vue

@@ -64,6 +64,10 @@ export default {
       type: [Array],
       default: () => [],
     },
+    hangNo: {
+      type: [String],
+      default: () => '',
+    },
   },
   watch: {
     showDialog(value) {
@@ -112,7 +116,7 @@ export default {
         })
     },
     // 执行挂单
-    doHangUp(hangNo) {
+    doHangUp(hangNo, msg = '是否挂单?') {
       const app = this
       if (!app.cartList || app.cartList.length < 1) {
         Message({
@@ -145,6 +149,7 @@ export default {
                 })
                 app.getHangUpList()
                 app.$emit('doHangUp')
+                this.$emit('closeDialog', 'hangUpDialog')
               }
             })
             .catch(() => {
@@ -173,6 +178,18 @@ export default {
     },
     // 取单
     getHangUp(hangNo, memberInfo) {
+      //添加判断是否是一个桌子要更新菜品
+      console.log(this.hangNo, 'this.hangNo', hangNo, 'hangNo')
+
+      if (this.hangNo === hangNo) {
+        // this.$emit('updateHangNo')
+        console.log(this.hangNo, hangNo)
+        this.doHangUp(hangNo, '更新菜品?')
+        console.log('执行')
+        this.$emit('closeDialog', 'hangUpDialog')
+
+        return
+      }
       this.$emit('getHangNo', { hangNo: hangNo, memberInfo: memberInfo })
     },
     close() {

src/renderer/views/cashier/index.vue

@@ -332,6 +332,7 @@
       :show-dialog="openHangUpDialog"
       :memberInfo="memberInfo"
       :cartList="cartList"
+      :hangNo="hangNo"
       @getHangNo="getHangNo"
       @doHangUp="doHangUp"
       @closeDialog="closeDialog"