From 4e3f1065636a36bc31c9b24065279ad99ee0b2f4 Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Wed, 6 May 2026 11:42:00 +0800
Subject: [PATCH] =?UTF-8?q?refactor(customer):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=A1=A8=E5=8D=95=E7=95=8C=E9=9D=A2=E5=92=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/biz/customer/CustomerForm.vue   | 322 ++++++++++++------
 .../src/views/biz/customer/index.vue          |  72 ++--
 .../src/views/biz/machine/MachineForm.vue     |   2 +-
 .../src/views/biz/material/MaterialForm.vue   |  79 +++--
 .../src/views/biz/material/index.vue          |  44 ++-
 5 files changed, 306 insertions(+), 213 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/CustomerForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/CustomerForm.vue
index 4c29f88..9abb77e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/CustomerForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/CustomerForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
     <el-form
       ref="formRef"
       :model="formData"
@@ -7,110 +7,204 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="客户编码" prop="custNo">
-        <el-input v-model="formData.custNo" placeholder="请输入客户编码" />
-      </el-form-item>
-      <el-form-item label="客户全称" prop="custName">
-        <el-input v-model="formData.custName" placeholder="请输入客户全称" />
-      </el-form-item>
-      <el-form-item label="客户简称" prop="custSimName">
-        <el-input v-model="formData.custSimName" placeholder="请输入客户简称" />
-      </el-form-item>
-      <el-form-item label="所属行业（1钢铁  2 电力 3 化工）" prop="industryClass">
-        <el-input v-model="formData.industryClass" placeholder="请输入所属行业（1钢铁  2 电力 3 化工）" />
-      </el-form-item>
-      <el-form-item label="合作状态（1 潜在 2意向 3正式 4暂停 5终止）" prop="coopStatus">
-        <el-radio-group v-model="formData.coopStatus">
-          <el-radio
-            v-for="dict in getStrDictOptions(DICT_TYPE.COOP_STATUS)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="企业性质 （1 国有企业 2 民营企业 3 外资企业）" prop="enterpriseType">
-        <el-select v-model="formData.enterpriseType" placeholder="请选择企业性质 （1 国有企业 2 民营企业 3 外资企业）">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISE_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="客户等级（1 核心 2重点 3一般）" prop="custReg">
-        <el-input v-model="formData.custReg" placeholder="请输入客户等级（1 核心 2重点 3一般）" />
-      </el-form-item>
-      <el-form-item label="信用等级( I 优 2 良 3 中 4 差)" prop="creditRate">
-        <el-input v-model="formData.creditRate" placeholder="请输入信用等级( I 优 2 良 3 中 4 差)" />
-      </el-form-item>
-      <el-form-item label="联系人1" prop="contact1">
-        <el-input v-model="formData.contact1" placeholder="请输入联系人1" />
-      </el-form-item>
-      <el-form-item label="联系电话1" prop="conPhone1">
-        <el-input v-model="formData.conPhone1" placeholder="请输入联系电话1" />
-      </el-form-item>
-      <el-form-item label="联系地址1" prop="conAddress1">
-        <el-input v-model="formData.conAddress1" placeholder="请输入联系地址1" />
-      </el-form-item>
-      <el-form-item label="联系人2" prop="contact2">
-        <el-input v-model="formData.contact2" placeholder="请输入联系人2" />
-      </el-form-item>
-      <el-form-item label="联系电话2" prop="conPhone2">
-        <el-input v-model="formData.conPhone2" placeholder="请输入联系电话2" />
-      </el-form-item>
-      <el-form-item label="联系地址2" prop="conAddress2">
-        <el-input v-model="formData.conAddress2" placeholder="请输入联系地址2" />
-      </el-form-item>
-      <el-form-item label="公司税号" prop="comTaxNumber">
-        <el-input v-model="formData.comTaxNumber" placeholder="请输入公司税号" />
-      </el-form-item>
-      <el-form-item label="开户地区" prop="accountRegion">
-        <el-input v-model="formData.accountRegion" placeholder="请输入开户地区" />
-      </el-form-item>
-      <el-form-item label="开户银行" prop="accountBank">
-        <el-input v-model="formData.accountBank" placeholder="请输入开户银行" />
-      </el-form-item>
-      <el-form-item label="开户账号" prop="accountNo">
-        <el-input v-model="formData.accountNo" placeholder="请输入开户账号" />
-      </el-form-item>
-      <el-form-item label="付款方式（1 预付 2 月付  3承兑）" prop="payMeth">
-        <el-input v-model="formData.payMeth" placeholder="请输入付款方式（1 预付 2 月付  3承兑）" />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
-      </el-form-item>
-      <el-form-item label="启用状态（1：启用2：未启用）" prop="enabledStatus">
-        <el-radio-group v-model="formData.enabledStatus">
-          <el-radio
-            v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_STATUS)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
+      <!-- 基础信息 -->
+      <div class="form-section">
+        <div class="section-title">基础信息</div>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="客户编码" prop="custNo">
+              <el-input v-model="formData.custNo" placeholder="请输入客户编码" :disabled="formType === 'update'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户全称" prop="custName">
+              <el-input v-model="formData.custName" placeholder="请输入客户全称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户简称" prop="custSimName">
+              <el-input v-model="formData.custSimName" placeholder="请输入客户简称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="所属行业" prop="industryClass">
+              <el-select v-model="formData.industryClass" placeholder="请选择所属行业">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.INDUSTRY_CLASS)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="合作状态" prop="coopStatus">
+              <el-select v-model="formData.coopStatus" placeholder="请选择合作状态">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.COOP_STATUS)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="企业性质" prop="enterpriseType">
+              <el-select v-model="formData.enterpriseType" placeholder="请选择企业性质">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISE_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="客户等级" prop="custReg">
+              <el-select v-model="formData.custReg" placeholder="请选择客户等级">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.CUSTOMER_LEVER)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="信用等级" prop="creditRate">
+              <el-select v-model="formData.creditRate" placeholder="请选择信用等级">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.CREDIT_RATE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="启用状态" prop="enabledStatus">
+              <el-select v-model="formData.enabledStatus" placeholder="请选择启用状态">
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_STATUS)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" :rows="2" />
+        </el-form-item>
+      </div>
+
+      <!-- 联系方式 -->
+      <div class="form-section">
+        <div class="section-title">联系方式</div>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="联系人1" prop="contact1">
+              <el-input v-model="formData.contact1" placeholder="请输入联系人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系电话1" prop="conPhone1">
+              <el-input v-model="formData.conPhone1" placeholder="请输入联系电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系地址1" prop="conAddress1">
+              <el-input v-model="formData.conAddress1" placeholder="请输入联系地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="联系人2" prop="contact2">
+              <el-input v-model="formData.contact2" placeholder="请输入联系人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系电话2" prop="conPhone2">
+              <el-input v-model="formData.conPhone2" placeholder="请输入联系电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系地址2" prop="conAddress2">
+              <el-input v-model="formData.conAddress2" placeholder="请输入联系地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+
+      <!-- 开票信息 -->
+      <div class="form-section">
+        <div class="section-title">开票信息</div>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="公司税号" prop="comTaxNumber">
+              <el-input v-model="formData.comTaxNumber" placeholder="请输入公司税号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开户地区" prop="accountRegion">
+              <el-input v-model="formData.accountRegion" placeholder="请输入开户地区" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开户银行" prop="accountBank">
+              <el-input v-model="formData.accountBank" placeholder="请输入开户银行" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="开户账号" prop="accountNo">
+              <el-input v-model="formData.accountNo" placeholder="请输入开户账号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="付款方式" prop="payMeth">
+              <el-select v-model="formData.payMeth" placeholder="请选择付款方式">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.PAY_METH)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">保 存</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
 <script setup lang="ts">
