From 5a67ef0d46b3835ea1555ca8e045c663bde0f638 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:31:47 +0800
Subject: [PATCH] 调整查询条件

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialType/index.vue  |   19 +++++++++++--------
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerType/index.vue |   13 +++++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerType/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerType/index.vue
index 41d7369..151d731 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerType/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerType/index.vue
@@ -24,7 +24,7 @@
 				</a-form-item>
 			</a-col>
 		
-              <a-col :md="8" :sm="24">
+              <!-- <a-col :md="8" :sm="24">
                 <a-form-item label="鍗曚綅">
                   <a-input v-model="queryParam.unit" allow-clear placeholder="璇疯緭鍏ュ崟浣�"/>
                 </a-form-item>
@@ -33,7 +33,7 @@
                 <a-form-item label="浣跨敤鏈熼檺">
                   <a-input v-model="queryParam.usagePeriod" allow-clear placeholder="璇疯緭鍏ヤ娇鐢ㄦ湡闄�"/>
                 </a-form-item>
-              </a-col>
+              </a-col> -->
 			<a-col :md="8" :sm="24">
 				<a-form-item label="鏄惁绂佺敤">
 					<a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled" placeholder="璇烽�夋嫨鏄惁绂佺敤">
@@ -44,17 +44,17 @@
 		          <!--骞存湀鏃ユ椂鍒嗙-->
 			<!--鏃堕棿鑼冨洿-->
 
-				<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.createdTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangecreatedTime"/>
 
 					</a-form-item>
-				</a-col>
+				</a-col> -->
 			          <!--骞存湀鏃ユ椂鍒嗙-->
 			<!--鏃堕棿鑼冨洿-->
 
-				<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"/>
@@ -71,7 +71,8 @@
                 <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">
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialType/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialType/index.vue
index 58ab44a..8244ae9 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialType/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialType/index.vue
@@ -11,16 +11,18 @@
                 <a-input v-model="queryParam.materialTypeCode" allow-clear placeholder="璇疯緭鍏ョ被鍨嬬紪鍙�"/>
               </a-form-item>
             </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="绫诲瀷鎻忚堪">
-                <a-input v-model="queryParam.materialTypeDescr" allow-clear placeholder="璇疯緭鍏ョ被鍨嬫弿杩�"/>
-              </a-form-item>
-            </a-col><template v-if="advanced">
-              <a-col :md="8" :sm="24">
+
+			<a-col :md="8" :sm="24">
                 <a-form-item label="绫诲瀷鍚嶇О">
                   <a-input v-model="queryParam.materialTypeName" allow-clear placeholder="璇疯緭鍏ョ被鍨嬪悕绉�"/>
                 </a-form-item>
               </a-col>
+			<template v-if="advanced">
+                       <!-- <a-col :md="8" :sm="24">
+              <a-form-item label="绫诲瀷鎻忚堪">
+                <a-input v-model="queryParam.materialTypeDescr" allow-clear placeholder="璇疯緭鍏ョ被鍨嬫弿杩�"/>
+              </a-form-item>
+            </a-col> -->
 			<a-col :md="8" :sm="24">
 				<a-form-item label="鏄惁绂佺敤">
 					<a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled" placeholder="璇烽�夋嫨鏄惁绂佺敤">
@@ -29,7 +31,7 @@
 				</a-form-item>
 			</a-col>
 		
-              <a-col :md="8" :sm="24">
+              <!-- <a-col :md="8" :sm="24">
                 <a-form-item label="鍒涘缓浜�">
                   <a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ュ垱寤轰汉"/>
                 </a-form-item>
@@ -38,7 +40,8 @@
                 <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">

--
Gitblit v1.9.3