From 6e3b6044ba218ba2c7cf4ad9d80821d8f78f1ff0 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 21:02:02 +0800
Subject: [PATCH] 1

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
index f53e721..308880b 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -23,10 +23,18 @@
 								</a-col>
 								<a-col :md="8" :sm="24">
 									<a-form-item label="鐗╂枡绫诲瀷鍚嶇О">
-										<a-input v-model="queryParam.materialTypeName" allow-clear
-											placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" />
+										<!-- <a-input v-model="queryParam.materialTypeName" allow-clear
+											placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" /> -->
+											<a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷"
+												v-model="queryParam.materialTypeName">
+												<a-select-option v-for="(item, index) in materialTypeData" :key="index"
+													:value="item.materialTypeName">{{
+														item.materialTypeName }}</a-select-option>
+											</a-select>
 									</a-form-item>
 								</a-col>
+
+
 								<!-- <a-col :md="8" :sm="24">
 									<a-form-item label="鐗╂枡绫诲瀷鎻忚堪">
 										<a-input v-model="queryParam.materialTypeDescr" allow-clear
@@ -44,11 +52,12 @@
 										<a-input v-model="queryParam.materialGroup" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑粍" />
 									</a-form-item>
 								</a-col>
-								<a-col :md="8" :sm="24">
+								<!-- <a-col :md="8" :sm="24">
 									<a-form-item label="ABC鍒嗙被鍚嶇О">
 										<a-input v-model="queryParam.abcClassName" allow-clear placeholder="璇疯緭鍏BC鍒嗙被鍚嶇О" />
 									</a-form-item>
-								</a-col><a-col :md="8" :sm="24">
+								</a-col> -->
+								<a-col :md="8" :sm="24">
 									<a-form-item label="ABC鍒嗙被">
 										<a-input-number v-model="queryParam.abcClass" style="width: 100%" allow-clear
 											placeholder="璇疯緭鍏BC鍒嗙被" />
@@ -223,7 +232,7 @@
 <script>
 import { STable } from '@/components'
 import moment from 'moment'
-import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
+import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel ,materialTypeDataList} from '@/api/modular/main/WmsBase/WmsMaterialManage'
 //鑷畾涔塼able楂樺害
 import setTableHtMixin from '@/mixins/handleTableHt.js'
 import addForm from './addForm.vue'
@@ -768,7 +777,8 @@
 				})
 			},
 			selectedRowKeys: [],
-			selectedRows: []
+			selectedRows: [],
+			materialTypeData:[]
 		}
 	},
 	created() {
@@ -804,7 +814,11 @@
 			},
 			false
 		)
+		materialTypeDataList().then((d) => {
+			this.materialTypeData = d.data || []
+		}).catch(() => {
 
+		})
 	},
 	methods: {
 		moment,

--
Gitblit v1.9.3