From 57067e7107abc6d7b921ca9ba1dc46b4b4107c95 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/CNAS/process/disposal/sampleReceipt/index.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/CNAS/process/disposal/sampleReceipt/index.vue b/src/views/CNAS/process/disposal/sampleReceipt/index.vue
index 5cc9020..2cd0206 100644
--- a/src/views/CNAS/process/disposal/sampleReceipt/index.vue
+++ b/src/views/CNAS/process/disposal/sampleReceipt/index.vue
@@ -40,7 +40,7 @@
         <lims-table :tableData="tableData" :column="column" @pagination="pagination"
                     :height="'calc(100vh - 280px)'" :key="upIndex" :page="page" :tableLoading="tableLoading">
           <template #inspectionItem="scope">
-            <div style="white-space: pre-line; text-align: left; padding: 4px 0;">{{ scope.row.inspectionItem }}</div>
+            <div style="white-space: pre-line; text-align: center; padding: 4px 0;">{{ scope.row.inspectionItem }}</div>
           </template>
           <template #remark="scope">
             <span>{{ scope.row.status === 2 && scope.row.rejectRemark ? scope.row.rejectRemark : scope.row.remark }}</span>
@@ -145,6 +145,7 @@
         { label: '鏍峰搧缂栧彿', prop: 'sampleCode' },
         { label: '妫�娴嬮」鐩�', prop: 'inspectionItem', dataType: 'slot', slot: 'inspectionItem', width: '220px' },
         { label: '濮旀墭缂栧彿', prop: 'entrustCode' },
+        { label: '閫佹牱鏃堕棿', prop: 'sampleDate', width: '110px', formatData: value => value || '鈥�' },
         { label: '鏂规硶鏍囧噯', prop: 'methodStandard' },
         { label: '涓绘浜虹瀛�', prop: 'mainInspectorName' },
         { label: '澶囨敞', prop: 'remark', dataType: 'slot', slot: 'remark', width: '180px' },
@@ -306,8 +307,8 @@
   line-height: 24px;
   padding: 6px 14px;
   font-size: 14px;
-  color: #333333;
-  border: 1px solid #EEEEEE;
+  color: var(--lims-text);
+  border: 1px solid var(--lims-divider);
   cursor: pointer;
 }
 

--
Gitblit v1.9.3