licc преди 3 седмици
родител
ревизия
121684d5d4
променени са 2 файла, в които са добавени 7 реда и са изтрити 3 реда
  1. 1 1
      src/views/order/index.vue
  2. 6 2
      src/views/orders/list.vue

+ 1 - 1
src/views/order/index.vue

@@ -16,7 +16,7 @@
               </div>
               <div @click="startOrder" class="rounded w-full h-full pt-3 relative" style="background-color: #4A5DFF;color:rgba(255, 255, 255)">
                 <p class="font-semibold text-xl" style="font-size: 35px;">
-                  点餐
+                  吧台点餐
                 </p>
               </div>
             </div>

+ 6 - 2
src/views/orders/list.vue

@@ -106,7 +106,11 @@
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column label="桌号" prop="deskName"></el-table-column>
+                <el-table-column label="桌号/餐号" prop="deskName" min-width="100">
+                  <template #default="{ row }">
+                    {{ row.deskName ? row.deskName : row.mealCode }}
+                  </template>
+                </el-table-column>
                 <el-table-column label="备注" prop="remark"  min-width="100" show-tooltip-when-overflow></el-table-column>
                 <el-table-column label="状态" min-width="170" prop="status" >
                     <template #default="{ row }">
@@ -120,7 +124,7 @@
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column label="类型" prop="type" :formatter="(row: any) => (row.type == 0 ? '后台点单' : '扫码点单')"></el-table-column>
+                <el-table-column label="类型" prop="type" :formatter="(row: any) => (row.type == 0 ? '吧台点餐' : '扫码点餐')"></el-table-column>
                 <el-table-column label="结账时间" prop="checkoutTime"></el-table-column>
                 <el-table-column label="创建时间" prop="createTime"></el-table-column>
                 <el-table-column label="操作" width="60" fixed="right">