From c62829b1adf9c3cfed01dc7dab84f9ef41971a2a Mon Sep 17 00:00:00 2001
From: "DESKTOP-8FGKA8Q\\chunfen" <vivanyyw@126.com>
Date: Sat, 7 Sep 2024 16:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E3=80=81?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E5=95=86=E5=93=81=E7=9A=84=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/views/goods/combination.vue  | 27 +++++++++----------
 resources/frontend/src/views/goods/goods.vue  |  3 ++-
 .../frontend/src/views/plat/orderList.vue     |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/resources/frontend/src/views/goods/combination.vue b/resources/frontend/src/views/goods/combination.vue
index 96864f6..0ca47e8 100644
--- a/resources/frontend/src/views/goods/combination.vue
+++ b/resources/frontend/src/views/goods/combination.vue
@@ -23,12 +23,12 @@
           :on-error="uploadError" style="display:inline-block;margin: 0 15px 0 0;">
           <el-button type="warning" icon="el-icon-upload2">组合商品导入</el-button>
         </el-upload>
-        <el-button type="primary" plain @click="addGoodsCombination" icon="el-icon-plus">新增组合商品</el-button>
+        <el-button type="primary" plain @click="addGoodsCombination" icon="el-icon-plus" v-if="is_admin">新增组合商品</el-button>
       </div>
 
       <el-table v-loading="loading" ref="multipleTable" :data="tableData" class="table" tooltip-effect="dark" border
         style="width: 100%" row-key="id" :tree-props="{ children: 'children' }">
-        <el-table-column label="商品信息" width="400">
+        <el-table-column label="商品信息" width="400" class-name="flex">
           <template slot-scope="scope">
             <div class="commodityimg">
               <img :src="scope.row.img_url" class="Img" />
@@ -40,8 +40,8 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="num" label="组合数量"></el-table-column>
-        <el-table-column label="剩余库存">
+        <el-table-column prop="num" label="组合数量" align="center"></el-table-column>
+        <el-table-column label="剩余库存" align="center">
           <template slot-scope="scope">
             <span v-if="!scope.row.children">{{ scope.row.stock }}</span>
           </template>
@@ -65,9 +65,9 @@
             </template>
         </el-table-column> -->
         <!-- <el-table-column sortable prop="total_orders_num" label="累计订单"></el-table-column> -->
-        <el-table-column sortable prop="sale_stock" label="可售库存"></el-table-column>
-        <el-table-column prop="status" label="状态"></el-table-column>
-        <el-table-column label="操作" width="130">
+        <el-table-column sortable prop="sale_stock" label="可售库存" align="center"></el-table-column>
+        <el-table-column prop="status" label="状态" align="center"></el-table-column>
+        <el-table-column label="操作" width="130" align="center" v-if="is_admin">
           <template slot-scope="scope">
             <el-button type="text" @click="handleEdit(scope.row.id)">编辑</el-button>
             <!-- <el-button type="text" @click="handleDelete(scope.row.id)">删除</el-button> -->
@@ -148,6 +148,7 @@
           }]
         },
         skus: [],
+        is_admin: false,
         remoteLoading: false
       }
     },
@@ -170,6 +171,7 @@
           this.Paginationdata = res.data.meta
           this.currentPage = res.data.meta.current_page
           this.per_page = parseInt(res.data.meta.per_page)
+          this.is_admin = res.data.manage && res.data.manage.is_admin
           this.loading = false
         })
       },
@@ -293,11 +295,6 @@
     float: right;
   }
 
-  ::v-deep .cell {
-    display: flex;
-    align-items: center;
-  }
-
   .commodityimg {
     width: 59px;
     height: 59px;
@@ -306,12 +303,14 @@
     display: block;
     margin-right: 12px;
   }
-
   .Img {
     width: 100%;
     height: 100%;
   }
-
+  ::v-deep .flex .cell{
+    display: flex;
+    align-items: center;
+  }
   ::v-deep .btn11 {
     padding: 0;
     width: 14px;
diff --git a/resources/frontend/src/views/goods/goods.vue b/resources/frontend/src/views/goods/goods.vue
index 9b3f0bf..ba3c83e 100644
--- a/resources/frontend/src/views/goods/goods.vue
+++ b/resources/frontend/src/views/goods/goods.vue
@@ -554,7 +554,7 @@
         chooseList: [],
         showUpdate: false,
         commitLoading: false,
-        is_admin: localStorage.getItem('roleName') == '超级管理员' || localStorage.getItem('roleName') == '系统管理员',
+        is_admin: false,
         showAdd: false,
         showEdit: false,
         curId: 0
@@ -599,6 +599,7 @@
           this.sku_code = {
             sku_code: this.shopsData
           }
+          this.is_admin = res.data.manage && res.data.manage.is_admin
           this.loading = false
         })
       },
diff --git a/resources/frontend/src/views/plat/orderList.vue b/resources/frontend/src/views/plat/orderList.vue
index 0710bf3..c94c130 100644
--- a/resources/frontend/src/views/plat/orderList.vue
+++ b/resources/frontend/src/views/plat/orderList.vue
@@ -83,7 +83,7 @@
                     <el-button type="primary" @click="handleChoose">筛选</el-button>
                     <el-button plain @click="handleReChoose">重置筛选</el-button>
                 </el-form-item>
-                <!-- <el-button type="primary" @click="print">打印</el-button> -->
+                <el-button type="primary" @click="print">打印</el-button>
                 <el-button v-if="form.goods_sku_num === 2" type="primary">配货单导出</el-button>
             </el-form>
         </el-card>