From 2b31fa203f3435a582be51f45899d99164c9917a Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期四, 09 四月 2026 13:34:59 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/SC/gfzl

---
 ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-detail.vue |   51 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-detail.vue b/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-detail.vue
old mode 100644
new mode 100755
index d652e37..a67f64b
--- a/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-detail.vue
+++ b/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-detail.vue
@@ -55,38 +55,38 @@
     key: 'index',
     title: $t('common.index'),
     align: 'center',
-    width: 64,
+    width: 56,
     render: (_: any, index: number) => index + 1
   },
   {
     key: 'fsNum',
     title: '鍠備笣鏈哄彿',
     align: 'center',
-    width: 100
+    width: 84
   },
   {
     key: 'siloNum',
     title: '鍌ㄤ笣鏌滃彿',
     align: 'center',
-    width: 100
+    width: 84
   },
   {
     key: 'pipeNum',
     title: '绠￠亾鍙�',
     align: 'center',
-    width: 100
+    width: 84
   },
   {
     key: 'equNo',
     title: '鏈哄彴鍙�',
     align: 'center',
-    width: 100
+    width: 72
   },
   {
     key: 'shiftCode',
     title: '鐝浠ｇ爜',
     align: 'center',
-    width: 100,
+    width: 88,
     render: (row: StoreSilkDetailVo) => {
       const map: Record<string, string> = {
         '1': '鏃╃彮',
@@ -100,19 +100,19 @@
     key: 'shiftStartTime',
     title: '鐝寮�濮嬫椂闂�',
     align: 'center',
-    width: 160
+    width: 148
   },
   {
     key: 'shiftEndTime',
     title: '鐝缁撴潫鏃堕棿',
     align: 'center',
-    width: 160
+    width: 148
   },
   {
     key: 'output',
     title: '浜ч噺(鍗冩敮)',
     align: 'center',
-    width: 120,
+    width: 96,
     render: (row: StoreSilkDetailVo) => {
       if (row.output === null || row.output === undefined) return '-';
       const v = Number(row.output);
@@ -124,7 +124,7 @@
     key: 'outputBox',
     title: '浜ч噺(绠�)',
     align: 'center',
-    width: 100,
+    width: 84,
     render: (row: StoreSilkDetailVo) => {
       const v = detailType.value === 'roller' ? calcRollerBox(row.output) : calcPackerBox(row.output);
       if (v === null) return '-';
@@ -139,30 +139,34 @@
     title="浜ч噺鏄庣粏"
     :bordered="false"
     size="small"
-    class="card-wrapper flex-col-stretch"
+    class="flex-col-stretch card-wrapper"
     :content-style="{ flex: 1, overflow: 'hidden', display: 'flex', flexDirection: 'column' }"
   >
     <template #header-extra>
       <NSpace :size="8">
-        <NButton size="small" ghost :type="detailType === 'roller' ? 'primary' : 'default'" @click="detailType = 'roller'">
+        <NButton
+          size="small"
+          ghost
+          :type="detailType === 'roller' ? 'primary' : 'default'"
+          @click="detailType = 'roller'"
+        >
           鍗锋帴
         </NButton>
-        <NButton size="small" ghost :type="detailType === 'packer' ? 'primary' : 'default'" @click="detailType = 'packer'">
+        <NButton
+          size="small"
+          ghost
+          :type="detailType === 'packer' ? 'primary' : 'default'"
+          @click="detailType = 'packer'"
+        >
           鍖呰
         </NButton>
       </NSpace>
     </template>
 
-    <div v-if="!detailList || detailList.length === 0" class="flex-center h-full text-gray-400">
+    <div v-if="!detailList || detailList.length === 0" class="h-full flex-center text-gray-400">
       璇风偣鍑讳笂鏂硅〃鏍艰鏌ョ湅璇︽儏
     </div>
-    <NDataTable
-      v-else
-      :columns="columns as any"
-      :data="detailList"
-      flex-height
-      class="flex-1-hidden"
-    />
+    <NDataTable v-else :columns="columns as any" :data="detailList" flex-height class="flex-1-hidden" />
   </NCard>
 </template>
 
@@ -170,4 +174,9 @@
 :deep(.n-card__content) {
   padding: 8px 12px;
 }
+
+:deep(.n-data-table-th),
+:deep(.n-data-table-td) {
+  padding: 4px 6px;
+}
 </style>

--
Gitblit v1.9.3