From 827f535cdd197ab228f561bf5559b215a1c4a929 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 17 三月 2026 17:20:51 +0800
Subject: [PATCH] 1.入库记录(合格自定义入库有过磅单)

---
 src/views/inventoryManagement/stockManagement/Qualified.vue |    4 ++--
 src/views/inventoryManagement/receiptManagement/Record.vue  |    7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 8e65c3c..9de4963 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -54,6 +54,10 @@
                          label="搴忓彿"
                          type="index"
                          width="60"/>
+        <el-table-column label="浜у搧绫诲瀷"
+                         prop="productType"
+                         width="100"
+                         show-overflow-tooltip/>
         <el-table-column label="鍏ュ簱鎵规"
                          prop="inboundBatches"
                          width="280"
@@ -111,7 +115,8 @@
                          width="120"
                          align="center">
           <template #default="scope">
-            <el-button type="primary"
+            <el-button v-if="scope.row.recordType === '0'"
+                       type="primary"
                        size="mini"
                        @click="handlePreview(scope.row)">瀵煎嚭杩囩鍗�</el-button>
           </template>
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 5498f80..9f9e1d7 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="search_form">
       <div>
-        <span class="search_title ml10">浜у搧澶х被锛�</span>
+        <span class="search_title ml10">浜у搧鍚嶇О锛�</span>
         <el-input v-model="searchForm.productName"
                   style="width: 240px"
                   placeholder="璇疯緭鍏�"
@@ -24,7 +24,7 @@
         <el-table-column align="center" type="selection" width="55" />
         <el-table-column align="center" label="搴忓彿" type="index" width="60" />
         <el-table-column label="浜у搧绫诲瀷" prop="parentName" show-overflow-tooltip />
-        <el-table-column label="浜у搧澶х被" prop="productName" show-overflow-tooltip />
+        <el-table-column label="浜у搧鍚嶇О" prop="productName" show-overflow-tooltip />
         <el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
         <el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
         <el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />

--
Gitblit v1.9.3