From 643f51141b9a046f74e444f47a0539496a27d6e4 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:01:24 +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 |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 308880b..430833b 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -59,7 +59,7 @@
 								</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="璇疯緭鍏BC鍒嗙被" />
 									</a-form-item>
 								</a-col>
@@ -153,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>
 
@@ -729,7 +729,7 @@
 					dataIndex: 'updatedTime'
 				},
 				{
-					title: '鍒涘缓鑰呭悕绉�',
+					title: '鍒涘缓浜�',
 					align: 'center',
 					customHeaderCell: () => {
 						return {
@@ -749,7 +749,7 @@
 					dataIndex: 'createdUserName'
 				},
 				{
-					title: '淇敼鑰呭悕绉�',
+					title: '淇敼浜�',
 					align: 'center',
 					customHeaderCell: () => {
 						return {

--
Gitblit v1.9.3