From 727d57b3c5e2b3658c7a41981bd7da9f5a71bf38 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Tue, 21 Oct 2025 16:00:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E6=89=93=E5=8D=B0=E6=9D=A1=E7=A0=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/in/stockIn/index.vue | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index 7b43151..1d3b3bf 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -9,10 +9,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料描述" prop="materialDesc"><!--物料描述-->
+      <el-form-item label="物料名称" prop="materialDesc"><!--物料描述-->
         <el-input
           v-model="queryParams.materialDesc"
-          placeholder="请输入物料描述"
+          placeholder="请输入物料名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -114,18 +114,18 @@
         >单据确认<!--单据确认-->
         </el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="info"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          :disabled="detailMultiple"-->
-<!--          @click="handleBarcodePrinting"-->
-<!--          v-hasPermi="['in:stockIn:barcodePrinting']"-->
-<!--        >打印条码&lt;!&ndash;打印条码&ndash;&gt;-->
-<!--        </el-button>-->
-<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :disabled="detailMultiple"
+          @click="handleBarcodePrinting"
+          v-hasPermi="['in:stockIn:barcodePrinting']"
+        >打印条码<!--打印条码-->
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -176,8 +176,8 @@
       <el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID-->
       <el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
       <el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码-->
-      <el-table-column label="供应商" align="left" prop="supplierName"/><!--供应商-->
-      <el-table-column label="规格型号" align="left" prop="spec" />
+      <el-table-column label="供应商" align="left" prop="supplierName" width="160"/><!--供应商-->
+      <el-table-column label="规格型号" align="left" prop="spec" width="160"/>
       <el-table-column label="生产图号" align="left" prop="cargoNo" />
       <el-table-column label="单位" align="left" prop="unit" />
       <el-table-column label="来源" align="left" prop="spare1"><!--来源-->