From 2957e793816419fd9b326a91231cbbeaf2b29793 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 25 Jun 2026 11:18:08 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dao/MdMeMaterialbase.java         |  5 ++
 .../src/views/wms/basedata/group/index.vue    |  6 ++
 .../src/views/wms/basedata/material/index.vue | 67 +++++++++++++++++--
 3 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java
index b4675ee..f3766a0 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java
@@ -187,5 +187,10 @@ public class MdMeMaterialbase implements Serializable {
      */
     private String execution_stand;
 
+    /**
+     * 是否压容
+     */
+    private String material_type;
+
 
 }
diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue
index 3650963..c3a5536 100644
--- a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue
+++ b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue
@@ -279,6 +279,7 @@
                   size="mini"
                   style="width: 200px;"
                   class="filter-item"
+                  disabled
                   @change="crud.toQuery"
                 >
                   <el-option
@@ -297,6 +298,7 @@
                   size="mini"
                   style="width: 200px;"
                   class="filter-item"
+                  disabled
                   @change="crud.toQuery"
                 >
                   <el-option
@@ -543,11 +545,15 @@ export default {
         this.form.material_spec = row.material_spec
         this.form.material_name = row.material_name
         this.form.material_id = row.material_id
+        this.form.material_type = row.material_type
+        this.form.execution_stand = row.execution_stand
       }).catch(() => {
         this.form.material_spec = ''
         this.form.material_name = ''
         this.form.material_code = ''
         this.form.material_id = ''
+        this.form.material_type = ''
+        this.form.execution_stand = ''
       })
     },
     checkVehicle(value) {
diff --git a/wms/nladmin-ui/src/views/wms/basedata/material/index.vue b/wms/nladmin-ui/src/views/wms/basedata/material/index.vue
index 59d16c5..b4caba2 100644
--- a/wms/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/wms/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -68,17 +68,51 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
+              <el-form-item label="执行标准" prop="execution_stand">
+                <el-select
+                  v-model="form.execution_stand"
+                  size="mini"
+                  style="width: 200px;"
+                  class="filter-item"
+                  @change="crud.toQuery"
+                >
+                  <el-option
+                    v-for="item in executionList"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="是否压容" prop="material_type">
+                <el-select
+                  v-model="form.material_type"
+                  size="mini"
+                  style="width: 200px;"
+                  class="filter-item"
+                  @change="crud.toQuery"
+                >
+                  <el-option
+                    v-for="item in materialType"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+           <!-- <el-col :span="8">
               <el-form-item label="外部标识" prop="ext_id">
                 <el-input v-model="form.ext_id" style="width: 200px;" />
               </el-form-item>
-            </el-col>
+            </el-col>-->
           </el-row>
           <el-row>
-            <el-col :span="8">
+          <!--  <el-col :span="8">
               <el-form-item label="静置时间" prop="standing_time">
                 <el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;" />
               </el-form-item>
-            </el-col>
+            </el-col>-->
             <el-col :span="8">
               <el-form-item label="是否启用" prop="is_used">
                 <el-radio v-model="form.is_used" label="0">否</el-radio>
@@ -105,9 +139,9 @@
         <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
         <el-table-column prop="material_spec" label="物料规格" width="140" />
         <el-table-column prop="material_model" label="物料型号" />
-        <el-table-column prop="class_name" label="物料分类" width="140" />
+        <el-table-column prop="execution_stand" label="执行标准" :min-width="flexWidth('execution_stand',crud.data,'执行标准')" />
+        <el-table-column prop="material_type" label="是否压容" :min-width="flexWidth('material_type',crud.data,'是否压容')" :formatter="formattMaterial" />
         <el-table-column prop="unit_name" label="计量单位" />
-        <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
         <el-table-column prop="product_series_name" label="系列" />
         <el-table-column label="启用" align="center" prop="is_used">
           <template slot-scope="scope">
@@ -184,6 +218,7 @@ const defaultForm = {
   is_delete: null,
   ext_id: null,
   material_height_type: null,
+  material_type: null,
   product_series: null
 }
 export default {
@@ -210,6 +245,18 @@ export default {
       fullscreenLoading: false,
       measure_unit: [],
       productSeries: [],
+      executionList: [
+        { 'label':'AWS A5.18', 'value': 'AWS A5.18' },
+        { 'label':'AWS A5.9M', 'value': 'AWS A5.9M' },
+        { 'label':'GB/T 15620', 'value': 'GB/T 15620' },
+        { 'label':'GB/T 17853', 'value': 'GB/T 17853' },
+        { 'label':'GB/T 8110', 'value': 'GB/T 8110' },
+        { 'label':'NB/T 47018', 'value': 'NB/T 47018' }
+      ],
+      materialType: [
+        { 'label':'压容', 'value': '0' },
+        { 'label':'非压容', 'value': '1' }
+      ],
       permission: {},
       rules: {
         material_id: [
@@ -232,6 +279,9 @@ export default {
         ],
         material_height_type: [
           { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        execution_stand: [
+          { required: true, message: '执行标准不能为空', trigger: 'blur' }
         ]
       }
     }
@@ -276,6 +326,13 @@ export default {
           data.is_used = '0'
         }
       })
+    },
+    formattMaterial(row) {
+      if (row.material_type === '0') {
+        return '压容'
+      } else if (row.material_type === '1') {
+        return '非压容'
+      }
     }
   }
 }