From dda913d87a5a6acfbb04359ad0691cf3c9c62fb9 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 25 Feb 2025 10:32:29 +0800
Subject: [PATCH] =?UTF-8?q?change(mes):=20=E4=BF=AE=E6=94=B9=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=B1=BB=E5=9E=8B=E9=A1=B5=E9=9D=A2=E3=80=81=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=A4=A7=E7=B1=BB=E5=92=8C=E8=AE=BE=E5=A4=87=E5=A4=A7?=
 =?UTF-8?q?=E7=B1=BB=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除不必要的搜索字段
- 物料类型页面更新物料大类字段为下拉选择数据库表数据而不是字典
- 调整表格列显示
- 添加物料大类名称字段
---
 src/api/mes/baseMaterialType/types.ts        |  43 +++--
 src/views/mes/baseDeviceCategory/index.vue   |  63 ++++---
 src/views/mes/baseMaterialCategory/index.vue |  66 +++++---
 src/views/mes/baseMaterialType/index.vue     | 169 ++++++++++---------
 4 files changed, 207 insertions(+), 134 deletions(-)

diff --git a/src/api/mes/baseMaterialType/types.ts b/src/api/mes/baseMaterialType/types.ts
index 7b8cf5f..687a04d 100644
--- a/src/api/mes/baseMaterialType/types.ts
+++ b/src/api/mes/baseMaterialType/types.ts
@@ -30,9 +30,9 @@ export interface BaseMaterialTypeVO {
   ancestors: string;
 
   /**
-   * 物料大类(1原材料  2半成品 3成品)
+   * 物料大类
    */
-  materialCategories: string;
+  materialCategoryId: string;
 
   /**
    * 物料小类
@@ -79,10 +79,15 @@ export interface BaseMaterialTypeVO {
    */
   updateTime: string;
 
-    /**
-     * 子对象
-     */
-    children: BaseMaterialTypeVO[];
+  /**
+   * 子对象
+   */
+  children: BaseMaterialTypeVO[];
+
+  /**
+   * 物料大类名称
+   */
+  materialCategoryName?: string;
 }
 
 export interface BaseMaterialTypeForm extends BaseEntity {
@@ -112,9 +117,9 @@ export interface BaseMaterialTypeForm extends BaseEntity {
   ancestors?: string;
 
   /**
-   * 物料大类(1原材料  2半成品 3成品)
+   * 物料大类
    */
-  materialCategories?: string;
+  materialCategoryId?: string;
 
   /**
    * 物料小类
@@ -136,6 +141,11 @@ export interface BaseMaterialTypeForm extends BaseEntity {
    */
   remark?: string;
 
+  /**
+   * 物料大类名称
+   */
+  materialCategoryName?: string;
+
 }
 
 export interface BaseMaterialTypeQuery {
@@ -166,9 +176,9 @@ export interface BaseMaterialTypeQuery {
   ancestors?: string;
 
   /**
-   * 物料大类(1原材料  2半成品 3成品)
+   * 物料大类
    */
-  materialCategories?: string;
+  materialCategoryId?: string;
 
   /**
    * 物料小类
@@ -185,10 +195,15 @@ export interface BaseMaterialTypeQuery {
    */
   activeFlag?: string;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+
+  /**
+   * 物料大类名称
+   */
+  materialCategoryName?: string;
 }
 
 
diff --git a/src/views/mes/baseDeviceCategory/index.vue b/src/views/mes/baseDeviceCategory/index.vue
index d4d5474..0ec34a4 100644
--- a/src/views/mes/baseDeviceCategory/index.vue
+++ b/src/views/mes/baseDeviceCategory/index.vue
@@ -4,17 +4,22 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="大类ID" prop="deviceCategoryId">
-              <el-input v-model="queryParams.deviceCategoryId" placeholder="请输入大类ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="大类编号" prop="deviceCategoryCode">
-              <el-input v-model="queryParams.deviceCategoryCode" placeholder="请输入大类编号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            <!--            <el-form-item label="大类ID" prop="deviceCategoryId">
+                          <el-input v-model="queryParams.deviceCategoryId" placeholder="请输入大类ID" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
+            <!--            <el-form-item label="大类编号" prop="deviceCategoryCode">
+                          <el-input v-model="queryParams.deviceCategoryCode" placeholder="请输入大类编号" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
             <el-form-item label="大类名称" prop="deviceCategoryName">
               <el-input v-model="queryParams.deviceCategoryName" placeholder="请输入大类名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <!--            <el-form-item label="激活标识" prop="activeFlag">
+                          <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
             <el-form-item label="激活标识" prop="activeFlag">
-              <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -49,7 +54,12 @@
         <el-table-column label="大类ID" align="center" prop="deviceCategoryId" v-if="columns[0].visible"/>
         <el-table-column label="大类编号" align="center" prop="deviceCategoryCode" v-if="columns[2].visible"/>
         <el-table-column label="大类名称" align="center" prop="deviceCategoryName" v-if="columns[3].visible"/>
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[4].visible"/>
+        <!--        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[4].visible"/>-->
+        <el-table-column label="激活标识" align="center" prop="activeFlag">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -65,6 +75,7 @@
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
+
     <!-- 添加或修改设备大类信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="baseDeviceCategoryFormRef" :model="form" :rules="rules" label-width="80px">
@@ -74,8 +85,17 @@
         <el-form-item label="大类名称" prop="deviceCategoryName">
           <el-input v-model="form.deviceCategoryName" placeholder="请输入大类名称" />
         </el-form-item>
+        <!--        <el-form-item label="激活标识" prop="activeFlag">
+                  <el-input v-model="form.activeFlag" placeholder="请输入激活标识" />
+                </el-form-item>-->
         <el-form-item label="激活标识" prop="activeFlag">
-          <el-input v-model="form.activeFlag" placeholder="请输入激活标识" />
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -96,6 +116,7 @@ import { listBaseDeviceCategory, getBaseDeviceCategory, delBaseDeviceCategory, a
 import { BaseDeviceCategoryVO, BaseDeviceCategoryQuery, BaseDeviceCategoryForm } from '@/api/mes/baseDeviceCategory/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
 
 const baseDeviceCategoryList = ref<BaseDeviceCategoryVO[]>([]);
 const buttonLoading = ref(false);
@@ -116,24 +137,24 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `大类ID`, visible: true },
-        { key: 1, label: `租户编号`, visible: true },
-        { key: 2, label: `大类编号`, visible: true },
-        { key: 3, label: `大类名称`, visible: true },
-        { key: 4, label: `激活标识`, visible: true },
-        { key: 5, label: `备注`, visible: true },
-        { key: 6, label: `创建部门`, visible: true },
-        { key: 7, label: `创建人`, visible: true },
-        { key: 8, label: `创建时间`, visible: true },
-        { key: 9, label: `更新人`, visible: true },
-        { key: 10, label: `更新时间`, visible: true },
+  { key: 0, label: `大类ID`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `大类编号`, visible: true },
+  { key: 3, label: `大类名称`, visible: true },
+  { key: 4, label: `激活标识`, visible: true },
+  { key: 5, label: `备注`, visible: true },
+  { key: 6, label: `创建部门`, visible: false },
+  { key: 7, label: `创建人`, visible: false },
+  { key: 8, label: `创建时间`, visible: false },
+  { key: 9, label: `更新人`, visible: false },
+  { key: 10, label: `更新时间`, visible: false },
 ]);
 
 const initFormData: BaseDeviceCategoryForm = {
   deviceCategoryId: undefined,
   deviceCategoryCode: undefined,
   deviceCategoryName: undefined,
-  activeFlag: undefined,
+  activeFlag: '1',
   remark: undefined,
 }
 const data = reactive<PageData<BaseDeviceCategoryForm, BaseDeviceCategoryQuery>>({
diff --git a/src/views/mes/baseMaterialCategory/index.vue b/src/views/mes/baseMaterialCategory/index.vue
index bbbf5b9..da30d8a 100644
--- a/src/views/mes/baseMaterialCategory/index.vue
+++ b/src/views/mes/baseMaterialCategory/index.vue
@@ -4,17 +4,22 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="大类ID" prop="materialCategoryId">
+<!--            <el-form-item label="大类ID" prop="materialCategoryId">
               <el-input v-model="queryParams.materialCategoryId" placeholder="请输入大类ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item>-->
             <el-form-item label="大类编号" prop="materialCategoryCode">
               <el-input v-model="queryParams.materialCategoryCode" placeholder="请输入大类编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="大类名称" prop="materialCategoryName">
               <el-input v-model="queryParams.materialCategoryName" placeholder="请输入大类名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <!--            <el-form-item label="激活标识" prop="activeFlag">
+                          <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
             <el-form-item label="激活标识" prop="activeFlag">
-              <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -49,7 +54,12 @@
         <el-table-column label="大类ID" align="center" prop="materialCategoryId" v-if="columns[0].visible"/>
         <el-table-column label="大类编号" align="center" prop="materialCategoryCode" v-if="columns[2].visible"/>
         <el-table-column label="大类名称" align="center" prop="materialCategoryName" v-if="columns[3].visible"/>
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[4].visible"/>
+        <!--        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[4].visible"/>-->
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[4].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -74,8 +84,17 @@
         <el-form-item label="大类名称" prop="materialCategoryName">
           <el-input v-model="form.materialCategoryName" placeholder="请输入大类名称" />
         </el-form-item>
+        <!--        <el-form-item label="激活标识" prop="activeFlag">
+                  <el-input v-model="form.activeFlag" placeholder="请输入激活标识" />
+                </el-form-item>-->
         <el-form-item label="激活标识" prop="activeFlag">
-          <el-input v-model="form.activeFlag" placeholder="请输入激活标识" />
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -96,6 +115,7 @@ import { listBaseMaterialCategory, getBaseMaterialCategory, delBaseMaterialCateg
 import { BaseMaterialCategoryVO, BaseMaterialCategoryQuery, BaseMaterialCategoryForm } from '@/api/mes/baseMaterialCategory/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
 
 const baseMaterialCategoryList = ref<BaseMaterialCategoryVO[]>([]);
 const buttonLoading = ref(false);
@@ -116,24 +136,24 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `大类ID`, visible: true },
-        { key: 1, label: `租户编号`, visible: true },
-        { key: 2, label: `大类编号`, visible: true },
-        { key: 3, label: `大类名称`, visible: true },
-        { key: 4, label: `激活标识`, visible: true },
-        { key: 5, label: `备注`, visible: true },
-        { key: 6, label: `创建部门`, visible: true },
-        { key: 7, label: `创建人`, visible: true },
-        { key: 8, label: `创建时间`, visible: true },
-        { key: 9, label: `更新人`, visible: true },
-        { key: 10, label: `更新时间`, visible: true },
+  { key: 0, label: `大类ID`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `大类编号`, visible: true },
+  { key: 3, label: `大类名称`, visible: true },
+  { key: 4, label: `激活标识`, visible: true },
+  { key: 5, label: `备注`, visible: true },
+  { key: 6, label: `创建部门`, visible: false },
+  { key: 7, label: `创建人`, visible: false },
+  { key: 8, label: `创建时间`, visible: false },
+  { key: 9, label: `更新人`, visible: false },
+  { key: 10, label: `更新时间`, visible: false },
 ]);
 
 const initFormData: BaseMaterialCategoryForm = {
   materialCategoryId: undefined,
   materialCategoryCode: undefined,
   materialCategoryName: undefined,
-  activeFlag: undefined,
+  activeFlag: '1',
   remark: undefined,
 }
 const data = reactive<PageData<BaseMaterialCategoryForm, BaseMaterialCategoryQuery>>({
@@ -149,9 +169,9 @@ const data = reactive<PageData<BaseMaterialCategoryForm, BaseMaterialCategoryQue
     }
   },
   rules: {
-    materialCategoryId: [
-      { required: true, message: "大类ID不能为空", trigger: "blur" }
-    ],
+    /*    materialCategories: [
+          { required: true, message: "大类ID不能为空", trigger: "blur" }
+        ],*/
     materialCategoryCode: [
       { required: true, message: "大类编号不能为空", trigger: "blur" }
     ],
@@ -161,9 +181,9 @@ const data = reactive<PageData<BaseMaterialCategoryForm, BaseMaterialCategoryQue
     activeFlag: [
       { required: true, message: "激活标识不能为空", trigger: "blur" }
     ],
-    remark: [
-      { required: true, message: "备注不能为空", trigger: "blur" }
-    ],
+    /*    remark: [
+          { required: true, message: "备注不能为空", trigger: "blur" }
+        ],*/
   }
 });
 
