From a67ee99ad9bebe824ef4101558323a264b4e4a48 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 2 Apr 2025 15:12:02 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=9D=83=E9=99=90=E5=88=97=E8=A1=A8=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E4=B8=BA=E7=A9=BA=E6=95=B0=E7=BB=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/staff/index.vue | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/views/shop/staff/index.vue b/src/views/shop/staff/index.vue
index 852c5ea..2a5a85d 100644
--- a/src/views/shop/staff/index.vue
+++ b/src/views/shop/staff/index.vue
@@ -44,11 +44,8 @@
     <!-- 新增 -->
     <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
       <template #formFooter>
-        <selectPermission
-          v-model="selPermissionList"
-          :list="permissionList"
-          ref="refSelectPermission"
-        ></selectPermission>
+        <div>11</div>
+        <selectPermission v-model="addSelPermissionList" :list="permissionList"></selectPermission>
       </template>
     </page-modal>
 
@@ -59,11 +56,7 @@
       @submit-click="handleSubmitClick"
     >
       <template #formFooter>
-        <selectPermission
-          v-model="selPermissionList"
-          :list="permissionList"
-          ref="refSelectPermission"
-        ></selectPermission>
+        <selectPermission v-model="selPermissionList" :list="permissionList"></selectPermission>
       </template>
     </page-modal>
 
@@ -85,7 +78,6 @@ import RoleApi, { type SysRole } from "@/api/account/role";
 import ShopStaffApi from "@/api/account/shopStaff";
 import permissionApi, { type ShopPermission } from "@/api/account/permission";
 import selectPermission from "./components/select-permission.vue";
-const refSelectPermission = ref();
 
 const {
   searchRef,
@@ -106,6 +98,7 @@ const {
 let permissionList = ref<ShopPermission[]>([]);
 //选中的权限列表
 let selPermissionList = ref<string[]>([]);
+let addSelPermissionList = ref<string[]>([]);
 // 数据初始化
 async function init() {
   // 覆写添加确定方法
@@ -113,7 +106,7 @@ async function init() {
   addModalConfig.formAction = (data) => {
     return oldAddSubmitFunc({
       ...data,
-      shopPermissionIds: selPermissionList.value.reduce((pre: string[], cur: string) => {
+      shopPermissionIds: addSelPermissionList.value.reduce((pre: string[], cur: string) => {
         return pre.concat(cur);
       }, [] as string[]),
     });
@@ -179,7 +172,6 @@ async function handleEditClick(row: IObject) {
     editModalRef.value?.setFormData({ ...res });
   });
 }
-1;
 // 其他工具栏
 function handleToolbarClick(name: string) {
   console.log(name);

From ba731155ae33fb53ae9c56ba4a18b7481ff65103 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 2 Apr 2025 16:15:32 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=94=B6?=
 =?UTF-8?q?=E9=93=B6=E6=9C=BA=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/account/shopPagePermission.ts | 46 +++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 src/api/account/shopPagePermission.ts

diff --git a/src/api/account/shopPagePermission.ts b/src/api/account/shopPagePermission.ts
new file mode 100644
index 0000000..7b50c5d
--- /dev/null
+++ b/src/api/account/shopPagePermission.ts
@@ -0,0 +1,46 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+import { get } from "lodash";
+const baseURL = Account_BaseUrl + "/admin/shopPagePermission";
+const Api = {
+  // 获取所有页面路径
+  getPageAll(params: any) {
+    return request<any, object[]>({
+      url: `${baseURL}`,
+      method: "get",
+      params: params,
+    });
+  },
+  // 保存修改权限
+  save(data: any) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "post",
+      data: data,
+    });
+  },
+  //获取员工拥有页面路径
+  detail(params: any) {
+    return request<any, PagePath[]>({
+      url: `${baseURL}/detail`,
+      method: "get",
+      params: params,
+    });
+  },
+  //获取当前员工已拥有页面路径
+  mine(params: any) {
+    return request<any>({
+      url: `${baseURL}/mine`,
+      method: "get",
+      params: params,
+    });
+  }
+};
+
+export default Api;
+
+interface PagePath {
+  label: string;
+  value: string;
+  [property: string]: any;
+}
\ No newline at end of file

From dab029cd23af613e75677d9f71bb4487784fcd76 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 2 Apr 2025 16:17:05 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=EF=BC=8C=E4=BF=AE=E6=94=B9skuName=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/index/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue
index f5785f3..2913dbb 100644
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -38,9 +38,9 @@
                 <span :class="[item.isVip == 1 ? 'colorStyle' : '']">
                   {{ item.productName }}
                 </span>
-                <span class="refund" v-if="item.refundNumber">(退 - {{ item.refundNumber }})</span>
+                <span class="refund" v-if="item.refundNum">(退 - {{ item.refundNum }})</span>
               </div>
-              <div class="sku">{{ item.productSkuName }}</div>
+              <div class="sku">{{ item.skuName }}</div>
             </div>
           </div>
         </div>
@@ -49,7 +49,7 @@
         <div>
           <p>
             名称：
-            <el-tag type="primary">{{ scope.row.tableName }}</el-tag>
+            <el-tag type="primary">{{ scope.row.tableName || "无" }}</el-tag>
           </p>
           <p v-if="scope.row.tableCode">编号：{{ scope.row.tableCode }}</p>
         </div>

From 2d92fca5a5f2b6843290be34f6d1f1d1802f0cf2 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 2 Apr 2025 16:18:19 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E5=91=98=E5=B7=A5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=B6=E9=9F=B3=E6=9C=BA=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/staff/config/add.ts  | 15 ++------
 src/views/shop/staff/config/edit.ts |  6 ----
 src/views/shop/staff/index.vue      | 54 +++++++++++++++++++++++++++--
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/src/views/shop/staff/config/add.ts b/src/views/shop/staff/config/add.ts
index 5cdcbd9..bb9dff7 100644
--- a/src/views/shop/staff/config/add.ts
+++ b/src/views/shop/staff/config/add.ts
@@ -165,19 +165,8 @@ const modalConfig: IModalConfig<addRequest> = {
       ],
       initialValue: 1,
     },
-    {
-      label: "员工权限设置",
-      prop: "",
-      type: "title",
-      slotName: "title",
-    },
-    {
-      type: 'custom',
-      prop: 'permission',
-      slotName: 'permission',
-      label: '',
-      hidden: true
-    }
+
+
 
   ],
 };
