From 8af06c6c4276d4e6a2b0956ae3f87e1750abf43e Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Thu, 23 Nov 2023 15:09:46 +0800
Subject: [PATCH] bug

---
 src/views/base/material/index.vue                   | 6 ++++--
 src/views/base/materialProductBom/add-or-updata.vue | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/base/material/index.vue b/src/views/base/material/index.vue
index ad584127..3ed043ea 100644
--- a/src/views/base/material/index.vue
+++ b/src/views/base/material/index.vue
@@ -39,6 +39,7 @@ import {
 	deleteMaterial
 } from '@/api/base/material';
 import { listData } from "@/api/system/dict/data";
+import { publicFormatter } from '@/utils/dict';
 
 const tableProps = [
 	{
@@ -59,8 +60,9 @@ const tableProps = [
 		label: '英文名称'
 	},
 	{
-		prop: 'materialType',
-		label: '物料类型'
+		prop: 'type',
+		label: '物料类型',
+		filter: publicFormatter('material_type')
 	},
 	{
 		prop: 'supplierName',
diff --git a/src/views/base/materialProductBom/add-or-updata.vue b/src/views/base/materialProductBom/add-or-updata.vue
index ec766d8d..727cf356 100644
--- a/src/views/base/materialProductBom/add-or-updata.vue
+++ b/src/views/base/materialProductBom/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 11:09:44
+ * @LastEditTime: 2023-11-23 15:00:00
  * @Description:
 -->
 <template>
@@ -311,6 +311,9 @@ export default {
 						row.mUnit = u.label
 					}
 				})
+			} else {
+				row.unit = null
+				row.mUnit = ''
 			}
 			// row.materialCode = tempList[0].code
 			// row.unit = tempList[0].unit