fix(material): 修复物料管理中的字典类型和表单验证问题

mes-ui/mes-ui-admin-vue3/src/views/biz/material/MaterialForm.vue

@@ -114,8 +114,8 @@ const formData = ref({
   schemeId: undefined,
 })
 
-const validateSafeStock = (rule: any, value: number, callback: any) => {
+const validateSafeStock = (_rule: any, value: number, callback: any) => {
-  if (value === undefined || value === null || value === '') {
+  if (value === undefined || value === null ) {
     callback()
     return
   }
@@ -149,20 +149,25 @@ 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 {
-      formData.value = await MaterialApi.getMaterial(id)
+      const data = await MaterialApi.getMaterial(id)
       // 加载质检方案名称
-      if (formData.value.schemeId) {
+      if (data.schemeId) {
-        const inspPlan = await InspPlanApi.getInspPlan(formData.value.schemeId)
+        const inspPlan = await InspPlanApi.getInspPlan(data.schemeId)
         schemeName.value = inspPlan.schemeName
       }
+      // 先重置再赋值
+      resetForm()
+      formData.value = data
     } finally {
       formLoading.value = false
     }
+  } else {
+    // 新增时直接重置
+    resetForm()
   }
 }
 /** 打开质检方案选择弹窗 */

mes-ui/mes-ui-admin-vue3/src/views/biz/material/index.vue

@@ -34,7 +34,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.MAT_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.MAT_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -85,7 +85,7 @@
 
       <el-table-column label="单位" align="center" prop="unit" >
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.UNIT" :value="scope.row.unit" />
+          <dict-tag :type="DICT_TYPE.MAT_UNIT" :value="scope.row.unit" />
         </template>
       </el-table-column>
 

mes-ui/mes-ui-admin-vue3/src/views/biz/proline/index.vue

@@ -98,7 +98,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as ProLineApi from '@/api/biz/proline'
 import ProLineForm from './ProLineForm.vue'
 
-defineOptions({ name: 'Proline' })
+defineOptions({ name: 'ProLine' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化