Prechádzať zdrojové kódy

2024.08.26
- 点餐处理页和桌号设置页完善创建桌号二维码功能;
- 订单菜品组件显示商品详情时更改传参;
- 封装商品sku选择组件;
- 添加菜品组件选择逻辑修改为选择商品sku的逻辑;
- 当前订单和点餐订单页增加结账功能;

zweiqin 7 mesiacov pred
rodič
commit
e2422cd229

+ 11 - 3
src/views/commodity/commoditySystem/components/DetailModal.vue

@@ -219,9 +219,17 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep img {
-	width: 100px;
-	height: 100px;
+.small-padding {
+	.cell {
+		padding-left: 5px;
+		padding-right: 5px;
+	}
+}
+
+.fixed-width {
+	.el-button--mini {
+		padding: 7px 10px;
+	}
 }
 </style>
 

+ 171 - 0
src/views/commodity/commoditySystem/components/SkuSelection.vue

@@ -0,0 +1,171 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    v-bind="modalOptions"
+    append-to-body
+  >
+    <el-form
+      ref="formData"
+      :model="formData"
+      size="mini"
+      label-position="left"
+      label-suffix=":"
+      label-width="200px"
+    >
+      <!-- 商品SKU选择 -->
+      <el-form-item label="商品名称" prop="productName">
+        {{ formData.productName || '--' }}
+      </el-form-item>
+
+      <div style="display: flex;padding-bottom: 14px;font-size: 16px;font-weight: bold;">
+        <div
+          style="width: 4px;height: 14px;margin-left: 6px;margin-right: 6px;background-color: #0519D4;border-radius: 2px;"
+        >
+        </div>
+        <div>商品款式</div>
+      </div>
+      <el-row class="detail-box">
+        <el-col :span="24">
+          <el-table
+            :data="formData.skus" style="width: 100%"
+            :header-cell-style="{ background: '#EEF3FF', color: '#333333' }"
+          >
+            <el-table-column v-for="(skuAttr, index) in formData.names.filter(i => i.skuName && i.values.some((attr) => attr.skuValue))" :key="index" :label="skuAttr.skuName">
+              <template slot-scope="scope">
+                <div v-if="scope.row.skuAttrCodeDTOList && scope.row.skuAttrCodeDTOList[index]">
+                  {{ handleAttrValue(scope.row.skuAttrCodeDTOList && scope.row.skuAttrCodeDTOList[index]) }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="售价">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.price" maxlength="9" disabled />
+              </template>
+            </el-table-column>
+            <el-table-column label="原价">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.originalPrice" maxlength="9" disabled />
+              </template>
+            </el-table-column>
+            <el-table-column label="库存">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.stockNumber" maxlength="9" disabled />
+              </template>
+            </el-table-column>
+            <el-table-column label="重量(KG)">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.weight" maxlength="9" disabled />
+              </template>
+            </el-table-column>
+            <el-table-column label="SKU">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.sku" maxlength="20" disabled />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="操作" width="220" fixed="right" class-name="small-padding fixed-width">
+              <template slot-scope="{ row }">
+                <el-button
+                  type="warning" size="mini"
+                  @click="$emit('select', row)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+import { getProductGetById } from '@/api/commodity'
+
+export default {
+  name: 'SkuSelection',
+  data() {
+    return {
+      modalOptions: {
+        closeOnClickModal: false,
+        width: '800px',
+        title: '商品SKU选择'
+      },
+      visible: false,
+      formData: {
+        productId: '',
+        productName: '',
+        skus: [],
+        names: []
+      }
+    }
+  },
+  methods: {
+    handleClose() {
+      this.visible = false
+    },
+    handleOpen(params = {}) {
+      this.formData = Object.assign(this.$options.data().formData, params)
+      if (params.productId) {
+        this.getInfo(params.productId)
+      }
+      this.visible = true
+    },
+    async getInfo(id) {
+      const loading = this.$loading({ text: '加载中' })
+      try {
+        const res = await getProductGetById({ productId: id })
+        this.formData = Object.assign(this.$options.data().formData, res.data, {
+          productId: res.data.productId || '',
+          productName: res.data.productName || '',
+          skus: res.data.skus || [],
+          names: res.data.names || []
+        })
+      } finally {
+        loading.close()
+      }
+    },
+    handleAttrValue(map) {
+      const hasChilds =
+        this.formData.names &&
+        this.formData.names.filter((skuAttr) => {
+          const hasChild = skuAttr.values.some((attr) => attr.skuValue)
+          return skuAttr.skuName && hasChild
+        })
+      if (!map) {
+        return ''
+      }
+      const { code, valueCode } = map
+      let codeStr = ''
+      hasChilds.map((item) => {
+        const { values } = item
+        values &&
+          values.some((attr) => {
+            const isSome = item.code === code && attr.valueCode === valueCode
+            if (isSome) {
+              codeStr = attr.skuValue
+            }
+            return isSome
+          })
+      })
+      return codeStr
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.small-padding {
+	.cell {
+		padding-left: 5px;
+		padding-right: 5px;
+	}
+}
+
+.fixed-width {
+	.el-button--mini {
+		padding: 7px 10px;
+	}
+}
+</style>
+

+ 1 - 1
src/views/customer/customerList/components/TagAdd.vue

@@ -75,11 +75,11 @@ export default {
     },
     handleOpen(params = {}) {
       this.modalOptions.title = '添加标签'
+      this.$refs.formData && this.$refs.formData.resetFields()
       this.formData.buyerUserId = params.buyerUserId
       // this.formData = Object.assign(this.$options.data().formData, params)
       this.visible = true
       this.initList()
-      this.$refs.formData && this.$refs.formData.resetFields()
     },
     handleSubmit() {
       this.$refs.formData.validate(async (valid) => {

+ 1 - 1
src/views/customer/customerList/components/VoucherTransfer.vue

@@ -75,11 +75,11 @@ export default {
     },
     handleOpen(params = {}) {
       this.modalOptions.title = '代金券转赠'
+      this.$refs.formData && this.$refs.formData.resetFields()
       this.formData.buyerUserId = params.buyerUserId
       // this.formData = Object.assign(this.$options.data().formData, params)
       this.visible = true
       this.initList()
-      this.$refs.formData && this.$refs.formData.resetFields()
     },
     handleSubmit() {
       this.$refs.formData.validate(async (valid) => {

+ 1 - 1
src/views/finance/account/components/UnBindBank.vue

@@ -66,11 +66,11 @@ export default {
     },
     handleOpen(params = {}) {
       this.modalOptions.title = '解绑银行卡'
+      this.$refs.formData && this.$refs.formData.resetFields()
       this.formData.phone = params.phone
       // this.formData = Object.assign(this.$options.data().formData, params)
       this.visible = true
       this.initList()
-      this.$refs.formData && this.$refs.formData.resetFields()
     },
     handleSubmit() {
       this.$refs.formData.validate(async (valid) => {

+ 72 - 0
src/views/mealManagement/TableNumberSetting/components/MealCodeCreate.vue

@@ -0,0 +1,72 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    v-bind="modalOptions"
+  >
+    <el-form
+      ref="formData"
+      :model="formData"
+      size="mini"
+      label-position="left"
+      label-suffix=":"
+      label-width="200px"
+    >
+      <!-- 桌号二维码 -->
+      <el-form-item label="桌号ID" prop="deskId">
+        {{ formData.deskId || '--' }}
+      </el-form-item>
+      <el-form-item label="桌号二维码" prop="codeImage">
+        <el-image v-if="formData.codeImage" :src="formData.codeImage" style="width:380px; height:380px" fit="fill" :preview-src-list="[ formData.codeImage ]" />
+        <span v-else>--</span>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+import { createQRShopAuthDept } from '@/api/mealManagement/TableNumberSetting'
+
+export default {
+  name: 'MealCodeCreate',
+  data() {
+    return {
+      modalOptions: {
+        closeOnClickModal: false,
+        width: '800px',
+        title: '查看桌号二维码详情'
+      },
+      visible: false,
+      formData: {
+        deskId: '',
+        codeImage: ''
+      }
+    }
+  },
+  methods: {
+    handleClose() {
+      this.visible = false
+    },
+    handleOpen(params = {}) {
+      this.formData.deskId = params.id
+      // this.formData = Object.assign(this.$options.data().formData, params)
+      if (params.id) {
+        this.getInfo(params.id)
+      }
+      this.visible = true
+    },
+    async getInfo(id) {
+      const loading = this.$loading({ text: '加载中' })
+      try {
+        const res = await createQRShopAuthDept({ id })
+        // this.formData = Object.assign(this.$options.data().formData, res.data, {
+        //   id: res.data.id || ''
+        // })
+        this.formData.codeImage = res.data
+      } finally {
+        loading.close()
+      }
+    }
+  }
+}
+</script>
+

+ 1 - 1
src/views/mealManagement/TableNumberSetting/components/MealOrderCreate.vue

@@ -78,11 +78,11 @@ export default {
     },
     handleOpen(params = {}) {
       this.modalOptions.title = '创建点餐订单'
+      this.$refs.formData && this.$refs.formData.resetFields()
       this.formData.deskId = params.id
       // this.formData = Object.assign(this.$options.data().formData, params)
       this.visible = true
       this.initList()
-      this.$refs.formData && this.$refs.formData.resetFields()
     },
     handleSubmit() {
       this.$refs.formData.validate(async (valid) => {

+ 6 - 11
src/views/mealManagement/TableNumberSetting/index.vue

@@ -73,7 +73,7 @@
             </el-button>
             <el-button
               type="info" size="mini"
-              @click="handleCreatCode(row)"
+              @click="$refs.MealCodeCreate && $refs.MealCodeCreate.handleOpen(row)"
             >
               创建桌码
             </el-button>
@@ -106,6 +106,8 @@
       />
     </div>
 
+    <!-- 创建桌号二维码 -->
+    <MealCodeCreate ref="MealCodeCreate" @success="getList" />
     <!-- 创建点餐订单 -->
     <MealOrderCreate ref="MealOrderCreate" @success="getList" />
     <!-- 新增编辑 -->
@@ -116,14 +118,16 @@
 </template>
 
 <script>
+import MealCodeCreate from './components/MealCodeCreate'
 import MealOrderCreate from './components/MealOrderCreate'
 import EditModal from './components/EditModal'
 import DetailModal from './components/DetailModal'
-import { getPageAllShopAuthDept, deletePostShopAuthDept, createQRShopAuthDept, checkoutShopLaOrders } from '@/api/mealManagement/TableNumberSetting'
+import { getPageAllShopAuthDept, deletePostShopAuthDept, checkoutShopLaOrders } from '@/api/mealManagement/TableNumberSetting'
 
 export default {
   name: 'TableNumberSetting',
   components: {
+    MealCodeCreate,
     MealOrderCreate,
     EditModal,
     DetailModal
@@ -174,15 +178,6 @@ export default {
         })
         .catch(() => {})
     },
-    handleCreatCode(row) {
-      this.$confirm('确定对此项创建桌号二维码?')
-        .then(async () => {
-          await createQRShopAuthDept({ id: row.id })
-          this.$message({ message: '创建成功!', type: 'success' })
-          this.handleSearch()
-        })
-        .catch(() => {})
-    },
     handleCheckout(row) {
       this.$confirm('确定结账此项?')
         .then(async () => {

+ 28 - 3
src/views/mealManagement/currentOrders/index.vue

@@ -17,10 +17,11 @@
         v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list"
         v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }"
       >
-        <el-table-column align="center" width="100" label="ID" prop="id" fixed="left" />
-        <el-table-column align="center" width="150" label="订单号" prop="number" fixed="left" show-overflow-tooltip />
+        <el-table-column align="center" width="80" label="ID" prop="id" fixed="left" />
+        <el-table-column align="center" width="120" label="订单号" prop="number" fixed="left" show-overflow-tooltip />
         <el-table-column align="center" width="120" label="商家ID" prop="aid" show-overflow-tooltip />
         <el-table-column align="center" width="100" label="桌号ID" prop="deskId" show-overflow-tooltip />
+        <el-table-column align="center" width="120" label="桌号名称" prop="deskName" show-overflow-tooltip />
         <el-table-column align="center" width="120" label="用餐人数" prop="userNum" show-overflow-tooltip />
         <el-table-column align="center" label="订单类型" prop="type">
           <template slot-scope="{ row }">
@@ -47,18 +48,28 @@
               详情
             </el-button>
             <el-button
+              v-if="row.id && (row.status === 0)"
               type="warning" size="mini"
               @click="$refs.MealOrderPlace && $refs.MealOrderPlace.handleOpen(row)"
             >
               下单
             </el-button>
             <el-button
+              v-if="row.deskId && (row.status === 1)"
+              type="warning" size="mini"
+              @click="handleCheckout(row)"
+            >
+              结账
+            </el-button>
+            <el-button
+              v-if="row.id && ((row.status === 0) || (row.status === 1))"
               type="primary" size="mini"
               @click="$refs.AddDishes && $refs.AddDishes.handleOpen(row)"
             >
               菜品添加
             </el-button>
             <el-button
+              v-if="row.id"
               type="info" size="mini"
               @click="$refs.OrderDishes && $refs.OrderDishes.handleOpen(row)"
             >
@@ -75,6 +86,8 @@
     <AddDishes ref="AddDishes" @success="getList" />
     <!-- 订单菜品 -->
     <OrderDishes ref="OrderDishes" @success="getList" />
+    <!-- 点餐订单详情 -->
+    <DetailModal ref="DetailModal" />
   </div>
 </template>
 
@@ -82,14 +95,17 @@
 import MealOrderPlace from '../mealOrders/components/MealOrderPlace'
 import AddDishes from '../mealOrders/components/AddDishes'
 import OrderDishes from '../mealOrders/components/OrderDishes'
+import DetailModal from './components/DetailModal'
 import { getCurrentShopLaOrders } from '@/api/mealManagement/currentOrders'
+import { checkoutShopLaOrders } from '@/api/mealManagement/TableNumberSetting'
 
 export default {
   name: 'CurrentOrders',
   components: {
     MealOrderPlace,
     AddDishes,
-    OrderDishes
+    OrderDishes,
+    DetailModal
   },
   data() {
     return {
@@ -116,6 +132,15 @@ export default {
     },
     handleDetail(row) {
       this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
+    },
+    handleCheckout(row) {
+      this.$confirm('确定结账此项?')
+        .then(async () => {
+          await checkoutShopLaOrders({ did: row.deskId })
+          this.$message({ message: '结账成功!', type: 'success' })
+          this.handleSearch()
+        })
+        .catch(() => {})
     }
   }
 }

+ 18 - 5
src/views/mealManagement/mealOrders/components/AddDishes.vue

@@ -83,9 +83,9 @@
               </el-button>
               <el-button
                 type="warning" size="mini"
-                @click="handleAddAishes(row)"
+                @click="$refs.SkuSelection && $refs.SkuSelection.handleOpen(row)"
               >
-                添加菜品
+                选择菜品
               </el-button>
             </template>
           </el-table-column>
@@ -93,6 +93,8 @@
 
         <!-- 查看详情 -->
         <DetailModal ref="DetailModal" />
+        <!-- sku选择 -->
+        <SkuSelection ref="SkuSelection" @select="handleAddAishes" />
       </div>
       <div>
         <el-pagination
@@ -113,6 +115,7 @@
 
 <script>
 import DetailModal from '../../../commodity/commoditySystem/components/DetailModal'
+import SkuSelection from '../../../commodity/commoditySystem/components/SkuSelection'
 import { dishAddShopLaOrdersDish } from '@/api/mealManagement/mealOrders'
 import { getClassify, getClassifyGetAll } from '@/api/commodity'
 import XeUtils from 'xe-utils'
@@ -120,7 +123,8 @@ import XeUtils from 'xe-utils'
 export default {
   name: 'AddDishes',
   components: {
-    DetailModal
+    DetailModal,
+    SkuSelection
   },
   data() {
     return {
@@ -206,11 +210,12 @@ export default {
       this.productListQuery = { productMarque: '', search: '', shelveState: '', stock: '', classifyId: '', page: 1, pageSize: 10 }
       this.getProductList()
     },
-    handleAddAishes(row) {
+    handleAddAishes(e) {
       this.$confirm('确定对此项添加为菜品?')
         .then(async () => {
-          await dishAddShopLaOrdersDish({ orderId: this.formData.orderId, dishId: row.productId })
+          await dishAddShopLaOrdersDish({ orderId: this.formData.orderId, dishId: e.skuId })
           this.$message({ message: '添加成功!', type: 'success' })
+          this.$refs.SkuSelection && this.$refs.SkuSelection.handleClose()
           // this.getProductList()
         })
         .catch(() => { })
@@ -220,6 +225,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.filter-container {
+	.filter-item {
+		display: inline-block;
+		vertical-align: middle;
+		margin-bottom: 10px;
+	}
+}
+
 .small-padding {
 	.cell {
 		padding-left: 5px;

+ 1 - 1
src/views/mealManagement/mealOrders/components/MealOrderPlace.vue

@@ -67,11 +67,11 @@ export default {
     },
     handleOpen(params = {}) {
       this.modalOptions.title = '点餐订单下单'
+      this.$refs.formData && this.$refs.formData.resetFields()
       this.formData.number = params.id
       // this.formData = Object.assign(this.$options.data().formData, params)
       this.visible = true
       this.initList()
-      this.$refs.formData && this.$refs.formData.resetFields()
     },
     handleSubmit() {
       this.$refs.formData.validate(async (valid) => {

+ 7 - 7
src/views/mealManagement/mealOrders/components/OrderDishes.vue

@@ -20,15 +20,15 @@
         >
           <el-table-column align="center" min-width="80" prop="id" label="ID" />
           <el-table-column align="center" width="120" prop="orderId" label="订单ID" show-overflow-tooltip />
-          <el-table-column align="center" min-width="120" label="品ID" prop="dishId">
+          <el-table-column align="center" min-width="120" label="品ID" prop="dishId">
             <template slot-scope="{ row }">
               <div>
                 <span>{{ row.dishId }}</span>
                 <el-button
-                  v-if="row.dishId"
+                  v-if="row.productId"
                   style="margin-left: 14px;"
                   type="warning" size="mini"
-                  @click="$refs.DetailModal && $refs.DetailModal.handleOpen({ productId: row.dishId })"
+                  @click="$refs.DetailModal && $refs.DetailModal.handleOpen({ productId: row.productId })"
                 >
                   详情
                 </el-button>
@@ -88,7 +88,7 @@ export default {
       listQuery: {
         // page: 1,
         // pageSize: 10,
-        // id: ''
+        id: ''
       }
     }
   },
@@ -98,9 +98,9 @@ export default {
     },
     handleOpen(params = {}) {
       this.formData = Object.assign(this.$options.data().formData, params)
-      // this.listQuery.id = params.id
-      if (params.activityId) {
-        // this.getInfo(params.activityId)
+      this.listQuery.id = params.id
+      if (params.id) {
+        // this.getInfo(params.id)
         this.getList()
       }
       this.visible = true

+ 28 - 3
src/views/mealManagement/mealOrders/index.vue

@@ -32,10 +32,11 @@
         v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list"
         v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }"
       >
-        <el-table-column align="center" width="100" label="ID" prop="id" fixed="left" />
-        <el-table-column align="center" width="150" label="订单号" prop="number" fixed="left" show-overflow-tooltip />
+        <el-table-column align="center" width="80" label="ID" prop="id" fixed="left" />
+        <el-table-column align="center" width="120" label="订单号" prop="number" fixed="left" show-overflow-tooltip />
         <el-table-column align="center" width="120" label="商家ID" prop="aid" show-overflow-tooltip />
         <el-table-column align="center" width="100" label="桌号ID" prop="deskId" show-overflow-tooltip />
+        <el-table-column align="center" width="120" label="桌号名称" prop="deskName" show-overflow-tooltip />
         <el-table-column align="center" width="120" label="用餐人数" prop="userNum" show-overflow-tooltip />
         <el-table-column align="center" label="订单类型" prop="type">
           <template slot-scope="{ row }">
@@ -62,18 +63,28 @@
               详情
             </el-button>
             <el-button
+              v-if="row.id && (row.status === 0)"
               type="warning" size="mini"
               @click="$refs.MealOrderPlace && $refs.MealOrderPlace.handleOpen(row)"
             >
               下单
             </el-button>
             <el-button
+              v-if="row.deskId && (row.status === 1)"
+              type="warning" size="mini"
+              @click="handleCheckout(row)"
+            >
+              结账
+            </el-button>
+            <el-button
+              v-if="row.id && ((row.status === 0) || (row.status === 1))"
               type="primary" size="mini"
               @click="$refs.AddDishes && $refs.AddDishes.handleOpen(row)"
             >
               菜品添加
             </el-button>
             <el-button
+              v-if="row.id"
               type="info" size="mini"
               @click="$refs.OrderDishes && $refs.OrderDishes.handleOpen(row)"
             >
@@ -99,6 +110,8 @@
     <AddDishes ref="AddDishes" @success="getList" />
     <!-- 订单菜品 -->
     <OrderDishes ref="OrderDishes" @success="getList" />
+    <!-- 点餐订单详情 -->
+    <DetailModal ref="DetailModal" />
   </div>
 </template>
 
@@ -106,14 +119,17 @@
 import MealOrderPlace from './components/MealOrderPlace'
 import AddDishes from './components/AddDishes'
 import OrderDishes from './components/OrderDishes'
+import DetailModal from './components/DetailModal'
 import { getOrderListShopLaOrders } from '@/api/mealManagement/mealOrders'
+import { checkoutShopLaOrders } from '@/api/mealManagement/TableNumberSetting'
 
 export default {
   name: 'MealOrders',
   components: {
     MealOrderPlace,
     AddDishes,
-    OrderDishes
+    OrderDishes,
+    DetailModal
   },
   data() {
     return {
@@ -148,6 +164,15 @@ export default {
     },
     handleDetail(row) {
       this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
+    },
+    handleCheckout(row) {
+      this.$confirm('确定结账此项?')
+        .then(async () => {
+          await checkoutShopLaOrders({ did: row.deskId })
+          this.$message({ message: '结账成功!', type: 'success' })
+          this.handleSearch()
+        })
+        .catch(() => {})
     }
   }
 }

+ 6 - 11
src/views/mealManagement/mealProcessing/index.vue

@@ -63,7 +63,7 @@
             </el-button>
             <el-button
               type="info" size="mini"
-              @click="handleCreatCode(row)"
+              @click="$refs.MealCodeCreate && $refs.MealCodeCreate.handleOpen(row)"
             >
               创建桌码
             </el-button>
@@ -84,6 +84,8 @@
       </el-table>
     </div>
 
+    <!-- 创建桌号二维码 -->
+    <MealCodeCreate ref="MealCodeCreate" @success="initData" />
     <!-- 创建点餐订单 -->
     <MealOrderCreate ref="MealOrderCreate" @success="initData" />
     <!-- 查看详情 -->
@@ -92,14 +94,16 @@
 </template>
 
 <script>
+import MealCodeCreate from '../TableNumberSetting/components/MealCodeCreate'
 import MealOrderCreate from '../TableNumberSetting/components/MealOrderCreate'
 import DetailModal from '../TableNumberSetting/components/DetailModal'
-import { getAllShopAuthDept, createQRShopAuthDept, checkoutShopLaOrders } from '@/api/mealManagement/TableNumberSetting'
+import { getAllShopAuthDept, checkoutShopLaOrders } from '@/api/mealManagement/TableNumberSetting'
 import { getAllShopAuthPost } from '@/api/mealManagement/regionalSetting'
 
 export default {
   name: 'MealProcessing',
   components: {
+    MealCodeCreate,
     MealOrderCreate,
     DetailModal
   },
@@ -135,15 +139,6 @@ export default {
     handleDetail(row) {
       this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
     },
-    handleCreatCode(row) {
-      this.$confirm('确定对此项创建桌号二维码?')
-        .then(async () => {
-          await createQRShopAuthDept({ id: row.id })
-          this.$message({ message: '创建成功!', type: 'success' })
-          this.handleSearch()
-        })
-        .catch(() => {})
-    },
     handleCheckout(row) {
       this.$confirm('确定结账此项?')
         .then(async () => {

+ 1 - 1
src/views/selectionCenter/productSelectionList/components/SelectionAddModal.vue

@@ -103,13 +103,13 @@ export default {
       this.groupList = result.data
     },
     handleOpen(params = {}) {
+      this.$refs.formData && this.$refs.formData.resetFields()
       this.getCategoryTreeList()
       this.getGroupDataList()
       this.formData.productId = params.productId
       this.formData.shopParentId = params.shopId
       // this.formData = Object.assign(this.$options.data().formData, params)
       this.visible = true
-      this.$refs.formData && this.$refs.formData.resetFields()
     },
     handleSubmit() {
       this.$confirm('确定选择加入该选品吗?')