diff --git a/src/views/shop/staff/config/edit.ts b/src/views/shop/staff/config/edit.ts
index bb05d21..8faa32c 100644
--- a/src/views/shop/staff/config/edit.ts
+++ b/src/views/shop/staff/config/edit.ts
@@ -164,12 +164,6 @@ const modalConfig: IModalConfig<editRequest> = {
       ],
       initialValue: 1,
     },
-    {
-      label: "员工权限设置",
-      prop: "",
-      type: "title",
-      slotName: "title",
-    },
   ],
 };
 
diff --git a/src/views/shop/staff/index.vue b/src/views/shop/staff/index.vue
index 2a5a85d..9d29858 100644
--- a/src/views/shop/staff/index.vue
+++ b/src/views/shop/staff/index.vue
@@ -44,7 +44,19 @@
     <!-- 新增 -->
     <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
       <template #formFooter>
-        <div>11</div>
+        <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"
+              :label="item.label"
+            />
+          </el-checkbox-group>
+        </div>
+        <h3 style="color: rgb(63, 158, 255)">员工权限设置</h3>
+
         <selectPermission v-model="addSelPermissionList" :list="permissionList"></selectPermission>
       </template>
     </page-modal>
@@ -56,6 +68,19 @@
       @submit-click="handleSubmitClick"
     >
       <template #formFooter>
+        <h3 style="color: rgb(63, 158, 255)">收银机权限设置</h3>
+        <div>
+          <el-checkbox-group v-model="editPagePathIdList">
+            <el-checkbox
+              v-for="(item, index) in pagePathIdLists"
+              :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>
@@ -78,7 +103,7 @@ import RoleApi, { type SysRole } from "@/api/account/role";
 import ShopStaffApi from "@/api/account/shopStaff";
 import permissionApi, { type ShopPermission } from "@/api/account/permission";
 import selectPermission from "./components/select-permission.vue";
