README.md

@@ -4,7 +4,7 @@
 
 ## 正式宝塔
 
-<https://121.40.128.145:38279/mianban/>
+<https://121.40.128.145:38279/>
 chaozg
 chaozg123
 

src/api/account/menu.ts

@@ -9,12 +9,6 @@ const MenuApi = {
       method: "get",
     });
   },
-  getCashMenus() {
-    return request<any, CashMenu[]>({
-      url: `${baseURL}/list/cash`,
-      method: "get",
-    });
-  },
   /**获取所有菜单 */
   getList(data: getListRequest) {
     return request<any, MenuVO[]>({
@@ -54,13 +48,6 @@ const MenuApi = {
 };
 
 export default MenuApi;
-export interface CashMenu {
-  component?: null | string;
-  menuId: number;
-  name: null | string;
-  path?: null | string;
-  [property: string]: any;
-}
 
 /** RouteVO，路由对象 */
 export interface RouteVO {

src/api/account/role.ts

@@ -33,11 +33,11 @@ const RoleApi = {
     });
   },
   // 获取角色对应的菜单id
-  getMenu(id: number, type: number = 0) {
+  getMenu(id: number) {
     return request<any, any[]>({
       url: `${baseURL}/menu`,
       method: "get",
-      params: { id, type },
+      params: { id },
     });
   },
 };

src/components/CURD/PageContent.vue

@@ -515,7 +515,6 @@ import {
 import ExcelJS from "exceljs";
 import { reactive, ref } from "vue";
 import type { IContentConfig, IObject, IOperatData } from "./types";
-import { el } from "element-plus/es/locale";
 
 // 定义接收的属性
 const props = defineProps<{
@@ -593,45 +592,6 @@ const selectionData = ref<IObject[]>([]);
 // 删除ID集合 用于批量删除
 const removeIds = ref<(number | string)[]>([]);
 function handleSelectionChange(selection: any[]) {
-  console.log("selectionData.value", selectionData.value);
-
-  // if(selection.length==0){
-  //   selectionData.value=selectionData.value.filter((item) => {
-  //     return pageData.value.find(v=>v[pk]===item[pk])!=undefined
-  //   });
-  // }else{
-  //   selectionData.value=selectionData.value.filter((item) => {
-  //     return pageData.value.find(v=>v[pk]===item[pk])==undefined
-  //   });
-  // }
-
-  //之前有选中，现在置空
-  if (selection.length == 0 && selectionData.value.length > 0) {
-    defaultSelData.value = defaultSelData.value.filter((item) => {
-      return pageData.value.find((v) => v[pk] === item[pk]) != undefined;
-    });
-  }
-  //之前没有选中，现在有
-  if (selection.length > 0 && selectionData.value.length == 0) {
-    defaultSelData.value = selection;
-  }
-  //之前有选中，现在有
-  if (selection.length > 0 && selectionData.value.length > 0) {
-    defaultSelData.value = defaultSelData.value.filter((item) => {
-      const isNowPageData = pageData.value.find((v) => v[pk] === item[pk]);
-      if (isNowPageData) {
-        return selection.find((v) => v[pk] === item[pk]) != undefined;
-      } else {
-        return true;
-      }
-    });
-    for (let i of selection) {
-      if (defaultSelData.value.find((v) => v[pk] === i[pk]) == undefined) {
-        defaultSelData.value.push(i);
-      }
-    }
-  }
-  console.log("defaultSelData.value", defaultSelData.value);
   selectionData.value = selection;
   removeIds.value = selection.map((item) => item[pk]);
 }
@@ -1030,9 +990,6 @@ function fetchPageData(formData: IObject = {}, isRestart = false) {
       } else {
         pageData.value = data;
       }
-      nextTick(() => {
-        setSelectTable(defaultSelData.value);
-      });
     })
     .finally(() => {
       loading.value = false;
@@ -1073,42 +1030,14 @@ function saveXlsx(fileData: BlobPart, fileName: string) {
   document.body.removeChild(downloadLink);
   window.URL.revokeObjectURL(downloadUrl);
 }
-function test(rows: any[]) {}
+function test(rows: any[]) {
-
+  console.log(tableRef, "tioshi222222222222222222222");
-const defaultSelData = ref<IObject[]>([]);
+  // rows.forEach((row) => {
-// 设置默认选择
+  //   tableRef.value!.toggleRowSelection(row, undefined)
-function setSelectTable(rows: any[]) {
+  // })
-  selectionData.value = rows;
-  defaultSelData.value = rows;
-  pageData.value.forEach((element: IObject) => {
-    rows.forEach((row) => {
-      if (element.id == row.id) {
-        console.log("selected", element);
-        tableRef.value!.toggleRowSelection(element, true);
-      }
-    });
-  });
 }
-//清除选中
-function clearSelectTable() {
-  selectionData.value = [];
-  defaultSelData.value = [];
-  pageData.value.forEach((element: IObject) => {
-    tableRef.value!.toggleRowSelection(element, false);
-  });
-}
-
 // 暴露的属性和方法
-defineExpose({
+defineExpose({ fetchPageData, exportPageData, getFilterParams, getselectTable, pagination, test });
-  clearSelectTable,
-  fetchPageData,
-  exportPageData,
-  getFilterParams,
-  getselectTable,
-  pagination,
-  test,
-  setSelectTable,
-});
 </script>
 
 <style lang="scss" scoped>

src/components/mycomponents/myDialog.vue

@@ -1,44 +1,45 @@
 <template>
-  <el-dialog v-model="dialogVisible" :title="props.title" :width="props.width" @close="close">
+  <el-dialog v-model="dialogVisible" :title="props.title" :width="props.width">
     <slot></slot>
     <template #footer>
       <span class="dialog-footer">
-        <el-button @click="close">取消</el-button>
+        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="Confirm">确定</el-button>
+        <el-button type="primary" @click="Confirm">
+          确定
+        </el-button>
       </span>
     </template>
   </el-dialog>
 </template>
 
 <script lang="ts" setup>
-import { ref } from "vue";
+import { ref } from 'vue'
-import { ElMessageBox } from "element-plus";
+import { ElMessageBox } from 'element-plus'
 
 let props = defineProps({
   title: {
     type: String,
-    default: "Dialog",
+    default: 'Dialog'
   },
   width: {
     type: String,
-    default: "30%",
+    default: '30%'
-  },
+  }
-});
+})
-const emit = defineEmits(["confirm", "close"]);
+const emit = defineEmits(['confirm'])
-const dialogVisible = ref(false);
+const dialogVisible = ref(false)
+
 
 function open() {
-  dialogVisible.value = true;
+  dialogVisible.value = true
 }
-
 function Confirm() {
-  emit("confirm");
+  emit('confirm')
 }
 function close() {
-  dialogVisible.value = false;
+  dialogVisible.value = false
-  emit("close");
 }
-defineExpose({ open, close });
+defineExpose({ open, close })
 </script>
 <style scoped>
 .dialog-footer button:first-child {

src/data/menus.ts

@@ -1,98 +0,0 @@
-//收银机菜单列表
-export const casher_windows_menus = [
-  {
-    title: '销售汇总',
-    icon: '/static/indexImg/PAGE_SALES_SUMMARY.svg',
-    pageUrl: 'PAGES_SALES_SUMMARY'
-  },
-  {
-    title: '代客下单',
-    icon: '/static/indexImg/icon-substitute-ordering.svg',
-    pageUrl: 'PAGES_CREATE_ORDER',
-  },
-  {
-    title: '桌台',
-    icon: '/static/indexImg/icon-table.svg',
-    pageUrl: 'PAGES_TABLE'
-  },
-  {
-    title: '商品管理',
-    icon: '/static/indexImg/icon-product-control.svg',
-    pageUrl: 'PAGES_PRODUCT'
-  },
-  {
-    title: '分组管理',
-    icon: '/static/indexImg/goods-group.svg',
-    pageUrl: 'PAGES_GOODS_GROUP'
-  },
-  {
-    title: '分类管理',
-    icon: '/static/indexImg/icon-category.svg',
-    pageUrl: 'PAGES_CATEGORY'
-  },
-  {
-    title: '会员管理',
-    icon: '/static/indexImg/icon-user.svg',
-    pageUrl: 'PAGES_USER_CONTROL'
-  },
-  {
-    title: '员工管理',
-    icon: '/static/indexImg/icon-staff.svg',
-    pageUrl: 'PAGES_STAFF'
-  },
-  {
-    title: '耗材管理',
-    icon: '/static/indexImg/PAGE_SALES_SUMMARY.svg',
-    pageUrl: 'PAGES_SALES_CONSUMABLES'
-  },
-  {
-    title: '订单管理',
-    icon: '/static/indexImg/icon-order.svg',
-    pageUrl: 'PAGES_ORDER_INDEX'
-  },
-  {
-    title: '设备管理',
-    icon: '/static/indexImg/icon-printer.svg',
-    pageUrl: 'PAGES_PRINTER_INDEX'
-  },
-  {
-    title: '交班',
-    icon: '/static/indexImg/icon-work.svg',
-    pageUrl: 'PAGES_WORK_INDEX'
-  },
-  {
-    title: '排队',
-    icon: '/static/indexImg/icon-line-up.svg',
-    pageUrl: 'PAGES_LINE_UP'
-  },
-  {
-    title: '霸王餐',
-    icon: '/static/indexImg/icon-bwc.svg',
-    pageUrl: 'PAGES_BWC'
-  },
-  {
-    title: '优惠券',
-    icon: '/static/coupon/icon_coupon.svg',
-    pageUrl: 'PAGES_COUPON_INDEX'
-  },
-  {
-    title: '订阅通知',
-    icon: '/static/indexImg/icon-notification.svg',
-    pageUrl: 'PAGES_NOTIFICATION_INDEX'
-  },
-  {
-    title: '挂账管理',
-    icon: '/static/indexImg/icon_credit.svg',
-    pageUrl: 'PAGES_CREDIT_BUYER_INDEX'
-  },
-  {
-    title: '核销管理',
-    icon: '/static/indexImg/pagewriteoff.svg',
-    pageUrl: 'PAGES_WEITEOFF'
-  },
-  {
-    title: '退出登录',
-    icon: '/static/indexImg/icon-login-out.svg',
-    pageUrl: 'PAGES_LOGIN',
-  }
-]

src/store/modules/carts.ts

@@ -22,11 +22,6 @@ export const useCartsStore = defineStore("carts", () => {
   let dinnerType = ref<string>('dine-in');
 
 
-  //就餐模式 先付 后付
-  const isPayBefore = computed(() => {
-    return shopUser.userInfo.registerType == 'before' ? true : false;
-  });
-
 
   //是否启用会员价
   const useVipPrice = computed(() => {
@@ -781,7 +776,7 @@ export const useCartsStore = defineStore("carts", () => {
     changeTable,
     rotTable,
     getGoods,
-    setGoodsMap, isPayBefore
+    setGoodsMap
   };
 });
 

src/views/admin/system/menu/index.vue

@@ -233,49 +233,6 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="小程序路径" prop="miniPath">
-          <el-input v-model="formData.miniPath" placeholder="pages/index/index" />
-        </el-form-item>
-        <el-form-item label="小程序组件" prop="miniComponent">
-          <el-input v-model="formData.miniComponent" placeholder="小程序组件名称" />
-        </el-form-item>
-        <el-form-item label="小程序图标">
-          <single-image-upload
-            style="width: 100px; height: 100px"
-            v-model="formData.miniIcon"
-          ></single-image-upload>
-        </el-form-item>
-        <el-form-item label="接口路径" prop="miniPage">
-          <div class="w-full">
-            <div>
-              <el-button @click="apiInfoPush" icon="plus" type="primary">添加</el-button>
-            </div>
-            <div class="u-flex u-m-t-10" v-for="(item, index) in formData.apiInfo" :key="index">
-              <el-form-item label="请求方式" label-position="left">
-                <el-select v-model="item.method" style="width: 100px">
-                  <el-option
-                    v-for="(item, index) in apiMethodOptions"
-                    :key="index"
-                    :value="item.value"
-                  >
-                    {{ item.label }}
-                  </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="接口地址" style="flex: 1">
-                <el-input v-model="item.url" placeholder="支持通配符*和?" />
-              </el-form-item>
-              <el-icon
-                style="margin-left: 10px"
-                size="20"
-                color="#F56c6c"
-                @click="formData.apiInfo.splice(index, 1)"
-              >
-                <RemoveFilled />
-              </el-icon>
-            </div>
-          </div>
-        </el-form-item>
         <el-form-item v-if="formData.type !== MenuTypeEnum.BUTTON" prop="hidden" label="显示状态">
           <el-radio-group v-model="formData.hidden">
             <el-radio :value="1">隐藏</el-radio>
@@ -345,19 +302,7 @@ const dialog = reactive({
   title: "新增菜单",
   visible: false,
 });
-const apiMethodOptions = ref([
+
-  { value: "All", label: "All" },
-  { value: "GET", label: "GET" },
-  { value: "POST", label: "POST" },
-  { value: "PUT", label: "PUT" },
-  { value: "DELETE", label: "DELETE" },
-]);
-function apiInfoPush() {
-  if (!formData.value.apiInfo) {
-    formData.value.apiInfo = [];
-  }
-  formData.value.apiInfo.push({ method: "All", url: "" });
-}
 // 查询参数
 const queryParams = reactive<getListRequest>({});
 // 菜单表格数据
@@ -381,10 +326,6 @@ const initialeditRequestData = ref<editRequest>({
   path: "",
   component: "",
   name: "",
-  miniPath: "",
-  miniComponent: "",
-  miniIcon: "",
-  apiInfo: [],
 });
 // 菜单表单数据
 const formData = ref({ ...initialeditRequestData.value });
@@ -473,7 +414,6 @@ function handleOpenDialog(pid?: string, menuId?: string) {
             path: data.path || "", // Ensure path is always a string
             title: data.title || "", // Ensure title is always a string
             type: data.type ?? 0, // Ensure type is always a number
-            apiInfo: data.apiInfo ? JSON.parse(data.apiInfo) : [],
           };
         });
       } else {

src/views/admin/system/role/index.vue

@@ -3,12 +3,7 @@
     <div class="search-bar">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-form-item prop="keywords" label="关键字">
-          <el-input
+          <el-input v-model="queryParams.key" placeholder="角色名称" clearable @keyup.enter="handleQuery" />
-            v-model="queryParams.key"
-            placeholder="角色名称"
-            clearable
-            @keyup.enter="handleQuery"
-          />
         </el-form-item>
 
         <el-form-item>
@@ -26,14 +21,8 @@
         </el-button> -->
       </div>
 
-      <el-table
+      <el-table ref="dataTableRef" v-loading="loading" :data="roleList" highlight-current-row :border="true"
-        ref="dataTableRef"
+        @selection-change="handleSelectionChange">
-        v-loading="loading"
-        :data="roleList"
-        highlight-current-row
-        :border="true"
-        @selection-change="handleSelectionChange"
-      >
         <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="角色名称" prop="name" />
         <el-table-column label="角色级别" prop="level" />
@@ -41,60 +30,33 @@
         <el-table-column label="创建日期" prop="createTime" />
         <el-table-column fixed="right" label="操作" width="220">
           <template #default="scope">
-            <el-button
+            <el-button type="primary" size="small" link icon="position" @click="handleOpenAssignPermDialog(scope.row)">
-              type="primary"
-              size="small"
-              link
-              icon="position"
-              @click="handleOpenAssignPermDialog(scope.row)"
-            >
               分配菜单
             </el-button>
-            <el-button
+            <el-button type="primary" size="small" link icon="edit" @click="handleOpenDialog(scope.row)">
-              type="primary"
-              size="small"
-              link
-              icon="edit"
-              @click="handleOpenDialog(scope.row)"
-            >
               编辑
             </el-button>
-            <el-button
+            <el-button v-if="scope.row.level > 0" type="danger" size="small" link icon="delete"
-              type="danger"
+              @click="handleDelete(scope.row.id)">
-              size="small"
-              link
-              icon="delete"
-              @click="handleDelete(scope.row.id)"
-            >
               删除
             </el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination
+      <pagination v-if="total > 0" v-model:total="total" v-model:page="queryParams.page"
-        v-if="total > 0"
+        v-model:limit="queryParams.size" @pagination="handleQuery" />
-        v-model:total="total"
-        v-model:page="queryParams.page"
-        v-model:limit="queryParams.size"
-        @pagination="handleQuery"
-      />
     </el-card>
 
     <!-- 角色表单弹窗 -->
-    <el-dialog
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" @close="handleCloseDialog">
-      v-model="dialog.visible"
-      :title="dialog.title"
-      width="500px"
-      @close="handleCloseDialog"
-    >
       <el-form ref="addRequestRef" :model="formData" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="name">
           <el-input v-model="formData.name" placeholder="请输入角色名称" />
         </el-form-item>
 
         <el-form-item label="角色等级" prop="level">
-          <el-input-number placeholder="角色等级" v-model="formData.level"></el-input-number>
+          <el-input-number v-model="formData.level" placeholder="角色等级" :min="1" :precision="0" />
         </el-form-item>
 
         <!-- <el-form-item label="数据菜单" prop="dataScope">
@@ -106,12 +68,12 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="描述" prop="description">
-          <el-input type="textarea" v-model="formData.description" placeholder="描述" />
+          <el-input v-model="formData.description" type="textarea" placeholder="描述" />
+        </el-form-item>
+
+        <el-form-item label="菜单分配" prop="menuIdList">
+          <menuSelect ref="refmenuSelect" v-model="formData.menuIdList" />
         </el-form-item>
-        <el-alert title="角色菜单请点击角色列表的分配菜单按钮编辑" type="success" effect="dark" />
-        <!-- <el-form-item label="菜单分配" prop="menuIdList">
-          <menuSelect ref="refmenuSelect" v-model="formData.menuIdList"></menuSelect>
-        </el-form-item> -->
       </el-form>
 
       <template #footer>
@@ -123,22 +85,7 @@
     </el-dialog>
 
     <!-- 分配菜单弹窗 -->
-    <el-drawer v-model="assignPermDialogVisible" size="500">
+    <el-drawer v-model="assignPermDialogVisible" :title="'【' + checkedRole.name + '】菜单分配'" size="500">
-      <template #header>
-        <div>
-          <div>
-            <h3>
-              {{ "【" + checkedRole.name + "】菜单分配" }}
-            </h3>
-          </div>
-          <div>
-            <el-form-item label="平台类型">
-              <el-radio-group v-model="platformType" @change="handlePlatformTypeChange">
-                <el-radio :value="0">管理端</el-radio>
-                <el-radio :value="1">收银机</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </div>
       <div class="flex-x-between">
         <el-input v-model="permKeywords" clearable class="w-[150px]" placeholder="菜单菜单名称">
           <template #prefix>
@@ -153,11 +100,7 @@
             </template>
             {{ isExpanded ? "收缩" : "展开" }}
           </el-button>
-              <el-checkbox
+          <el-checkbox v-model="parentChildLinked" class="ml-5" @change="handleparentChildLinkedChange">
-                v-model="parentChildLinked"
-                class="ml-5"
-                @change="handleparentChildLinkedChange"
-              >
             父子联动
           </el-checkbox>
 
@@ -171,42 +114,14 @@
           </el-tooltip>
         </div>
       </div>
-        </div>
+
-      </template>
+      <el-tree ref="permTreeRef" node-key="value" show-checkbox :data="menuPermOptions"
-      <div class="u-relative" style="overflow-x: hidden">
+        :filter-node-method="handlePermFilter" :default-expand-all="true" :check-strictly="!parentChildLinked"
-        <el-tree
+        class="mt-5">
-          ref="permTreeRef"
-          node-key="value"
-          show-checkbox
-          :data="menuPermOptions"
-          :default-checked-keys="adminMenuIdList"
-          :filter-node-method="handlePermFilter"
-          :default-expand-all="true"
-          :check-strictly="!parentChildLinked"
-          class="mt-5"
-        >
         <template #default="{ data }">
           {{ data.label }}
         </template>
       </el-tree>
-        <div
-          class="cashMenuIdList"
-          :style="{
-            transform: `translateX(${(platformType == 1 ? 0 : 1) * 100}%)`,
-          }"
-        >
-          <el-checkbox-group v-model="cashMenuIdList">
-            <el-checkbox
-              v-for="(item, index) in casher_windows_menus"
-              :key="index"
-              :value="item.menuId"
-            >
-              {{ item.name }}
-            </el-checkbox>
-          </el-checkbox-group>
-        </div>
-      </div>
-
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="handleAssignPermSubmit">确 定</el-button>
@@ -223,11 +138,11 @@ defineOptions({
   inheritAttrs: false,
 });
 import { useUserStore } from "@/store/modules/user";
-// import { casher_windows_menus } from "@/data/menus";
+
 const shopUser = useUserStore();
 import menuSelect from "./components/menus.vue";
 import RoleApi, { SysRole, addRequest, getListRequest } from "@/api/account/role";
-import MenuAPI, { type RouteVO, CashMenu } from "@/api/account/menu";
+import MenuAPI, { type RouteVO } from "@/api/account/menu";
 
 const queryFormRef = ref();
 const addRequestRef = ref();
@@ -253,7 +168,6 @@ const menuPermOptions = ref<RouteVO[]>([]);
 const dialog = reactive({
   title: "",
   visible: false,
-  row: {},
 });
 // 角色表单
 const formData = reactive<addRequest>({
@@ -265,7 +179,7 @@ const formData = reactive<addRequest>({
   menuIdList: [],
   description: "",
 });
-const cashMenuIdList = ref<number[]>([]);
+
 const rules = reactive({
   name: [{ required: true, message: "请输入角色名称", trigger: "blur" }],
   level: [{ required: false, message: "请输入角色等级", trigger: "blur" }],
@@ -284,14 +198,6 @@ const isExpanded = ref(true);
 
 const parentChildLinked = ref(false);
 
-const platformType = ref(0);
-function handlePlatformTypeChange(e: string | number | boolean | undefined) {
-  const value = Number(e); // Ensure the value is cast to a number
-  console.log("handlePlatformTypeChange");
-  platformType.value = value;
-  handleOpenAssignPermDialog(dialog.row);
-}
-
 // 查询
 function handleQuery() {
   loading.value = true;
@@ -322,16 +228,15 @@ function handleSelectionChange(selection: any) {
 // 打开角色弹窗
 async function handleOpenDialog(row: SysRole) {
   dialog.visible = true;
-  dialog.row = row;
   if (row && row.id) {
     dialog.title = "修改角色";
     //获取角色菜单列表
-    const data = await RoleApi.getMenu(row.id, platformType.value);
+    const data = await RoleApi.getMenu(row.id);
     console.log(data);
     Object.assign(formData, row);
     formData.menuIdList = data;
     setTimeout(() => {
-      // refmenuSelect.value.setChecked(data);
+      refmenuSelect.value.setChecked(data);
     }, 300);
     console.log(formData);
   } else {
@@ -343,12 +248,11 @@ async function handleOpenDialog(row: SysRole) {
 function handleSubmit() {
   addRequestRef.value.validate((valid: any) => {
     if (valid) {
-      // const checkedMenuIds: number[] = refmenuSelect.value.getPerms();
+      const checkedMenuIds: number[] = refmenuSelect.value.getPerms();
       loading.value = true;
       const roleId = formData.id;
       if (roleId) {
-        // RoleApi.update(roleId, { ...formData, menuIdList: checkedMenuIds })
+        RoleApi.update(roleId, { ...formData, menuIdList: checkedMenuIds })
-        RoleApi.update(roleId, formData)
           .then(() => {
             ElMessage.success("修改成功");
             handleCloseDialog();
@@ -372,9 +276,9 @@ function handleSubmit() {
 
 // 关闭弹窗
 function handleCloseDialog() {
-  addRequestRef.value?.resetFields();
+  addRequestRef.value.resetFields();
-  addRequestRef.value?.clearValidate();
+  addRequestRef.value.clearValidate();
-  refmenuSelect.value?.reset();
+  refmenuSelect.value.reset();
   formData.id = undefined;
   formData.sort = 1;
   formData.status = 1;
@@ -426,13 +330,6 @@ function returnMenu(menu) {
   });
 }
 
-const casher_windows_menus = ref<CashMenu[]>([]);
-//获取收银机菜单
-async function getCashMenus() {
-  const res = await MenuAPI.getCashMenus();
-  console.log(res);
-  casher_windows_menus.value = res;
-}
 // 获取所有的菜单
 async function getMenuPermOptions() {
   let arr =
@@ -440,42 +337,26 @@ async function getMenuPermOptions() {
   menuPermOptions.value = returnMenu(arr);
 }
 getMenuPermOptions();
-getCashMenus();
-
-const adminMenuIdList = ref<number[]>([]);
 // 打开分配菜单菜单弹窗
 async function handleOpenAssignPermDialog(row: SysRole) {
   const roleId = row.id;
-  dialog.row = row;
   if (roleId) {
     assignPermDialogVisible.value = true;
     loading.value = true;
+
     checkedRole.value.id = roleId;
     checkedRole.value.name = row.name as string;
-    getMenuIds(roleId);
-  }
-}
-// 回显角色已拥有的菜单
 
-function getMenuIds(roleId: number) {
+    // 回显角色已拥有的菜单
-  roleId = roleId ? roleId : dialog.row.id;
+    RoleApi.getMenu(roleId)
-  if (!roleId) {
-    return;
-  }
-  RoleApi.getMenu(roleId, platformType.value)
       .then((data) => {
-      if (platformType.value == 0) {
         const checkedMenuIds = data;
-        adminMenuIdList.value = data;
+        checkedMenuIds.forEach((menuId) => permTreeRef.value!.setChecked(menuId, true, false));
-        // checkedMenuIds.forEach((menuId) => permTreeRef.value!.setChecked(menuId, true, false));
-      }
-      if (platformType.value == 1) {
-        cashMenuIdList.value = data;
-      }
       })
       .finally(() => {
         loading.value = false;
       });
+  }
 }
 
 // 分配菜单菜单提交
@@ -488,13 +369,7 @@ function handleAssignPermSubmit() {
       .map((node: any) => node.value);
 
     loading.value = true;
-    RoleApi.update(roleId, {
+    RoleApi.update(roleId, { name, menuIdList: checkedMenuIds })
-      name,
-      adminMenuIdList: checkedMenuIds,
-      cashMenuIdList: cashMenuIdList.value.filter((id) =>
-        casher_windows_menus.value.find((v) => v.menuId == id)
-      ),
-    })
       .then(() => {
         ElMessage.success("分配菜单成功");
         assignPermDialogVisible.value = false;
@@ -542,9 +417,6 @@ watch(
   (val) => {
     if (!val) {
       permTreeRef.value.setCheckedKeys([]);
-      platformType.value = 0;
-      cashMenuIdList.value = [];
-      adminMenuIdList.value = [];
     }
   }
 );
@@ -568,14 +440,3 @@ onMounted(() => {
   handleQuery();
 });
 </script>
-<style scoped lang="scss">
-.cashMenuIdList {
-  position: absolute;
-  box-sizing: border-box;
-  padding: var(--el-drawer-padding-primary);
-  inset: 0;
-  background-color: #fff;
-  z-index: 2;
-  transition: all 0.3s ease-in-out;
-}
-</style>

src/views/online-shop/goods-group.vue

@@ -4,18 +4,11 @@
     <template v-if="isA">
       <!-- 搜索 -->
 
+
       <!-- 列表 -->
-      <page-content
+      <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
-        ref="contentRef"
+        @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
-        :content-config="contentConfig"
+        @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
-        @add-click="handleAddClick"
-        @edit-click="handleEditClick"
-        @export-click="handleExportClick"
-        @search-click="handleSearchClick"
-        @toolbar-click="handleToolbarClick"
-        @operat-click="handleOperatClick"
-        @filter-change="handleFilterChange"
-      >
         <template #status="scope">
           <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
             {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
@@ -29,11 +22,7 @@
         </template>
         <template #mobile="scope">
           <el-text>{{ scope.row[scope.prop] }}</el-text>
-          <copy-button
+          <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
-            v-if="scope.row[scope.prop]"
-            :text="scope.row[scope.prop]"
-            style="margin-left: 2px"
-          />
         </template>
       </page-content>
 
@@ -62,11 +51,7 @@
       </page-modal> -->
 
       <!-- 编辑 -->
-      <page-modal
+      <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick">
-        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>
@@ -75,37 +60,23 @@
             <el-button type="primary" @click="addgoods">
               <el-icon>
                 <Plus />
-              </el-icon>
+              </el-icon>添加商品
-              添加商品
             </el-button>
             <!-- 选责商品列表 -->
-            <selectGoodslist
+            <selectGoodslist @deleteItememit="deleteItem($event)" :list="selectData"></selectGoodslist>
-              @deleteItememit="deleteItem($event)"
-              :list="selectData"
-            ></selectGoodslist>
           </div>
         </template>
         <template #addmanagementtime="scope">
           <template v-if="scope.formData.useTime == 1">
             {{ scope.formData }}
-            <el-time-picker
+            <el-time-picker value-format="HH:mm:ss" v-model="scope.formData.saleTime" is-range range-separator="到"
-              value-format="HH:mm:ss"
+              start-placeholder="开始时间" end-placeholder="结束时间" />
-              v-model="scope.formData.saleTime"
-              is-range
-              range-separator="到"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            />
           </template>
         </template>
       </page-modal>
     </template>
     <template v-else>
-      <page-content
+      <page-content ref="contentRef" :content-config="contentConfig2" @operat-click="handleOperatClick">
-        ref="contentRef"
-        :content-config="contentConfig2"
-        @operat-click="handleOperatClick"
-      >
         <template #status="scope">
           <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
             {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
@@ -114,31 +85,12 @@
       </page-content>
     </template>
     <!-- 新增添加商品 -->
-    <myDialog
+    <myDialog title="选择商品" width="50%" ref="myDialogRef" @Confirm="subitgood">
-      title="选择商品"
+      <page-search ref="searchRefs" :search-config="searchConfig2" @query-click="searchs"
-      width="50%"
+        @reset-click="handleResetClick" />
-      ref="myDialogRef"
+      <page-content ref="contentRefs" v-if="switchref" :content-config="contentConfig2" @add-click="handleAddClick"
-      @Confirm="subitgood"
+        @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
-      @close="resetSelectData"
+        @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
-    >
-      <page-search
-        ref="searchRefs"
-        :search-config="searchConfig2"
-        @query-click="searchs"
-        @reset-click="handleResetClick"
-      />
-      <page-content
-        ref="contentRefs"
-        v-if="switchref"
-        :content-config="contentConfig2"
-        @add-click="handleAddClick"
-        @edit-click="handleEditClick"
-        @export-click="handleExportClick"
-        @search-click="handleSearchClick"
-        @toolbar-click="handleToolbarClick"
-        @operat-click="handleOperatClick"
-        @filter-change="handleFilterChange"
-      >
         <template #status="scope">
           <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
             {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
@@ -152,14 +104,13 @@
         </template>
         <template #mobile="scope">
           <el-text>{{ scope.row[scope.prop] }}</el-text>
-          <copy-button
+          <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
-            v-if="scope.row[scope.prop]"
-            :text="scope.row[scope.prop]"
-            style="margin-left: 2px"
-          />
         </template>
       </page-content>
 
+
+
+
       <!-- <el-table :data="selectData" border style="width: 100%">
         <el-table-column prop="date" align="center" label="Date" />
         <el-table-column prop="address" align="center" label="Address" />
@@ -176,10 +127,7 @@
         </el-form-item>
         <el-form-item label="" v-if="selectData.length">
           <!-- 选责商品列表 -->
-          <selectGoodslist
+          <selectGoodslist @deleteItememit="deleteItem($event)" :list="selectData"></selectGoodslist>
-            @deleteItememit="deleteItem($event)"
-            :list="selectData"
-          ></selectGoodslist>
         </el-form-item>
         <el-form-item label="分组状态">
           <el-radio-group v-model="forms.status">
@@ -194,14 +142,8 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="时间选择" v-if="forms.useTime == 1">
-          <el-time-picker
+          <el-time-picker value-format="HH:mm:ss" v-model="forms.time" is-range range-separator="到"
-            value-format="HH:mm:ss"
+            start-placeholder="开始时间" end-placeholder="结束时间" />
-            v-model="forms.time"
-            is-range
-            range-separator="到"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
         </el-form-item>
         <el-form-item label="排列方式">
           <el-radio-group v-model="forms.sortMode">
@@ -232,8 +174,8 @@ import contentConfig2 from "./goodsGroupconfig/content2";
 import editModalConfig from "./goodsGroupconfig/edit";
 import searchConfig from "./goodsGroupconfig/search";
 import searchConfig2 from "./goodsGroupconfig/search2";
-import myDialog from "@/components/mycomponents/myDialog.vue";
+import myDialog from '@/components/mycomponents/myDialog.vue'
-import selectGoodslist from "./goodsGroupconfig/selectGoodslist.vue";
+import selectGoodslist from "./goodsGroupconfig/selectGoodslist.vue"
 import { isSyncStatus } from "@/utils/index";
 
 const {
@@ -255,56 +197,57 @@ const {
 } = usePage();
 
 if (isSyncStatus()) {
-  contentConfig.toolbar[0].hidden = true;
+  contentConfig.toolbar[0].hidden = true
-  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = true;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = true
-  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = true;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = true
-  contentConfig.cols[3].templet = "custom";
+  contentConfig.cols[3].templet = "custom"
 } else {
-  contentConfig.toolbar[0].hidden = false;
+  contentConfig.toolbar[0].hidden = false
-  contentConfig.cols[3].templet = "switch";
+  contentConfig.cols[3].templet = "switch"
-  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = false;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = false
-  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = false;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = false
 }
 
-let switchref = ref(false);
+let switchref = ref(false)
 
 // 新增
 async function handleAddClick() {
   addModalRef.value?.setModalVisible();
-  selectData.value = [];
+  selectData.value = []
   // 加载上级规格下拉数据源 
   // addModalConfig.formItems[2]!.attrs!.data = await UserAPI.getPage({ name: "" });
   // 加载角色下拉数据源
   // addModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
 }
-const myDialogRef = ref(null);
+const myDialogRef = ref(null)
-const myDialogRefAdd = ref(null);
+const myDialogRefAdd = ref(null)
-const elFormref = ref(null);
+const elFormref = ref(null)
-let title = ref("新增分组");
+let title = ref("新增分组")
 // 选中的商品数据
-let selectData = ref([]);
+let selectData = ref([])
 let forms = reactive({
   name: "",
   status: 1,
   useTime: 0,
-  sortMode: "0",
+  sortMode: '0',
   sort: 1,
-  time: "",
+  time: ""
-});
+})
 
 // 添加商品
-async function addgoods() {
+function addgoods() {
   // console.log(selectData.value, '编辑时候有的数据')
-  switchref.value = true;
+  switchref.value = true
-  myDialogRef.value.open();
+  myDialogRef.value.open()
-  await nextTick();
+
-  contentRefs.value.setSelectTable(selectData.value);
 }
 const rules = reactive<FormRules<RuleForm>>({
-  name: [{ required: true, message: "请输入分组名称", trigger: "blur" }],
+  name: [
-});
+    { required: true, message: '请输入分组名称', trigger: 'blur' },
+  ],
+})
 interface RuleForm {
-  name: string;
+  name: string
 }
 
 // 添加编辑商品分组
@@ -314,71 +257,76 @@ async function addConfirm() {
     if (valid) {
       let obj = {
         ...forms,
-        selectgoods: selectData.value,
+        selectgoods: selectData.value
-      };
+      }
       // 商品选择的合集
       if (selectData.value.length) {
-        let arr = [];
+        let arr = []
         selectData.value.forEach((item, index) => {
-          arr.push(item.id);
+          arr.push(item.id)
-        });
+        })
-        obj.productIds = arr;
+        obj.productIds = arr
       }
-      console.log(obj, "商品分组的参数");
+      console.log(obj, '商品分组的参数')
       if (obj.time && obj.time.length) {
-        obj.saleStartTime = obj.time[0];
+        obj.saleStartTime = obj.time[0]
-        obj.saleEndTime = obj.time[1];
+        obj.saleEndTime = obj.time[1]
       }
       if (title.value == "新增分组") {
-        let res = await UserAPI.addunit(obj);
+        let res = await UserAPI.addunit(obj)
         if (res.code == 200) {
           ElMessage.success("添加成功");
-          myDialogRefAdd.value.close();
+          myDialogRefAdd.value.close()
         }
       } else {
         if (obj.useTime == 0) {
-          obj.saleStartTime = null;
+          obj.saleStartTime = null
-          obj.saleEndTime = null;
+          obj.saleEndTime = null
         }
-        let res = await UserAPI.update(obj);
+        let res = await UserAPI.update(obj)
         if (res.code == 200) {
           ElMessage.success("编辑成功");
-          myDialogRefAdd.value.close();
+          myDialogRefAdd.value.close()
         }
       }
       // contentConfig.indexAction()
-      handleQueryClick();
+      handleQueryClick()
     } else {
-      console.log("error submit!", fields);
+      console.log('error submit!', fields)
     }
-  });
+  })
+
+
+
 }
 // 添加商品的回调
 function subitgood() {
+
   if (title.value == "编辑分组") {
-    let arr = selectData.value;
+    let arr = selectData.value
     contentRefs.value.getselectTable().forEach((item: any) => {
-      let selectdata = selectData.value.find((ele) => ele.id == item.id);
+      let selectdata = selectData.value.find(ele => ele.id == item.id)
       if (!selectdata) {
-        arr.push(item);
+        arr.push(item)
       }
-    });
+    })
-    selectData.value = arr;
+    selectData.value = arr
   } else {
-    selectData.value = contentRefs.value.getselectTable();
+    selectData.value = contentRefs.value.getselectTable()
   }
-  switchref.value = false;
+  switchref.value = false
-  myDialogRef.value.close();
+  myDialogRef.value.close()
 }
 // 删除商品
 function deleteItem(data: any) {
-  selectData.value = data;
+  selectData.value = data
 }
 
+
 // 编辑
 async function handleEditClick(row: IObject) {
   editModalRef.value?.handleDisabled(false);
-  title.value = "编辑分组";
+  title.value = "编辑分组"
   // 加载部门下拉数据源
   // editModalConfig.formItems[2]!.attrs!.data = await UserAPI.getPage({ name: "" });
   // editModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
@@ -386,13 +334,13 @@ async function handleEditClick(row: IObject) {
   // editModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
   // 根据id获取数据进行填充
   const data = await UserAPI.getunitinfo(row.id);
-  let obj = { ...data };
+  let obj = { ...data }
-  selectData.value = data.productList;
+  selectData.value = data.productList
-  obj.time = [obj.saleStartTime, obj.saleEndTime];
+  obj.time = [obj.saleStartTime, obj.saleEndTime]
   for (let key in obj) {
-    forms[key] = obj[key];
+    forms[key] = obj[key]
   }
-  myDialogRefAdd.value.open();
+  myDialogRefAdd.value.open()
   // editModalRef.value?.setFormData(obj);
   // editModalRef.value?.setModalVisible();
 }
@@ -404,15 +352,15 @@ function handleToolbarClick(name: string) {
       name: "",
       status: 1,
       useTime: 0,
-      sortMode: "0",
+      sortMode: '0',
       sort: 1,
-      time: "",
+      time: ""
-    });
+    })
-    selectData.value = [];
+    selectData.value = []
-    title.value = "新增分组";
+    title.value = "新增分组"
 
     // 新增
-    myDialogRefAdd.value.open();
+    myDialogRefAdd.value.open()
   }
 }
 // 其他操作列
@@ -450,12 +398,6 @@ async function handleOperatClick(data: IOperatData) {
   }
 }
 
-//清除选择商品弹窗表单选中和
-function resetSelectData() {
-  contentRefs.value?.clearSelectTable();
-  switchref.value = false;
-}
-
 // 切换示例
 const isA = ref(true);
 </script>

src/views/order/index/config/content.ts

@@ -29,7 +29,7 @@ const contentConfig: IContentConfig = {
   //   // return OrderApi.edit(data);
   // },
   pk: "id",
-  toolbar: [],
+  toolbar: ["add"],
   defaultToolbar: ["refresh", "filter", "search"],
   cols: [
     { type: "selection", width: 50, align: "center" },

src/views/shop/staff/index.vue

@@ -2,24 +2,12 @@
   <div class="app-container">
     <!-- 列表 -->
     <!-- 搜索 -->
-    <page-search
+    <page-search ref="searchRef" :search-config="searchConfig" @query-click="handleQueryClick"
-      ref="searchRef"
+      @reset-click="handleResetClick" />
-      :search-config="searchConfig"
-      @query-click="handleQueryClick"
-      @reset-click="handleResetClick"
-    />
     <!-- 列表 -->
-    <page-content
+    <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
-      ref="contentRef"
+      @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
-      :content-config="contentConfig"
+      @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
-      @add-click="handleAddClick"
-      @edit-click="handleEditClick"
-      @export-click="handleExportClick"
-      @search-click="handleSearchClick"
-      @toolbar-click="handleToolbarClick"
-      @operat-click="handleOperatClick"
-      @filter-change="handleFilterChange"
-    >
       <template #status="scope">
         <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
           {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
@@ -33,18 +21,14 @@
       </template>
       <template #mobile="scope">
         <el-text>{{ scope.row[scope.prop] }}</el-text>
-        <copy-button
+        <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
-          v-if="scope.row[scope.prop]"
-          :text="scope.row[scope.prop]"
-          style="margin-left: 2px"
-        />
       </template>
     </page-content>
 
     <!-- 新增 -->
     <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
       <template #formFooter>
-        <!-- <h3 style="color: rgb(63, 158, 255)">收银机权限设置</h3>
+        <h3 style="color: rgb(63, 158, 255)">收银机权限设置</h3>
         <div>
           <el-checkbox-group v-model="addPagePathIdList">
             <el-checkbox v-for="(item, index) in pagePathIdLists" :key="index" :value="item.value"
@@ -53,33 +37,24 @@
         </div>
         <h3 style="color: rgb(63, 158, 255)">员工权限设置</h3>
 
-        <selectPermission v-model="addSelPermissionList" :list="permissionList"></selectPermission> -->
+        <selectPermission v-model="addSelPermissionList" :list="permissionList"></selectPermission>
       </template>
     </page-modal>
 
     <!-- 编辑 -->
-    <page-modal
+    <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick">
-      ref="editModalRef"
-      :modal-config="editModalConfig"
-      @submit-click="handleSubmitClick"
-    >
       <template #formFooter>
         <h3 style="color: rgb(63, 158, 255)">收银机权限设置</h3>
         <div>
           <el-checkbox-group v-model="editPagePathIdList">
-            <el-checkbox
+            <el-checkbox v-for="(item, index) in pagePathIdLists" :key="index" :value="item.value"
-              v-for="(item, index) in pagePathIdLists"
+              :label="item.label" />
-              :key="index"
-              :value="item.value"
-              :label="item.label"
-            />
           </el-checkbox-group>
         </div>
         <h3 style="color: rgb(63, 158, 255)">员工权限设置</h3>
 
         <selectPermission v-model="selPermissionList" :list="permissionList"></selectPermission>
       </template>
-      -->
     </page-modal>
 
     <!-- 修改密码 -->
@@ -140,11 +115,8 @@ const oldeditSubmitFunc = editModalConfig.formAction;
 // 数据初始化
 async function init() {
   // 覆写添加确定方法
-  if (
+  if (JSON.parse(localStorage.getItem('userInfo') || '{}').isHeadShop == 0 && localStorage.getItem('loginType') == '0') {
-    JSON.parse(localStorage.getItem("userInfo") || "{}").isHeadShop == 0 &&
+    searchConfig.formItems.splice(0, 1)
-    localStorage.getItem("loginType") == "0"
-  ) {
-    searchConfig.formItems.splice(0, 1);
   }
   addModalConfig.formAction = function (data) {
     return ShopStaffApi.add({

src/views/tool/table/index.vue

@@ -52,7 +52,7 @@
           v-for="item in tableList"
           :key="item.id"
           class="item"
-          :style="{ 'background-color': status[item.status] ? status[item.status].type : '' }"
+          :style="{ 'background-color': status[item.status].type }"
         >
           <div class="new-top flex u-row-between">
             <div class="u-flex u-flex-1 u-p-r-10">