优化小票新增存酒管理

2026-04-03 15:35:48 +08:00
parent c3a20ab2db
commit 78e88b8eb7
15 changed files with 1622 additions and 28138 deletions
--- a/src/views/device/add.vue
+++ b/src/views/device/add.vue
@@ -45,6 +45,12 @@
              </span>
            </div>
          </el-form-item>
+          <el-form-item label="是否打印交班小票">
+            <el-radio-group v-model="form.handoverSwitch">
+              <el-radio-button label="否" :value="0"></el-radio-button>
+              <el-radio-button label="是" :value="1"></el-radio-button>
+            </el-radio-group>
+          </el-form-item>
          <!-- <el-form-item label="打印份数">
            <el-select v-model="form.printQty">
              <el-option :label="item" :value="item" v-for="item in 4" :key="item"></el-option>
@@ -182,7 +188,8 @@ const form = ref({
  printQty: '', // 打印数量 c1m1^2 = 顾客+商家[2张] m1^1 = 商家[1张] c1^1顾客[1张] c2m1^3顾客2+商家1[3张]
  printMethod: 'all', // 打印方式 all-全部打印 normal-仅打印结账单「前台」one-仅打印制作单「厨房」queue-仅打印排队取号
  printType: [], // 打印类型，JSON数组 refund-确认退款单 handover-交班单 queue-排队取号
-  status: 1
+  status: 1,
+  handoverSwitch: 0, // 交班单开关 0-关闭 1-开启
 });

 const printDataLoading = ref(false);
--- a/src/views/home/components/cartOperation.vue
+++ b/src/views/home/components/cartOperation.vue
@@ -251,18 +251,21 @@
 </template>

 <script setup>
+import _ from 'lodash'
 import { ref } from 'vue'
 import { ElMessage } from 'element-plus'
 import takeFoodCode from '@/components/takeFoodCode.vue'
 import TableMerging from './tableMerging.vue'
 import skuModal from '@/components/skuModal.vue'
 import { useGoods } from '@/store/goods.js'
-import { inputFilterFloat, formatDecimal } from '@/utils/index.js'
+import { inputFilterFloat, formatDecimal, getOrderByIdAjax, commOrderPrintData } from '@/utils/index.js'
 import { refundOrder } from '@/api/order.js'
 import { useSocket } from '@/store/socket.js'
+import { usePrint } from '@/store/print.js'

 const goodsStore = useGoods()
 const socket = useSocket()
+const printStore = usePrint()

 const tableMergingRef = ref(null)