-
+import shopPagePermissionApi from "@/api/account/shopPagePermission";
 const {
   searchRef,
   contentRef,
@@ -99,6 +124,18 @@ let permissionList = ref<ShopPermission[]>([]);
 //选中的权限列表
 let selPermissionList = ref<string[]>([]);
 let addSelPermissionList = ref<string[]>([]);
+
+// 选中的收音机页面列表
+interface PagePath {
+  label: string;
+  value: string;
+  [property: string]: any;
+}
+
+const pagePathIdLists = ref<PagePath[]>([]);
+const addPagePathIdList = ref<string[]>([]);
+const editPagePathIdList = ref<string[]>([]);
+
 // 数据初始化
 async function init() {
   // 覆写添加确定方法
@@ -106,6 +143,7 @@ async function init() {
   addModalConfig.formAction = (data) => {
     return oldAddSubmitFunc({
       ...data,
+      pagePathIdList: addPagePathIdList.value,
       shopPermissionIds: addSelPermissionList.value.reduce((pre: string[], cur: string) => {
         return pre.concat(cur);
       }, [] as string[]),
@@ -116,6 +154,7 @@ async function init() {
   editModalConfig.formAction = (data) => {
     return oldeditSubmitFunc({
       ...data,
+      pagePathIdList: editPagePathIdList.value,
       shopPermissionIds: selPermissionList.value.reduce((pre: string[], cur: string) => {
         return pre.concat(cur);
       }, [] as string[]),
@@ -134,6 +173,14 @@ async function init() {
   });
   addModalConfig.formItems[1]!.options = roleArr;
   editModalConfig.formItems[1]!.options = roleArr;
+  const pagesRes = await shopPagePermissionApi.getPageAll({});
+  pagePathIdLists.value = pagesRes.map((item: any) => {
+    return {
+      ...item,
+      label: item.name,
+      value: item.id,
+    };
+  });
 }
 init();
 
@@ -165,6 +212,9 @@ async function handleEditClick(row: IObject) {
       }
     }
   }
+  const pageList = await shopPagePermissionApi.detail({ staffId: row.id });
+  console.log(pageList);
+  editPagePathIdList.value = pageList.map((item) => item.id);
   console.log(selPermissionList.value);
   // 根据id获取数据进行填充
   await ShopStaffApi.get(row.id).then((res) => {

From f337d7841f8588a62ffd3c4bb1c7bf310eb1eb4f Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Wed, 2 Apr 2025 16:35:01 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E5=95=86=E5=93=81=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E7=AE=AD=E5=A4=B4=E5=B7=A6=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/specifications.vue              | 6 ++++++
 src/views/product/specificationsconfig/content.ts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/product/specifications.vue b/src/views/product/specifications.vue
index 249977f..6f9ae41 100644
--- a/src/views/product/specifications.vue
+++ b/src/views/product/specifications.vue
@@ -10,6 +10,12 @@
       <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 #deptName="scope">
+          <div style="display: inline-block;width: 50px;">
+            {{ scope.row.name }}
+          </div>
+          <!-- <el-text></el-text> -->
+        </template>
         <template #status="scope">
           <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
             {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
diff --git a/src/views/product/specificationsconfig/content.ts b/src/views/product/specificationsconfig/content.ts
index 425fb3a..ebdba47 100644
--- a/src/views/product/specificationsconfig/content.ts
+++ b/src/views/product/specificationsconfig/content.ts
@@ -45,7 +45,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
   ],
   cols: [
     // { type: "selection", width: 50, align: "center" },
-    { label: "模板名称", align: "center", prop: "name" },
+    { label: "模板名称", align: "center", slotName: "deptName", templet: "custom", },
     { label: "完整名称", align: "center", prop: "fullName" },
     // {
     //   label: "操作",