From 9758c4337f5e0720596f5311e67ec37a3106a71a Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Tue, 4 Nov 2025 13:22:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86-=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=20=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/bas/BasProduct/domain/BasProduct.java |  2 +-
 ruoyi-ui/src/views/bas/basProduct/index.vue     | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
index 0a4a5e3..183c2c4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
@@ -51,7 +51,7 @@ public class BasProduct extends BaseEntity
     private String spec;
 
     /** 型号 */
-    @Excel(name = "物料状态")
+    @Excel(name = "物料状态",dictType = "product_type")
     private String spare1;
 
     /** 单件净重 */
diff --git a/ruoyi-ui/src/views/bas/basProduct/index.vue b/ruoyi-ui/src/views/bas/basProduct/index.vue
index 2c3ff51..ff92800 100644
--- a/ruoyi-ui/src/views/bas/basProduct/index.vue
+++ b/ruoyi-ui/src/views/bas/basProduct/index.vue
@@ -183,7 +183,11 @@
       <el-table-column label="规格型号" align="center" prop="spec" />
       <el-table-column label="图号" align="center" prop="cargoNo" />
       <el-table-column label="常用编码" align="center" prop="parentId" />
-      <el-table-column label="物料状态" align="center" prop="spare1" />
+      <el-table-column label="物料状态" align="center" prop="spare1" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.product_type" :value="scope.row.spare1"/>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unit" />
       <el-table-column label="启用标识" align="center" prop="spare7" >
         <template slot-scope="scope">
@@ -257,7 +261,14 @@
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="物料状态" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入物料状态" />
+          <el-select v-model="form.spare1" placeholder="请选择物料状态">
+            <el-option
+              v-for="dict in dict.type.product_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="是否系统项" prop="spare2">
           <el-select v-model="form.spare2" placeholder="请选择是否系统项">
@@ -308,7 +319,7 @@ import { listBasProduct, getBasProduct, delBasProduct, addBasProduct, updateBasP
 
 export default {
   name: "BasProduct",
-  dicts:['sys_yes_no'],
+  dicts:['sys_yes_no','product_type'],
   data() {
     return {
       // 遮罩层