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/WmsSubstituteGood/index.vue |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsSubstituteGood/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsSubstituteGood/index.vue
index 8e04a41..46bd705 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsSubstituteGood/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsSubstituteGood/index.vue
@@ -55,7 +55,7 @@
 			          <!--骞存湀鏃ユ椂鍒嗙-->
 			<!--鏃堕棿鑼冨洿-->
 
-				<a-col :md="8" :sm="24">
+				<!-- <a-col :md="8" :sm="24">
 					<a-form-item label="鏇存柊鏃堕棿">
 						<a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"  :show-time="{
 format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.updatedTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangeupdatedTime"/>
@@ -64,15 +64,16 @@
 				</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>
+              </a-col> -->
+				</template>
 
             <a-col :md="8" :sm="24" >
               <span class="table-page-search-submitButtons">
@@ -350,7 +351,7 @@
 	dataIndex: 'updatedTime'
 	},
 	{
-	title: '鍒涘缓鑰呭悕绉�',
+	title: '鍒涘缓浜�',
 	align: 'center',
 	customHeaderCell: () => {
 	return {
@@ -370,7 +371,7 @@
 	dataIndex: 'createdUserName'
 	},
 	{
-	title: '淇敼鑰呭悕绉�',
+	title: '淇敼浜�',
 	align: 'center',
 	customHeaderCell: () => {
 	return {

--
Gitblit v1.9.3