From cf626cb8620d8d81a957c4a4e4c35ec6801c8138 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Fri, 11 Apr 2025 09:47:00 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=88=86=E5=BA=97=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=AD=9B=E9=80=89name=E5=90=8D=E7=A7=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/branchStore/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/shop/branchStore/index.vue b/src/views/shop/branchStore/index.vue
index fe95978..12fa3c2 100644
--- a/src/views/shop/branchStore/index.vue
+++ b/src/views/shop/branchStore/index.vue
@@ -117,8 +117,7 @@ async function getTableData() {
     const res = await ShopBranchApi.getList({
       page: state.tableData.page,
       size: state.tableData.size,
-      shopName: state.query.name,
-      status: state.query.status,
+      branchShopName: state.query.name,
     });
     state.tableData.loading = false;
     state.tableData.list = res.records;

From fdc1933bbefa0fa191116ec7ab47da16e6288faa Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 11 Apr 2025 09:56:42 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?crud=E6=90=9C=E7=B4=A2=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=9C=AA=E9=85=8D=E7=BD=AEshowFastE?=
 =?UTF-8?q?dit=E4=B8=BAtrue=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 361d6c6..b05e811 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -108,7 +108,7 @@
               <el-radio-button value="month">本月</el-radio-button>
               <el-radio-button value="custom">自定义</el-radio-button>
             </el-radio-group>
-            <div class="flex" v-if="timeValue === 'custom'">
+            <div class="flex" v-if="timeValue === 'custom' || !item.attrs?.showFastEdit">
               <el-date-picker v-model="queryParams[item.prop]" v-bind="item.attrs" />
             </div>
           </template>

From 04ae1c342be1dc1eef4ceafa0cc6a75689a9ade6 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Fri, 11 Apr 2025 11:34:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E9=94=80=E5=94=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=88=86=E7=B1=BB=E7=AD=9B=E9=80=89=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=95=86=E5=93=81=E5=90=8C=E6=AD=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/sales.vue    | 7 ++++---
 src/views/product/index.vue | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/data/sales.vue b/src/views/data/sales.vue
index c34d08f..f77c38d 100644
--- a/src/views/data/sales.vue
+++ b/src/views/data/sales.vue
@@ -12,15 +12,16 @@
           </el-form-item>
 
           <el-form-item v-if="isHeadShop == 1">
-            <el-select v-model="shopId" placeholder="选择分店" style="width: 200px; margin-right: 10px" @change="getCategory">
+            <el-select v-model="shopId" placeholder="选择分店" style="width: 200px; margin-right: 10px"
+              @change="getCategory">
               <el-option v-for="item in branchList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
             </el-select>
           </el-form-item>
-          <el-form-item>
+          <!-- <el-form-item>
             <el-select v-model="query.prodCategoryId" placeholder="商品分类" style="width: 140px">
               <el-option :label="item.name" :value="item.id" v-for="item in categorys" :key="item.id"></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
         </template>
         <el-form-item>
           <el-radio-group v-model="timeValue" @change="timeChange">
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 3d9d32f..6b8b55d 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -199,7 +199,9 @@ let datas = reactive({
   remark: "",
   images: []
 });
-if (JSON.parse(localStorage.getItem('userInfo') || '{}').isHeadShop == 0) {
+let userInfo = ref(JSON.parse(localStorage.getItem('userInfo') || '{}'))
+console.log(userInfo.value.isEnableProdSync)
+if (userInfo.value.isHeadShop == 0 && userInfo.value.isEnableProdSync == 1) {
   contentConfig.toolbar.splice(0, 1)
 }else {
   contentConfig.toolbar.splice(1, 1)

From 8fd3565bac3cd3f85799535e9ea3213885905d18 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Fri, 11 Apr 2025 14:57:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/index.ts                    | 14 +++++++++++++-
 src/views/admin/system/menu/index.vue |  2 +-
 src/views/product/index.vue           | 17 ++++++++++++-----
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/utils/index.ts b/src/utils/index.ts
index 1ada8db..f17566b 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -116,4 +116,16 @@ export function downloadFile(obj: BlobPart, name: string, suffix: string, useUni
   document.body.appendChild(link);
   link.click();
   document.body.removeChild(link);
-}
\ No newline at end of file
+}
+
+/**
+ * 判断主店同步是否启用
+ */
+export function isSyncStatus() {
+  let userInfo = ref(JSON.parse(localStorage.getItem('userInfo') || '{}'))
+  if (userInfo.value.isHeadShop == 0 && userInfo.value.isEnableProdSync == 1 && userInfo.value.isEnableVipSync == 1 && userInfo.value.isEnableConsSync == 1) {
+    return true
+  }else {
+    return false
+  }
+}
diff --git a/src/views/admin/system/menu/index.vue b/src/views/admin/system/menu/index.vue
index 140584b..1ef4177 100644
--- a/src/views/admin/system/menu/index.vue
+++ b/src/views/admin/system/menu/index.vue
@@ -162,7 +162,7 @@
             <el-radio :value="2">接口</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="是否外链" prop="path">
+        <el-form-item label="是否外链" >
           <el-switch
             v-model="formData.iFrame"
             :active-value="1"
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 6b8b55d..f700cab 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -159,6 +159,7 @@ import UserAPI from "@/api/product/index";
 import { useRouter } from "vue-router";
 import type { IObject, IOperatData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
+import { isSyncStatus } from "@/utils/index";
 import addModalConfig from "./indexconfig/add";
 import contentConfig from "./indexconfig/content";
 import MultiImageUpload from "@/components/Upload/MultiImageUpload.vue"
@@ -199,13 +200,19 @@ let datas = reactive({
   remark: "",
   images: []
 });
-let userInfo = ref(JSON.parse(localStorage.getItem('userInfo') || '{}'))
-console.log(userInfo.value.isEnableProdSync)
-if (userInfo.value.isHeadShop == 0 && userInfo.value.isEnableProdSync == 1) {
-  contentConfig.toolbar.splice(0, 1)
+if (isSyncStatus()) {
+  if( JSON.stringify(contentConfig.toolbar)?.indexOf("add") != -1){
+    contentConfig.toolbar?.splice(0, 1)
+  }
+  if( JSON.stringify(contentConfig.cols[contentConfig.cols.length-1].operat)?.indexOf("delete") != -1){
+      contentConfig.cols[contentConfig.cols.length-1].operat?.splice(2, 1)
+  }
 }else {
-  contentConfig.toolbar.splice(1, 1)
+  if( JSON.stringify(contentConfig.toolbar)?.indexOf("custom2") != -1){
+    contentConfig.toolbar?.splice(1, 1)
+  }
 }
+
 onMounted(() => {
   console.log(route.query);
   if (route.query.id) {