diff --git a/src/views/mes/baseMaterialType/index.vue b/src/views/mes/baseMaterialType/index.vue
index 5b7ed59..1e15198 100644
--- a/src/views/mes/baseMaterialType/index.vue
+++ b/src/views/mes/baseMaterialType/index.vue
@@ -4,32 +4,42 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-<!--            <el-form-item label="物料类型ID" prop="matrialTypeId">
-              <el-input v-model="queryParams.matrialTypeId" placeholder="请输入物料类型ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>-->
-<!--            <el-form-item label="父级标识" prop="parentId">
-              <el-input v-model="queryParams.parentId" placeholder="请输入父级标识" clearable @keyup.enter="handleQuery" />
-            </el-form-item>-->
-<!--            <el-form-item label="物料类型编号" prop="matrialTypeCode">
-              <el-input v-model="queryParams.matrialTypeCode" placeholder="请输入物料类型编号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>-->
-            <el-form-item label="物料类型名称" prop="matrialTypeName">
+            <!--            <el-form-item label="物料类型ID" prop="matrialTypeId">
+                          <el-input v-model="queryParams.matrialTypeId" placeholder="请输入物料类型ID" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
+            <!--            <el-form-item label="父级标识" prop="parentId">
+                          <el-input v-model="queryParams.parentId" placeholder="请输入父级标识" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
+            <!--            <el-form-item label="物料类型编号" prop="matrialTypeCode">
+                          <el-input v-model="queryParams.matrialTypeCode" placeholder="请输入物料类型编号" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
+            <el-form-item label="物料类型名称" prop="matrialTypeName" label-width="100px">
               <el-input v-model="queryParams.matrialTypeName" placeholder="请输入物料类型名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-<!--            <el-form-item label="祖级列表" prop="ancestors">