@@ -339,6 +342,25 @@ async function returnOrderItemAjax(num = 1) {
        await refundOrder(data)
        goodsStore.cartOrderItem.returnNum += num
        goodsStore.calcCartInfo()
+
+        getOrderByIdAjax(goodsStore.orderListInfo.id).then(res => {
+            let originOrderInfo = res
+            console.log('originOrderInfo1===', originOrderInfo);
+            
+            console.log('goodsStore.cartOrderItem.id', goodsStore.cartOrderItem.id);
+
+            let index = originOrderInfo.cartList.findIndex(item => item.id == goodsStore.cartOrderItem.id)
+
+            console.log('index===', index);
+
+            originOrderInfo.cartList = _.at(originOrderInfo.cartList, index);
+            console.log('originOrderInfo2===', originOrderInfo);
+            // return
+
+            printStore.printRefund(commOrderPrintData({ ...originOrderInfo, isGuest: false, isBefore: false, title: '退菜单' }));
+        }).catch(err => {
+            console.log(err);
+        })
        // await goodsStore.historyOrderAjax('', data.orderId)
    } catch (error) {
        console.log(error);
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -212,6 +212,7 @@
 </template>

 <script setup>
+import _ from 'lodash'
 import { ref } from "vue";
 import { useGlobal } from '@/store/global.js'
 import SelectVipUser from "@/components/selectVipUser.vue";
@@ -224,7 +225,7 @@ import fastCashier from "@/views/home/components/fastCashier.vue";
 import pendingCartModal from "@/views/home/components/pendingCartModal.vue";
 import tableMerging from '@/views/home/components/tableMerging.vue'
 import CartItem from './components/cartItem.vue'
-import { formatDecimal, formatPhoneNumber } from '@/utils/index.js'
+import { formatDecimal, formatPhoneNumber, getOrderByIdAjax, commOrderPrintData } from '@/utils/index.js'
 import { useGoods } from '@/store/goods.js'
 import { staffPermission } from '@/api/user.js'
 import { createOrder } from '@/api/order.js'
@@ -299,6 +300,7 @@ async function quickCashHandle() {
 // 生成订单 t=0 先下单后结算 t=1直接结算
 async function createOrderHandle(t = 0) {
  try {
+    let placeNum = goodsStore.orderListInfo.placeNum || 0
    if (goodsStore.cartList.length) {
      const data = {
        orderId: goodsStore.orderListInfo.id || '',  // 订单id
@@ -309,7 +311,7 @@ async function createOrderHandle(t = 0) {
        tableCode: goodsStore.cartList[0].table_code, // 台桌号
        dineMode: goodsStore.allSelected ? store.shopInfo.eatModel.split(',')[1] : store.shopInfo.eatModel.split(',')[0], // 用餐方式
        remark: remark.value, // 备注
-        placeNum: (goodsStore.orderListInfo.placeNum || 0) + 1, // 下单次数
+        placeNum: placeNum + 1, // 下单次数
        waitCall: 0, // 是否叫号
        userId: goodsStore.vipUserInfo.userId || '', // 会员用户id
        limitRate: goodsStore.limitDiscountRes
@@ -328,6 +330,17 @@ async function createOrderHandle(t = 0) {
          settleAccountRef.value.show(t)
        } else {
          goodsStore.clearCart()
+          // 开始打印客看单,可看单需要剔除其他历史下单
+          getOrderByIdAjax(res.id).then(res => {
+            let originOrderInfo = res
+            originOrderInfo.detailMap = _.at(originOrderInfo.detailMap, placeNum + 1);
+
+            console.log('originOrderInfo', originOrderInfo);
+
+            printStore.pushReceiptData(commOrderPrintData({ ...originOrderInfo, isGuest: true, isBefore: true }));
+          }).catch(err => {
+            console.log(err);
+          })
        }
        // 清除购物车，更新历史订单
        goodsStore.updateOrderList()
--- a/src/views/member/components/StoreWineManagement.vue
+++ b/src/views/member/components/StoreWineManagement.vue
@@ -0,0 +1,303 @@
+<template>
+    <el-drawer v-model="drawerVisible" size="100%" :with-header="false" direction="btt">
+        <div class="drawer_wrap">
+            <div class="header">
+                <div class="left">
+                    <div class="return" @click="drawerVisible = false">
+                        <el-icon size="26" color="#555">
+                            <Back />
+                        </el-icon>
+                    </div>
+                    <div class="user_info">
+                        <el-image :src="userInfo.headImg" fit="cover"
+                            style="width: 40px; height: 40px; border-radius: 50%;background-color: #efefef;">
+                            <template #error>
+                                <el-icon style="font-size: 40px; color: #ccc;">
+                                    <user />
+                                </el-icon>
+                            </template>
+                        </el-image>
+                        <el-text>{{ userInfo.nickName }}/{{ userInfo.phone }}</el-text>
+                    </div>
+                </div>
+                <div class="right">
+                    <!-- <el-button type="danger" @click="dialogVisible = true">取酒</el-button> -->
+                    <el-button type="primary" @click="dialogVisible = true">新增存酒</el-button>
+                </div>
+            </div>
+            <div class="pay_wrap">
+                <div class="tab">
+                    <el-table :data="list" height="100%" border stripe>
+                        <el-table-column label="记录" prop="name"></el-table-column>
+                        <el-table-column label="数量" prop="num"></el-table-column>
+                        <el-table-column label="操作时间" prop="expTime"></el-table-column>
+                        <el-table-column label="操作" width="150">
+                            <template #default="{ row }">
+                                <el-button type="danger" :disabled="row.num <= 0"
+                                    @click="takeWineDialogVisible = true; maxTakeNum = row.num; takeWineForm.id = row.id;">取酒</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </div>
+        </div>
+    </el-drawer>
+    <el-dialog v-model="dialogVisible" title="新增存酒" width="350px" :close-on-click-modal="false" destroy-on-close>
+        <el-form :model="form" :rules="rules" label-width="100px" label-position="left">
+            <el-form-item label="选择酒品">
+                <el-select v-model="form.shopStorageGoodId" placeholder="请选择存酒商品" style="width: 180px;">
+                    <el-option v-for="item in storageGoodList" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="存酒数量">
+                <el-input-number v-model="form.num" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="存酒有效期">
+                <el-input-number v-model="form.expDay" :min="1"></el-input-number>
+                <span style="margin-left: 8px;">天</span>
+            </el-form-item>
+        </el-form>
+        <div class="dialog-footer">
+            <div class="btn">
+                <el-button style="width: 100%;" @click="dialogVisible = false">取 消</el-button>
+            </div>
+            <div class="btn">
+                <el-button style="width: 100%;" type="primary" :loading="confirmLoading" @click="confirmHandle">确
+                    定</el-button>
+            </div>
+        </div>
+    </el-dialog>
+    <!-- 取酒对话框,只选择数量即可，不可超过存酒的数量 -->
+    <el-dialog v-model="takeWineDialogVisible" title="取酒" width="350px" :close-on-click-modal="false" destroy-on-close>
+        <el-form :model="takeWineForm" :rules="takeWineRules" label-width="100px" label-position="left">
+            <el-form-item label="取酒数量">
+                <el-input-number v-model="takeWineForm.num" :min="1" :max="maxTakeNum"></el-input-number>
+            </el-form-item>
+        </el-form>
+        <div class="dialog-footer">
+            <div class="btn">
+                <el-button style="width: 100%;" @click="takeWineDialogVisible = false">取 消</el-button>
+            </div>
+            <div class="btn">
+                <el-button style="width: 100%;" type="primary" :loading="takeWineConfirmLoading"
+                    @click="confirmTakeWineHandle">确 定</el-button>
+            </div>
+        </div>
+    </el-dialog>
+</template>
+
+<script setup>
+import { ref, onMounted } from "vue";
+import { ElMessage } from 'element-plus'
+import { shopStoragePost, storageGoodGet, shopStorageGet, shopStoragePut } from '@/api/product_new'
+
+const props = defineProps({
+    userInfo: {
+        type: Object,
+        default: () => ({})
+    }
+})
+
+const drawerVisible = ref(false);
+const dialogVisible = ref(false);
+
+const list = ref([]);
+
+// 获取存酒记录
+async function shopStorageGetAjax() {
+    try {
+        const res = await shopStorageGet({
+            key: '',
+            phone: props.userInfo.phone,
+            page: 1,
+            size: 999,
+        });
+        list.value = res.records || [];
+    } catch (error) {
+        console.error('获取存酒列表失败:', error);
+    }
+}
+
+const form = ref({
+    userId: '',
+    shopStorageGoodId: '', // 存酒商品ID
+    num: 1, // 存酒数量
+    expDay: 1, // 存酒有效期，单位天默认1天
+})
+
+const rules = {
+    shopStorageGoodId: [{ required: true, message: '请选择存酒商品', trigger: 'change' }],
+    num: [{ required: true, message: '请输入存酒数量', trigger: 'change' }],
+    expDay: [{ required: true, message: '请输入存酒有效期', trigger: 'change' }],
+}
+
+// 确认存酒
+const confirmLoading = ref(false);
+async function confirmHandle() {
+    try {
+        confirmLoading.value = true;
+        form.value.userId = props.userInfo.userId;
+        await shopStoragePost(form.value);
+        ElMessage.success('存酒成功');
+        dialogVisible.value = false;
+        shopStorageGetAjax(); // 刷新存酒商品列表
+    } catch (error) {
+        console.error('存酒失败:', error);
+    } finally {
+        confirmLoading.value = false;
+    }
+}
+
+// 获取存酒商品列表
+const storageGoodList = ref([]);
+async function storageGoodGetAjax() {
+    try {
+        const res = await storageGoodGet({
+            page: 1,
+            size: 999,
+        });
+        storageGoodList.value = res.records || [];
+    } catch (error) {
+        console.error('获取存酒商品列表失败:', error);
+    }
+}
+
+const takeWineDialogVisible = ref(false);
+const takeWineForm = ref({
+    id: '', // 存酒记录ID
+    num: 1,
+})
+const takeWineRules = {
+    num: [{ required: true, message: '请输入取酒数量', trigger: 'change' }],
+}
+const maxTakeNum = ref(1);
+const takeWineConfirmLoading = ref(false);
+
+function confirmTakeWineHandle() {
+    shopStoragePutAjax();
+}
+
+// 存酒取酒 num 必需 正数为存酒反之为取酒
+async function shopStoragePutAjax() {
+    try {
+        takeWineConfirmLoading.value = true;
+        await shopStoragePut({
+            id: takeWineForm.value.id,
+            num: -takeWineForm.value.num, // 取酒数量为负数
+        });
+        ElMessage.success('取酒成功');
+        takeWineDialogVisible.value = false;
+        shopStorageGetAjax(); // 刷新存酒记录列表
+    } catch (error) {
+        console.error('取酒失败:', error);
+    } finally {
+        takeWineConfirmLoading.value = false;
+    }
+}
+
+function init() {
+    drawerVisible.value = false;
+    dialogVisible.value = false;
+    takeWineDialogVisible.value = false;
+    form.value = {
+        userId: '',
+        shopStorageGoodId: '',
+        num: 1,
+        expDay: 1,
+    };
+    takeWineForm.value = {
+        id: '',
+        num: 1,
+    };
+    maxTakeNum.value = 1;
+    list.value = [];
+}
+
+function show() {
+    init();
+    drawerVisible.value = true;
+    // 刷新列表数据
+    storageGoodGetAjax();
+    shopStorageGetAjax();
+}
+
+defineExpose({
+    show,
+    init,
+});
+
+// 初始化
+
+
+
+onMounted(() => {
+    storageGoodGetAjax();
+    shopStorageGetAjax();
+})
+</script>
+
+<style scoped lang="scss">
+.drawer_wrap {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    padding: var(--el-font-size-base) 0;
+    flex-direction: column;
+    gap: var(--el-font-size-base);
+
+    .header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 var(--el-font-size-base);
+        background-color: #fff;
+        padding: var(--el-font-size-base);
+        border-radius: var(--el-font-size-base);
+
+        .left {
+            display: flex;
+            align-items: center;
+            gap: var(--el-font-size-base);
+
+            .return {
+                cursor: pointer;
+                border-radius: 4px;
+                transition: background-color 0.3s;
+                padding: 10px 8px 4px;
+
+                &:hover {
+                    background-color: rgba(0, 0, 0, 0.1);
+                }
+            }
+
+            .user_info {
+                display: flex;
+                align-items: center;
+                gap: var(--el-font-size-base);
+            }
+        }
+    }
+
+    .pay_wrap {
+        flex: 1;
+        background: #fff;
+        border-radius: var(--el-font-size-base);
+
+        .tab {
+            height: 100%;
+            padding: var(--el-font-size-base);
+        }
+    }
+}
+
+.dialog-footer {
+    display: flex;
+    justify-content: flex-end;
+    gap: var(--el-font-size-base);
+
+    .btn {
+        flex: 1;
+    }
+}
+</style>
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -99,6 +99,9 @@
                </div>
            </div>
            <div class="btn_wrap">
+                <div class="btn">
+                    <el-button type="success" style="width: 100%;" @click="StoreWineManagementRef.show()">存酒管理</el-button>
+                </div>
                <div class="btn">
                    <el-button type="warning" style="width: 100%;" @click="UserChargeRef.show()">账户充值</el-button>
                </div>
@@ -114,6 +117,8 @@
    <RecordDialog ref="RecordDialogRef" @refund="getUserList" />
    <!-- 添加会员 -->
    <AddUserDrawer ref="AddUserDrawerRef" @success="queryHandle" />
+    <!-- 存酒管理 -->
+    <StoreWineManagement ref="StoreWineManagementRef" :user-info="currentRow" />
 </template>

 <script setup>
@@ -123,10 +128,12 @@ import { shopUserList } from '@/api/account.js'
 import UserCharge from './components/userCharge.vue'
 import RecordDialog from './components/recordDialog.vue'
 import AddUserDrawer from './components/addUserDrawer.vue'
+import StoreWineManagement from './components/storeWineManagement.vue'

 const UserChargeRef = ref(null)
 const RecordDialogRef = ref(null)
 const AddUserDrawerRef = ref(null)
+const StoreWineManagementRef = ref(null)

 const queryForm = ref({
    key: '',
--- a/src/views/order/components/refundDrawer.vue
+++ b/src/views/order/components/refundDrawer.vue
@@ -260,6 +260,7 @@ async function printRefund(rows) {
        if (printStore.deviceNoteList.length) {
            // 本地打印
            const data = {
+                title: '退款单',
                shop_name: store.shopInfo.shopName,
                loginAccount: store.userInfo.name,
                carts: [],
@@ -268,6 +269,7 @@ async function printRefund(rows) {
                orderInfo: item.value,
                outNumber: item.value.id,
                createdAt: item.value.createTime,
+                refundMethod: cash.value ? '现金' : '原路退回',
                printTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
            }

--- a/src/views/work/index.vue
+++ b/src/views/work/index.vue
@@ -179,8 +179,16 @@ const exit = async () => {
        if (loading.value) return
        loading.value = true;
        // await staffPermission('yun_xu_jiao_ban')
-        const res = await handover(isPrint.value)
-        const data = await handoverData(res)
+
+        // const res = await handover(isPrint.value)
+        // const data = await handoverData(res)
+
+        const res = '136'
+        const data = { "accountType": "merchant", "alipayAmount": 0, "cashAmount": 38.5, "categoryDataList": [{ "amount": 8.7, "categoryId": "614", "categoryName": "主食", "num": 3, "quantity": 1 }, { "amount": 29.8, "categoryId": "615", "categoryName": "炒菜", "num": 5, "quantity": 4 }], "creditAmount": 0, "handAmount": 38.5, "handoverTime": "2026-04-02 18:19:45", "id": "136", "loginTime": "2026-04-02 18:17:57", "orderCount": 1, "productDataList": [{ "amount": 8.7, "num": 3, "productId": "4037", "productName": "金镶白玉板", "skuId": "6727", "skuName": "" }, { "amount": 8.8, "num": 1, "productId": "4039", "productName": "雪底红梅", "skuId": "6729", "skuName": "" }, { "amount": 1.2, "num": 1, "productId": "4045", "productName": "清蒸鲈鱼", "skuId": "6738", "skuName": "微辣,中度酸" }, { "amount": 2, "num": 1, "productId": "4046", "productName": "四喜丸子", "skuId": "6741", "skuName": "" }, { "amount": 17.8, "num": 2, "productId": "4295", "productName": "小烤串", "skuId": "6990", "skuName": "" }], "quickInAmount": 0, "refundAmount": 0, "shopId": "151", "shopName": "高歌的小店", "staffId": "151", "staffName": "高歌的小店", "vipPay": 0, "vipRecharge": 0, "wechatAmount": 0 }
+
+        // console.log('res===', JSON.stringify(res));
+        // console.log('data===', JSON.stringify(data));
+
        if (printStore.deviceNoteList.length) {
            // 使用本地打印机 打印交班数据
            data.printTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
@@ -190,7 +198,8 @@ const exit = async () => {
            // 使用云打印机 打印交班数据
            await handoverNetworkPrint(data.id)
        }
-        logoutHandle()
+        // logoutHandle()
+        loading.value = false;
    } catch (error) {
        loading.value = false;
        console.log(error);