From b6fd2a89f69c406acb00196b2865b12e839360e6 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 09:51:56 +0800
Subject: [PATCH] 1

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue    |   20 +++++++++++---------
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue  |    6 +++---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue |    6 +++---
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
index b6c0a0f..2c60278 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
@@ -25,9 +25,9 @@
           <a-input-number placeholder="璇疯緭鍏ュ簱鍖虹姸鎬�" style="width: 100%"
             v-decorator="['areaStatus', { rules: [{ required: true, message: '璇疯緭鍏ュ簱鍖虹姸鎬侊紒' }] }]" />
         </a-form-item> -->
-        <a-form-item label="ERP搴撳瓨鍦�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="璇疯緭鍏RP搴撳瓨鍦�"
-            v-decorator="['erpCode', { rules: [{ required: true, message: '璇疯緭鍏RP搴撳瓨鍦帮紒' }] }]" />
+        <a-form-item label="搴撳瓨鍦扮紪鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <a-input placeholder="璇疯緭鍏ュ簱瀛樺湴缂栫爜"
+            v-decorator="['erpCode', { rules: [{ required: true, message: '璇疯緭鍏ュ簱瀛樺湴缂栫爜锛�' }] }]" />
         </a-form-item>
         <a-form-item label="鎵�灞炰粨搴�" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�灞炰粨搴�"
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
index b313e4d..01e9116 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
@@ -25,9 +25,9 @@
           <a-input-number placeholder="璇疯緭鍏ュ簱鍖虹姸鎬�" style="width: 100%"
             v-decorator="['areaStatus', { rules: [{ required: true, message: '璇疯緭鍏ュ簱鍖虹姸鎬侊紒' }] }]" />
         </a-form-item> -->
-        <a-form-item label="ERP搴撳瓨鍦�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="璇疯緭鍏RP搴撳瓨鍦�"
-            v-decorator="['erpCode', { rules: [{ required: true, message: '璇疯緭鍏RP搴撳瓨鍦帮紒' }] }]" />
+        <a-form-item label="搴撳瓨鍦扮紪鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <a-input placeholder="璇疯緭鍏ュ簱瀛樺湴缂栫爜"
+            v-decorator="['erpCode', { rules: [{ required: true, message: '璇疯緭鍏ュ簱瀛樺湴缂栫爜锛�' }] }]" />
         </a-form-item>
         <a-form-item label="鎵�灞炰粨搴�" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�灞炰粨搴�"
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
index ec493f5..db67a5c 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
@@ -27,11 +27,11 @@
 										<a-input v-model="queryParam.areaName" allow-clear placeholder="璇疯緭鍏ュ簱鍖哄悕绉�" />
 									</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.areaDesc" allow-clear placeholder="璇疯緭鍏ュ簱鍖烘弿杩�" />
 									</a-form-item>
-								</a-col>
+								</a-col> -->
 								<!-- <a-col :md="8" :sm="24">
 									<a-form-item label="搴撳尯鐘舵��">
 										<a-input-number v-model="queryParam.areaStatus" style="width: 100%" allow-clear
@@ -39,8 +39,8 @@
 									</a-form-item>
 								</a-col> -->
 								<a-col :md="8" :sm="24">
-									<a-form-item label="ERP搴撳瓨鍦�">
-										<a-input v-model="queryParam.erpCode" allow-clear placeholder="璇疯緭鍏RP搴撳瓨鍦�" />
+									<a-form-item label="搴撳瓨鍦扮紪鐮�">
+										<a-input v-model="queryParam.erpCode" allow-clear placeholder="璇疯緭鍏ュ簱瀛樺湴缂栫爜" />
 									</a-form-item>
 								</a-col><a-col :md="8" :sm="24">
 									<a-form-item label="鎵�灞炰粨搴�">
@@ -123,7 +123,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')]
@@ -131,11 +131,11 @@
 											@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')]
@@ -154,7 +154,9 @@
 									<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">
@@ -429,7 +431,7 @@
 					dataIndex: 'areaStatus'
 				},
 				{
-					title: 'ERP搴撳瓨鍦�',
+					title: '搴撳瓨鍦扮紪鐮�',
 					align: 'center',
 					customHeaderCell: () => {
 						return {

--
Gitblit v1.9.3