Merge branch 'cheney' into dev

src/views/score-statistics/components/MonthlyRating.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-card>
+		<el-card shadow="hover" class="border-none">
 			<span class="title">监控ASIN每月平均评分</span>
 			<div class="mb-1" style="display: flex; align-items: baseline; justify-content: space-between">
 				<div style="display: flex; gap: 25px; margin-bottom: 10px">

src/views/score-statistics/components/Overview.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-card v-loading="loading" style="margin-bottom: 10px; height: 155px">
+	<el-card shadow="hover" class="border-none" v-loading="loading" style="margin-bottom: 10px; height: 155px">
 		<div class="header-container">
 			<span style="font-size: 16px; font-weight: 500">统计概览</span>
 			<div>

src/views/score-statistics/index.vue

@@ -12,7 +12,7 @@ import MonthlyRating from '/@/views/score-statistics/components/MonthlyRating.vu
 <template>
 	<div class="flex-grow p-5">
 		<Overview></Overview>
-		<el-card style="margin: 10px 0">
+		<el-card shadow="hover" class="my-5 border-none">
 			<LineChart></LineChart>
 		</el-card>
 		<MonthlyRating></MonthlyRating>

src/views/sku-manage/Columns.ts

@@ -42,7 +42,7 @@ export const ProductBrandColumns = [
 export const ProductCategoryColumns = [
   { type: 'seq', title: 'No.', width: 70, align: 'center', fixed: 'left' },
   {
-    field: 'name', title: '种类名称', align: 'center', fixed: 'left',
+    field: 'name', title: '种类名称', align: 'center', minWidth: 130, fixed: 'left',
     slots: { default: 'name' }
   },
   {
@@ -50,14 +50,14 @@ export const ProductCategoryColumns = [
     slots: { default: 'main' }
   },
   {
-    field: 'status', title: '状 态', align: 'center',
+    field: 'status', title: '状 态', width: 100, align: 'center',
     slots: { default: 'status' }
   },
   {
-    field: 'update_datetime', title: '更新时间', align: 'center',
+    field: 'update_datetime', title: '更新时间', width: 170, align: 'center',
     slots: { default: 'update_datetime' }
   },
-  { field: 'create_datetime', title: '创建时间', align: 'center', slots: { default: 'create_datetime' } },
+  { field: 'create_datetime', title: '创建时间', width: 170, align: 'center', slots: { default: 'create_datetime' } },
   {
     field: 'operate', title: '操 作', width: 130, align: 'center', fixed: 'right',
     slots: { default: 'operate' }
@@ -67,19 +67,19 @@ export const ProductCategoryColumns = [
 export const CompanySkuColumns = [
   { type: 'checkbox', width: 50, align: 'center', fixed: 'left' },
   {
-    field: 'sku', title: 'SKU', align: 'center', fixed: 'left',
+    field: 'sku', title: 'SKU', align: 'center', minWidth: 200, fixed: 'left',
     slots: { default: 'sku' }
   },
   {
-    field: 'brand', title: '品牌名称', align: 'center', width: 'auto',
+    field: 'brand', title: '品牌名称', align: 'center', minWidth: 80,
     slots: { default: 'brand' }
   },
   {
-    field: 'kind', title: '种 类', align: 'center',
+    field: 'kind', title: '种 类', align: 'center', minWidth: 150,
     slots: { default: 'kind' }
   },
   {
-    field: 'version_feature', title: '版本特性', align: 'center',
+    field: 'version_feature', title: '版本特性', align: 'center', minWidth: 180,
     slots: { default: 'version_feature' }
   },
   {

src/views/sku-manage/company-sku/component/DataTableSlot.vue

@@ -95,8 +95,10 @@ function showDetail() {
 				</div>
       </div>
     </div>
-    <div v-else-if="field === 'sku'" class="flex flex-nowrap">
-      {{ row.sku }}
+    <div v-else-if="field === 'sku'" class="flex justify-center flex-nowrap">
+      <div>
+        {{ row.sku }}
+      </div>
       <el-button :disabled="!row.sku" :icon="CopyDocument" class="ml-1 cursor-pointer" link
                  @click="handleCopy(row.sku || '')"></el-button>
     </div>

src/views/sku-manage/product-brand/component/DataTableSlot.vue

@@ -38,7 +38,7 @@ function onConfirm() {
             </el-icon>
           </PermissionButton>
         </div>
-        <div v-if="hasPermission('SkuBrandDelete')">
+        <div v-else-if="hasPermission('SkuBrandDelete')">
           <el-popconfirm
               :icon="InfoFilled"
               icon-color="#626AEF"
@@ -65,7 +65,11 @@ function onConfirm() {
             </template>
           </el-popconfirm>
         </div>
-        
+        <div v-else class="italic">
+          <el-tag type="warning">
+            暂无权限
+          </el-tag>
+        </div>
       </div>
     </div>
     <div v-else>

src/views/sku-manage/product-category/component/DataTable.vue

@@ -54,7 +54,7 @@ const gridOptions: any = reactive({
     isHover: true
   },
   columnConfig: {
-    resizable: true
+    // resizable: true
   },
   pagerConfig: {
     total: tableOptions.value.total,