~shaocx/iWare_RawMaterialWarehouse.git

			@@ -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,13 +52,14 @@
			<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="请输入ABC分类名称" />
			</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
			<a-input-number v-model="queryParam.abcClassName" style="width: 100%" allow-clear
			placeholder="请输入ABC分类" />
			</a-form-item>
			</a-col>
			@@ -144,13 +153,13 @@
			</a-col>

			<a-col :md="8" :sm="24">
			<a-form-item label="创建者名称">
			<a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建者名称" />
			<a-form-item label="创建人">
			<a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建人" />
			</a-form-item>
			</a-col>
			<a-col :md="8" :sm="24">
			<a-form-item label="修改者名称">
			<a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改者名称" />
			<a-form-item label="修改人">
			<a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改人" />
			</a-form-item>
			</a-col> </template>

			@@ -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'
			//自定义table高度
			import setTableHtMixin from '@/mixins/handleTableHt.js'
			import addForm from './addForm.vue'
			@@ -720,7 +729,7 @@
			dataIndex: 'updatedTime'
			},
			{
			title: '创建者名称',
			title: '创建人',
			align: 'center',
			customHeaderCell: () => {
			return {
			@@ -740,7 +749,7 @@
			dataIndex: 'createdUserName'
			},
			{
			title: '修改者名称',
			title: '修改人',
			align: 'center',
			customHeaderCell: () => {
			return {
			@@ -768,7 +777,8 @@
			})
			},
			selectedRowKeys: [],
			selectedRows: []
			selectedRows: [],
			materialTypeData:[]
			}
			},
			created() {
			@@ -804,7 +814,11 @@
			},
			false
			)
			materialTypeDataList().then((d) => {
			this.materialTypeData = d.data \|\| []
			}).catch(() => {

			})
			},
			methods: {
			moment,