From 9ba89815f653c07a61eed3fce8d737f74c810881 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:59:48 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 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 14d5a46..8ac1a7d 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -59,8 +59,15 @@
</a-col> -->
<a-col :md="8" :sm="24">
<a-form-item label="ABC鍒嗙被">
- <a-input-number v-model="queryParam.abcClassName" style="width: 100%" allow-clear
- placeholder="璇疯緭鍏BC鍒嗙被" />
+ <!-- <a-input-number v-model="queryParam.abcClassName" style="width: 100%" allow-clear
+ placeholder="璇疯緭鍏BC鍒嗙被" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨ABC鍒嗙被" v-model="queryParam.abcClass" >
+ <a-select-option v-for="(item, index) in materialTypeData2" :key="index" :value="item.code">{{
+ item.name }}</a-select-option>
+ </a-select>
+
+
</a-form-item>
</a-col>
<!-- <a-col :md="8" :sm="24">
@@ -409,28 +416,8 @@
sorter: true,
dataIndex: 'materialGroup'
},
- // {
- // title: 'ABC鍒嗙被鍚嶇О',
- // align: 'center',
- // customHeaderCell: () => {
- // return {
- // style: {
- // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- // }
- // }
- // },
- // customCell: () => {
- // return {
- // style: {
- // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- // }
- // }
- // },
- // sorter: true,
- // dataIndex: 'abcClassName'
- // },
{
- title: 'ABC鍒嗙被',
+ title: 'ABC鍒嗙被鍚嶇О',
align: 'center',
customHeaderCell: () => {
return {
@@ -447,8 +434,28 @@
}
},
sorter: true,
- dataIndex: 'abcClass'
+ dataIndex: 'abcClassName'
},
+ // {
+ // title: 'ABC鍒嗙被',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'abcClass'
+ // },
{
title: '鐗╂枡瑙勬牸',
align: 'center',
@@ -808,6 +815,9 @@
const isDisabledOption = this.$options
this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
+ const materialTypeOption = this.$options
+ this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class_type')
+
this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
window.addEventListener(
'resize',
--
Gitblit v1.9.3