-              <el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />
-            </el-form-item>-->
-            <el-form-item label="物料大类" prop="materialCategories">
-              <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable>
-                <el-option v-for="dict in mes_material_categories" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </el-form-item>
-<!--            <el-form-item label="物料小类" prop="materialSubclass">
-              <el-input v-model="queryParams.materialSubclass" placeholder="请输入物料小类" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="工序ID" prop="processId">
-              <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>-->
+            <!--            <el-form-item label="祖级列表" prop="ancestors">
+                          <el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
+            <!--            <el-form-item label="物料大类" prop="materialCategories">
+                          <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable>
+                            <el-option v-for="dict in mes_material_categories" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                          </el-select>
+                        </el-form-item>-->
+            <!--            <el-form-item label="物料大类" prop="materialCategoryId">
+                          <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable>
+                            <el-option
+                              v-for="item in materialCategoryList "
+                              :key="item.materialCategoryId"
+                              :label="item.materialCategoryName"
+                              :value="item.materialCategoryId"
+                            />
+                          </el-select>
+                        </el-form-item>-->
+            <!--            <el-form-item label="物料小类" prop="materialSubclass">
+                          <el-input v-model="queryParams.materialSubclass" placeholder="请输入物料小类" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="工序ID" prop="processId">
+                          <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
             <el-form-item label="激活标识" prop="activeFlag">
               <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
                 <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -64,19 +74,16 @@
         :default-expand-all="isExpandAll"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
