优化路由切换白屏问题

src/App.vue

@@ -3,7 +3,17 @@
     <!-- 开启水印 -->
     <el-watermark :font="{ color: fontColor }" :content="watermarkEnabled ? defaultSettings.watermarkContent : ''"
       :z-index="9999" class="wh-full">
-      <router-view />
+      <!-- 🔴 修改开始：使用 v-slot 处理路由组件 -->
+      <router-view v-slot="{ Component, route }">
+        <!-- 
+           1. 使用 <transition> 包裹，防止渲染冲突 
+           2. 加上 :key="route.path" 强制 Vue 在路由变化时重新渲染，避免复用导致的空白
+        -->
+        <transition name="fade" mode="out-in">
+          <component :is="Component" :key="route.path" />
+        </transition>
+      </router-view>
+      <!-- 🟢 修改结束 -->
     </el-watermark>
   </el-config-provider>
 </template>

src/api/order/order.ts

@@ -89,6 +89,22 @@ const OrderApi = {
       responseType: 'blob'
     });
   },
+  // 打印经营日报
+  printDayReport(params: any) {
+    return request<any>({
+      url: `${Order_BaseUrl}/admin/finance/printDayReport`,
+      method: "get",
+      params
+    });
+  },
+  // 打印日结单
+  printDaySettle(params: any) {
+    return request<any>({
+      url: `${Order_BaseUrl}/admin/finance/printDaySettle`,
+      method: "get",
+      params
+    });
+  },
 };
 
 export default OrderApi;

src/api/order/sale-summary.ts

@@ -28,6 +28,14 @@ const Api = {
       responseType: 'blob'
     });
   },
+  // 商品报表打印
+  print(params: any) {
+    return request<any>({
+      url: `${baseURL}/print`,
+      method: "get",
+      params
+    });
+  },
 };
 
 export default Api;

src/api/product/index.ts

@@ -48,6 +48,14 @@ const AuthAPI = {
       data,
     });
   },