-import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getStrDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as CustomerApi from '@/api/biz/customer'
 
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
+const { t } = useI18n()
+const message = useMessage()
 
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formLoading = ref(false)
+const formType = ref('')
 const formData = ref({
   id: undefined,
   custNo: undefined,
@@ -133,21 +227,21 @@ const formData = ref({
   accountNo: undefined,
   payMeth: undefined,
   remark: undefined,
-  enabledStatus: undefined,
+  enabledStatus: 0,
 })
 const formRules = reactive({
-  custNo: [{ required: true, message: '客户编码不能为空', trigger: 'blur' }],
-  enabledStatus: [{ required: true, message: '启用状态（1：启用2：未启用）不能为空', trigger: 'blur' }],
+  custNo: [{ required: true, message: '请输入客户编码', trigger: 'blur' }],
+  custName: [{ required: true, message: '请输入客户全称', trigger: 'blur' }],
+  custSimName: [{ required: true, message: '请输入客户简称', trigger: 'blur' }],
+  enabledStatus: [{ required: true, message: '请选择启用状态', trigger: 'change' }],
 })
-const formRef = ref() // 表单 Ref
+const formRef = ref()
 
-/** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
-  // 修改时，设置数据
   if (id) {
     formLoading.value = true
     try {
@@ -157,14 +251,11 @@ const open = async (type: string, id?: number) => {
     }
   }
 }
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+defineExpose({ open })
 
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const emit = defineEmits(['success'])
 const submitForm = async () => {
-  // 校验表单
   await formRef.value.validate()
-  // 提交请求
   formLoading.value = true
   try {
     const data = formData.value as unknown as CustomerApi.CustomerVO
@@ -176,14 +267,12 @@ const submitForm = async () => {
       message.success(t('common.updateSuccess'))
     }
     dialogVisible.value = false
-    // 发送操作成功的事件
     emit('success')
   } finally {
     formLoading.value = false
   }
 }
 
-/** 重置表单 */
 const resetForm = () => {
   formData.value = {
     id: undefined,
@@ -207,8 +296,21 @@ const resetForm = () => {
     accountNo: undefined,
     payMeth: undefined,
     remark: undefined,
-    enabledStatus: undefined,
+    enabledStatus: 0,
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+.form-section {
+  margin-bottom: 24px;
+}
+.section-title {
+  font-size: 14px;
+  font-weight: 600;
+  color: #606266;
+  margin-bottom: 16px;
+  padding-left: 8px;
+  border-left: 3px solid #409eff;
+}
+</style>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/index.vue
index edb4016..4f197ff 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/index.vue
@@ -6,7 +6,7 @@
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="68px"
+      label-width="80px"
     >
       <el-form-item label="客户编码" prop="custNo">
         <el-input
@@ -35,10 +35,10 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="启用状态（1：启用2：未启用）" prop="enabledStatus">
+      <el-form-item label="状态" prop="enabledStatus">
         <el-select
           v-model="queryParams.enabledStatus"
-          placeholder="请选择启用状态（1：启用2：未启用）"
+          placeholder="请选择状态"
           clearable
           class="!w-240px"
         >
@@ -61,15 +61,6 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['biz:customer:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -77,61 +68,40 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="自增字段" align="center" prop="id" />
+      <el-table-column label="序号" align="center" type="index" width="60px" />
       <el-table-column label="客户编码" align="center" prop="custNo" />
       <el-table-column label="客户全称" align="center" prop="custName" />
       <el-table-column label="客户简称" align="center" prop="custSimName" />
-      <el-table-column label="所属行业（1钢铁  2 电力 3 化工）" align="center" prop="industryClass">
+      <el-table-column label="所属行业" align="center" prop="industryClass">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INDUSTRY_CLASS" :value="scope.row.industryClass" />
         </template>
       </el-table-column>
-      <el-table-column label="合作状态（1 潜在 2意向 3正式 4暂停 5终止）" align="center" prop="coopStatus">
+      <el-table-column label="合作状态" align="center" prop="coopStatus">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COOP_STATUS" :value="scope.row.coopStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="企业性质 （1 国有企业 2 民营企业 3 外资企业）" align="center" prop="enterpriseType">
+      <el-table-column label="企业性质" align="center" prop="enterpriseType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ENTERPRISE_TYPE" :value="scope.row.enterpriseType" />
         </template>
       </el-table-column>
-      <el-table-column label="客户等级（1 核心 2重点 3一般）" align="center" prop="custReg">
+      <el-table-column label="客户等级" align="center" prop="custReg">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL" :value="scope.row.custReg" />
+          <dict-tag :type="DICT_TYPE.CUSTOMER_LEVER" :value="scope.row.custReg" />
         </template>
       </el-table-column>
-      <el-table-column label="信用等级( I 优 2 良 3 中 4 差)" align="center" prop="creditRate">
+      <el-table-column label="信用等级" align="center" prop="creditRate">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CREDIT_RATE" :value="scope.row.creditRate" />
         </template>
       </el-table-column>
       <el-table-column label="联系人1" align="center" prop="contact1" />
       <el-table-column label="联系电话1" align="center" prop="conPhone1" />
-      <el-table-column label="联系地址1" align="center" prop="conAddress1" />
-      <el-table-column label="联系人2" align="center" prop="contact2" />
-      <el-table-column label="联系电话2" align="center" prop="conPhone2" />
-      <el-table-column label="联系地址2" align="center" prop="conAddress2" />
-      <el-table-column label="公司税号" align="center" prop="comTaxNumber" />
-      <el-table-column label="开户地区" align="center" prop="accountRegion" />
-      <el-table-column label="开户银行" align="center" prop="accountBank" />
-      <el-table-column label="开户账号" align="center" prop="accountNo" />
-      <el-table-column label="付款方式（1 预付 2 月付  3承兑）" align="center" prop="payMeth" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="启用状态（1：启用2：未启用）" align="center" prop="enabledStatus">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_STATUS" :value="scope.row.enabledStatus" />
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="scope">
+  
           <el-button
             link
             type="primary"
@@ -140,14 +110,21 @@
           >
             编辑
           </el-button>
-          <el-button
+                  <el-button
+            link
+            type="primary"
+            @click="openDetailForm(scope.row.id)"
+          >
+            详情
+          </el-button>
+          <!-- <el-button
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
             v-hasPermi="['biz:customer:delete']"
           >
             删除
-          </el-button>
+          </el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -162,6 +139,8 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <CustomerForm ref="formRef" @success="getList" />
+  <!-- 详情弹窗 -->
+  <CustomerDetail ref="detailRef" />
 </template>
 
 <script setup lang="ts">
@@ -170,6 +149,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as CustomerApi from '@/api/biz/customer'
 import CustomerForm from './CustomerForm.vue'
+import CustomerDetail from './CustomerDetail.vue'
 
 defineOptions({ name: 'Customer' })
 
@@ -220,6 +200,12 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
+/** 详情操作 */
+const detailRef = ref()
+const openDetailForm = (id: number) => {
+  detailRef.value.open(id)
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/machine/MachineForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/machine/MachineForm.vue
index c7e944c..08ac2ac 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/machine/MachineForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/machine/MachineForm.vue
@@ -162,7 +162,7 @@ const resetForm = () => {
     id: undefined,
     machineCd: undefined,
     machineName: undefined,
-    enabledStatus: 0, // 默认启用
+    enabledStatus: 0,
     remark: undefined,
     belgLineId: undefined,
     belgProcId: undefined,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/material/MaterialForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/material/MaterialForm.vue
index 31be356..16bbb1c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/material/MaterialForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/material/MaterialForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
     <el-form
       ref="formRef"
       :model="formData"
@@ -7,20 +7,8 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
-      </el-form-item>
-      <el-form-item label="物料编码" prop="matCode">
-        <el-input v-model="formData.matCode" placeholder="请输入物料编码" />
-      </el-form-item>
-      <el-form-item label="物料名称" prop="matName">
-        <el-input v-model="formData.matName" placeholder="请输入物料名称" />
-      </el-form-item>
-      <el-form-item label="父分类id" prop="parentId">
-        <el-input v-model="formData.parentId" placeholder="请输入父分类id" />
-      </el-form-item>
-      <el-form-item label="物料类型(1 原材料  2 半成品  3 成品 4 联产品 )" prop="matType">
-        <el-select v-model="formData.matType" placeholder="请选择物料类型(1 原材料  2 半成品  3 成品 4 联产品 )">
+     <el-form-item label="物料类型" prop="matType">
+        <el-select v-model="formData.matType" placeholder="请选择物料类型">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.MAT_TYPE)"
             :key="dict.value"
@@ -29,31 +17,46 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态(1启用 2 未启用)" prop="enabledStatus">
-        <el-radio-group v-model="formData.enabledStatus">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_STATUS)"
+      <el-form-item label="物料编码" prop="matCode">
+        <el-input v-model="formData.matCode" placeholder="请输入物料编码" />
+      </el-form-item>
+      <el-form-item label="物料名称" prop="matName">
+        <el-input v-model="formData.matName" placeholder="请输入物料名称" />
+      </el-form-item>
+       <el-form-item label="单位" prop="unit">
+        <el-select v-model="formData.unit" placeholder="请选择单位">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.MAT_UNIT)"
             :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input v-model="formData.unit" placeholder="请输入单位" />
+      <el-form-item label="质检方案" prop="schemeId">
+        <el-input v-model="formData.schemeId" placeholder="请输入质检方案" />
       </el-form-item>
-      <el-form-item label="品牌" prop="brand">
+        <el-form-item label="品牌" prop="brand">
         <el-input v-model="formData.brand" placeholder="请输入品牌" />
       </el-form-item>
-      <el-form-item label="规格型号" prop="spec">
-        <el-input v-model="formData.spec" placeholder="请输入规格型号" />
+     
+      <el-form-item label="状态" prop="enabledStatus">
+        <el-select v-model="formData.enabledStatus" placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
+    
       <el-form-item label="安全库存" prop="safeStock">
         <el-input v-model="formData.safeStock" placeholder="请输入安全库存" />
       </el-form-item>
-      <el-form-item label="质检方案id" prop="schemeId">
-        <el-input v-model="formData.schemeId" placeholder="请输入质检方案id" />
+  
+        <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -80,7 +83,7 @@ const formData = ref({
   matName: undefined,
   parentId: undefined,
   matType: undefined,
-  enabledStatus: undefined,
+  enabledStatus: 0,
   unit: undefined,
   brand: undefined,
   spec: undefined,
@@ -88,7 +91,15 @@ const formData = ref({
   schemeId: undefined,
 })
 const formRules = reactive({
-})
+  // 物料类型,物料编码,物料名称,单位,质检方案,状态
+  matType: [{ required: true, message: '请选择物料类型', trigger: ['blur'] }],
+  matCode: [{ required: true, message: '请输入物料编码', trigger: ['blur'] }],
+  matName: [{ required: true, message: '请输入物料名称', trigger: ['blur'] }],
+  unit: [{ required: true, message: '请输入单位', trigger: ['blur'] }],
+  schemeId: [{ required: true, message: '请输入质检方案', trigger: ['blur'] }],
+  enabledStatus: [{ required: true, message: '请选择状态', trigger: ['blur'] }],
+
+ })
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
@@ -142,7 +153,7 @@ const resetForm = () => {
     matName: undefined,
     parentId: undefined,
     matType: undefined,
-    enabledStatus: undefined,
+    enabledStatus: 0,
     unit: undefined,
     brand: undefined,
     spec: undefined,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/material/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/material/index.vue
index 525ac44..8b43e4f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/material/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/material/index.vue
@@ -6,7 +6,7 @@
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="68px"
+      label-width="80px"
     >
       <el-form-item label="物料编码" prop="matCode">
         <el-input
@@ -26,10 +26,10 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="物料类型(1 原材料  2 半成品  3 成品 4 联产品 )" prop="matType">
+      <el-form-item label="物料类型" prop="matType">
         <el-select
           v-model="queryParams.matType"
-          placeholder="请选择物料类型(1 原材料  2 半成品  3 成品 4 联产品 )"
+          placeholder="请选择物料类型"
           clearable
           class="!w-240px"
         >
@@ -41,10 +41,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态(1启用 2 未启用)" prop="enabledStatus">
+      <el-form-item label="状态" prop="enabledStatus">
         <el-select
           v-model="queryParams.enabledStatus"
-          placeholder="请选择状态(1启用 2 未启用)"
+          placeholder="请选择状态"
           clearable
           class="!w-240px"
         >
@@ -67,15 +67,6 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['biz:material:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -83,25 +74,28 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="序号" align="center" type="index" width="60" />
       <el-table-column label="物料编码" align="center" prop="matCode" />
       <el-table-column label="物料名称" align="center" prop="matName" />
-      <el-table-column label="父分类id" align="center" prop="parentId" />
-      <el-table-column label="物料类型(1 原材料  2 半成品  3 成品 4 联产品 )" align="center" prop="matType">
+      <el-table-column label="物料类型" align="center" prop="matType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MAT_TYPE" :value="scope.row.matType" />
         </template>
       </el-table-column>
-      <el-table-column label="状态(1启用 2 未启用)" align="center" prop="enabledStatus">
+     
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="规格型号" align="center" prop="spec" />
+      <el-table-column label="品牌" align="center" prop="brand" />
+       <el-table-column label="状态" align="center" prop="enabledStatus">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.SYSTEM_STATUS" :value="scope.row.enabledStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="品牌" align="center" prop="brand" />
-      <el-table-column label="规格型号" align="center" prop="spec" />
-      <el-table-column label="安全库存" align="center" prop="safeStock" />
-      <el-table-column label="质检方案id" align="center" prop="schemeId" />
+      <!-- <el-table-column label="安全库存" align="center" prop="safeStock" /> -->
+      <!-- <el-table-column label="质检方案id" align="center" prop="schemeId" /> -->
+      <!-- <el-table-column label="父分类id" align="center" prop="parentId" /> -->
+      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
+
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button
@@ -112,14 +106,14 @@
           >
             编辑
           </el-button>
-          <el-button
+          <!-- <el-button
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
             v-hasPermi="['biz:material:delete']"
           >
             删除
-          </el-button>
+          </el-button> -->
         </template>
       </el-table-column>
     </el-table>