-<!--        <el-table-column label="物料类型ID" align="center" prop="matrialTypeId" />
-        <el-table-column label="租户编号" prop="tenantId" />-->
-<!--        <el-table-column label="父级标识" align="center" prop="parentId" />-->
+        <!--        <el-table-column label="物料类型ID" align="center" prop="matrialTypeId" />
+                <el-table-column label="租户编号" prop="tenantId" />-->
+        <!--        <el-table-column label="父级标识" align="center" prop="parentId" />-->
         <el-table-column label="物料类型编号" align="center" prop="matrialTypeCode" />
         <el-table-column label="物料类型名称" align="center" prop="matrialTypeName" />
-        <el-table-column label="祖级列表" align="center" prop="ancestors" />
-        <el-table-column label="物料大类" align="center" prop="materialCategories">
-          <template #default="scope">
-            <dict-tag :options="mes_material_categories" :value="scope.row.materialCategories"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="物料小类" align="center" prop="materialSubclass" />
-        <el-table-column label="工序ID" align="center" prop="processId" />
+        <!--        <el-table-column label="祖级列表" align="center" prop="ancestors" />-->
+        <el-table-column label="物料大类" align="center" prop="materialCategoryName"/>
+
+        <!--        <el-table-column label="物料小类" align="center" prop="materialSubclass" />-->
+        <!--        <el-table-column label="工序ID" align="center" prop="processId" />-->
         <el-table-column label="激活标识" align="center" prop="activeFlag">
           <template #default="scope">
             <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