+  // 商品-标记自动售罄
+  markIsAutoSoldOut(data: Object) {
+    return request<any, Responseres>({
+      url: `${baseURL}/markIsAutoSoldOut`,
+      method: "post",
+      data,
+    });
+  },
   // 删除
   deleteByIds(id: number | String) {
     return request<any, Responseres>({
@@ -72,7 +80,7 @@ const AuthAPI = {
     });
   },
 
-  // 耗材列表
+  // 耗材列表分页
   productcons(params: any) {
     return request<any, Responseres>({
       url: `/product/admin/product/cons/page`,
@@ -80,7 +88,22 @@ const AuthAPI = {
       params
     });
   },
-
+  // 耗材列表
+  productconsList(params: any) {
+    return request<any, Responseres>({
+      url: `/product/admin/product/cons/list`,
+      method: "get",
+      params
+    });
+  },
+  // 耗材列表
+  consStock(params: any) {
+    return request<any, Responseres>({
+      url: `/product/admin/product/cons/consStock`,
+      method: "get",
+      params
+    });
+  },
   // 上下架
   onOff(data: any) {
     return request<any, Responseres>({

src/components/printBusinessDialog.vue

@@ -0,0 +1,120 @@
+<template>
+  <el-dialog title="打印确认" width="400px" v-model="showDayBusiness">
+    <div class="business_wrap">
+      <div class="title">
+        <el-text>请选择要打印的日期：</el-text> <el-text type="danger">周期最长为7天</el-text>
+      </div>
+      <div class="row">
+        <el-date-picker v-model="printDayBusinessParams.date" type="daterange" start-placeholder="开始日期"
+          end-placeholder="结束日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled-date="disabledDate"
+          @change="handleDateChange" clearable />
+      </div>
+      <div class="business_tips">
+        <el-text type="info">若数据过多，打印时间会比较长，请耐心等待</el-text>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="showDayBusiness = false">取 消</el-button>
+        <el-button type="primary" @click="confirmHandle" :loading="printDayBusinessLoading">确 定</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import dayjs from "dayjs";
+import { ref, onMounted } from "vue";
+import { ElMessage } from 'element-plus'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '经营日报'
+  }
+})
+
+const showDayBusiness = ref(false)
+const emits = defineEmits(['success'])
+
+// 打印参数
+const printDayBusinessParams = ref({
+  date: [],
+})
+const printDayBusinessLoading = ref(false)
+
+// 取消
+const confirmHandle = () => {
+  // 校验日期
+  if (!printDayBusinessParams.value.date || printDayBusinessParams.value.date.length !== 2) {
+    ElMessage.warning('请选择日期范围')
+    return
+  }
+  showDayBusiness.value = false
+  emits('success', { date: printDayBusinessParams.value.date })
+}
+
+// 日期禁用规则：只能选昨天及更早，不能选未来
+const disabledDate = (time) => {
+  const yesterday = dayjs().subtract(1, 'day').format('YYYY-MM-DD')
+  return dayjs(time).isAfter(yesterday)
+}
+
+// 日期选择后校验：区间长度不能超过7天
+const handleDateChange = (val) => {
+  if (!val || val.length !== 2) return
+  const [start, end] = val
+  const days = dayjs(end).diff(start, 'day') + 1 // 包含起止日
+  if (days > 7) {
+    ElMessage.warning('日期范围最多只能选择7天')
+    printDayBusinessParams.value.date = [] // 清空选择
+  }
+}
+
+// 判断当前时间 是否在 00:00 ~ 05:20 之间
+const time = ref(['00:00', '05:20'])
+const isInTimeRange = () => {
+  const now = dayjs()
+  const startTime = dayjs(time.value[0], 'HH:mm')
+  const endTime = dayjs(time.value[1], 'HH:mm')
+  return now.isAfter(startTime) && now.isBefore(endTime)
+}
+
+// 打开弹窗
+const show = () => {
+  if (isInTimeRange()) {
+    ElMessage.warning(`当前时间不能打印${props.title}，打印时间：${time.value[0]}点至${time.value[1]}点`)
+    return
+  }
+  showDayBusiness.value = true
+}
+
+// 暴露方法
+defineExpose({ show })
+
+// 初始化默认选中昨天
+onMounted(() => {
+  const yesterday = dayjs().subtract(1, 'day').format('YYYY-MM-DD')
+  printDayBusinessParams.value.date = [yesterday, yesterday]
+})
+</script>
+
+<style scoped lang="scss">
+.business_wrap {
+  .title {
+    display: flex;
+    gap: 6px;
+    align-items: center;
+  }
+
+  .row {
+    padding-top: 14px;
+  }
+
+  .business_tips {
+    padding-top: 6px;
+    display: flex;
+    justify-content: center;
+  }
+}
+</style>

src/components/refundConsModal.vue

@@ -0,0 +1,83 @@
+<template>
+    <el-dialog title="提示" width="450px" v-model="visible">
+        <div class="refund_content">
+            <div class="title_wrap">请确认当前菜品是否已上菜</div>
+            <div class="list_wrap">
+                <div class="item" v-for="(item, index) in list" :key="index">
+                    <span>{{ item.name }}</span>
+                    <span>x{{ item.num }}</span>
+                </div>
+            </div>
+        </div>
+        <div class="dialog_footer">
+            <div class="btn">
+                <el-button @click="handleCancel" style="width: 100%;">未上菜（退还库存）</el-button>
+            </div>
+            <div class="btn">
+                <el-button type="primary" @click="handleOk" style="width: 100%;">已上菜（不退库存）</el-button>
+            </div>
+        </div>
+    </el-dialog>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+
+const visible = ref(false)
+
+const props = defineProps({
+    list: {
+        type: Array,
+        default: () => []
+    }
+})
+
+const emits = defineEmits(['success'])
+
+// 未上菜 1退菜图库存
+function handleCancel() {
+    visible.value = false
+    emits('success', 1)
+}
+
+// 已上菜 2仅退菜不退库存
+function handleOk() {
+    visible.value = false
+    emits('success', 2)
+}
+
+function show() {
+    visible.value = true
+}
+
+defineExpose({
+    show
+})
+</script>
+
+<style scoped lang="scss">
+.refund_content {
+    .title_wrap {
+        font-size: 16px;
+    }
+
+    .list_wrap {
+        padding-top: 14px;
+        .item {
+            display: flex;
+            justify-content: space-between;
+        }
+    }
+}
+
+.dialog_footer {
+    display: flex;
+    justify-content: center;
+    gap: 20px;
+    padding-top: 20px;
+
+    .btn {
+        flex: 1;
+    }
+}
+</style>

src/router/index.ts

@@ -24,61 +24,17 @@ export const constantRoutes: RouteRecordRaw[] = [
   },
 
   {
-    path: "/",
+    path: '/',
     component: Layout,
-    redirect: "/index",
-    meta: {
-      title: "数据中心",
-      icon: "数据统计",
-      alwaysShow: true,
-    },
+    redirect: '/index',
     children: [
       {
-        path: "index",
-        component: () => import("@/views/data/index.vue"),
-        name: "",
+        path: 'index',
+        component: () => import('@/views/index/index.vue'),
+        name: 'index',
         meta: {
-          title: "经营数据",
-          affix: false,
-          keepAlive: true,
-        },
-      },
-      {
-        path: "sales",
-        name: "",
-        component: () => import("@/views/data/sales.vue"),
-        meta: {
-          title: "销售统计",
-          affix: false,
-          keepAlive: true,
-        },
-      },
-      {
-        path: "table",
-        name: "",
-        component: () => import("@/views/data/table.vue"),
-        meta: {
-          title: "台桌统计",
-          affix: false,
-          keepAlive: true,
-        },
-      },
-      {
-        path: "finance",
-        name: "",
-        component: () => import("@/views/data/finance.vue"),
-        meta: {
-          title: "财务报表"
-        },
-      },
-      {
-        path: "work",
-        name: "workStatistics",
-        component: () => import("@/views/data/work.vue"),
-        meta: {
-          title: "收银交班记录",
-          affix: false,
-          keepAlive: true,
+          title: '首页',
+          icon: 'homepage',
         },
       },
       {
@@ -91,9 +47,79 @@ export const constantRoutes: RouteRecordRaw[] = [
         component: () => import("@/views/error/404.vue"),
         meta: { hidden: true },
       },
-    ],
+    ]
   },
   // {
+  //   path: "/",
+  //   component: Layout,
+  //   redirect: "/index",
+  //   meta: {
+  //     title: "数据中心",
+  //     icon: "数据统计",
+  //     alwaysShow: true,
+  //   },
+  //   children: [
+  //     {
+  //       path: "index",
+  //       component: () => import("@/views/data/index.vue"),
+  //       name: "",
+  //       meta: {
+  //         title: "经营数据",
+  //         affix: false,
+  //         keepAlive: true,
+  //       },
+  //     },
+  //     {
+  //       path: "sales",
+  //       name: "",
+  //       component: () => import("@/views/data/sales.vue"),
+  //       meta: {
+  //         title: "销售统计",
+  //         affix: false,
+  //         keepAlive: true,
+  //       },
+  //     },
+  //     {
+  //       path: "table",
+  //       name: "",
+  //       component: () => import("@/views/data/table.vue"),
+  //       meta: {
+  //         title: "台桌统计",
+  //         affix: false,
+  //         keepAlive: true,
+  //       },
+  //     },
+  //     {
+  //       path: "finance",
+  //       name: "",
+  //       component: () => import("@/views/data/finance.vue"),
+  //       meta: {
+  //         title: "财务报表"
+  //       },
+  //     },
+  //     {
+  //       path: "work",
+  //       name: "workStatistics",
+  //       component: () => import("@/views/data/work.vue"),
+  //       meta: {
+  //         title: "收银交班记录",
+  //         affix: false,
+  //         keepAlive: true,
+  //       },
+  //     },
+  //     {
+  //       path: "401",
+  //       component: () => import("@/views/error/401.vue"),
+  //       meta: { hidden: true },
+  //     },
+  //     {
+  //       path: "404",
+  //       component: () => import("@/views/error/404.vue"),
+  //       meta: { hidden: true },
+  //     },
+  //   ],
+  // },
+  // {
   //   path: "/shop",
   //   component: Layout,
   //   meta: {

src/store/modules/carts.ts

@@ -3,6 +3,7 @@ import WebSocketManager, { type ApifoxModel, msgType } from "@/utils/websocket";
 import orderApi from "@/api/order/order";
 import { useUserStoreHook } from "@/store/modules/user";
 import productApi from "@/api/product/index";
+import categoryApi from "@/api/product/productclassification";
 import shopUserApi from '@/api/account/shopUser'
 import limitTimeDiscountApi from '@/api/market/limitTimeDiscount.js'
 import { BigNumber } from "bignumber.js";
@@ -82,8 +83,6 @@ export const useCartsStore = defineStore("carts", () => {
       default: productType = GoodsType.NORMAL;
     }
 
-
-
     return {
       ...item,
       id: item.id,
@@ -226,9 +225,27 @@ export const useCartsStore = defineStore("carts", () => {
   const isLinkFinshed = ref(false);
 
   // 当前购物车数据（现在 getAllGoodsList 能直接访问）
-  const list = useStorage<any[]>("carts", []);
-  // 历史订单数据（现在 getAllGoodsList 能直接访问），不从本地缓存获取，改为从接口获取
-  const oldOrder = ref<any>({
+  const list = useStorage<any[]>(
+    "carts",
+    [],
+    localStorage,
+    {
+      serializer: {
+        read: (rawValue) => {
+          // 没有值时直接返回默认空数组
+          if (!rawValue) return []
+          try {
+            return JSON.parse(rawValue)
+          } catch {
+            return []
+          }
+        },
+        write: (value) => JSON.stringify(value),
+      },
+    }
+  )
+  // 历史订单数据（现在 getAllGoodsList 能直接访问）
+  const oldOrder = useStorage<any>("Instead_olold_order", {
     detailMap: [],
     originAmount: 0
   });
@@ -332,11 +349,61 @@ export const useCartsStore = defineStore("carts", () => {
       }
     });
 
+    const consList = await productApi.consStock({ shopId: localStorage.getItem("shopId") })
+
+    goods.value = addGoodsSoldOutStatus(goods.value, consList)
+
     console.log('代客下单页面商品缓存.goods.value', goods.value);
 
     setGoodsMap(goods.value);
   }
 
+
+  /**
+ * 给商品列表批量添加 isSoldOut 售罄状态字段
+ * @param {Array} goodsList - 商品列表 [ { consList, isAutoSoldStock } ]
+ * @param {Array} consStockList - 真实耗材库存列表 [ { consId, stockNumber } ]
+ * @returns 带 isSoldOut 字段的新商品列表
+ */
+  function addGoodsSoldOutStatus(goodsList, consStockList) {
+    // console.log('addGoodsSoldOutStatus.goodsList', goodsList);
+    // console.log('addGoodsSoldOutStatus.consStockList', consStockList);
+
+    // 耗材ID映射真实库存（保留）
+    const consMap = _.keyBy(consStockList, item => String(item.consId));
+
+    return _.map(goodsList, goods => {
+      let isSoldOut = false;
+
+      // 开启自动售罄才判断
+      if (goods.isAutoSoldStock === 1 || goods.isAutoSoldStock === true) {
+        const goodsConsList = goods.consList || [];
+
+        // 无耗材 → 不售罄
+        if (goodsConsList.length === 0) {
+          isSoldOut = false;
+        } else {
+          // 核心：只要有一个耗材 真实库存 < 商品需要量 → 售罄
+          isSoldOut = _.some(goodsConsList, consItem => {
+            // 商品绑定的耗材ID（对应真实库存ID）
+            const consId = String(consItem.consInfoId);
+            // 商品需要消耗的数量（你的需求量）
+            const needStock = consItem.surplusStock || 0;
+            // 起售数量
+            const suitNum = goods.type == 'single' ? goods.skuList[0].suitNum : 1;
+            // 真实库存
+            const realStock = _.get(consMap, [consId, 'stockNumber'], 0);
+
+            // 真实库存 < 需要量 * 起售数量 → 不足 → 售罄
+            return realStock < needStock * suitNum;
+          });
+        }
+      }
+
+      return { ...goods, isSoldOut };
+    });
+  }
+
   function setGoodsMap(goods: any[]) {
     for (let item of goods) {
       goodsMap[item.id] = item;
@@ -642,7 +709,9 @@ export const useCartsStore = defineStore("carts", () => {
     sendMessage('add', { ...basic_msg, ...data });
   }
 
+  // 添加购物车/编辑购物车
   function add(data: any) {
+    // console.log('添加购物车/编辑购物车===', data);
     goods.value.map(item => {
       if (item.id == data.product_id) {
         data.is_time_discount = item.is_time_discount ? 1 : 0
@@ -657,8 +726,29 @@ export const useCartsStore = defineStore("carts", () => {
     console.log('carts.add===', data);
 
     if (hasCart) {
+      // console.log('编辑', msg);
+      if (hasCart.number * 1 + msg.number * 1 == 2) {
+        ElMessage({
+          type: 'warning',
+          message: '购物车已有该商品，请确认是否重复',
+          duration: 4000
+        })
+      }
       update({ ...hasCart, ...msg, number: hasCart.number * 1 + msg.number * 1 });
     } else {
+      // console.log('添加', msg);
+      let arr = _.flatten(_.values(oldOrder.value.detailMap))
+      // console.log('添加.arr===', arr);
+      const isExist = _.some(arr, item => Number(item.productId) === msg.product_id)
+
+      // console.log('添加.isExist===', isExist);
+      if (msg.number == 1 && isExist) {
+        ElMessage({
+          type: 'warning',
+          message: '该商品已下单过，请确认是否重复',
+          duration: 4000
+        })
+      }
       sendMessage('add', msg);
     }
   }
@@ -888,7 +978,7 @@ export const useCartsStore = defineStore("carts", () => {
       console.log("收到消息：", msg);
       if (!msg.status) {
         if (msg.hasOwnProperty('status') && msg.status !== 1 && msg.operate_type !== 'bulk_edit') {
-          return ElMessage.error(msg.message || '操作失败');
+          return ElMessage.error(msg.msg || '操作失败');
         }
       }
       if (msg?.data) {
@@ -1050,8 +1140,6 @@ export const useCartsStore = defineStore("carts", () => {
     newUserDiscount.value = {}
   }
 
-
-
   return {
     disconnect,
     dinnerType,

src/store/modules/user.ts

@@ -39,7 +39,7 @@ export const useUserStore = defineStore("user", () => {
           setRefreshToken(token);
           localStorage.setItem("shopId", "" + data.shopInfo.id);
           localStorage.setItem("branch_shopId", data.shopInfo.id)
-          resolve();
+          resolve(data);
         })
         .catch((error) => {
           reject(error);

src/views/data/finance.vue

@@ -10,6 +10,8 @@
           <el-form-item>
             <el-button type="primary" icon="Search" :loading="loading" @click="handleQuery">查询</el-button>
             <el-button @click="handleReset" icon="Refresh" :loading="loading">重置</el-button>
+            <el-button icon="Printer" @click="printBusinessDialogRef.show()">经营日报</el-button>
+            <el-button icon="Printer" @click="printBusinessDialogRef2.show()">日结单</el-button>
           </el-form-item>
         </el-form>
         <el-form inline>
@@ -359,6 +361,8 @@
       </div>
     </div>
   </div>
+  <printBusinessDialog ref="printBusinessDialogRef" @success="printHandle" />
+  <printBusinessDialog ref="printBusinessDialogRef2" @success="printHandle2" />
 </template>
 
 <script setup>
@@ -366,6 +370,46 @@ import dayjs from "dayjs";
 import { ref, onMounted } from "vue";
 import OrderApi from "@/api/order/order";
 import { downloadFile, multiplyAndFormat } from '@/utils'
+import printBusinessDialog from "@/components/printBusinessDialog.vue";
+
+const printBusinessDialogRef = ref(null)
+
+// 打印经营日报回调
+async function printHandle(res) {
+  try {
+    const shopStaff = JSON.parse(localStorage.getItem('shopStaff')) || { name: '' }
+    const shopName = localStorage.getItem('shopName')
+    await OrderApi.printDayReport({
+      beginDate: res.date[0],
+      endDate: res.date[1],
+      rangeType: 'CUSTOM',
+      shopId: localStorage.getItem('shopId') || '',
+      operator: shopStaff.name || shopName
+    })
+    ElMessage.success('打印成功')
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+const printBusinessDialogRef2 = ref(null)
+// 打印日结单回调
+async function printHandle2(res) {
+  try {
+    const shopStaff = JSON.parse(localStorage.getItem('shopStaff')) || { name: '' }
+    const shopName = localStorage.getItem('shopName')
+    await OrderApi.printDaySettle({
+      beginDate: res.date[0],
+      endDate: res.date[1],
+      rangeType: 'CUSTOM',
+      shopId: localStorage.getItem('shopId') || '',
+      operator: shopStaff.name || shopName
+    })
+    ElMessage.success('打印成功')
+  } catch (error) {
+    console.log(error);
+  }
+}
 
 const queryForm = ref({
   queryDate: dayjs().format('YYYY-MM-DD'), // 查询日期 yyyy-MM-dd

src/views/data/sales.vue

@@ -44,6 +44,7 @@
             <span v-if="!downloadLoading">导出Excel</span>
             <span v-else>下载中...</span>
           </el-button>
+          <el-button icon="Printer" :loading="printLoading" @click="$refs.printBusinessDialogRef.show()">打印</el-button>
           <importData :type="7" @close="getTableData" />
         </el-form-item>
       </el-form>
@@ -185,6 +186,7 @@
         @current-change="paginationChange" @size-change="sizeChange"
         layout="total, sizes, prev, pager, next, jumper"></el-pagination>
     </div>
+    <printBusinessDialog ref="printBusinessDialogRef" title="商品报表" @success="printBusinessConfirm" />
   </div>
 </template>
 
@@ -197,9 +199,10 @@ import ShopApi from "@/api/account/shop";
 import dayjs from "dayjs";
 import { downloadFile, multiplyAndFormat } from "@/utils/index";
 import { formatDateRange } from './utils/index.js'
+import printBusinessDialog from '@/components/printBusinessDialog.vue';
 
 export default {
-  components: { importData },
+  components: { importData, printBusinessDialog },
   data() {
     return {
       multiplyAndFormat,
@@ -233,7 +236,8 @@ export default {
         // dayjs(time)：将原生 Date 转为 dayjs 对象
         // isAfter：判断目标日期是否在今天之后
         return dayjs(time).isAfter(dayjs().startOf('day'));
-      }
+      },
+      printLoading: false
     };
   },
   filters: {
@@ -255,6 +259,34 @@ export default {
     this.geiShopList();
   },
   methods: {
+    // 确认打印
+    printBusinessConfirm(res) {
+      this.printHandle(res.date)
+    },
+    // 打印
+    async printHandle(date) {
+      try {
+        const shopStaff = JSON.parse(localStorage.getItem('shopStaff')) || { name: '' }
+        const shopName = localStorage.getItem('shopName')
+
+        this.printLoading = true
+
+        await saleSummaryApi.print({
+          beginDate: date[0],
+          endDate: date[1],
+          categoryId: this.query.prodCategoryId,
+          productName: this.query.productName,
+          shopId: this.shopId,
+          rangeType: this.timeValue,
+          operator: shopStaff.name || shopName
+        })
+        ElMessage.success('操作成功')
+      } catch (error) {
+        console.log(error);
+      }
+
+      this.printLoading = false
+    },
     /**
      * 获取分店列表
      */

src/views/data/workconfig/component/my-table.vue

@@ -4,10 +4,10 @@
       <el-table-column prop="shopName" align="center" label="商户名称" />
       <el-table-column prop="staffName" align="center" label="职员名称" />
       <el-table-column prop="orderCount" align="center" label="订单数量" />
-      <el-table-column prop="handAmount" align="center" label="应交金额" />
-      <el-table-column prop="quickInAmount" align="center" label="快捷收款金额" />
+      <el-table-column prop="orderTurnover" align="center" label="应交金额" />
+      <el-table-column prop="balance" align="center" label="余额支付" />
       <el-table-column prop="refundAmount" align="center" label="退款金额" />
-      <el-table-column prop="handAmount" align="center" label="总收入" />
+      <el-table-column prop="turnover" align="center" label="总收入" />
       <el-table-column prop="loginTime" align="center" label="开始时间" />
       <el-table-column prop="handoverTime" align="center" label="交班时间" />
       <el-table-column label="操作" align="center">

src/views/devices/config/add.ts

@@ -15,9 +15,13 @@ const modalConfig: IModalConfig<addRequest> = {
   },
   formAction: function (data) {
     let obj = { ...data }
-    obj.printType = data.printType.join(',')
+    console.log("打印类型", data);
+    // obj.printType = data.printType.join(',')
     obj.categoryIds = JSON.stringify(data.categoryIdsArr)
     obj.categoryList = JSON.stringify(data.categoryIdsArr)
+    if (data.classifyPrint == 0) {
+      obj.categoryIds = ''
+    }
     // obj.categoryIds = '[' + data.categoryIdsArr.join(',') + ']'
     return printerApi.add(obj);
   },
@@ -85,7 +89,7 @@ const modalConfig: IModalConfig<addRequest> = {
     {
       type: "select",
       label: "打印类型",
-      prop: "subType",
+      prop: "printType",
       rules: [{ required: false, message: "请选择打印类型", trigger: "blur" }],
       attrs: {
         placeholder: "请选择打印类型",
@@ -103,7 +107,7 @@ const modalConfig: IModalConfig<addRequest> = {
     {
       type: "select",
       label: "打印机品牌",
-      prop: "contentType",
+      prop: "brand",
       rules: [{ required: true, message: "请选择打印机品牌", trigger: "blur" }],
       attrs: {
         placeholder: "请选择打印机品牌",
@@ -139,27 +143,27 @@ const modalConfig: IModalConfig<addRequest> = {
       label: "",
       initialValue: []
     },
-
     {
       type: "radio",
       label: "打印数量",
-      prop: "printQty",
+      prop: "printNum",
       options: options.printQty,
       initialValue: options.printQty[0].value
     },
     {
       type: "radio",
       label: "打印方式",
-      prop: "printMethod",
+      prop: "kitchenPrintMode",
       options: options.printMethod,
       initialValue: options.printMethod[0].value
     },
     {
-      type: "checkbox",
+      type: "custom",
       label: "打印类型",
-      prop: "printType",
+      prop: "printContentType",
       options: options.printType,
-      initialValue: options.printType.map(v => v.value)
+      initialValue: options.printType.map(v => v.value),
+      slotName: 'printTypeSlot'
     },
     {
       label: "打印机状态",

src/views/devices/config/content.ts

@@ -59,8 +59,8 @@ const contentConfig: IContentConfig<getListRequest> = {
       label: "状态",
       align: "center",
       prop: "status",
-      templet: "switch",
-      slotName: "status",
+      templet: "custom",
+      slotName: "status"
     },
     { label: "创建时间", align: "center", prop: "createTime" },
     // {

src/views/devices/config/edit.ts

@@ -20,6 +20,9 @@ const modalConfig: IModalConfig<editRequest> = {
       obj.categoryIds = JSON.stringify(data.categoryIdsArr)
       obj.categoryList = JSON.stringify(data.categoryIdsArr)
     }
+    if (data.classifyPrint == 0) {
+      obj.categoryIds = ''
+    }
     return printerApi.edit(obj);
   },
   beforeSubmit(data) {
@@ -157,13 +160,12 @@ const modalConfig: IModalConfig<editRequest> = {
       initialValue: options.printMethod[0].value
     },
     {
-      type: "checkbox",
+      type: "custom",
       label: "打印类型",
-      prop: "printType",
-      options: options.printType,
-      initialValue: options.printType.map(v => v.value)
+      prop: "printContentType",
+      options: '',
+      initialValue: ''
     },
-
     {
       label: "打印机状态",
       prop: "status",
@@ -174,6 +176,16 @@ const modalConfig: IModalConfig<editRequest> = {
         inactiveValue: 0,
       }
     },
+    {
+      label: "媒体音开关",
+      prop: "volumeSwitch",
+      type: "switch",
+      initialValue: 1,
+      attrs: {
+        activeValue: 1,
+        inactiveValue: 0,
+      }
+    },
   ],
 };
 

src/views/devices/printer.vue

@@ -9,16 +9,16 @@
     <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
       @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
       @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
-      <template #status="scope">
+      <!-- <template #status="scope">
         <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
           {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
         </el-tag>
-      </template>
+      </template> -->
       <template #contentType="scope">
-        {{ scope.row.contentType == 'yxyPrinter' ? "云想印" : "飞鹅" }}
+        {{ scope.row.contentType == "yxyPrinter" ? "云想印" : "飞鹅" }}
       </template>
       <template #subType="scope">
-        {{ scope.row.subType == 'label' ? "标签" : "小票" }}
+        {{ scope.row.subType == "label" ? "标签" : "小票" }}
       </template>
       <template #caozuo="scope">
         {{ scope }}
@@ -26,10 +26,18 @@
       <template #gender="scope">
         <DictLabel v-model="scope.row[scope.prop]" code="gender" />
       </template>
+      <template #status="scope">
+        <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0"
+          @click="statusChange($event, scope.row)"></el-switch>
+      </template>
       <template #operate="scope">
         <div v-if="scope.row.connectionType != 'USB'">
-          <el-button @click="handleEditClick(scope.row)" icon="Edit" type="primary" link>编辑</el-button>
-          <el-button @click="handdeleteevent(scope.row)" icon="Delete" type="danger" link>删除</el-button>
+          <el-button @click="handleEditClick(scope.row)" icon="Edit" type="primary" link>
+            编辑
+          </el-button>
+          <el-button @click="handdeleteevent(scope.row)" icon="Delete" type="danger" link>
+            删除
+          </el-button>
         </div>
       </template>
       <!-- <template #mobile="scope">
@@ -39,10 +47,21 @@
     </page-content>
 
     <!-- 新增 -->
-    <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
+    <!-- <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
       <template #gender="scope">
         <Dict v-model="scope.formData[scope.prop]" code="gender" />
       </template>
+      <template #printTypeSlot="scope">
+        <div class="row" v-for="(item, index) in printTypeList" :key="index">
+          <div class="title">{{ item.label }}</div>
+          <div class="cont">
+            <el-checkbox-group v-model="item.values" @change="printTypeChange($event, index, scope)">
+              <el-checkbox :label="item.label" :value="item.value" v-for="item in item.list"
+                :key="item.value"></el-checkbox>
+            </el-checkbox-group>
+          </div>
+        </div>
+      </template>
       <template #classifyPrintData="scope">
         <template v-if="scope.formData.classifyPrint == 1">
           <el-checkbox-group v-model="scope.formData.categoryIdsArr">
@@ -52,13 +71,24 @@
           </el-checkbox-group>
         </template>
       </template>
-    </page-modal>
+    </page-modal> -->
 
     <!-- 编辑 -->
-    <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick">
+    <!-- <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick">
       <template #gender="scope">
         <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
       </template>
+      <template #printTypeSlot="scope">
+        <div class="row" v-for="(item, index) in printTypeList" :key="index">
+          <div class="title">{{ item.label }}</div>
+          <div class="cont">
+            <el-checkbox-group v-model="item.values" @change="printTypeChange($event, index, scope)">
+              <el-checkbox :label="item.label" :value="item.value" v-for="item in item.list"
+                :key="item.value"></el-checkbox>
+            </el-checkbox-group>
+          </div>
+        </div>
+      </template>
       <template #classifyPrintData="scope">
         <template v-if="scope.formData.classifyPrint == 1">
           <el-checkbox-group v-model="scope.formData.categoryIdsArr">
@@ -68,11 +98,103 @@
           </el-checkbox-group>
         </template>
       </template>
-    </page-modal>
+    </page-modal> -->
+
+    <el-dialog :title="form.id ? '编辑打印机' : '添加打印机'" width="800px" v-model="visible" @closed="dialogClosed"
+      @open="dialogOpen">
+      <div style="height: 60vh;overflow-y: auto;" ref="formDivRef">
+        <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+          <el-form-item label="设备名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入设备名称"></el-input>
+          </el-form-item>
+          <el-form-item label="设备类型">
+            <el-radio-group v-model="form.connectionType">
+              <el-radio-button label="USB" value="USB"></el-radio-button>
+              <el-radio-button label="云打印" value="云打印"></el-radio-button>
+              <el-radio-button label="局域网" value="局域网"></el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="小票类型">
+            <el-radio-group v-model="form.printType">
+              <el-radio-button label="标签" value="label"></el-radio-button>
+              <el-radio-button label="小票" value="cash"></el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="打印机品牌" prop="brand">
+            <el-radio-group v-model="form.brand">
+              <el-radio-button label="飞鹅"></el-radio-button>
+              <el-radio-button label="云想印"></el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="ip地址/MAC地址" prop="address">
+            <el-input v-model="form.address" placeholder="请输入ip地址/MAC地址"></el-input>
+          </el-form-item>
+          <el-form-item label="端口" prop="port">
+            <el-input v-model="form.port" placeholder="请输入端口"></el-input>
+          </el-form-item>
+          <el-form-item label="小票尺寸" prop="receiptSize">
+            <el-radio-group v-model="form.receiptSize">
+              <el-radio-button label="58mm"></el-radio-button>
+              <el-radio-button label="80mm"></el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="打印数量" prop="printNum">
+            <el-input-number v-model="form.printNum" :step="1" :min="1"></el-input-number>
+          </el-form-item>
+          <el-form-item label="打印内容" prop="printContentType">
+            <div class="row" v-for="(item, index) in printTypeList" :key="index">
+              <div class="title">{{ item.label }}</div>
+              <div class="cont">
+                <el-checkbox-group v-model="item.values" @change="printTypeChange($event, index)">
+                  <el-checkbox :label="item.label" :value="item.value" v-for="item in item.list"
+                    :key="item.value"></el-checkbox>
+                </el-checkbox-group>
+              </div>
+            </div>
+          </el-form-item>
+          <!-- <el-form-item label="打印模式" prop="kitchenPrintMode">
+            <el-radio-group v-model="form.kitchenPrintMode">
+              <el-radio-button label="整单" value="all"></el-radio-button>
+              <el-radio-button label="单个" value="only"></el-radio-button>
+            </el-radio-group>
+            <el-text type="info" style="margin-left: 14px;">仅针对厨房制作单的打印</el-text>
+          </el-form-item> -->
+          <el-form-item label="分类打印">
+            <div class="column">
+              <div style="display: flex;align-items: center;">
+                <el-radio-group v-model="form.classifyPrint">
+                  <el-radio-button label="所有" value="0"></el-radio-button>
+                  <el-radio-button label="部分分类" value="1" v-if="printTypeList[1].values.length > 0"></el-radio-button>
+                </el-radio-group>
+                <el-text type="info" style="margin-left: 14px;">仅针对厨房制作单的打印</el-text>
+              </div>
+              <template v-if="form.classifyPrint == 1">
+                <el-checkbox-group v-model="form.categoryIds">
+                  <el-checkbox v-for="item in PrinterTypeList" :value="item.id" :label="item.name"></el-checkbox>
+                </el-checkbox-group>
+              </template>
+            </div>
+          </el-form-item>
+          <el-form-item label="媒体音量">
+            <el-switch v-model="form.volumeSwitch" :active-value="1" :inactive-value="0"></el-switch>
+          </el-form-item>
+          <el-form-item label="启用状态">
+            <el-switch v-model="form.status" :active-value="1" :inactive-value="0"></el-switch>
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="visible = false">取 消</el-button>
+          <el-button type="primary" :loading="loading" @click="submitHandle">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup lang="ts">
+import _ from 'lodash'
 import UserAPI from "@/api/account/printer";
 import type { IObject, IOperatData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
@@ -80,6 +202,166 @@ import addModalConfig from "./config/add";
 import contentConfig from "./config/content";
 import editModalConfig from "./config/edit";
 import searchConfig from "./config/search";
+import { options } from './config/config'
+import printerApi, { type addRequest } from "@/api/account/printer";
+
+const printTypeList = ref([
+  {
+    label: '前台',
+    values: [],
+    list: [
+      { label: '客看单', value: 'GUEST_ORDER' },
+      { label: '预结算单', value: 'PRE_ORDER' },
+      { label: '结算单', value: 'ORDER' },
+      { label: '退菜单', value: 'RETURN_ORDER' },
+      { label: '退款单', value: 'REFUND_ORDER' },
+    ]
+  },
+  {
+    label: '后厨',
+    values: [],
+    list: [
+      { label: '后厨-整单', value: 'ALL_KITCHEN' },
+      { label: '后厨-分单', value: 'ONLY_KITCHEN' },
+      { label: '后厨-退菜单', value: 'REFUND_KITCHEN' },
+    ]
+  },
+  {
+    label: '其它',
+    values: [],
+    list: [
+      { label: '交班单', value: 'HANDOVER' },
+      { label: '排队取号', value: 'CALL' },
+      { label: '储值单', value: 'RECHARGE' },
+      { label: '入库单', value: 'STOCK' },
+      { label: '盘点单', value: 'STOCK_CHECK' },
+      { label: '商品报表', value: 'PRODUCT_REPORT' },
+      { label: '经营日报', value: 'DAY_REPORT' },
+      { label: '日结单', value: 'DAY_ORDER' },
+    ]
+  }
+])
+
+const loading = ref(false)
+const visible = ref(false)
+const formRef = ref(null)
+const obj = {
+  id: '',
+  name: '', // 设备名称
+  connectionType: '云打印', // 连接方式 USB、云打印、局域网
+  printType: 'cash', // 打印类型 label标签 cash小票
+  brand: '', // 打印机品牌 飞鹅/云想印
+  address: '', // ip地址/MAC地址
+  port: '', // 端口
+  receiptSize: '58mm', // 小票尺寸 58mm 80mm
+  printNum: 1, // 打印数量
+  printContentType: '', // 打印内容
+  kitchenPrintMode: 'all', // 打印模式(厨房打印菜品) all整单 /only单个
+  classifyPrint: '0', // 分类打印 0-所有 1-部分分类
+  categoryIds: [], // 分类Id
+  status: 1, // 0 禁用 1启用
+  volumeSwitch: 1, // 媒体声音开关 0关1开
+}
+const form = ref({ ...obj })
+
+const rules = {
+  name: [
+    {
+      required: true,
+      message: '请输入设备名称',
+      trigger: 'blur'
+    }
+  ],
+  brand: [
+    {
+      required: true,
+      message: '请选择打印机品牌',
+      trigger: 'change'
+    }
+  ],
+  printNum: [
+    {
+      required: true,
+      message: '请选择打印数量',
+      trigger: 'change'
+    }
+  ],
+  // kitchenPrintMode: [
+  //   {
+  //     required: true,
+  //     message: '请选择打印模式',
+  //     trigger: 'change'
+  //   }
+  // ]
+}
+
+function dialogClosed() {
+  formRef.value.resetFields()
+  form.value = { ...obj }
+}
+
+const formDivRef = ref(null)
+async function dialogOpen() {
+  await nextTick()
+  if (formDivRef.value) {
+    // console.log('开始滚动到顶部')
+    formDivRef.value.scrollTop = 0
+  }
+}
+
+// 打印类型切换
+function printTypeChange(e, index, scope) {
+  if (index == 1 && printTypeList.value[index].values.length == 0) {
+    form.value.categoryList = []
+  }
+
+  let arr = []
+  printTypeList.value.forEach(item => {
+    arr.push(...item.values)
+  })
+
+  form.value.printContentType = arr.join(',')
+}
+
+function submitHandle() {
+  console.log('submitHandle===', form.value);
+  formRef.value.validate(async valid => {
+    try {
+      if (valid) {
+        loading.value = true
+        const data = { ...form.value }
+        data.categoryIds = form.value.categoryIds.join(',')
+        if (form.value.id) {
+          await printerApi.edit(data)
+        } else {
+          await printerApi.add(data)
+        }
+        ElMessage.success(form.value.id ? '编辑成功' : '添加成功')
+        visible.value = false
+
+        handleQueryClick();
+      }
+    } catch (error) {
+      console.log(error);
+    }
+    setTimeout(() => {
+      loading.value = false
+    }, 300);
+  })
+}
+
+// 更改状态
+async function statusChange(e, data) {
+  try {
+    await printerApi.edit({
+      id: data.id,
+      status: data.status
+    });
+    handleQueryClick();
+  } catch (error) {
+    console.log(error);
+  }
+}
 
 const {
   searchRef,
@@ -98,11 +380,11 @@ const {
 onMounted(() => {
   getPrinterType();
 });
-let PrinterTypeList = ref([])
+let PrinterTypeList = ref([]);
 // 获取商品分类
 async function getPrinterType() {
   let res = await UserAPI.getPrinterType();
-  PrinterTypeList.value = res.records
+  PrinterTypeList.value = res.records;
 }
 function handdeleteevent(item) {
   ElMessageBox.confirm("确认删除?", "警告", {
@@ -114,28 +396,45 @@ function handdeleteevent(item) {
       ElMessage.success("删除成功");
       handleQueryClick();
     });
-
   });
 }
 // 新增
 async function handleAddClick() {
-  addModalRef.value?.setModalVisible();
+  // addModalRef.value?.setModalVisible();
+  visible.value = true
 }
 // 编辑
 async function handleEditClick(row: IObject) {
-  editModalRef.value?.handleDisabled(false);
-  editModalRef.value?.setModalVisible();
-  // 根据id获取数据进行填充
-  let data = await UserAPI.get(row.id);
-  data.printType = data.printType.split(',');
+  form.value = { ...row }
+  visible.value = true
 
-  if (data.categoryIds) {
-    data.categoryIdsArr = JSON.parse(data.categoryIds)
-  }
+  form.value.categoryIds = form.value.categoryIds.split(',')
 
-  data.classifyPrint = data.classifyPrint * 1;
+  const printContentTypes = row.printContentType.split(',')
+  printTypeList.value.forEach(val => {
+    val.values = _.map(
+      _.filter(val.list, item => printContentTypes.includes(item.value)),
+      'value'
+    );
+  })
 
-  editModalRef.value?.setFormData(data);
+  // editModalRef.value?.handleDisabled(false);
+  // editModalRef.value?.setModalVisible();
+  // // 根据id获取数据进行填充
+  // let data = await UserAPI.get(row.id);
+  // data.printType = data.printType.split(",");
+
+  // if (data.categoryIds) {
+  //   data.categoryIdsArr = JSON.parse(data.categoryIds);
+  // } else {
+  //   data.categoryIdsArr = [];
+  // }
+  // console.log(data.categoryIdsArr);
+  // console.log(data);
+
+  // data.classifyPrint = data.classifyPrint * 1;
+
+  // editModalRef.value?.setFormData(data);
 }
 // 其他工具栏
 function handleToolbarClick(name: string) {

src/views/index/index.vue

@@ -1,5 +1,112 @@
 <template>
-  <div>
-    <h1>Index</h1>
+  <div class="gyq_container">
+    <div class="item_wrap">
+      <div class="title">您好，欢迎登录</div>
+      <div class="item_list">
+        <div class="item" v-for="(item, index) in quickStore.quickMenus.splice(0, 6)" :key="item.id"
+          @click="menuClick(item.menuId)">
+          <img class="icon" :src="icons[index + 1]" alt="">
+          {{ returnMenuName(item.menuId) }}
+        </div>
+      </div>
+    </div>
   </div>
-</template>
+</template>
+
+<script setup>
+import { onMounted, nextTick } from "vue";
+import { useQuickStore, usePermissionStore, useUserStore } from "@/store";
+
+import icon1 from "@/assets/index_quick1.png";
+import icon2 from "@/assets/index_quick2.png";
+import icon3 from "@/assets/index_quick3.png";
+import icon4 from "@/assets/index_quick4.png";
+import icon5 from "@/assets/index_quick5.png";
+import icon6 from "@/assets/index_quick6.png";
+
+const icons = {
+  1: icon1,
+  2: icon2,
+  3: icon3,
+  4: icon4,
+  5: icon5,
+  6: icon6,
+};
+
+const userStore = useUserStore();
+const quickStore = useQuickStore();
+const permissionStore = usePermissionStore();
+
+function returnMenuName(menuId) {
+  return permissionStore.returnMenuName(menuId);
+}
+
+function menuClick(menuId) {
+  permissionStore.menuJump(menuId);
+}
+
+onMounted(async () => {
+  await nextTick();
+  console.log('quickStore.quickMenus', quickStore.quickMenus);
+})
+</script>
+
+<style scoped lang="scss">
+.gyq_container {
+  width: 100%;
+  height: 100%;
+  background: url('@/assets/index_bg.png') no-repeat center center / cover;
+  display: flex;
+  align-items: center;
+  padding-bottom: 50px;
+}
+
+.item_wrap {
+  padding-left: 300px;
+
+  .title {
+    font-size: 40px;
+    margin-bottom: 50px;
+    font-weight: bold;
+  }
+
+  .item_list {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-template-rows: repeat(2, 1fr);
+    grid-column-gap: 90px;
+    grid-row-gap: 90px;
+
+    .item {
+      width: 152px;
+      height: 83px;
+      border-radius: 20px;
+      background: linear-gradient(115deg, #9EC4FF 5.9%, #6668E8 111.62%);
+      position: relative;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 16px;
+      color: #fff;
+      padding-left: 30px;
+
+      &:hover {
+        cursor: pointer;
+
+        .icon {
+          transform: translateY(-10px);
+        }
+      }
+
+      .icon {
+        position: absolute;
+        left: -30px;
+        top: -20px;
+        width: 83px;
+        height: 78px;
+        transition: all 0.3s ease-in-out;
+      }
+    }
+  }
+}
+</style>

src/views/login/index.vue

@@ -74,12 +74,19 @@ const accountList = reactive([
   { username: "19107220837", type: 'danger', label: '快乐时光店铺' },
   // { username: "18199991111", type: 'success', label: '草莓加盟主店可直接管理' },
   { username: "18821670757", type: 'success', label: '高歌的小店' },
+  { username: "18821670757", staffUserName: '18821670758', type: 'primary', label: '高歌的小店的员工-张三' },
   { username: "191123456", type: 'primary', label: '酸橘子' },
 ]);
 
 // 快捷模拟登录
 function accountHandle(item) {
   state.loginForm.username = item.username;
+  if (item.staffUserName) {
+    state.loginForm.loginType = 1
+    state.loginForm.staffUserName = item.staffUserName
+  } else {
+    state.loginForm.loginType = 0
+  }
   state.loginForm.code = 666666
   const d = new Date();
   state.loginForm.password = `czg${d.getHours().toString().padStart(2, '0')}${d.getMinutes().toString().padStart(2, '0')}`;
@@ -191,6 +198,12 @@ function handleLogin() {
       userStore
         .login(user)
         .then(async (res) => {
+
+          console.log('login===', res);
+
+          localStorage.setItem('shopStaff', JSON.stringify(res.shopStaff))
+
+
           const token = getToken();
           console.log("token", token);
           $douyin_checkIn({

src/views/order/index/components/detail.vue

@@ -93,13 +93,8 @@
               <div>
                 实收金额：
                 <span style="color: red">￥{{ detail.payAmount }}</span>
-                <el-button
-                  v-if="detail.status != 'unpaid' && detail.refundAmount < detail.payAmount"
-                  size="small"
-                  type="danger"
-                  class="u-m-l-10"
-                  @click="tuikuan()"
-                >
+                <el-button v-if="detail.status != 'unpaid' && detail.refundAmount < detail.payAmount" size="small"
+                  type="danger" class="u-m-l-10" @click="tuikuan()">
                   <span>退款</span>
                 </el-button>
               </div>
@@ -116,7 +111,11 @@
                   退款详情>
                 </span> -->
               </div>
-              <div class="color-red">退款方式：{{ detail.refundType }}</div>
+              <div class="color-red">
+                <span v-if="detail.refundType">
+                  退款方式：{{ detail.refundType === "cash" ? "现金退款" : "原路退回" }}
+                </span>
+              </div>
               <div></div>
               <div></div>
             </div>
@@ -126,35 +125,22 @@
           <div style="margin-bottom: 16px; font-size: 16px">商品信息</div>
           <template v-for="(item, index) in detail.detailMap" :key="index">
             <h4>第{{ index }}次下单</h4>
-            <el-table
-              :data="item"
-              :ref="'refTable' + index"
-              @select-all="tableSelectAll($event, index)"
-            >
+            <el-table :data="item" :ref="'refTable' + index" @select-all="tableSelectAll($event, index)">
               <!-- <el-table-column type="selection" width="55" /> -->
               <el-table-column label="数量" type="selection">
                 <template v-slot="scope">
                   <div v-if="detail.status == 'unpaid'">
-                    <el-checkbox
-                      v-if="scope.row.num - scope.row.returnNum > 0"
-                      v-model="scope.row.checked"
-                    />
+                    <el-checkbox v-if="scope.row.num - scope.row.returnNum > 0" v-model="scope.row.checked" />
                   </div>
                   <div v-else>
-                    <el-checkbox
-                      v-if="scope.row.num - scope.row.refundNum > 0"
-                      v-model="scope.row.checked"
-                    />
+                    <el-checkbox v-if="scope.row.num - scope.row.refundNum > 0" v-model="scope.row.checked" />
                   </div>
                 </template>
               </el-table-column>
               <el-table-column label="商品" width="150">
                 <template v-slot="scope">
                   <div class="shop_info">
-                    <el-image
-                      :src="scope.row.productImg"
-                      style="width: 40px; height: 40px"
-                    ></el-image>
+                    <el-image :src="scope.row.productImg" style="width: 40px; height: 40px"></el-image>
                     <div class="info">
                       <span :class="[scope.row.isVip == 1 ? 'colorStyle' : '']">
                         {{ scope.row.productName }}
@@ -187,32 +173,17 @@
               <el-table-column label="实付">
                 <template v-slot="scope">￥{{ scope.row.payAmount }}</template>
               </el-table-column>
-              <el-table-column
-                v-if="detail.status == 'unpaid'"
-                label="可退菜数量"
-                align="center"
-                width="130px"
-              >
+              <el-table-column v-if="detail.status == 'unpaid'" label="可退菜数量" align="center" width="130px">
                 <template v-slot="scope">
-                  <el-input-number
-                    v-if="scope.row.checked"
-                    :min="0"
-                    style="width: 100px"
-                    v-model="scope.row.selNumber"
-                    :max="scope.row.num - scope.row.returnNum"
-                  ></el-input-number>
+                  <el-input-number v-if="scope.row.checked" :min="0" style="width: 100px" v-model="scope.row.selNumber"
+                    :max="scope.row.num - scope.row.returnNum"></el-input-number>
                   <span class="" v-else>{{ scope.row.num - scope.row.returnNum }}</span>
                 </template>
               </el-table-column>
               <el-table-column v-else label="可退款数量" align="center" width="130px">
                 <template v-slot="scope">
-                  <el-input-number
-                    v-if="scope.row.checked"
-                    :min="0"
-                    style="width: 100px"
-                    v-model="scope.row.selNumber"
-                    :max="scope.row.num - scope.row.refundNum - scope.row.returnNum"
-                  ></el-input-number>
+                  <el-input-number v-if="scope.row.checked" :min="0" style="width: 100px" v-model="scope.row.selNumber"
+                    :max="scope.row.num - scope.row.refundNum - scope.row.returnNum"></el-input-number>
                   <span class="" v-else>
                     {{ scope.row.num - scope.row.refundNum - scope.row.returnNum }}
                   </span>
@@ -227,23 +198,13 @@
               <el-table-column label="操作" fixed="right">
                 <template v-slot="scope">
                   <template v-if="detail.status != 'unpaid'">
-                    <el-button
-                      v-if="canTuikuan(scope.row)"
-                      link
-                      size="small"
-                      @click="tuikuan(scope.row)"
-                    >
+                    <el-button v-if="canTuikuan(scope.row)" link size="small" @click="tuikuan(scope.row)">
                       <span>退款</span>
                     </el-button>
                     <span class="color-999" v-if="scope.row.status == 'refund'">已退款</span>
                   </template>
                   <template v-if="detail.status == 'unpaid'">
-                    <el-button
-                      v-if="canTuicai(scope.row)"
-                      link
-                      size="small"
-                      @click="tuicai(scope.row)"
-                    >
+                    <el-button v-if="canTuicai(scope.row)" link size="small" @click="tuicai(scope.row)">
                       <span>退菜</span>
                     </el-button>
                     <span class="color-999" v-else>已退菜</span>
@@ -253,41 +214,25 @@
             </el-table>
           </template>
           <!-- 退款 -->
-          <div
-            class="u-p-20 u-flex u-row-right"
-            v-if="
-              detail.status !== 'refund' &&
-              detail.status !== 'unpaid' &&
-              detail.status !== 'cancelled'
-            "
-          >
-            <el-checkbox
-              v-model="allSelected"
-              @change="allSelectedChange"
-              label="全选"
-            ></el-checkbox>
+          <div class="u-p-20 u-flex u-row-right" v-if="
+            detail.status !== 'refund' &&
+            detail.status !== 'unpaid' &&
+            detail.status !== 'cancelled'
+          ">
+            <el-checkbox v-model="allSelected" @change="allSelectedChange" label="全选"></el-checkbox>
             <el-button type="danger" class="u-m-l-20" @click.stop="tuikuan('all')">退款</el-button>
           </div>
           <!-- 退菜 -->
           <div class="u-p-20 u-flex u-row-right" v-if="detail.status == 'unpaid'">
-            <el-checkbox
-              v-model="allSelected"
-              @change="allSelectedChange"
-              label="全选"
-            ></el-checkbox>
+            <el-checkbox v-model="allSelected" @change="allSelectedChange" label="全选"></el-checkbox>
             <el-button type="danger" class="u-m-l-20" @click.stop="tuicai('all')">退菜</el-button>
           </div>
         </div>
       </div>
     </el-drawer>
     <!-- 退款 -->
-    <return-money
-      :modal="false"
-      ref="refReturnMoney"
-      :max="selGoods.num"
-      :goods="selGoods"
-      @confirm="refReturnMoneyConfirm"
-    ></return-money>
+    <return-money :modal="false" ref="refReturnMoney" :max="selGoods.num" :goods="selGoods"
+      @confirm="refReturnMoneyConfirm"></return-money>
     <!-- 退菜 -->
     <order-return-cart ref="refReturnCart" @confirm="refReturnCartConfirm"></order-return-cart>
   </div>
@@ -462,6 +407,12 @@ export default {
     },
     tuikuan(item) {
       if (!item) {
+        let arrs = []
+        for (let i in this.detail.detailMap) {
+          this.detail.detailMap[i].map((v) => {
+            arrs.push(v);
+          });
+        }
         this.$refs.refReturnMoney.open([], this.detail);
         return;
       }
@@ -480,6 +431,9 @@ export default {
       if (arr.length == 0) {
         return ElMessage.error("请选择要退款的商品和数量");
       }
+
+      console.log('tuikuan===', arr);
+
       this.$refs.refReturnMoney.open(arr, this.detail);
     },
     tuicai(item) {
@@ -498,7 +452,7 @@ export default {
       if (arr.length == 0) {
         return ElMessage.error("请选择要退菜的商品和数量");
       }
-      console.log(arr);
+      console.log('tuicai===', arr);
       this.$refs.refReturnCart.open(arr, this.detail);
     },
 

src/views/order/index/components/return-money.vue

@@ -4,11 +4,7 @@
       <div class="u-flex u-col-top" v-if="goodsList && goodsList.length">
         <span class="u-m-0">退款商品</span>
         <div class="u-p-l-20 goods-list">
-          <div
-            class="u-flex u-font-12 goods-list-item"
-            v-for="(goods, index) in goodsList"
-            :key="index"
-          >
+          <div class="u-flex u-font-12 goods-list-item" v-for="(goods, index) in goodsList" :key="index">
             <span class="">
               {{ goods.productName }}
             </span>
@@ -35,12 +31,7 @@
         <div class="flex u-row-between">
           <span class="color-red">退款金额</span>
           <div class="u-flex u-flex-1 u-p-l-20">
-            <el-input-number
-              type="number"
-              v-model="number"
-              :min="min"
-              :max="canReturnMoney"
-            ></el-input-number>
+            <el-input-number type="number" v-model="number" :min="min" :max="canReturnMoney"></el-input-number>
             <span class="u-m-l-10">可退{{ canReturnMoney }}元</span>
           </div>
         </div>
@@ -73,13 +64,8 @@
       </div>
 
       <div class="u-flex u-flex-wrap tags">
-        <div
-          class="tag"
-          v-for="(tag, index) in tags"
-          @click="changeSel(tag)"
-          :key="index"
-          :class="{ active: tag.checked }"
-        >
+        <div class="tag" v-for="(tag, index) in tags" @click="changeSel(tag)" :key="index"
+          :class="{ active: tag.checked }">
           {{ tag.label }}
         </div>
       </div>
@@ -94,16 +80,22 @@
       </template>
     </el-dialog>
     <safe-password ref="refPassword" @confirm="pwdConfirm"></safe-password>
+    <!-- 退款退菜推库存的操作弹窗 -->
+    <refundConsModal ref="refundConsModalRef" :list="refundList" @success="refundConsModalSuccess" />
   </div>
 </template>
-  <script>
+<script>
 import { ElMessage } from "element-plus";
 import safePassword from "./password.vue";
 import { useUserStore } from "@/store/modules/user";
+import { useCartsStore } from "@/store/modules/carts";
+import categoryApi from "@/api/product/productclassification";
+import refundConsModal from "@/components/refundConsModal.vue";
 const shopUser = useUserStore();
 export default {
   components: {
     safePassword,
+    refundConsModal
   },
   props: {
     modal: {
@@ -135,6 +127,8 @@ export default {
       goods: {
         productId: -999,
       },
+      refundList: [],
+      refundStock: ''
     };
   },
   computed: {
@@ -196,18 +190,26 @@ export default {
         .join(",");
       const note = selTag + (this.note.length > 0 ? "," + this.note : "");
       console.log(note);
-      this.$emit("confirm", {
+
+      const data = {
         refundAmount: this.number,
         cash: this.cash,
         refundReason: note,
         refundDetails: this.goodsList.map((v) => {
-          return { id: v.id, num: v.num };
+          return { id: v.id, num: v.selNumber };
         }),
         ...e,
-      });
+        refundStock: this.refundStock
+      }
+      this.$emit("confirm", data);
       this.close();
     },
-    confirm() {
+    // 退款推库存的操作
+    refundConsModalSuccess(e) {
+      this.refundStock = e
+      this.emitTuikuan()
+    },
+    async confirm() {
       const selTag = this.tags
         .filter((item) => item.checked)
         .map((item) => item.label)
@@ -220,14 +222,58 @@ export default {
         this.$refs.refPassword.open();
         return;
       }
+
+      // 在这里给订单的商品补全库存信息 start
+      const carts = useCartsStore();
+      let categorys = JSON.parse(localStorage.getItem('categorys'))
+      let shopInfo = JSON.parse(localStorage.getItem('userInfo'))
+
+      if (!categorys) {
+        categorys = await categoryApi.getList({})
+      }
+
+      this.goodsList.forEach(item => {
+        carts.goods.forEach(val => {
+          if (item.productId == val.id) {
+            if (shopInfo.refundMode == 1) {
+              // 跟随分类退款模式
+              categorys.forEach(v => {
+                if (val.categoryId == v.id) {
+                  item.refundMode = v.refundMode
+                }
+              })
+            } else {
+              // 跟随商品退款模式及
+              item.refundMode = val.refundMode
+            }
+          }
+        })
+      })
+      console.log('this.goodsList===', this.goodsList);
+      // 在这里给订单的商品补全库存信息 end
+
+      this.goodsList.forEach(item => {
+        if (item.refundMode == 3) {
+          this.refundList.push({
+            name: item.productName,
+            num: item.selNumber
+          })
+        }
+      })
+
+      if (this.refundList.length > 0) {
+        this.$refs.refundConsModalRef.show()
+        return
+      }
+
       this.emitTuikuan();
     },
   },
-  mounted() {},
+  mounted() { },
 };
 </script>
-  
-  <style lang="scss" scoped>
+
+<style lang="scss" scoped>
 :deep(.el-tag) {
   margin-top: 10px;
   margin-right: 10px;
@@ -237,6 +283,7 @@ export default {
   line-height: 35px;
   height: 35px;
 }
+
 .tags {
   .tag {
     margin: 10px 10px 0 0;
@@ -246,6 +293,7 @@ export default {
     font-size: 14px;
     color: #000;
     cursor: pointer;
+
     &.active {
       color: #1890ff;
       background: #e8f4ff;
@@ -253,14 +301,17 @@ export default {
     }
   }
 }
+
 :deep(.number-box .el-input__inner::-webkit-inner-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
+
 :deep(.number-box .el-input__inner::-webkit-outer-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
+
 .goods-list-item {
   height: 24px;
   line-height: 24px;
@@ -268,6 +319,7 @@ export default {
   border-radius: 3px;
   padding: 0 10px;
 }
+
 .goods-list-item:not(:first-child) {
   margin-top: 6px;
 }

src/views/product/category.vue

@@ -15,7 +15,11 @@
             {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
           </el-tag>
         </template>
-
+        <template #refundMode="scope">
+          <!-- <el-switch v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
+            @click="isRefundStockChange($event, scope)" /> -->
+          <el-text>{{ returnLabel(scope.row[scope.prop]) }}</el-text>
+        </template>
         <template #slotNameimage="scope">
           <el-image v-if="scope.row.pic" :src="scope.row.pic" lazy style="width: 40px; height: 40px" />
           <div v-else>无</div>
@@ -68,6 +72,17 @@ import editModalConfig from "./categoryconfig/edit";
 import searchConfig from "./categoryconfig/search";
 import { isSyncStatus, downloadFile } from "@/utils/index";
 
+const options = ref([
+  { label: "退菜退库存", value: 1 },
+  { label: "仅退菜不退库存", value: 2 },
+  { label: "每次询问-退菜后弹窗提示，可手动选择", value: 3 },
+])
+
+function returnLabel(value: number) {
+  const option = options.value.find((option) => option.value === value);
+  return option ? option.label : "未知";
+}
+
 const {
   searchRef,
   contentRef,
@@ -106,6 +121,16 @@ async function handleExportClick() {
   }
 }
 
+// 退菜是否退库存开关切换
+async function isRefundStockChange(e: any, scope: any) {
+  try {
+    await UserAPI.update(scope.row);
+  } catch (error) {
+    console.log(error);
+    ElMessage.error("操作失败");
+  }
+}
+
 // 新增
 async function handleAddClick() {
   addModalRef.value?.setModalVisible();

src/views/product/categoryconfig/add.ts

@@ -10,7 +10,7 @@ const modalConfig: IModalConfig<UserForm> = {
     draggable: true,
   },
   form: {
-    labelWidth: 100,
+    labelWidth: 120,
   },
   formAction: UserAPI.addunit,
   beforeSubmit(data) {
@@ -31,6 +31,26 @@ const modalConfig: IModalConfig<UserForm> = {
       prop: "pic",
       type: "UpImage",
     },
+    {
+      label: '退菜是否退库存',
+      prop: 'refundMode',
+      type: 'radio',
+      options: [
+        { label: "退菜退库存", value: 1 },
+        { label: "仅退菜不退库存", value: 2 },
+        { label: "每次询问-退菜后弹窗提示，可手动选择", value: 3 },
+      ],
+      initialValue: 1,
+    },
+    {
+      label: "排序",
+      prop: "sort",
+      type: "input-number",
+      attrs: {
+        placeholder: "请输入排序",
+      },
+      initialValue: 1,
+    },
     {
       label: "开关",
       prop: "status",
@@ -44,15 +64,6 @@ const modalConfig: IModalConfig<UserForm> = {
         inactiveValue: 0,
       },
       initialValue: 1,
-    },
-    {
-      label: "排序",
-      prop: "sort",
-      type: "input-number",
-      attrs: {
-        placeholder: "请输入排序",
-      },
-      initialValue: 1,
     }
   ],
 };

src/views/product/categoryconfig/content.ts

@@ -77,6 +77,13 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       templet: "switch",
       slotName: "status",
     },
+    {
+      label: "退菜是否退库存",
+      align: "center",
+      prop: "refundMode",
+      templet: "custom",
+      slotName: "refundMode",
+    },
     {
       label: "操作",
       align: "center",

src/views/product/categoryconfig/edit.ts

@@ -35,6 +35,26 @@ const modalConfig: IModalConfig<UserForm> = {
       prop: "pic",
       type: "UpImage",
     },
+    {
+      label: '退菜是否退库存',
+      prop: 'refundMode',
+      type: 'radio',
+      options: [
+        { label: "退菜退库存", value: 1 },
+        { label: "仅退菜不退库存", value: 2 },
+        { label: "每次询问-退菜后弹窗提示，可手动选择", value: 3 },
+      ],
+      initialValue: 1,
+    },
+    {
+      label: "排序",
+      prop: "sort",
+      type: "input-number",
+      attrs: {
+        placeholder: "请输入排序",
+      },
+      initialValue: 1,
+    },
     {
       label: "开关",
       prop: "status",
@@ -48,15 +68,6 @@ const modalConfig: IModalConfig<UserForm> = {
         inactiveValue: 0,
       },
       initialValue: 1,
-    },
-    {
-      label: "排序",
-      prop: "sort",
-      type: "input-number",
-      attrs: {
-        placeholder: "请输入排序",
-      },
-      initialValue: 1,
     }
   ],
 };

src/views/product/index.vue

@@ -5,7 +5,7 @@
     <page-search ref="searchRef" :search-config="searchConfig" @query-click="newHandleQueryClick"
       @reset-click="handleResetClick2" />
     <!-- 顶部数据 -->
-    <Statistics :data="gongjiData"></Statistics>
+    <!-- <Statistics :data="gongjiData"></Statistics> -->
     <!-- 列表 -->
     <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
       @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
@@ -29,7 +29,8 @@
           @click="handleSwitchChange(scope.row)"></el-switch>
       </template>
       <template #isStock="scope">
-        <el-switch disabled v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"></el-switch>
+        <el-switch v-if="!scope.row.productId" v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
+          :disabled="!scope.row.type" @click="isStockChange(scope.row)"></el-switch>
       </template>
 
       <template #kucunedit="scope">
@@ -42,13 +43,18 @@
       </template>
 
       <template #tuikuantuihui="scope">
-        <el-switch v-if="!scope.row.productId" v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
-          @click="handleSwitchhaocai(scope.row)"></el-switch>
+        <!-- <el-switch v-if="!scope.row.productId" v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
+          @click="handleSwitchhaocai(scope.row)"></el-switch> -->
+        <el-text>{{ returnLabel(scope.row[scope.prop]) }}</el-text>
       </template>
       <template #sellOut="scope">
         <el-switch v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
           @click="handleSwitchChangeTwo(scope.row)"></el-switch>
       </template>
+      <template #autoSellOut="scope">
+        <el-switch v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
+          @click="handleSwitchChangeTwo2($event, scope.row)"></el-switch>
+      </template>
       <template #mobile="scope">
         <el-text>{{ scope.row[scope.prop] }}</el-text>
         <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
@@ -95,7 +101,7 @@
           <el-input-number v-model="datas.number" :min="1" label="描述文字"></el-input-number>
         </el-form-item>
         <el-form-item label="报损照片" label-width="">
-          <MultiImageUpload v-model="datas.images" />
+          <MultiImageUpload v-model="datas.imgUrls" />
         </el-form-item>
         <el-form-item label="备注" label-width="">
           <el-input v-model="datas.remark" type="textarea" />
@@ -121,9 +127,10 @@
         <el-table-column label="序号" type="index" width="60"></el-table-column>
         <el-table-column label="耗材名称" prop="consInfoId">
           <template v-slot="scope">
-            <el-select v-model="scope.row.consInfoId" reserve-keyword placeholder="请输入关键词"
+            <el-select filterable v-model="scope.row.consInfoId" reserve-keyword placeholder="请输入关键词"
               @change="selectionChange($event, scope.row)">
-              <el-option v-for="item in options" :key="item.id" :label="item.conName" :value="item.id"></el-option>
+              <el-option v-for="item in options" :key="item.id * 1" :label="item.conName"
+                :value="item.id * 1"></el-option>
             </el-select>
             <!-- <div class="tips" v-if="scope.row.stockNumber">库存：{{ scope.row.stockNumber }}</div> -->
           </template>
@@ -169,6 +176,19 @@
     <MyDialog ref="myDialogRefkucun" @confirm="confirmkucun" width="30%" title="库存修改">
       <el-input-number v-model="kucundata.stockNumbers" :min="0" />
     </MyDialog>
+    <!-- 报损记录 -->
+    <MyDialog ref="myDialogRefRecord" :title="dataAll.dataTitle" width="70%" @confirm="myDialogRefRecord.close()">
+      <!-- 表格 -->
+      <Table :list="dataAll.tableData"
+        v-if="dataAll.dataType == 'inSumTotal' || dataAll.dataType == 'winInNum' || dataAll.dataType == 'outSumTotal' || dataAll.dataType == 'lossOutNum'">
+      </Table>
+      <TableTwo :list="dataAll.tableData" v-else-if="dataAll.dataType == 'refundInNum'"></TableTwo>
+      <TableThree :list="dataAll.tableData" v-else-if="dataAll.dataType == 'salesNum'"></TableThree>
+
+      <TableFour :list="dataAll.tableData" v-else-if="dataAll.dataType == 'damageNum'"></TableFour>
+      <!-- 分页 -->
+      <Paging :pagingConfig="dataAll.pagingConfig" @sizeChange="sizeChange" @currentChange="currentChange"></Paging>
+    </MyDialog>
   </div>
 </template>
 
@@ -187,6 +207,89 @@ import editModalConfig from "./indexconfig/edit";
 import searchConfig from "./indexconfig/search";
 import MyDialog from "@/components/mycomponents/myDialog.vue";
 import Statistics from "./indexconfig/statistics.vue";
+import TableFour from './indexconfig/TableFour.vue'
+
+const myDialogRefRecord = ref(null)
+
+const refoundModeOptions = ref([
+  { label: "退菜退库存", value: 1 },
+  { label: "仅退菜不退库存", value: 2 },
+  { label: "每次询问-退菜后弹窗提示，可手动选择", value: 3 },
+])
+
+function returnLabel(value: number) {
+  const option = refoundModeOptions.value.find((option) => option.value == value);
+  return option ? option.label : "未知";
+}
+
+let dataAll = reactive({
+  dataList: [],
+  tableData: [],
+  pagingConfig: {
+    total: 0, // 总数
+    pageSize: 10, // 每页数据数量
+    pageNumber: 1, // 当前页码
+  },
+  dataType: "",
+  dataTitle: ""
+});
+
+function sizeChange(val) {
+  dataAll.pagingConfig.pageSize = val
+  clickEvent(dataAll.dataType)
+}
+function currentChange(val) {
+  dataAll.pagingConfig.pageNumber = val
+  clickEvent(dataAll.dataType)
+}
+
+async function clickEvent(key) {
+  dataAll.dataType = key
+  let obj = {}
+  switch (key) {
+    case 'inSumTotal':
+      dataAll.dataTitle = '增加数据统计'
+      obj = { page: dataAll.pagingConfig.pageNumber, size: dataAll.pagingConfig.pageSize, productId: "", inOutType: "in", inOutItem: "" }
+      break;
+    case 'winInNum':
+      dataAll.dataTitle = '手动增加统计'
+      obj = { page: dataAll.pagingConfig.pageNumber, size: dataAll.pagingConfig.pageSize, productId: "", inOutType: "in", inOutItem: "win-in" }
+      break;
+    case 'refundInNum':
+      dataAll.dataTitle = '退货统计'
+      obj = { page: dataAll.pagingConfig.pageNumber, size: dataAll.pagingConfig.pageSize, productId: "", inOutType: "in", inOutItem: "order-in" }
+      break;
+    case 'outSumTotal':
+      dataAll.dataTitle = '减少数量统计'
+      obj = { page: dataAll.pagingConfig.pageNumber, size: dataAll.pagingConfig.pageSize, productId: "", inOutType: "out", inOutItem: "" }
+      break;
+    case 'lossOutNum':
+      dataAll.dataTitle = '手动减少统计'
+      obj = { page: dataAll.pagingConfig.pageNumber, size: dataAll.pagingConfig.pageSize, productId: "", inOutType: "out", inOutItem: "loss-out" }
+      break;
+    case 'salesNum':
+      dataAll.dataTitle = '销量统计'
+      obj = { page: dataAll.pagingConfig.pageNumber, size: dataAll.pagingConfig.pageSize, productId: "", inOutType: "out", inOutItem: "order-out" }
+      break;
+    case 'damageNum':
+      dataAll.dataTitle = '报损统计'
+      obj = { page: dataAll.pagingConfig.pageNumber, size: dataAll.pagingConfig.pageSize, productId: datas.productId, inOutType: "out", inOutItem: "damage-out" }
+      break;
+  }
+  dataAll.tableData = []
+
+  let res = await UserAPI.stockFlow(obj);
+  dataAll.tableData = res.records
+  dataAll.tableData.forEach((item, index) => {
+    if (item.imgUrls.length > 7) {
+      item.imagesone = JSON.parse(item.imgUrls)[0]
+    }
+  })
+  dataAll.pagingConfig.total = res.totalRow
+  dataAll.pagingConfig.pageSize = res.pageSize
+  dataAll.pagingConfig.pageNumber = res.pageNumber
+  myDialogRefRecord.value.open()
+}
 
 const importDataRef = ref(null);
 
@@ -233,7 +336,7 @@ const form = reactive({
 let datas = reactive({
   number: 0,
   remark: "",
-  images: [],
+  imgUrls: [],
   productId: null, // Added productId property
 });
 
@@ -255,8 +358,8 @@ onMounted(async () => {
   // 获取耗材列表
   gethaocaiList();
 
-  const res = await UserAPI.getPage()
-  form.warnLine = res.warnLine || ''
+  const res = await UserAPI.getPage();
+  form.warnLine = res.warnLine || "";
   // console.log('contentRef.value===', res);
 });
 
@@ -310,7 +413,7 @@ function getTongji(params: IObject | undefined) {
 
 // 显示批量导入
 function handleUploadClick() {
-  importDataRef.value.show()
+  importDataRef.value.show();
 }
 
 // 导出商品
@@ -342,13 +445,25 @@ function createItem(val: IObject) {
   haocaiData.value.consList.push(item);
 }
 // 上架
-function handleSwitchChange(data: any) {
+async function handleSwitchChange(data: any) {
+  console.log(data);
   let obj = {
     type: data.productId ? "sku" : "product",
     id: data.id,
     isSale: data.isSale,
   };
-  UserAPI.onOff(obj);
+  await UserAPI.onOff(obj);
+  ElMessage.success("修改成功！");
+
+  if (data.productId) {
+    //sku
+    contentRef.value?.fetchPageData();
+  } else {
+    //product
+    data.skuList.map((v) => {
+      v.isSale = data.isSale;
+    });
+  }
 }
 // 售罄
 function handleSwitchChangeTwo(data: any) {
@@ -358,7 +473,18 @@ function handleSwitchChangeTwo(data: any) {
     isSoldOut: data.isSoldStock,
   };
   UserAPI.markIsSoldOut(obj);
+  ElMessage.success("修改成功！");
 }
+
+// 自动售罄
+function handleSwitchChangeTwo2(e: any, data: any) {
+  UserAPI.markIsAutoSoldOut({
+    id: data.id,
+    isAutoSoldStock: data.isAutoSoldStock
+  });
+  ElMessage.success("修改成功！");
+}
+
 function handleSwitchChangethree(data: any) {
   let obj = {
     type: data.type == "sku" ? "sku" : "product",
@@ -368,6 +494,18 @@ function handleSwitchChangethree(data: any) {
   UserAPI.markIsSoldOut(obj);
 }
 
+async function isStockChange(data: any) {
+  console.log(data);
+  let obj = {
+    type: "product",
+    id: data.id,
+    isSale: data.isStock,
+    optType: "stock",
+  };
+  await UserAPI.onOff(obj);
+  ElMessage.success("修改成功！");
+  return;
+}
 // 退款退回
 async function handleSwitchhaocai(row: IObject) {
   let res = await UserAPI.refundToStock({ isReturn: row.isRefundStock, id: row.id });
@@ -398,7 +536,7 @@ async function handleToolbarClick(name: string) {
     ElMessage.success("操作成功，数据正在后台同步中...");
   }
   if (name === "upload") {
-    importDataRef.value.show()
+    importDataRef.value.show();
   }
 }
 async function confirm() {
@@ -444,15 +582,26 @@ function typeFilter(item: any) {
 }
 // 其他操作列
 async function handleOperatClick(data: IOperatData) {
+  console.log(data);
   datas.productId = data.row.id;
-  myDialogRefbaosun.value.open();
-  datas.number = 1;
-  datas.remark = "";
+  switch (data.name) {
+    case 'cons':
+      myDialogRefbaosun.value.open();
+      datas.number = 1;
+      datas.remark = "";
+      break;
+    case 'consRecord':
+      clickEvent('damageNum')
+      // myDialogRefRecord.value.open()
+      break;
+    default:
+      break;
+  }
 }
 
 async function gethaocaiList() {
-  let res = await UserAPI.productcons({ id: route.query.id });
-  options.value = res.records;
+  let res = await UserAPI.productconsList({ id: route.query.id });
+  options.value = res || [];
 }
 </script>
 <style scoped lang="scss">

src/views/product/indexconfig/TableFour.vue

@@ -2,8 +2,8 @@
   <div style="margin-top: 10px;">
     <el-table :data="props.list" border style="">
       <el-table-column prop="productName" align="center" label="商品名称/规格名称" />
-      <el-table-column prop="beforeNumber" align="center" label="原库存" />
-      <el-table-column prop="afterNumber" align="center" label="变动后库存" />
+      <!-- <el-table-column prop="beforeNumber" align="center" label="原库存" />
+      <el-table-column prop="afterNumber" align="center" label="变动后库存" /> -->
       <el-table-column prop="inOutNumber" align="center" label="报损数量" />
       <el-table-column prop="createUserName" align="center" label="报损人" />
       <el-table-column prop="remark" align="center" label="备注" />

src/views/product/indexconfig/addgoods.vue

@@ -1,185 +1,194 @@
 <template>
   <div class="addgoods">
+    <div class="header-wrap">
+      <el-radio-group v-model="addFormType" size="large">
+        <el-radio-button label="基础信息" :value="1"></el-radio-button>
+        <el-radio-button label="耗材设置" :value="2"></el-radio-button>
+        <el-radio-button label="关联推荐商品" :value="3"></el-radio-button>
+      </el-radio-group>
+    </div>
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="150px" class="demo-ruleForm" status-icon>
-      <el-form-item label="商品名称" required>
-        <el-col :span="12">
-          <el-form-item prop="name">
-            <el-input v-model="ruleForm.name" placeholder="请输入商品名称" :disabled="isSyncStatus()" />
-          </el-form-item>
-        </el-col>
-      </el-form-item>
-      <el-form-item label="商品介绍">
-        <el-col :span="12">
-          <el-form-item>
-            <el-input v-model="ruleForm.shortTitle" type="textarea" placeholder="请输入商品介绍" :disabled="isSyncStatus()" />
-          </el-form-item>
-        </el-col>
-      </el-form-item>
-      <el-form-item label="单位" required>
-        <el-col :span="12">
-          <el-form-item prop="unitId">
-            <el-select v-model="ruleForm.unitId" placeholder="请选择单位" :disabled="isSyncStatus()">
-              <el-option :label="item.name" :value="item.id" v-for="item in datas.Company" :key="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-form-item>
-      <el-form-item label="商品分类" required>
-        <el-col :span="12">
-          <el-form-item prop="region">
-            <el-select v-model="ruleForm.categoryId" placeholder="请选择商品分类" :disabled="isSyncStatus()">
-              <el-option :label="item.name" :value="item.id" v-for="item in datas.classification" :key="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-form-item>
-      <!-- <el-form-item label="商品图片" required prop="images">
+      <div v-show="addFormType == 1">
+        <el-form-item label="商品名称" required>
+          <el-col :span="12">
+            <el-form-item prop="name">
+              <el-input v-model="ruleForm.name" placeholder="请输入商品名称" :disabled="isSyncStatus()" />
+            </el-form-item>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="商品介绍">
+          <el-col :span="12">
+            <el-form-item>
+              <el-input v-model="ruleForm.shortTitle" type="textarea" placeholder="请输入商品介绍"
+                :disabled="isSyncStatus()" />
+            </el-form-item>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="单位" required>
+          <el-col :span="12">
+            <el-form-item prop="unitId">
+              <el-select v-model="ruleForm.unitId" placeholder="请选择单位" :disabled="isSyncStatus()">
+                <el-option :label="item.name" :value="item.id" v-for="item in datas.Company" :key="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="商品分类" required>
+          <el-col :span="12">
+            <el-form-item prop="region">
+              <el-select v-model="ruleForm.categoryId" placeholder="请选择商品分类" :disabled="isSyncStatus()">
+                <el-option :label="item.name" :value="item.id" v-for="item in datas.classification" :key="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-form-item>
+        <!-- <el-form-item label="商品图片" required prop="images">
         <MultiImageUpload v-model="ruleForm.images" />
       </el-form-item> -->
-      <el-form-item label="商品图片" required prop="images">
-        <div style="display: flex; flex-wrap: wrap">
-          <div v-for="(item, index) in ruleForm.images" :key="index" style="position: relative" class="showStyle">
-            <el-icon class="buttonstyle" @click="deleteEvent(item)">
-              <DeleteFilled />
-            </el-icon>
-            <img style="width: 148px; height: 148px; margin-right: 6px" class="imgStyle" :src="item" alt="" />
-          </div>
-          <div class="upImgStyle" @click="addimgEvent">+</div>
-        </div>
-      </el-form-item>
-      <el-form-item>
-        <div class="tips">注：第一张图为商品封面图，图片尺寸为750×750</div>
-      </el-form-item>
-      <!-- 选择图片 -->
-      <AddImg ref="addImg" @successEvent="successEvent"></AddImg>
-
-      <el-form-item label="商品类型">
-        <el-radio-group v-model="ruleForm.type" @change="changeTypeEnum(ruleForm.type)" :disabled="isSyncStatus()">
-          <el-radio value="single">单规格商品</el-radio>
-          <el-radio value="sku">多规格商品</el-radio>
-          <el-radio value="package">套餐商品</el-radio>
-          <el-radio value="weight">称重商品</el-radio>
-          <!-- <el-radio label="coupon">团购券</el-radio> -->
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="套餐商品" v-if="ruleForm.type == 'package'">
-        <div style="display: block; width: 100%">
-          <div class="head-container">
-            <el-radio-group v-model="ruleForm.groupType" @change="typeChange">
-              <el-radio-button :label="0">固定套餐</el-radio-button>
-              <el-radio-button :label="1">可选套餐</el-radio-button>
-            </el-radio-group>
-          </div>
-          <div v-if="ruleForm.groupType == 0">
-            <el-table border :data="item.goods" v-for="(item, index) in ruleForm.proGroupVo" :key="index">
-              <el-table-column label="名称" prop="proName"></el-table-column>
-              <el-table-column label="规格" prop="skuName"></el-table-column>
-              <el-table-column label="价格" prop="price"></el-table-column>
-              <el-table-column label="数量" prop="number">
-                <template v-slot="scope">
-                  <el-input-number v-model="scope.row.number" :min="0" />
-                </template>
-              </el-table-column>
-              <el-table-column width="150">
-                <template #header>
-                  <el-button type="primary" @click="addgoods(-1)" :disabled="isSyncStatus()">
-                    添加商品
-                  </el-button>
-                </template>
-                <template v-slot="scope">
-                  <el-button type="text" :disabled="scope.row.type != 'sku' && isSyncStatus()"
-                    @click="showSelectSkuHandle(scope.row, scope.$index, index)">设置规格</el-button>
-                  <el-button type="text"
-                    @click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)">删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-          <div v-if="ruleForm.groupType == 1">
-            <div class="group_wrap" v-for="(item, index) in ruleForm.proGroupVo" :key="index">
-              <el-form inline :model="item">
-                <el-form-item label="规格组名">
-                  <el-input v-model="item.title" :disabled="isSyncStatus()" />
-                </el-form-item>
-                <el-form-item :label="`本组菜品${item.goods.length}选`">
-                  <el-input v-model="item.number" :disabled="isSyncStatus()" />
-                </el-form-item>
-                <el-form-item>
-                  <el-button @click="ruleForm.proGroupVo.splice(index, 1)" :disabled="isSyncStatus()">
-                    删除
-                  </el-button>
-                </el-form-item>
-              </el-form>
-              <div style="margin-top: 20px">
-                <el-table border :data="item.goods">
-                  <el-table-column label="名称" prop="proName"></el-table-column>
-                  <el-table-column label="规格" prop="skuName"></el-table-column>
-                  <el-table-column label="价格" prop="price"></el-table-column>
-                  <el-table-column label="数量" prop="number">
-                    <template v-slot="scope">
-                      <el-input-number v-model="scope.row.number" :min="0" :disabled="isSyncStatus()" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column width="150">
-                    <template #header>
-                      <el-button type="primary" @click="addgoods(index)" :disabled="isSyncStatus()">
-                        添加商品
-                      </el-button>
-                    </template>
-                    <template v-slot="scope">
-                      <el-button type="text" :disabled="scope.row.type != 'sku' && isSyncStatus()"
-                        @click="showSelectSkuHandle(scope.row, scope.$index, index)">设置规格</el-button>
-                      <el-button type="text" @click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)"
-                        :disabled="isSyncStatus()">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
+        <el-form-item label="商品图片" required prop="images">
+          <div style="display: flex; flex-wrap: wrap">
+            <div v-for="(item, index) in ruleForm.images" :key="index" style="position: relative" class="showStyle">
+              <el-icon class="buttonstyle" @click="deleteEvent(item)">
+                <DeleteFilled />
+              </el-icon>
+              <img style="width: 148px; height: 148px; margin-right: 6px" class="imgStyle" :src="item" alt="" />
             </div>
-            <el-button type="primary" @click="addtaocan" :disabled="isSyncStatus()">
-              添加套餐组
-            </el-button>
+            <div class="upImgStyle" @click="addimgEvent">+</div>
           </div>
-        </div>
-      </el-form-item>
-      <el-form-item label="选择规格" v-if="ruleForm.type == 'sku'">
-        <el-select v-model="ruleForm.specId" placeholder="请选择规格" style="width: 500px" @change="selectSpecHandle"
-          :disabled="isSyncStatus()">
-          <el-option :label="item.name" :value="item.id" v-for="item in datas.specificationsconfig"
-            :key="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="ele.name" v-if="datas.selectSpeclist.length" v-for="ele in datas.selectSpeclist"
-        :key="ele.name">
-        <el-checkbox-group v-model="ele.selectSpecResult" @change="selectSpecResultChange">
-          <el-checkbox :value="element.name" :label="element.name" v-for="(element, index) in ele.children"
-            :key="index"></el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      <!-- 规格属性 -->
-      <!-- 单规格、称重 -->
-      <SpecificationAttribute v-if="ruleForm.type != 'sku'" :info="ruleForm" :list="list"
-        ref="specificationAttributeRef">
-      </SpecificationAttribute>
-      <SpecificationAttribute v-if="ruleForm.type == 'sku' && list.length" :specTableHeaders="datas.specTableHeaders"
-        :info="ruleForm" :list="list" ref="specificationAttributeRef"></SpecificationAttribute>
-      <el-form-item label="重量">
-        <el-col :span="12">
-          <div style="display: block">
-            <el-input v-model="ruleForm.weight" placeholder="" :disabled="isSyncStatus()">
-              <template #append>千克</template>
-            </el-input>
-            <!-- <div style="color: #999;">用于快递或配送运费计重</div> -->
+        </el-form-item>
+        <el-form-item>
+          <div class="tips">注：第一张图为商品封面图，图片尺寸为750×750</div>
+        </el-form-item>
+        <!-- 选择图片 -->
+        <AddImg ref="addImg" @successEvent="successEvent"></AddImg>
+
+        <el-form-item label="商品类型">
+          <el-radio-group v-model="ruleForm.type" @change="changeTypeEnum(ruleForm.type)" :disabled="isSyncStatus()">
+            <el-radio value="single">单规格商品</el-radio>
+            <el-radio value="sku">多规格商品</el-radio>
+            <el-radio value="package">套餐商品</el-radio>
+            <el-radio value="weight">称重商品</el-radio>
+            <!-- <el-radio label="coupon">团购券</el-radio> -->
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="套餐商品" v-if="ruleForm.type == 'package'">
+          <div style="display: block; width: 100%">
+            <div class="head-container">
+              <el-radio-group v-model="ruleForm.groupType" @change="typeChange">
+                <el-radio-button :label="0">固定套餐</el-radio-button>
+                <el-radio-button :label="1">可选套餐</el-radio-button>
+              </el-radio-group>
+            </div>
+            <div v-if="ruleForm.groupType == 0">
+              <el-table border :data="item.goods" v-for="(item, index) in ruleForm.proGroupVo" :key="index">
+                <el-table-column label="名称" prop="proName"></el-table-column>
+                <el-table-column label="规格" prop="skuName"></el-table-column>
+                <el-table-column label="价格" prop="price"></el-table-column>
+                <el-table-column label="数量" prop="number">
+                  <template v-slot="scope">
+                    <el-input-number v-model="scope.row.number" :min="0" />
+                  </template>
+                </el-table-column>
+                <el-table-column width="150">
+                  <template #header>
+                    <el-button type="primary" @click="addgoods(-1)" :disabled="isSyncStatus()">
+                      添加商品
+                    </el-button>
+                  </template>
+                  <template v-slot="scope">
+                    <el-button type="text" :disabled="scope.row.type != 'sku' && isSyncStatus()"
+                      @click="showSelectSkuHandle(scope.row, scope.$index, index)">设置规格</el-button>
+                    <el-button type="text"
+                      @click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <div v-if="ruleForm.groupType == 1">
+              <div class="group_wrap" v-for="(item, index) in ruleForm.proGroupVo" :key="index">
+                <el-form inline :model="item">
+                  <el-form-item label="规格组名">
+                    <el-input v-model="item.title" :disabled="isSyncStatus()" />
+                  </el-form-item>
+                  <el-form-item :label="`本组菜品${item.goods.length}选`">
+                    <el-input v-model="item.number" :disabled="isSyncStatus()" />
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button @click="ruleForm.proGroupVo.splice(index, 1)" :disabled="isSyncStatus()">
+                      删除
+                    </el-button>
+                  </el-form-item>
+                </el-form>
+                <div style="margin-top: 20px">
+                  <el-table border :data="item.goods">
+                    <el-table-column label="名称" prop="proName"></el-table-column>
+                    <el-table-column label="规格" prop="skuName"></el-table-column>
+                    <el-table-column label="价格" prop="price"></el-table-column>
+                    <el-table-column label="数量" prop="number">
+                      <template v-slot="scope">
+                        <el-input-number v-model="scope.row.number" :min="0" :disabled="isSyncStatus()" />
+                      </template>
+                    </el-table-column>
+                    <el-table-column width="150">
+                      <template #header>
+                        <el-button type="primary" @click="addgoods(index)" :disabled="isSyncStatus()">
+                          添加商品
+                        </el-button>
+                      </template>
+                      <template v-slot="scope">
+                        <el-button type="text" :disabled="scope.row.type != 'sku' && isSyncStatus()"
+                          @click="showSelectSkuHandle(scope.row, scope.$index, index)">设置规格</el-button>
+                        <el-button type="text" @click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)"
+                          :disabled="isSyncStatus()">删除</el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </div>
+              </div>
+              <el-button type="primary" @click="addtaocan" :disabled="isSyncStatus()">
+                添加套餐组
+              </el-button>
+            </div>
           </div>
-        </el-col>
-      </el-form-item>
-      <el-form-item label="是否允许临时改价">
-        <el-radio-group v-model="ruleForm.isAllowTempModifyPrice" :disabled="isSyncStatus()">
-          <el-radio :value="1">允许</el-radio>
-          <el-radio :value="0">不允许</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- <el-form-item label="每日销量上限">
+        </el-form-item>
+        <el-form-item label="选择规格" v-if="ruleForm.type == 'sku'">
+          <el-select v-model="ruleForm.specId" placeholder="请选择规格" style="width: 500px" @change="selectSpecHandle"
+            :disabled="isSyncStatus()">
+            <el-option :label="item.name" :value="item.id" v-for="item in datas.specificationsconfig"
+              :key="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="ele.name" v-if="datas.selectSpeclist.length" v-for="ele in datas.selectSpeclist"
+          :key="ele.name">
+          <el-checkbox-group v-model="ele.selectSpecResult" @change="selectSpecResultChange">
+            <el-checkbox :value="element.name" :label="element.name" v-for="(element, index) in ele.children"
+              :key="index"></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <!-- 规格属性 -->
+        <!-- 单规格、称重 -->
+        <SpecificationAttribute v-if="ruleForm.type != 'sku'" :info="ruleForm" :list="list"
+          ref="specificationAttributeRef">
+        </SpecificationAttribute>
+        <SpecificationAttribute v-if="ruleForm.type == 'sku' && list.length" :specTableHeaders="datas.specTableHeaders"
+          :info="ruleForm" :list="list" ref="specificationAttributeRef"></SpecificationAttribute>
+        <el-form-item label="重量">
+          <el-col :span="12">
+            <div style="display: block">
+              <el-input v-model="ruleForm.weight" placeholder="" :disabled="isSyncStatus()">
+                <template #append>千克</template>
+              </el-input>
+              <!-- <div style="color: #999;">用于快递或配送运费计重</div> -->
+            </div>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="是否允许临时改价">
+          <el-radio-group v-model="ruleForm.isAllowTempModifyPrice" :disabled="isSyncStatus()">
+            <el-radio :value="1">允许</el-radio>
+            <el-radio :value="0">不允许</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- <el-form-item label="每日销量上限">
         <el-input-number v-model="ruleForm.dayLimit" :min="0" />
       </el-form-item>
       <el-form-item label="每单限购">
@@ -188,48 +197,127 @@
       <el-form-item label="每人限购">
         <el-input-number v-model="ruleForm.dayLimit" :min="0" />
       </el-form-item> -->
-      <el-form-item label="定时上下架">
-        <el-checkbox-group v-model="ruleForm.days">
-          <el-checkbox v-for="(item, index) in datas.cycle" :key="item.value" :value="item.value">
-            {{ item.label }}
-          </el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item>
-        <el-col :span="20">
-          <!-- <el-time-picker v-model="ruleForm.useTime" is-range range-separator="至" start-placeholder="开始时间"
+        <el-form-item label="定时上下架">
+          <el-checkbox-group v-model="ruleForm.days">
+            <el-checkbox v-for="(item, index) in datas.cycle" :key="item.value" :value="item.value">
+              {{ item.label }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item>
+          <el-col :span="20">
+            <!-- <el-time-picker v-model="ruleForm.useTime" is-range range-separator="至" start-placeholder="开始时间"
             end-placeholder="结束时间" value-format="HH:mm:ss" format="HH:mm:ss"   />
  -->
 
-          <el-time-picker v-model="ruleForm.startTime" value-format="HH:mm:ss" format="HH:mm:ss" placeholder="选择开始时间">
-          </el-time-picker>-
-          <el-time-picker v-model="ruleForm.endTime" value-format="HH:mm:ss" format="HH:mm:ss" placeholder="选择结束时间">
-          </el-time-picker>
-        </el-col>
-      </el-form-item>
-      <el-form-item label="上架">
-        <el-switch v-model="ruleForm.isSale" :active-value="1" :inactive-value="0" />
-      </el-form-item>
-      <el-form-item label="库存开关">
-        <div style="display: block;">
-          <el-switch v-model="ruleForm.isStock" :active-value="1" :inactive-value="0" :disabled="isSyncStatus()" />
-          <div style="color: #999;">注：关闭则不计算出库数据</div>
-        </div>
-      </el-form-item>
-      <el-form-item label="设为推荐" prop="delivery">
-        <el-switch v-model="ruleForm.isHot" :active-value="1" :inactive-value="0" />
-      </el-form-item>
-      <el-form-item label="库存数量">
-        <el-input-number v-model="ruleForm.stockNumber" :min="0" />
-      </el-form-item>
-      <el-form-item label="打包费" prop="delivery">
-        <div style="display: block;">
-          <el-input-number v-model="ruleForm.packFee" controls-position="right"
-            :disabled="isSyncStatus()"></el-input-number>
-          <div style="color: #999;">单份商品打包费。注：店铺开启外卖模式下该数据才生效</div>
-        </div>
-      </el-form-item>
-      <el-form-item label="关联推荐商品">
+            <el-time-picker v-model="ruleForm.startTime" value-format="HH:mm:ss" format="HH:mm:ss" placeholder="选择开始时间">
+            </el-time-picker>-
+            <el-time-picker v-model="ruleForm.endTime" value-format="HH:mm:ss" format="HH:mm:ss" placeholder="选择结束时间">
+            </el-time-picker>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="上架">
+          <el-switch v-model="ruleForm.isSale" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+        <!-- <el-form-item label="库存开关">
+          <div style="display: block;">
+            <el-switch v-model="ruleForm.isStock" :active-value="1" :inactive-value="0" :disabled="isSyncStatus()" />
+            <div style="color: #999;">注：关闭则不计算出库数据</div>
+          </div>
+        </el-form-item> -->
+        <el-form-item label="设为推荐" prop="delivery">
+          <el-switch v-model="ruleForm.isHot" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+        <!-- <el-form-item label="库存数量">
+          <el-input-number v-model="ruleForm.stockNumber" :min="0" />
+        </el-form-item> -->
+        <el-form-item label="打包费" prop="delivery">
+          <div style="display: block;">
+            <el-input-number v-model="ruleForm.packFee" controls-position="right"
+              :disabled="isSyncStatus()"></el-input-number>
+            <div style="color: #999;">单份商品打包费。注：店铺开启外卖模式下该数据才生效</div>
+          </div>
+        </el-form-item>
+      </div>
+      <div v-show="addFormType == 2" style="padding-bottom: 20px;">
+        <!-- 耗材绑定 -->
+        <el-form-item label="绑定耗材"></el-form-item>
+        <el-form-item label="商品名">{{ ruleForm.name }}</el-form-item>
+        <el-form-item>
+          <el-table :data="ruleForm.consList" border>
+            <el-table-column label="序号" type="index" width="60"></el-table-column>
+            <el-table-column label="耗材名称" prop="consInfoId">
+              <template v-slot="scope">
+                <el-select filterable v-model="scope.row.consInfoId" reserve-keyword placeholder="请输入关键词"
+                  @change="selectionChange($event, scope.row)">
+                  <el-option v-for="item in consOptions" :key="item.id" :label="item.conName"
+                    :value="item.id"></el-option>
+                </el-select>
+                <!-- <div class="tips" v-if="scope.row.stockNumber">库存：{{ scope.row.stockNumber }}</div> -->
+              </template>
+            </el-table-column>
+            <el-table-column label="单位" prop="conUnit">
+              <template v-slot="scope">
+                <el-input v-model="scope.row.conUnit" readonly disabled placeholder="请选择耗材"></el-input>
+                <!-- <el-select v-model="scope.row.conUnit" reserve-keyword placeholder="请输入关键词">
+              <el-option
+                v-for="item in returnConUnits(scope.row.consInfoId)"
+                :key="item"
+                :label="item"
+                :value="item"
+              ></el-option>
+            </el-select> -->
+              </template>
+            </el-table-column>
+            <el-table-column label="使用数量" prop="surplusStock" min-width="150px">
+              <template v-slot="scope">
+                <el-input-number v-model="scope.row.surplusStock" :min="0" />
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="100">
+              <template #header>
+                <el-button type="primary" size="small" @click="createItem">添加</el-button>
+              </template>
+              <template v-slot="scope">
+                <div class="table_btn_wrap">
+                  <div class="btn sub" @click="ruleForm.consList.splice(scope.$index, 1)">
+                    <el-icon>
+                      <RemoveFilled />
+                    </el-icon>
+                  </div>
+                  <!-- <div class="btn add" v-if="scope.$index == ruleForm.consList.length - 1"
+                    @click="createItem(scope.row)">
+                    <el-icon>
+                      <CirclePlusFilled />
+                    </el-icon>
+                  </div> -->
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+        <el-form-item label="自动售罄">
+          <div class="center">
+            <el-switch v-model="ruleForm.isAutoSoldStock" :active-value="1" :inactive-value="0"></el-switch>
+            <el-text type="info">当绑定的任何一种耗材库存不足时，商品自动售罄</el-text>
+          </div>
+        </el-form-item>
+        <el-form-item label="退菜是否退库存">
+          <div class="column">
+            <div>
+              <el-radio-group v-model="ruleForm.refundMode">
+                <el-radio label="退菜退库存" :value="1"></el-radio>
+                <el-radio label="仅退菜不退库存" :value="2"></el-radio>
+                <el-radio label="每次询问-退菜后弹窗提示，可手动选择" :value="3"></el-radio>
+              </el-radio-group>
+            </div>
+            <div>
+              <el-text type="danger">当前店铺退菜退库存规则：{{ shopInfoTypeFilter(shopInfo.refundMode) }}</el-text>
+            </div>
+          </div>
+        </el-form-item>
+      </div>
+      <el-form-item label="关联推荐商品" v-show="addFormType == 3">
         <div class="column">
           <div class="row">
             <div class="center">
@@ -313,10 +401,62 @@ import Sortable from "sortablejs";
 import { useTagsViewStore } from "@/store";
 import selecProductDialog from "@/views/marketing_center/group_booking/components/selecProductDialog.vue";
 
+const route = useRoute();
 const selecProductDialogRef = ref(null)
 const goodsListMax = ref(9)
 
+const addFormType = ref(1)
+
+const consOptions = ref([])
+
+// let haocaiData = ref({
+//   consList: [
+//     {
+//       productId: '',
+//       consInfoId: "",
+//       surplusStock: "0",
+//     }
+//   ]
+// });
+
+// 生成新商品绑定耗材关系项
+function createItem(val) {
+  let item = {
+    productId: '',
+    consInfoId: "",
+    surplusStock: "",
+  };
+  ruleForm.consList.push(item);
+}
+
+// 商品选择耗材
+function selectionChange(e, row) {
+  let item = consOptions.value.find((item) => item.id == e);
+  row.name = item.conName;
+  row.conUnit = item.conUnit;
+}
+
+// 获取耗材列表
+async function gethaocaiList() {
+  try {
+    let res = await UserAPI3.productconsList({ id: route.query.id });
+    console.log('获取耗材列表', res);
+    consOptions.value = res || [];
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+const shopInfo = ref('')
+
+function shopInfoTypeFilter(t) {
+  if (t == 1) return '跟随商品分类'
+  if (t == 2) return '跟随单商品'
+}
+
 onMounted(() => {
+  shopInfo.value = JSON.parse(localStorage.getItem('userInfo'))
+  gethaocaiList()
   // Sortable 需要在 el-table 渲染 tbody 后初始化，尝试多次以确保 DOM 可用
   const initSortable = async () => {
     await nextTick();
@@ -520,7 +660,10 @@ const ruleForm = reactive<RuleForm>({
   // 排序值
   sort: 1,
   selectSpecInfo: {},
-  relatedRecommendJson: [] // 关联推荐商品
+  relatedRecommendJson: [], // 关联推荐商品
+  consList: [], // 耗材列表
+  refundMode: 1, // 退菜是否退库存 1退菜退库存 2仅退菜不退库存 3每次询问-退菜后弹窗提示
+  isAutoSoldStock: 0, // 是否自动售罄
 });
 const rules = reactive<FormRules<RuleForm>>({
   name: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -584,6 +727,14 @@ async function tbProductGetDetail(id: any) {
   } else {
     list.value = ruleForm.skuList;
   }
+
+  // if (res.consList.length == 0) {
+  //   ruleForm.consList.push({
+  //     productId: '',
+  //     consInfoId: "",
+  //     surplusStock: "0",
+  //   })
+  // }
 }
 // 选择套餐商品sku
 function selectSkuHandle(item: any, index: number) {
@@ -1088,4 +1239,8 @@ const resetForm = (formEl: FormInstance | undefined) => {
     font-size: 14px;
   }
 }
+
+.header-wrap {
+  padding-bottom: 20px;
+}
 </style>

src/views/product/indexconfig/content.ts

@@ -9,6 +9,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
   table: {
     border: true,
     highlightCurrentRow: true,
+    expandRowKeys: [],
     rowKey: 'id',
     treeProps: {
       children: 'skuList' // 指定子节点存储的字段为 customChildren
@@ -72,13 +73,13 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       name: "sync",
       auth: "import",
     },
-    {
-      icon: "edit",
-      text: "库存预警",
-      type: "danger",
-      name: "custom1",
-      auth: "import",
-    },
+    // {
+    //   icon: "edit",
+    //   text: "库存预警",
+    //   type: "danger",
+    //   name: "custom1",
+    //   auth: "import",
+    // },
     {
       icon: "Download",
       text: "导出",
@@ -97,15 +98,15 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       slotName: "type",
     },
     // { label: "库存", align: "center", prop: "stockNumber" },
-    { label: "库存", align: "center", slotName: "kucunedit", templet: "custom", prop: "stockNumber" },
+    // { label: "库存", align: "center", slotName: "kucunedit", templet: "custom", prop: "stockNumber" },
     { label: "耗材信息", align: "center", prop: "consName", slotName: "consumables", templet: "custom", },
-    {
-      label: "库存开关",
-      align: "center",
-      prop: "isStock",
-      templet: "custom",
-      slotName: "isStock",
-    },
+    // {
+    //   label: "库存开关",
+    //   align: "center",
+    //   prop: "isStock",
+    //   templet: "custom",
+    //   slotName: "isStock",
+    // },
     {
       label: "上架",
       align: "center",
@@ -121,9 +122,16 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       slotName: "sellOut",
     },
     {
-      label: "退款退回库存",
+      label: "自动售罄",
       align: "center",
-      prop: "isRefundStock",
+      prop: "isAutoSoldStock",
+      templet: "custom",
+      slotName: "autoSellOut",
+    },
+    {
+      label: "退菜是否退库存",
+      align: "center",
+      prop: "refundMode",
       templet: "custom",
       slotName: "tuikuantuihui",
     },
@@ -133,7 +141,11 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: [{ text: "报损", name: '' }, { text: "编辑", icon: 'edit', name: "edit" }, { text: "删除", icon: 'delete', type: 'danger', name: "delete" }],
+      operat: [
+        { text: "报损", icon: '', name: 'cons' },
+        { text: "报损记录", name: 'consRecord' },
+        { text: "编辑", icon: 'edit', name: "edit" },
+        { text: "删除", icon: 'delete', type: 'danger', name: "delete" }],
     },
   ],
 };

src/views/shop/config/components/shopInfo.vue

@@ -52,12 +52,29 @@
             <el-radio value="after">餐饮版（先下单后支付）</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否允许用户自行支付" prop="isUserPay" v-if="form.registerType === 'after'">
+          <div class="column">
+            <div class="center" style="display: flex; align-items: center; gap: 14px">
+              <el-switch v-model="form.isUserPay" :active-value="1" :inactive-value="0"></el-switch>
+              <div class="tips" style="font-size: 14px; color: #999">
+                关闭后，用户将不能自行支付
+              </div>
+            </div>
+          </div>
+        </el-form-item>
+
         <el-form-item label="就餐模式「多选」" prop="eatModel">
           <el-checkbox-group v-model="form.eatModel">
             <el-checkbox value="dine-in">堂食自取</el-checkbox>
             <el-checkbox value="take-out">允许打包</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
+        <el-form-item label="退菜退库存模式">
+          <el-radio-group :model-value="form.refundMode" @change="refundModeChange">
+            <el-radio label="跟随商品分类" :value="1"></el-radio>
+            <el-radio label="跟随单商品" :value="2"></el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- <el-form-item label="积分群体">
           <el-radio-group v-model="form.consumeColony">
             <el-radio label="all">所有</el-radio>
@@ -172,6 +189,7 @@
             </div>
           </div>
         </el-form-item>
+
         <el-form-item label="上菜时间（分钟）" prop="isServeTimeControl">
           <div class="column">
             <div class="center" style="display: flex; align-items: center; gap: 14px">
@@ -341,7 +359,33 @@ export default {
   mounted() {
     this.tbShopInfo();
   },
+  watch: {
+    "form.registerType"(val) {
+      console.log(val);
+      if (val === "before") {
+        this.form.isUserPay = 1;
+      }
+    },
+  },
   methods: {
+    // 切换退菜退库存模式
+    refundModeChange(value) {
+      console.log('refundModeChange===', value);
+      const m = {
+        1: {
+          1: '跟随商品分类',
+          2: '商品分类'
+        },
+        2: {
+          1: '跟随单商品模式',
+          2: '商品列表'
+        }
+      }
+
+      ElMessageBox.confirm(`当前操作：将《退菜退库存》模式切换为「${m[value][1]}」本操作将会影响耗材库存数量的统计请谨慎操作修改后，可前往「商品管理-${m[value][2]}」中编辑/查看配置`, '提示', { showClose: false, showCancelButton: false }).then(() => {
+        this.form.refundMode = value
+      }).catch(() => { })
+    },
     chooseAddressConfirm(e) {
       console.log(e);
       this.$refs.refChooseAddress.close();

src/views/tool/Instead/components/goods-item.vue

@@ -27,6 +27,7 @@
     </div>
     <div class="status" v-if="
       item.isSoldStock ||
+      item.isSoldOut ||
       !item.isSale ||
       !item.isSaleTime ||
       (item.isStock && item.stockNumber * 1 <= 0)
@@ -37,8 +38,8 @@
         ElMessage.error('该商品不在可售时间内') ||
         isProductAvailable(item.days, item.startTime, item.endTime)
         " v-else-if="!item.isSaleTime" iconClass="no-sale" color="#fff" size="60"></svg-icon>
-      <svg-icon @click="ElMessage.error('该商品已售罄')" v-else-if="item.isSoldStock" iconClass="shouqing" color="#fff"
-        size="60"></svg-icon>
+      <svg-icon @click="ElMessage.error('该商品已售罄')" v-else-if="item.isSoldStock || item.isSoldOut" iconClass="shouqing"
+        color="#fff" size="60"></svg-icon>
       <svg-icon @click="ElMessage.error('库存不足')" v-else-if="item.isStock && item.stockNumber * 1 <= 0"
         iconClass="stock_null" color="#fff" size="60"></svg-icon>
     </div>

src/views/tool/Instead/components/return-cart.vue

@@ -41,13 +41,8 @@
     </div>
 
     <div class="u-flex u-flex-wrap tags">
-      <div
-        class="tag"
-        v-for="(tag, index) in tags"
-        @click="changeSel(tag)"
-        :key="index"
-        :class="{ active: tag.checked }"
-      >
+      <div class="tag" v-for="(tag, index) in tags" @click="changeSel(tag)" :key="index"
+        :class="{ active: tag.checked }">
         {{ tag.label }}
       </div>
     </div>
@@ -64,10 +59,15 @@
       </div>
     </template>
   </el-dialog>
+  <!-- 退款退菜推库存的操作弹窗 -->
+  <refundConsModal ref="refundConsModalRef" :list="refundList" @success="refundConsModalSuccess" />
 </template>
-  <script>
+<script>
 import { ElMessage } from "element-plus";
+import { useCartsStore } from '@/store/modules/carts'
+import refundConsModal from "@/components/refundConsModal.vue";
 export default {
+  components: { refundConsModal },
   props: {
     modal: {
       type: Boolean,
@@ -90,6 +90,9 @@ export default {
       goods: {
         productId: -999,
       },
+      refundList: [],
+      refundStock: '',
+      note: ''
     };
   },
   computed: {
@@ -132,34 +135,79 @@ export default {
       this.show = false;
       this.number = 1;
     },
+    // 选择退库存模式后
+    refundConsModalSuccess(e) {
+      this.refundStock = e
+      this.refundNext()
+    },
+    refundNext() {
+      this.$emit("confirm", {
+        refundReason: this.note,
+        refundAmount: 0,
+        refundDetails: [{ id: this.goods.id, num: this.number, returnAmount: 0 }],
+        refundStock: this.refundStock
+      });
+      this.close();
+    },
+    // 确认退菜
     confirm() {
       const selTag = this.tags
         .filter((item) => item.checked)
         .map((item) => item.label)
         .join(",");
-      const note = selTag + (this.note.length > 0 ? "," + this.note : "");
-      console.log(note);
-      if (!note) {
+      this.note = selTag + (this.note.length > 0 ? "," + this.note : "");
+
+      if (!this.note) {
         return ElMessage.error("请输入退菜原因");
       }
-      this.$emit("confirm", {
-        refundReason: note,
-        refundAmount: 0,
-        refundDetails: [{ id: this.goods.id, num: this.number, returnAmount: 0 }],
-      });
-      this.close();
+
+      const carts = useCartsStore();
+      let categorys = JSON.parse(localStorage.getItem('categorys'))
+      let shopInfo = JSON.parse(localStorage.getItem('userInfo'))
+
+      // 在这里给订单的商品补全库存信息 start
+      carts.goods.forEach(val => {
+        if (this.goods.productId == val.id) {
+          if (shopInfo.refundMode == 1) {
+            // 跟随分类退款模式
+            categorys.forEach(v => {
+              if (val.categoryId == v.id) {
+                this.goods.refundMode = v.refundMode
+              }
+            })
+          } else {
+            // 跟随商品退款模式及
+            this.goods.refundMode = val.refundMode
+          }
+        }
+      })
+
+      console.log('this.goods===', this.goods);
+      if (this.goods.refundMode == 3) {
+        this.refundList = [
+          {
+            name: this.goods.product_name,
+            num: this.number
+          }
+        ]
+        this.$refs.refundConsModalRef.show()
+        return
+      }
+      // 在这里给订单的商品补全库存信息 end
+      this.refundNext()
     },
   },
-  mounted() {},
+  mounted() { },
 };
 </script>
-  
-  <style lang="scss" scoped>
+
+<style lang="scss" scoped>
 :deep(.el-dialog__body) {
   margin-bottom: 14px;
   margin-top: 14px;
   padding: 0 20px;
 }
+
 :deep(.el-tag) {
   margin-top: 10px;
   margin-right: 10px;
@@ -169,6 +217,7 @@ export default {
   line-height: 35px;
   height: 35px;
 }
+
 .tags {
   .tag {
     margin: 10px 10px 0 0;
@@ -178,6 +227,7 @@ export default {
     font-size: 14px;
     color: #000;
     cursor: pointer;
+
     &.active {
       color: #1890ff;
       background: #e8f4ff;
@@ -185,10 +235,12 @@ export default {
     }
   }
 }
+
 :deep(.number-box .el-input__inner::-webkit-inner-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
+
 :deep(.number-box .el-input__inner::-webkit-outer-spin-button) {
   -webkit-appearance: none;
   margin: 0;

src/views/tool/Instead/index.vue

@@ -665,6 +665,7 @@ function getCategoryList() {
       size: 200,
     })
     .then((res) => {
+      localStorage.setItem('categorys', JSON.stringify(res))
       res.unshift({ name: "全部", id: "" });
       category.list = res;
     });

src/views/user/charge/data.ts

@@ -8,13 +8,18 @@
 // adminIn 管理员充值
 // adminOut管理员消费
 export const $bizCode = {
-  cashIn: "现金充值",
+  cashIn: "会员充值",
+  cashback: "消费返现",
+  cashback_refund: "消费返现扣减",
+  freeIn: "霸王餐充值",
+  awardIn: "充值奖励",
   wechatIn: "微信小程序充值",
   alipayIn: "支付宝小程序充值",
-  awardIn: "充值奖励",
-  rechargeRefund: "充值退款",
-  orderPay: "订单消费",
+  orderPay: "订单支付奖励",
   orderRefund: "订单退款",
-  adminIn: "管理员充值",
-  adminOut: "管理员消费",
+  rechargeRefund: "充值退款",
+  rechargeCashRefund: "会员现金退款",
+  adminIn: "管理员手动增减余额",
+  adminOut: "管理员退款充值",
+  rechargeRedemption: "充值兑换码"
 }