From 160c8b631cde434e5d7228626c1c0372e99d4024 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 18 Dec 2025 10:54:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E5=AE=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/index.vue    | 4 ++--
 src/views/tool/table/index.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index d70ecb1..1e19493 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -173,7 +173,7 @@
           </template>
         </el-table-column>
         <el-table-column label="单位" prop="conUnit">
-          <!-- <template v-slot="scope">
+          <template v-slot="scope">
             <el-select v-model="scope.row.conUnit" reserve-keyword placeholder="请输入关键词">
               <el-option
                 v-for="item in returnConUnits(scope.row.consInfoId)"
@@ -182,7 +182,7 @@
                 :value="item"
               ></el-option>
             </el-select>
-          </template> -->
+          </template>
         </el-table-column>
         <el-table-column label="使用数量" prop="surplusStock" min-width="150px">
           <template v-slot="scope">
diff --git a/src/views/tool/table/index.vue b/src/views/tool/table/index.vue
index 3994342..833360e 100644
--- a/src/views/tool/table/index.vue
+++ b/src/views/tool/table/index.vue
@@ -347,14 +347,14 @@ async function areainit() {
 }
 async function diancanShow(item, key) {
 	if (!key) {
-		router.push({ path: "/tool/index", query: { tableCode: item.tableCode } });
+		router.push({ path: "/Instead", query: { tableCode: item.tableCode } });
 		return;
 	}
 	if (key == "isAddGoods") {
-		router.push({ path: "/tool/index", query: { id: item.orderId, key } });
+		router.push({ path: "/Instead", query: { id: item.orderId, key } });
 	}
 	if (key == "isPayOrder") {
-		router.push({ path: "/tool/index", query: { id: item.orderId, key } });
+		router.push({ path: "/Instead", query: { id: item.orderId, key } });
 	}
 }
 const tabClick = (tab) => {

From 2635add6d217938a89d220689e12c3b713594e31 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 18 Dec 2025 11:30:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/index.vue | 10 +++++++---
 src/views/data/sales.vue | 10 +++++++---
 src/views/data/table.vue | 10 +++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/views/data/index.vue b/src/views/data/index.vue
index c415b90..3150866 100644
--- a/src/views/data/index.vue
+++ b/src/views/data/index.vue
@@ -702,9 +702,13 @@ export default {
      */
     async geiShopList() {
       try {
-        let res = await ShopApi.getBranchList()
-        this.branchList = res;
-        this.shopId = res[0].shopId
+        if (this.shopInfo.isHeadShop) {
+          let res = await ShopApi.getBranchList()
+          this.branchList = res;
+          this.shopId = res[0].shopId
+        } else {
+          this.shopId = this.shopInfo.id
+        }
       } catch (error) {
         console.log('获取分店列表===', error);
       }
diff --git a/src/views/data/sales.vue b/src/views/data/sales.vue
index 8dd6991..9400d7b 100644
--- a/src/views/data/sales.vue
+++ b/src/views/data/sales.vue
@@ -248,9 +248,13 @@ export default {
      * 获取分店列表
      */
     async geiShopList() {
-      let res = await ShopApi.getBranchList()
-      this.branchList = res;
-      this.shopId = res[0].shopId
+      if (this.shopInfo.isHeadShop) {
+        let res = await ShopApi.getBranchList()
+        this.branchList = res;
+        this.shopId = res[0].shopId
+      } else {
+        this.shopId = this.shopInfo.id
+      }
     },
     totalfilter(item, d) {
       let num = item + d;
diff --git a/src/views/data/table.vue b/src/views/data/table.vue
index a360083..8cab45b 100644
--- a/src/views/data/table.vue
+++ b/src/views/data/table.vue
@@ -151,9 +151,13 @@ export default {
     * 获取分店列表
     */
     async geiShopList() {
-      let res = await ShopApi.getBranchList()
-      this.branchList = res;
-      this.shopId = res[0].shopId
+      if (this.shopInfo.isHeadShop) {
+        let res = await ShopApi.getBranchList()
+        this.branchList = res;
+        this.shopId = res[0].shopId
+      } else {
+        this.shopId = this.shopInfo.id
+      }
     },
     //携带table id跳转到订单列表页面
     toTableOrderList(data) {