@@ -114,54 +121,54 @@
     <!-- 添加或修改物料类型信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="baseMaterialTypeFormRef" :model="form" :rules="rules" label-width="120px">
-<!--        <el-form-item label="物料类型ID" prop="matrialTypeId">
-          <el-input v-model="form.matrialTypeId" placeholder="请输入物料类型ID" />
-        </el-form-item>-->
-        <el-form-item label="父级标识" prop="parentId">
-          <el-tree-select
-            v-model="form.parentId"
-            :data="baseMaterialTypeOptions"
-            :props="{ value: 'matrialTypeId', label: 'matrialTypeName', children: 'children' }"
-            value-key="matrialTypeId"
-            placeholder="请选择父级标识"
-            check-strictly
-          />
-        </el-form-item>
+        <!--        <el-form-item label="物料类型ID" prop="matrialTypeId">
+                  <el-input v-model="form.matrialTypeId" placeholder="请输入物料类型ID" />
+                </el-form-item>-->
+        <!--        <el-form-item label="父级标识" prop="parentId">
+                  <el-tree-select
+                    v-model="form.parentId"
+                    :data="baseMaterialTypeOptions"
+                    :props="{ value: 'matrialTypeId', label: 'matrialTypeName', children: 'children' }"
+                    value-key="matrialTypeId"
+                    placeholder="请选择父级标识"
+                    check-strictly
+                  />
+                </el-form-item>-->
         <el-form-item label="物料类型编号" prop="matrialTypeCode">
           <el-input v-model="form.matrialTypeCode" placeholder="请输入物料类型编号" />
         </el-form-item>
         <el-form-item label="物料类型名称" prop="matrialTypeName">
           <el-input v-model="form.matrialTypeName" placeholder="请输入物料类型名称" />
         </el-form-item>
