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

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue |   84 +++++++++++++++++++++--------------------
 1 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
index 5a561f6..8a35244 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -114,7 +114,7 @@
 								<a-col :md="8" :sm="24">
 									<a-form-item label="鎵�鍦ㄥ簱鍖�">
 										<!-- <a-input v-model="queryParam.areaId" allow-clear placeholder="璇疯緭鍏ユ墍鍦ㄥ簱鍖�" /> -->
-										<a-select v-model="queryParam.areaId"  style="width: 100%" placeholder="璇烽�夋嫨鎵�鍦ㄥ簱鍖�">
+										<a-select v-model="queryParam.areaCode"  style="width: 100%" placeholder="璇烽�夋嫨鎵�鍦ㄥ簱鍖�">
 											<a-select-option  v-for="(item, index) in WmsAreaData" :key="index"
 												:value="item.areaCode">{{ item.areaName
 												}}</a-select-option>
@@ -469,6 +469,46 @@
 					dataIndex: 'placeAlias'
 				},
 				{
+					title: '鎵�鍦ㄥ簱鍖�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'areaName'
+				},
+				{
+					title: '搴撳尯缂栧彿',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'areaCode'
+				},
+				{
 					title: '搴撲綅绫诲瀷',
 					align: 'center',
 					customHeaderCell: () => {
@@ -735,26 +775,7 @@
 					sorter: true,
 					dataIndex: 'environment'
 				},
-				{
-					title: '搴撳尯缂栧彿',
-					align: 'center',
-					customHeaderCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					customCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					sorter: true,
-					dataIndex: 'areaCode'
-				},
+			
 				// {
 				// 	title: '鎵�鍦ㄥ簱鍖�',
 				// 	align: 'center',
@@ -775,26 +796,7 @@
 				// 	sorter: true,
 				// 	dataIndex: 'areaId'
 				// },
-				{
-					title: '搴撳尯鍚嶇О',
-					align: 'center',
-					customHeaderCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					customCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					sorter: true,
-					dataIndex: 'areaName'
-				},
+				
 				{
 					title: '妫�楠岀爜',
 					align: 'center',

--
Gitblit v1.9.3