-<!--        <el-form-item label="祖级列表" prop="ancestors">
-          <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />
-        </el-form-item>-->
-        <el-form-item label="物料大类" prop="materialCategories">
-          <el-select v-model="form.materialCategories" placeholder="请选择物料大类">
+        <!--        <el-form-item label="祖级列表" prop="ancestors">
+                  <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />
+                </el-form-item>-->
+        <el-form-item label="物料大类" prop="materialCategoryId">
+          <el-select v-model="form.materialCategoryId" placeholder="请选择物料大类">
             <el-option
-              v-for="dict in mes_material_categories"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="物料小类" prop="materialSubclass">
-          <el-input v-model="form.materialSubclass" placeholder="请输入物料小类" />
-        </el-form-item>
-<!--        <el-form-item label="工序ID" prop="processId">
-          <el-input v-model="form.processId" placeholder="请输入工序ID" />
-        </el-form-item>-->
-        <el-form-item label="工序" prop="processId">
-          <el-select v-model="form.processId" placeholder="请选择工序">
-            <el-option
-              v-for="item in processList"
-              :key="item.processId"
-              :label="item.processName"
-              :value="item.processId"
+              v-for="item in materialCategoryList "
+              :key="item.materialCategoryId"
+              :label="item.materialCategoryName"
+              :value="item.materialCategoryId"
             />
           </el-select>
         </el-form-item>
+        <!--        <el-form-item label="物料小类" prop="materialSubclass">
+                  <el-input v-model="form.materialSubclass" placeholder="请输入物料小类" />
+                </el-form-item>-->
+        <!--        <el-form-item label="工序ID" prop="processId">
+                  <el-input v-model="form.processId" placeholder="请输入工序ID" />
+                </el-form-item>-->
+        <!--        <el-form-item label="工序" prop="processId">
+                  <el-select v-model="form.processId" placeholder="请选择工序">
+                    <el-option
+                      v-for="item in processList"
+                      :key="item.processId"
+                      :label="item.processName"
+                      :value="item.processId"
+                    />
+                  </el-select>
+                </el-form-item>-->
         <el-form-item label="激活标识" prop="activeFlag">
           <el-radio-group v-model="form.activeFlag">
             <el-radio
@@ -189,6 +196,7 @@
 import { listBaseMaterialType, getBaseMaterialType, delBaseMaterialType, addBaseMaterialType, updateBaseMaterialType } from "@/api/mes/baseMaterialType";
 import { BaseMaterialTypeVO, BaseMaterialTypeQuery, BaseMaterialTypeForm } from '@/api/mes/baseMaterialType/types';
 import { getProcessInfoList } from "@/api/mes/baseProcessInfo";
+import {getBaseMaterialCategoryList} from "@/api/mes/baseMaterialCategory";
 
 type BaseMaterialTypeOption = {
   matrialTypeId: number;
@@ -223,10 +231,10 @@ const initFormData: BaseMaterialTypeForm = {
     matrialTypeCode: undefined,
     matrialTypeName: undefined,
     ancestors: undefined,
-    materialCategories: undefined,
+    materialCategoryId: undefined,
     materialSubclass: undefined,
     processId: undefined,
-  activeFlag: '1',
+    activeFlag: '1',
     remark: undefined,
 }
 
@@ -238,7 +246,7 @@ const data = reactive<PageData<BaseMaterialTypeForm, BaseMaterialTypeQuery>>({
     matrialTypeCode: undefined,
     matrialTypeName: undefined,
     ancestors: undefined,
-    materialCategories: undefined,
+    materialCategoryId: undefined,
     materialSubclass: undefined,
     processId: undefined,
     activeFlag: undefined,
@@ -397,7 +405,16 @@ const handleDelete = async (row: BaseMaterialTypeVO) => {
   proxy?.$modal.msgSuccess("删除成功");
 }
 
+
+let materialCategoryList = ref([]);
+const getMaterialCategory = async () => {
+  const res = await getBaseMaterialCategoryList(null);
+  materialCategoryList.value = res.data;
+}
+
+
 onMounted(() => {
+  getMaterialCategory();
   getProcessSelect();
   getList();
 });