From a630b33c48db307e47259078f57e28bdeee45edd Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 19:17:53 +0800
Subject: [PATCH] css

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue                             |  195 +-
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue                           |    8 
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue |    2 
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue                              |    4 
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue    |   13 
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue                             |  248 ++--
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue                                | 2540 +++++++++++++++++++++++++------------------------
 7 files changed, 1,501 insertions(+), 1,509 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 fb153d0..f53e721 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -27,17 +27,18 @@
 											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.materialTypeDescr" allow-clear
 											placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬫弿杩�" />
 									</a-form-item>
-								</a-col><a-col :md="8" :sm="24">
+								</a-col> -->
+								<!-- <a-col :md="8" :sm="24">
 									<a-form-item label="鐗╂枡绫诲瀷">
 										<a-input-number v-model="queryParam.materialType" style="width: 100%" allow-clear
 											placeholder="璇疯緭鍏ョ墿鏂欑被鍨�" />
 									</a-form-item>
-								</a-col>
+								</a-col> -->
 								<a-col :md="8" :sm="24">
 									<a-form-item label="鐗╂枡缁�">
 										<a-input v-model="queryParam.materialGroup" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑粍" />
@@ -70,7 +71,7 @@
 								</a-col>
 								<a-col :md="8" :sm="24">
 									<a-form-item label="閲囪喘鍗曚綅">
-										<a-input v-model="queryParam.pOUnit" allow-clear placeholder="璇疯緭鍏ラ噰璐崟浣�" />
+										<a-input v-model="queryParam.poUnit" allow-clear placeholder="璇疯緭鍏ラ噰璐崟浣�" />
 									</a-form-item>
 								</a-col>
 								<a-col :md="8" :sm="24">
@@ -85,7 +86,7 @@
 								</a-col>
 								<a-col :md="8" :sm="24">
 									<a-form-item label="鏍囧寘鏁伴噺">
-										<a-input v-model="queryParam.sNP" allow-clear placeholder="璇疯緭鍏ユ爣鍖呮暟閲�" />
+										<a-input v-model="queryParam.snp" allow-clear placeholder="璇疯緭鍏ユ爣鍖呮暟閲�" />
 									</a-form-item>
 								</a-col>
 								<a-col :md="8" :sm="24">
@@ -98,11 +99,11 @@
 										<a-input v-model="queryParam.batchRuleId" 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.controlRuleId" 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"
@@ -124,9 +125,8 @@
 									<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" />
+										}" 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>
@@ -137,9 +137,8 @@
 									<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" />
+										}" v-model="queryParam.updatedTime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
+											@change="onChangeupdatedTime" />
 
 									</a-form-item>
 								</a-col>
@@ -339,46 +338,46 @@
 					sorter: true,
 					dataIndex: 'materialTypeName'
 				},
-				{
-					title: '鐗╂枡绫诲瀷鎻忚堪',
-					align: 'center',
-					customHeaderCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					customCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					sorter: true,
-					dataIndex: 'materialTypeDescr'
-				},
-				{
-					title: '鐗╂枡绫诲瀷',
-					align: 'center',
-					customHeaderCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					customCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					sorter: true,
-					dataIndex: 'materialType'
-				},
+				// {
+				// 	title: '鐗╂枡绫诲瀷鎻忚堪',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'materialTypeDescr'
+				// },
+				// {
+				// 	title: '鐗╂枡绫诲瀷',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'materialType'
+				// },
 				{
 					title: '鐗╂枡缁�',
 					align: 'center',
@@ -399,26 +398,26 @@
 					sorter: true,
 					dataIndex: 'materialGroup'
 				},
-				{
-					title: 'ABC鍒嗙被鍚嶇О',
-					align: 'center',
-					customHeaderCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					customCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					sorter: true,
-					dataIndex: 'abcClassName'
-				},
+				// {
+				// 	title: 'ABC鍒嗙被鍚嶇О',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'abcClassName'
+				// },
 				{
 					title: 'ABC鍒嗙被',
 					align: 'center',
@@ -517,7 +516,7 @@
 						}
 					},
 					sorter: true,
-					dataIndex: 'pOUnit'
+					dataIndex: 'poUnit'
 				},
 				{
 					title: '棰滆壊',
@@ -577,7 +576,7 @@
 						}
 					},
 					sorter: true,
-					dataIndex: 'sNP'
+					dataIndex: 'snp'
 				},
 				{
 					title: '鎹㈢畻鐜�',
@@ -619,26 +618,26 @@
 					sorter: true,
 					dataIndex: 'batchRuleId'
 				},
-				{
-					title: '鎺у埗灞炴�ц鍒�',
-					align: 'center',
-					customHeaderCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					customCell: () => {
-						return {
-							style: {
-								'min-width': '120px'//鏈�灏忓垪瀹借缃�
-							}
-						}
-					},
-					sorter: true,
-					dataIndex: 'controlRuleId'
-				},
+				// {
+				// 	title: '鎺у埗灞炴�ц鍒�',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'controlRuleId'
+				// },
 				{
 					title: '鏄惁绂佺敤',
 					align: 'center',
@@ -898,10 +897,12 @@
 	}
 }
 </script>
-<style lang="less">.table-operator {
+<style lang="less">
+.table-operator {
 	margin-bottom: 18px;
 }
 
 button {
 	margin-right: 8px;
-}</style>
+}
+</style>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
index 2a9f2a9..b59e34c 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -28,7 +28,7 @@
             </a-form-item> -->
 
             <a-form-item label="鐗╂枡绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷" v-decorator="['materialType']">
+              <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷" v-decorator="['materialType', { rules: [{ required: true, message: '璇烽�夋嫨鐗╂枡绫诲瀷锛�' }] }]">
                 <a-select-option v-for="(item, index) in materialTypeData" :key="index" :value="item.id">{{
                   item.materialTypeName }}</a-select-option>
               </a-select>
@@ -70,7 +70,7 @@
             <a-form-item label="閲囪喘鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <!-- <a-input placeholder="璇疯緭鍏ラ噰璐崟浣�" v-decorator="['pOUnit']" /> -->
 
-              <a-select style="width: 100%" placeholder="璇烽�夋嫨閲囪喘鍗曚綅" v-decorator="['pOUnit']">
+              <a-select style="width: 100%" placeholder="璇烽�夋嫨閲囪喘鍗曚綅" v-decorator="['poUnit']">
                 <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.unitName">{{
                   item.unitName }}</a-select-option>
               </a-select>
@@ -84,7 +84,7 @@
               <a-input placeholder="璇疯緭鍏ラ噸閲�" v-decorator="['weight']" />
             </a-form-item>
             <a-form-item label="鏍囧寘鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input placeholder="璇疯緭鍏ユ爣鍖呮暟閲�" v-decorator="['sNP']" />
+              <a-input placeholder="璇疯緭鍏ユ爣鍖呮暟閲�" v-decorator="['snp']" />
             </a-form-item>
             <a-form-item label="鎹㈢畻鐜�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input placeholder="璇疯緭鍏ユ崲绠楃巼" v-decorator="['translateRate']" />
@@ -113,7 +113,7 @@
         <a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�">
           <add-form-sub v-if="visible" ref="addFormWmsSubstituteGoodRef" />
         </a-tab-pane>
-        <a-tab-pane key="5" tab="瀹㈡埛">
+        <a-tab-pane key="5" tab="寰�鏉ュ崟浣�">
           <add-form-base-customer v-if="visible" ref="addFormBaseCustomer" />
         </a-tab-pane>
 
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
index 367a2a9..2195160 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
@@ -2,7 +2,7 @@
   <div>
     <!--tab 鎺у埗灞炴�ц鍒欐槑缁� -->
     <a-form :form="form">
-        <a-form-item label="鎺у埗灞炴�ц鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+        <a-form-item label="鎺у埗灞炴�ц鍒欑紪鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input disabled  placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙�" v-decorator="['ruleCode', {rules: [{required: true, message: '璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙凤紒'}]}]" />
         </a-form-item>
         <a-form-item label="鎺у埗灞炴�ц鍒欏悕绉�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -94,16 +94,7 @@
       this.visible = false
       let record = this.$refs.showList.selectedRows[0];
       this.form.setFieldsValue({
-            id: record.id,
-            ruleCode: record.ruleCode,
-              maxImumqty: record.maxImumqty,
-              minImumqty: record.minImumqty,
-              safeImumqty: record.safeImumqty,
-              minStorageAge: record.minStorageAge,
-              maxStorageAge: record.maxStorageAge,
-              isNotChek: record.isNotChek,
-              shelfLifeDays: record.shelfLifeDays,
-              isDisabled: record.isDisabled
+            ...record
           })
 
     },
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
index 0d7bb05..87c4fbe 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
@@ -21,7 +21,7 @@
           v-decorator="['substituteMaterialCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠e搧鐗╂枡缂栧彿锛�' }] }]" /> -->
         <a-select style="width: 100%" placeholder="璇烽�夋嫨鏇夸唬鍝佺墿鏂欑紪鍙�"  v-decorator="['substituteMaterialCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠e搧鐗╂枡缂栧彿锛�' }] }]" >
           <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.materialCode" >{{
-            item.materialName }}</a-select-option>
+            item.materialCode }}</a-select-option>
         </a-select>
 
       </a-form-item>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
index d57ceb1..4588196 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
@@ -61,9 +61,9 @@
         <a-form-item label="搴撳瓨鐜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ュ簱瀛樼幆澧�" v-decorator="['environment']" />
         </a-form-item>
-        <a-form-item label="搴撳尯缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+        <!-- <a-form-item label="搴撳尯缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ュ簱鍖虹紪鍙�" v-decorator="['areaCode']" />
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item label="鎵�鍦ㄥ簱鍖�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�鍦ㄥ簱鍖�"
             v-decorator="['areaid', { rules: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ簱鍖猴紒' }] }]">
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
index 33bad2f..0d53342 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
@@ -1,33 +1,34 @@
 锘�<template>
-  <a-modal
-    title="缂栬緫搴撲綅淇℃伅"
-    :width="1100"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
+  <a-modal title="缂栬緫搴撲綅淇℃伅" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
     @cancel="handleCancel">
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-form-item label="搴撲綅缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="璇疯緭鍏ュ簱浣嶇紪鐮�" v-decorator="['placeCode', {rules: [{required: true, message: '璇疯緭鍏ュ簱浣嶇紪鐮侊紒'}]}]" />
-        </a-form-item>
+        <!-- <a-form-item label="搴撲綅缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <a-input placeholder="璇疯緭鍏ュ簱浣嶇紪鐮�"
+            v-decorator="['placeCode', { rules: [{ required: true, message: '璇疯緭鍏ュ簱浣嶇紪鐮侊紒' }] }]" />
+        </a-form-item> -->
         <a-form-item label="搴撲綅鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="璇疯緭鍏ュ簱浣嶅悕绉�" v-decorator="['placeName', {rules: [{required: true, message: '璇疯緭鍏ュ簱浣嶅悕绉帮紒'}]}]" />
+          <a-input placeholder="璇疯緭鍏ュ簱浣嶅悕绉�"
+            v-decorator="['placeName', { rules: [{ required: true, message: '璇疯緭鍏ュ簱浣嶅悕绉帮紒' }] }]" />
         </a-form-item>
         <a-form-item label="搴撲綅鍒悕" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ュ簱浣嶅埆鍚�" v-decorator="['placeAlias']" />
         </a-form-item>
         <a-form-item label="搴撲綅绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅绫诲瀷" v-decorator="['placeType', {rules: [{ required: true, message: '璇烽�夋嫨搴撲綅绫诲瀷锛�' }]}]">
-            <a-select-option v-for="(item,index) in placeTypeData" :key="index" :value="Number(item.code)">{{ item.name }}</a-select-option>
+          <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅绫诲瀷"
+            v-decorator="['placeType', { rules: [{ required: true, message: '璇烽�夋嫨搴撲綅绫诲瀷锛�' }] }]">
+            <a-select-option v-for="(item, index) in placeTypeData" :key="index" :value="item.code">{{ item.name
+            }}</a-select-option>
           </a-select>
         </a-form-item>
-        <a-form-item label="搴撲綅绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+        <!-- <a-form-item label="搴撲綅绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ュ簱浣嶇被鍨嬪悕绉�" v-decorator="['placeTypeName', {rules: [{required: true, message: '璇疯緭鍏ュ簱浣嶇被鍨嬪悕绉帮紒'}]}]" />
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item label="搴撲綅灞炴��" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅灞炴��" v-decorator="['placeStatus', {rules: [{ required: true, message: '璇烽�夋嫨搴撲綅灞炴�э紒' }]}]">
-            <a-select-option v-for="(item,index) in placeStatusData" :key="index" :value="Number(item.code)">{{ item.name }}</a-select-option>
+          <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅灞炴��"
+            v-decorator="['placeStatus', { rules: [{ required: true, message: '璇烽�夋嫨搴撲綅灞炴�э紒' }] }]">
+            <a-select-option v-for="(item, index) in placeStatusData" :key="index" :value="Number(item.code)">{{ item.name
+            }}</a-select-option>
           </a-select>
         </a-form-item>
         <!-- <a-form-item label="鏄惁鍫嗗灈鏈哄簱浣�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -60,15 +61,22 @@
         <a-form-item label="搴撳瓨鐜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ュ簱瀛樼幆澧�" v-decorator="['environment']" />
         </a-form-item>
-        <a-form-item label="搴撳尯缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+        <!-- <a-form-item label="搴撳尯缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ュ簱鍖虹紪鍙�" v-decorator="['areaCode']" />
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item label="鎵�鍦ㄥ簱鍖�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="璇疯緭鍏ユ墍鍦ㄥ簱鍖�" v-decorator="['areaId', {rules: [{required: true, message: '璇疯緭鍏ユ墍鍦ㄥ簱鍖猴紒'}]}]" />
+          <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�鍦ㄥ簱鍖�"
+            v-decorator="['areaId', { rules: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ簱鍖猴紒' }] }]">
+            <a-select-option v-for="(item, index) in WmsAreaData" :key="index" :value="Number(item.id)">{{ item.areaName
+            }}</a-select-option>
+          </a-select>
+          <!-- <a-input placeholder="璇疯緭鍏ユ墍鍦ㄥ簱鍖�" v-decorator="['areaId', {rules: [{required: true, message: '璇疯緭鍏ユ墍鍦ㄥ簱鍖猴紒'}]}]" /> -->
+
+
         </a-form-item>
-        <a-form-item label="搴撳尯鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+        <!-- <a-form-item label="搴撳尯鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ュ簱鍖哄悕绉�" v-decorator="['areaName']" />
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item label="妫�楠岀爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ユ楠岀爜" v-decorator="['verificationCode']" />
         </a-form-item>
@@ -117,7 +125,6 @@
         <a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
         </a-form-item>
-        <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
       </a-form>
     </a-spin>
   </a-modal>
@@ -125,127 +132,100 @@
 
 <script>
 import moment from 'moment'
-  import {
+import {
   WmsPlaceEdit
-  } from '@/api/modular/main/WmsBase/WmsPlaceManage'
-  export default {
-  data () {
-  return {
-  Id: 0,
-  labelCol: {
-  xs: { span: 24 },
-  sm: { span: 5 }
+} from '@/api/modular/main/WmsBase/WmsPlaceManage'
+import { WmsAreaPage, WmsAreaDelete, WmsAreaToExcel } from '@/api/modular/main/WmsBase/WmsAreaManage'
+export default {
+  data() {
+    return {
+      Id: 0,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 15 }
+      },
+      record: {},
+      placeTypeData: [],
+      placeStatusData: [],
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
   },
-  wrapperCol: {
-  xs: { span: 24 },
-  sm: { span: 15 }
+  
+  created() {
+    WmsAreaPage().then(res => {
+        this.WmsAreaData = res.data.rows
+      })
   },
-  record: {},
-  placeTypeData: [],
-  placeStatusData: [],
-        visible: false,
-        confirmLoading: false,
-        form: this.$form.createForm(this)
-      }
+  methods: {
+    moment,
+    // 鍒濆鍖栨柟娉�
+    edit(record) {
+      this.visible = true;
+      this.Id = record.id;
+      this.$nextTick(() => {
+      });
+      //娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
+      this.record = JSON.parse(JSON.stringify(record))
+      const placeTypeOption = this.$options
+      this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
+      const placeStatusOption = this.$options
+      this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
+      this.$nextTick(() => {
+        this.form.setFieldsValue(
+          {
+            ...record
+          }
+        )
+      })
+ 
     },
-    methods: {
-	moment,
-      // 鍒濆鍖栨柟娉�
-      edit (record) {
-        this.visible = true;
-		this.Id = record.id;
-        this.$nextTick(() => {
-        });
-        //娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
-        this.record = JSON.parse(JSON.stringify(record))
-        const placeTypeOption = this.$options
-        this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
-        const placeStatusOption = this.$options
-        this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
-        this.$nextTick(() => {
-          this.form.setFieldsValue(
-            {
-              id: record.id,
-              placeCode: record.placeCode,
-              placeName: record.placeName,
-              placeAlias: record.placeAlias,
-              placeType: record.placeType,
-              placeTypeName: record.placeTypeName,
-              placeStatus: record.placeStatus,
-              isSrmPlace: record.isSrmPlace,
-              srmPlaceNo: record.srmPlaceNo,
-              isRgvPlace: record.isRgvPlace,
-              rgvPlaceNo: record.rgvPlaceNo,
-              isAgvPlace: record.isAgvPlace,
-              agvPlaceNo: record.agvPlaceNo,
-              isTransPlace: record.isTransPlace,
-              transPlaceNo: record.transPlaceNo,
-              isActivateWCS: record.isActivateWCS,
-              environment: record.environment,
-              areaCode: record.areaCode,
-              areaId: record.areaId,
-              areaName: record.areaName,
-              verificationCode: record.verificationCode,
-              rowNo: record.rowNo,
-              columnNo: record.columnNo,
-              layerNo: record.layerNo,
-              laneNo: record.laneNo,
-              xzb: record.xzb,
-              yzb: record.yzb,
-              zzb: record.zzb,
-              length: record.length,
-              width: record.width,
-              height: record.height,
-              maxWeight: record.maxWeight,
-              inSequence: record.inSequence,
-              outSequence: record.outSequence,
-              isVirtually: record.isVirtually,
-              isDisabled: record.isDisabled
+    handleSubmit() {
+      const { form: { validateFields } } = this
+      this.confirmLoading = true
+      validateFields((errors, values) => {
+        if (!errors) {
+          for (const key in values) {
+            if (values[key] == null) continue
+            if (typeof (values[key]) === 'object') {
+              values[key] = JSON.stringify(values[key])
+              this.record[key] = values[key]
+            } else {
+              this.record[key] = values[key]
             }
-          )
-        })
-      },
-      handleSubmit () {
-        const { form: { validateFields } } = this
-        this.confirmLoading = true
-        validateFields((errors, values) => {
-          if (!errors) {
-            for (const key in values) {
-              if (values[key] == null) continue
-              if (typeof (values[key]) === 'object') {
-                values[key] = JSON.stringify(values[key])
-                 this.record[key] = values[key]
-              } else {
-                 this.record[key] = values[key]
-              }
-            }
-            WmsPlaceEdit(this.record).then((res) => {
-              if (res.success) {
-                this.$message.success('缂栬緫鎴愬姛')
-                this.confirmLoading = false
-                this.$emit('ok', this.record)
-                this.handleCancel()
-              } else {
-                this.$message.error('缂栬緫澶辫触锛�' + JSON.stringify(res.message))
-              }
-            }).finally((res) => {
+          }
+          WmsPlaceEdit(this.record).then((res) => {
+            if (res.success) {
+              this.$message.success('缂栬緫鎴愬姛')
               this.confirmLoading = false
-            })
-          }else{
+              this.$emit('ok', this.record)
+              this.handleCancel()
+            } else {
+              this.$message.error('缂栬緫澶辫触锛�' + JSON.stringify(res.message))
+            }
+          }).finally((res) => {
             this.confirmLoading = false
-          } 
-        });
-      },
-      handleCancel () {
-        this.form.resetFields()
-        this.visible = false
-      }
+          })
+        } else {
+          this.confirmLoading = false
+        }
+      });
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.visible = false
     }
   }
+}
 </script>
 <style lang="less" scoped>
-  .ant-row.ant-form-item {
-    width: 50% !important;
-    display: inline-block;
-  }
+.ant-row.ant-form-item {
+  width: 50% !important;
+  display: inline-block;
+}
 </style>
\ No newline at end of file
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 1efb1f8..2b5822b 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -1,44 +1,49 @@
 锘�<template>
-  <div ref="boxOutWrap" class="boxOutWrap">
-	<div ref="boxForm" class="boxForm">  
-    <a-card :bordered="false" :bodyStyle="tstyle">
+	<div ref="boxOutWrap" class="boxOutWrap">
+		<div ref="boxForm" class="boxForm">
+			<a-card :bordered="false" :bodyStyle="tstyle">
 
-      <div class="table-page-search-wrapper" v-if="hasPerm('WmsPlace:page')">
-        <a-form layout="inline">
-          <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="搴撲綅缂栫爜">
-                <a-input v-model="queryParam.placeCode" allow-clear placeholder="璇疯緭鍏ュ簱浣嶇紪鐮�"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="搴撲綅鍚嶇О">
-                <a-input v-model="queryParam.placeName" 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.placeAlias" 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.placeType" placeholder="璇烽�夋嫨搴撲綅绫诲瀷">
-                    <a-select-option v-for="(item,index) in placeTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <!-- <a-col :md="8" :sm="24">
+				<div class="table-page-search-wrapper" v-if="hasPerm('WmsPlace:page')">
+					<a-form layout="inline">
+						<a-row :gutter="48">
+							<a-col :md="8" :sm="24">
+								<a-form-item label="搴撲綅缂栫爜">
+									<a-input v-model="queryParam.placeCode" allow-clear placeholder="璇疯緭鍏ュ簱浣嶇紪鐮�" />
+								</a-form-item>
+							</a-col>
+							<a-col :md="8" :sm="24">
+								<a-form-item label="搴撲綅鍚嶇О">
+									<a-input v-model="queryParam.placeName" 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.placeAlias" 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.placeType"
+											placeholder="璇烽�夋嫨搴撲綅绫诲瀷">
+											<a-select-option v-for="(item, index) in placeTypeData" :key="index"
+												:value="item.code">{{ item.name }}</a-select-option>
+										</a-select>
+									</a-form-item>
+								</a-col>
+								<!-- <a-col :md="8" :sm="24">
                 <a-form-item label="搴撲綅绫诲瀷鍚嶇О">
                   <a-input v-model="queryParam.placeTypeName" 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.placeStatus" placeholder="璇烽�夋嫨搴撲綅灞炴��">
-                    <a-select-option v-for="(item,index) in placeStatusData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-			<!-- <a-col :md="8" :sm="24">
+								<!-- </a-col> -->
+								<a-col :md="8" :sm="24">
+									<a-form-item label="搴撲綅灞炴��">
+										<a-select :allowClear="true" style="width: 100%" v-model="queryParam.placeStatus"
+											placeholder="璇烽�夋嫨搴撲綅灞炴��">
+											<a-select-option v-for="(item, index) in placeStatusData" :key="index"
+												:value="item.code">{{ item.name }}</a-select-option>
+										</a-select>
+									</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.isSrmPlace" placeholder="璇烽�夋嫨鏄惁鍫嗗灈鏈哄簱浣�">
 						<a-select-option v-for="(item,index) in isSrmPlaceData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
@@ -90,1249 +95,1264 @@
                   <a-input v-model="queryParam.transPlaceNo" 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.isActivateWCS" placeholder="璇烽�夋嫨鏄惁婵�娲讳笌浠诲姟璋冨害">
-						<a-select-option v-for="(item,index) in isActivateWCSData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
-					</a-select>
-				</a-form-item>
-			</a-col>
-		
-              <a-col :md="8" :sm="24">
-                <a-form-item label="搴撳瓨鐜">
-                  <a-input v-model="queryParam.environment" allow-clear placeholder="璇疯緭鍏ュ簱瀛樼幆澧�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="搴撳尯缂栧彿">
-                  <a-input v-model="queryParam.areaCode" allow-clear placeholder="璇疯緭鍏ュ簱鍖虹紪鍙�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鎵�鍦ㄥ簱鍖�">
-                  <a-input v-model="queryParam.areaId" allow-clear placeholder="璇疯緭鍏ユ墍鍦ㄥ簱鍖�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="搴撳尯鍚嶇О">
-                  <a-input v-model="queryParam.areaName" allow-clear placeholder="璇疯緭鍏ュ簱鍖哄悕绉�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="妫�楠岀爜">
-                  <a-input v-model="queryParam.verificationCode" allow-clear placeholder="璇疯緭鍏ユ楠岀爜"/>
-                </a-form-item>
-              </a-col><a-col :md="8" :sm="24">
-                <a-form-item label="鎺�">
-                  <a-input-number v-model="queryParam.rowNo" style="width: 100%" allow-clear placeholder="璇疯緭鍏ユ帓"/>
-                </a-form-item>
-              </a-col><a-col :md="8" :sm="24">
-                <a-form-item label="鍒�">
-                  <a-input-number v-model="queryParam.columnNo" style="width: 100%" allow-clear placeholder="璇疯緭鍏ュ垪"/>
-                </a-form-item>
-              </a-col><a-col :md="8" :sm="24">
-                <a-form-item label="灞�">
-                  <a-input-number v-model="queryParam.layerNo" style="width: 100%" allow-clear placeholder="璇疯緭鍏ュ眰"/>
-                </a-form-item>
-              </a-col><a-col :md="8" :sm="24">
-                <a-form-item label="宸烽亾">
-                  <a-input-number v-model="queryParam.laneNo" style="width: 100%" allow-clear placeholder="璇疯緭鍏ュ贩閬�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="搴撲綅X鍧愭爣">
-                  <a-input v-model="queryParam.xzb" allow-clear placeholder="璇疯緭鍏ュ簱浣峏鍧愭爣"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="搴撲綅Y鍧愭爣">
-                  <a-input v-model="queryParam.yzb" allow-clear placeholder="璇疯緭鍏ュ簱浣峐鍧愭爣"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="搴撲綅Z鍧愭爣">
-                  <a-input v-model="queryParam.zzb" allow-clear placeholder="璇疯緭鍏ュ簱浣峑鍧愭爣"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="搴撲綅闀垮害">
-                  <a-input v-model="queryParam.length" allow-clear placeholder="璇疯緭鍏ュ簱浣嶉暱搴�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="搴撲綅瀹藉害">
-                  <a-input v-model="queryParam.width" allow-clear placeholder="璇疯緭鍏ュ簱浣嶅搴�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="搴撲綅楂樺害">
-                  <a-input v-model="queryParam.height" allow-clear placeholder="璇疯緭鍏ュ簱浣嶉珮搴�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鏈�澶ф壙閲�">
-                  <a-input v-model="queryParam.maxWeight" allow-clear placeholder="璇疯緭鍏ユ渶澶ф壙閲�"/>
-                </a-form-item>
-              </a-col><a-col :md="8" :sm="24">
-                <a-form-item label="鍏ュ簱椤哄簭">
-                  <a-input-number v-model="queryParam.inSequence" style="width: 100%" allow-clear placeholder="璇疯緭鍏ュ叆搴撻『搴�"/>
-                </a-form-item>
-              </a-col><a-col :md="8" :sm="24">
-                <a-form-item label="鍑哄簱椤哄簭">
-                  <a-input-number v-model="queryParam.outSequence" style="width: 100%" 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.isVirtually" placeholder="璇烽�夋嫨鏄惁铏氭嫙">
-						<a-select-option v-for="(item,index) in isVirtuallyData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
-					</a-select>
-				</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="璇烽�夋嫨鏄惁绂佺敤">
-						<a-select-option v-for="(item,index) in isDisabledData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
-					</a-select>
-				</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.isActivateWCS"
+											placeholder="璇烽�夋嫨鏄惁婵�娲讳笌浠诲姟璋冨害">
+											<a-select-option v-for="(item, index) in isActivateWCSData" :key="index"
+												:value="item.code">{{ item.name }}</a-select-option>
+										</a-select>
+									</a-form-item>
+								</a-col>
 
-				<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-col :md="8" :sm="24">
+									<a-form-item label="搴撳瓨鐜">
+										<a-input v-model="queryParam.environment" allow-clear placeholder="璇疯緭鍏ュ簱瀛樼幆澧�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="搴撳尯缂栧彿">
+										<a-input v-model="queryParam.areaCode" allow-clear placeholder="璇疯緭鍏ュ簱鍖虹紪鍙�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鎵�鍦ㄥ簱鍖�">
+										<a-input v-model="queryParam.areaId" allow-clear placeholder="璇疯緭鍏ユ墍鍦ㄥ簱鍖�" />
+									</a-form-item>
+								</a-col>
+								<!-- <a-col :md="8" :sm="24">
+									<a-form-item label="搴撳尯鍚嶇О">
+										<a-input v-model="queryParam.areaName" allow-clear placeholder="璇疯緭鍏ュ簱鍖哄悕绉�" />
+									</a-form-item>
+								</a-col> -->
+								<a-col :md="8" :sm="24">
+									<a-form-item label="妫�楠岀爜">
+										<a-input v-model="queryParam.verificationCode" allow-clear placeholder="璇疯緭鍏ユ楠岀爜" />
+									</a-form-item>
+								</a-col><a-col :md="8" :sm="24">
+									<a-form-item label="鎺�">
+										<a-input-number v-model="queryParam.rowNo" style="width: 100%" allow-clear
+											placeholder="璇疯緭鍏ユ帓" />
+									</a-form-item>
+								</a-col><a-col :md="8" :sm="24">
+									<a-form-item label="鍒�">
+										<a-input-number v-model="queryParam.columnNo" style="width: 100%" allow-clear
+											placeholder="璇疯緭鍏ュ垪" />
+									</a-form-item>
+								</a-col><a-col :md="8" :sm="24">
+									<a-form-item label="灞�">
+										<a-input-number v-model="queryParam.layerNo" style="width: 100%" allow-clear
+											placeholder="璇疯緭鍏ュ眰" />
+									</a-form-item>
+								</a-col><a-col :md="8" :sm="24">
+									<a-form-item label="宸烽亾">
+										<a-input-number v-model="queryParam.laneNo" style="width: 100%" allow-clear
+											placeholder="璇疯緭鍏ュ贩閬�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="搴撲綅X鍧愭爣">
+										<a-input v-model="queryParam.xzb" allow-clear placeholder="璇疯緭鍏ュ簱浣峏鍧愭爣" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="搴撲綅Y鍧愭爣">
+										<a-input v-model="queryParam.yzb" allow-clear placeholder="璇疯緭鍏ュ簱浣峐鍧愭爣" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="搴撲綅Z鍧愭爣">
+										<a-input v-model="queryParam.zzb" allow-clear placeholder="璇疯緭鍏ュ簱浣峑鍧愭爣" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="搴撲綅闀垮害">
+										<a-input v-model="queryParam.length" allow-clear placeholder="璇疯緭鍏ュ簱浣嶉暱搴�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="搴撲綅瀹藉害">
+										<a-input v-model="queryParam.width" allow-clear placeholder="璇疯緭鍏ュ簱浣嶅搴�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="搴撲綅楂樺害">
+										<a-input v-model="queryParam.height" allow-clear placeholder="璇疯緭鍏ュ簱浣嶉珮搴�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鏈�澶ф壙閲�">
+										<a-input v-model="queryParam.maxWeight" allow-clear placeholder="璇疯緭鍏ユ渶澶ф壙閲�" />
+									</a-form-item>
+								</a-col><a-col :md="8" :sm="24">
+									<a-form-item label="鍏ュ簱椤哄簭">
+										<a-input-number v-model="queryParam.inSequence" style="width: 100%" allow-clear
+											placeholder="璇疯緭鍏ュ叆搴撻『搴�" />
+									</a-form-item>
+								</a-col><a-col :md="8" :sm="24">
+									<a-form-item label="鍑哄簱椤哄簭">
+										<a-input-number v-model="queryParam.outSequence" style="width: 100%" 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.isVirtually"
+											placeholder="璇烽�夋嫨鏄惁铏氭嫙">
+											<a-select-option v-for="(item, index) in isVirtuallyData" :key="index"
+												:value="item.code">{{ item.name }}</a-select-option>
+										</a-select>
+									</a-form-item>
+								</a-col>
 
-					</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="璇烽�夋嫨鏄惁绂佺敤">
+											<a-select-option v-for="(item, index) in isDisabledData" :key="index"
+												:value="item.code">{{ item.name }}</a-select-option>
+										</a-select>
+									</a-form-item>
+								</a-col>
+								<!--骞存湀鏃ユ椂鍒嗙-->
+								<!--鏃堕棿鑼冨洿-->
 
-				<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"/>
+								<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 :md="8" :sm="24">
-                <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>
-              </a-col>	</template>
+									</a-form-item>
+								</a-col>
+								<!--骞存湀鏃ユ椂鍒嗙-->
+								<!--鏃堕棿鑼冨洿-->
 
-            <a-col :md="8" :sm="24" >
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)" >鏌ヨ</a-button>
-                <a-button style="margin-left: 8px" @click="() => queryParam = {}">閲嶇疆</a-button>
-                <a @click="toggleAdvanced" style="margin-left: 8px"> {{ advanced ? '鏀惰捣' : '灞曞紑' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
-              </span>
-            </a-col>
+								<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" />
 
-          </a-row>
-        </a-form>
-      </div>
-    </a-card>
-	</div>
-    <a-card :bordered="false">
-      <s-table
-        ref="table"
-        :columns="columns"
-        :data="loadData"
-        :alert="true"
-		@changeTablePage="pageInfo = $event"
-		:scroll="{x: true,y:tableHeight}"
-        :rowKey="(record) => record.id"
-        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
-        <template class="table-operator" slot="operator" v-if="hasPerm('WmsPlace:add')" >
-		<div ref="actionBar" class="actionBar">
-			<a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
-            瀵煎叆
-          </a-button>
-          <a-button type="info" v-if="hasPerm('WmsPlace:exportExcel')" icon="download" @click="WmsPlaceToExcel()">
-            瀵煎嚭
-          </a-button>
-			<a-button type="primary" v-if="hasPerm('WmsPlace:add')" icon="plus" @click="$refs.addForm.add()">鏂板搴撲綅淇℃伅</a-button>
+									</a-form-item>
+								</a-col>
+
+								<a-col :md="8" :sm="24">
+									<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>
+								</a-col> </template>
+
+							<a-col :md="8" :sm="24">
+								<span class="table-page-search-submitButtons">
+									<a-button type="primary" @click="$refs.table.refresh(true)">鏌ヨ</a-button>
+									<a-button style="margin-left: 8px" @click="() => queryParam = {}">閲嶇疆</a-button>
+									<a @click="toggleAdvanced" style="margin-left: 8px"> {{ advanced ? '鏀惰捣' : '灞曞紑' }}
+										<a-icon :type="advanced ? 'up' : 'down'" />
+									</a>
+								</span>
+							</a-col>
+
+						</a-row>
+					</a-form>
+				</div>
+			</a-card>
 		</div>
-		</template>
-		  <span slot="placeTypescopedSlots" slot-scope="text">
-			{{ 'place_type' | dictType(text) }}
-			</span>
-		  <span slot="placeStatusscopedSlots" slot-scope="text">
-			{{ 'place_status' | dictType(text) }}
-			</span>
-		  <span slot="isSrmPlacescopedSlots" slot-scope="text">
-			<div v-if="text===true ">
-				<a-tag color="green">鏄�</a-tag>
-			</div>
-			<div v-else-if="text==false">
-				<a-tag color="volcano">鍚�</a-tag>
-			</div>
-			<div v-else=""></div>
-			</span>
-		  <span slot="isRgvPlacescopedSlots" slot-scope="text">
-			<div v-if="text===true ">
-				<a-tag color="green">鏄�</a-tag>
-			</div>
-			<div v-else-if="text==false">
-				<a-tag color="volcano">鍚�</a-tag>
-			</div>
-			<div v-else=""></div>
-			</span>
-		  <span slot="isAgvPlacescopedSlots" slot-scope="text">
-			<div v-if="text===true ">
-				<a-tag color="green">鏄�</a-tag>
-			</div>
-			<div v-else-if="text==false">
-				<a-tag color="volcano">鍚�</a-tag>
-			</div>
-			<div v-else=""></div>
-			</span>
-		  <span slot="isTransPlacescopedSlots" slot-scope="text">
-			<div v-if="text===true ">
-				<a-tag color="green">鏄�</a-tag>
-			</div>
-			<div v-else-if="text==false">
-				<a-tag color="volcano">鍚�</a-tag>
-			</div>
-			<div v-else=""></div>
-			</span>
-		  <span slot="isActivateWCSscopedSlots" slot-scope="text">
-			<div v-if="text===true ">
-				<a-tag color="green">鏄�</a-tag>
-			</div>
-			<div v-else-if="text==false">
-				<a-tag color="volcano">鍚�</a-tag>
-			</div>
-			<div v-else=""></div>
-			</span>
-		  <span slot="isVirtuallyscopedSlots" slot-scope="text">
-			<div v-if="text===true ">
-				<a-tag color="green">鏄�</a-tag>
-			</div>
-			<div v-else-if="text==false">
-				<a-tag color="volcano">鍚�</a-tag>
-			</div>
-			<div v-else=""></div>
-			</span>
-		  <span slot="isDisabledscopedSlots" slot-scope="text">
-			<div v-if="text===true ">
-				<a-tag color="green">鏄�</a-tag>
-			</div>
-			<div v-else-if="text==false">
-				<a-tag color="volcano">鍚�</a-tag>
-			</div>
-			<div v-else=""></div>
-			</span>
-		  <span slot="action" slot-scope="text, record">
-			
-			<a v-if="hasPerm('WmsPlace:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
-          <a-divider type="vertical" v-if="hasPerm('WmsPlace:edit') & hasPerm('WmsPlace:delete')"/>
-          <a-popconfirm v-if="hasPerm('WmsPlace:delete')" placement="topRight" title="纭鍒犻櫎锛�" @confirm="() => WmsPlaceDelete(record)">
-            <a>鍒犻櫎</a>
-          </a-popconfirm>
-        </span>
-      </s-table>
-      <add-form ref="addForm" @ok="handleOk" />
-      <edit-form ref="editForm" @ok="handleOk" />
-	  <excel-form ref="excelForm" @ok="handleOk" />
-    </a-card>
-  </div>
+		<a-card :bordered="false">
+			<s-table ref="table" :columns="columns" :data="loadData" :alert="true" @changeTablePage="pageInfo = $event"
+				:scroll="{ x: true, y: tableHeight }" :rowKey="(record) => record.id"
+				:rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
+				<template class="table-operator" slot="operator" v-if="hasPerm('WmsPlace:add')">
+					<div ref="actionBar" class="actionBar">
+						<a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload"
+							@click="$refs.excelForm.index()">
+							瀵煎叆
+						</a-button>
+						<a-button type="info" v-if="hasPerm('WmsPlace:exportExcel')" icon="download"
+							@click="WmsPlaceToExcel()">
+							瀵煎嚭
+						</a-button>
+						<a-button type="primary" v-if="hasPerm('WmsPlace:add')" icon="plus"
+							@click="$refs.addForm.add()">鏂板搴撲綅淇℃伅</a-button>
+					</div>
+				</template>
+				<span slot="placeTypescopedSlots" slot-scope="text">
+					{{ 'place_type' | dictType(text) }}
+				</span>
+				<span slot="placeStatusscopedSlots" slot-scope="text">
+					{{ 'place_status' | dictType(text) }}
+				</span>
+				<span slot="isSrmPlacescopedSlots" slot-scope="text">
+					<div v-if="text === true">
+						<a-tag color="green">鏄�</a-tag>
+					</div>
+					<div v-else-if="text == false">
+						<a-tag color="volcano">鍚�</a-tag>
+					</div>
+					<div v-else=""></div>
+				</span>
+				<span slot="isRgvPlacescopedSlots" slot-scope="text">
+					<div v-if="text === true">
+						<a-tag color="green">鏄�</a-tag>
+					</div>
+					<div v-else-if="text == false">
+						<a-tag color="volcano">鍚�</a-tag>
+					</div>
+					<div v-else=""></div>
+				</span>
+				<span slot="isAgvPlacescopedSlots" slot-scope="text">
+					<div v-if="text === true">
+						<a-tag color="green">鏄�</a-tag>
+					</div>
+					<div v-else-if="text == false">
+						<a-tag color="volcano">鍚�</a-tag>
+					</div>
+					<div v-else=""></div>
+				</span>
+				<span slot="isTransPlacescopedSlots" slot-scope="text">
+					<div v-if="text === true">
+						<a-tag color="green">鏄�</a-tag>
+					</div>
+					<div v-else-if="text == false">
+						<a-tag color="volcano">鍚�</a-tag>
+					</div>
+					<div v-else=""></div>
+				</span>
+				<span slot="isActivateWCSscopedSlots" slot-scope="text">
+					<div v-if="text === true">
+						<a-tag color="green">鏄�</a-tag>
+					</div>
+					<div v-else-if="text == false">
+						<a-tag color="volcano">鍚�</a-tag>
+					</div>
+					<div v-else=""></div>
+				</span>
+				<span slot="isVirtuallyscopedSlots" slot-scope="text">
+					<div v-if="text === true">
+						<a-tag color="green">鏄�</a-tag>
+					</div>
+					<div v-else-if="text == false">
+						<a-tag color="volcano">鍚�</a-tag>
+					</div>
+					<div v-else=""></div>
+				</span>
+				<span slot="isDisabledscopedSlots" slot-scope="text">
+					<div v-if="text === true">
+						<a-tag color="green">鏄�</a-tag>
+					</div>
+					<div v-else-if="text == false">
+						<a-tag color="volcano">鍚�</a-tag>
+					</div>
+					<div v-else=""></div>
+				</span>
+				<span slot="action" slot-scope="text, record">
+
+					<a v-if="hasPerm('WmsPlace:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
+					<a-divider type="vertical" v-if="hasPerm('WmsPlace:edit') & hasPerm('WmsPlace:delete')" />
+					<a-popconfirm v-if="hasPerm('WmsPlace:delete')" placement="topRight" title="纭鍒犻櫎锛�"
+						@confirm="() => WmsPlaceDelete(record)">
+						<a>鍒犻櫎</a>
+					</a-popconfirm>
+				</span>
+			</s-table>
+			<add-form ref="addForm" @ok="handleOk" />
+			<edit-form ref="editForm" @ok="handleOk" />
+			<excel-form ref="excelForm" @ok="handleOk" />
+		</a-card>
+	</div>
 </template>
 <script>
-	import { STable } from '@/components'
-	import moment from 'moment'
-	import { WmsPlacePage, WmsPlaceDelete, WmsPlaceToExcel } from '@/api/modular/main/WmsBase/WmsPlaceManage'
-	//鑷畾涔塼able楂樺害
-	import setTableHtMixin from '@/mixins/handleTableHt.js'
-	import addForm from './addForm.vue'
-	import { exportExcel } from '@/utils/exportToExcel'
-	import { downloadFile } from '@/utils/util'
-	import editForm from './editForm.vue'
-	import excelForm from './excelForm.vue'
-	export default {
+import { STable } from '@/components'
+import moment from 'moment'
+import { WmsPlacePage, WmsPlaceDelete, WmsPlaceToExcel } from '@/api/modular/main/WmsBase/WmsPlaceManage'
+//鑷畾涔塼able楂樺害
+import setTableHtMixin from '@/mixins/handleTableHt.js'
+import addForm from './addForm.vue'
+import { exportExcel } from '@/utils/exportToExcel'
+import { downloadFile } from '@/utils/util'
+import editForm from './editForm.vue'
+import excelForm from './excelForm.vue'
+export default {
 	mixins: [setTableHtMixin],
 	components: {
-	STable,
-	addForm,
-	editForm,
-	excelForm
+		STable,
+		addForm,
+		editForm,
+		excelForm
 	},
-	data () {
-	return {
-	advanced: false, // 楂樼骇鎼滅储 灞曞紑/鍏抽棴
-	queryParam: {},
-	 pageInfo: {
-        current: 1,
-        pageSize: 10
-      },
-	columns: [
-	{
-	title:'搴忓彿',
-	width: '60px',
-	align: 'center',
-	customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
+	data() {
+		return {
+			advanced: false, // 楂樼骇鎼滅储 灞曞紑/鍏抽棴
+			queryParam: {},
+			pageInfo: {
+				current: 1,
+				pageSize: 10
+			},
+			columns: [
+				{
+					title: '搴忓彿',
+					width: '60px',
+					align: 'center',
+					customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
+				},
+				{
+					title: '搴撲綅缂栫爜',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'placeCode'
+				},
+				{
+					title: '搴撲綅鍚嶇О',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'placeName'
+				},
+				{
+					title: '搴撲綅鍒悕',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'placeAlias'
+				},
+				{
+					title: '搴撲綅绫诲瀷',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'placeType',
+					scopedSlots: { customRender: 'placeTypescopedSlots' }
+				},
+				// {
+				// 	title: '搴撲綅绫诲瀷鍚嶇О',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'placeTypeName'
+				// },
+				{
+					title: '搴撲綅灞炴��',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'placeStatus',
+					scopedSlots: { customRender: 'placeStatusscopedSlots' }
+				},
+				// {
+				// 	title: '鏄惁鍫嗗灈鏈哄簱浣�',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '140px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'isSrmPlace',
+				// 	scopedSlots: { customRender: 'isSrmPlacescopedSlots' }
+				// },
+				// {
+				// 	title: '鍫嗗灈鏈哄簱浣嶅彿',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'srmPlaceNo'
+				// },
+				// {
+				// 	title: '鏄惁RGV搴撲綅',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'isRgvPlace',
+				// 	scopedSlots: { customRender: 'isRgvPlacescopedSlots' }
+				// },
+				// {
+				// 	title: 'RGV搴撲綅鍙�',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'rgvPlaceNo'
+				// },
+				// {
+				// 	title: '鏄惁AGV搴撲綅',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'isAgvPlace',
+				// 	scopedSlots: { customRender: 'isAgvPlacescopedSlots' }
+				// },
+				// {
+				// 	title: 'AGV搴撲綅鍙�',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'agvPlaceNo'
+				// },
+				// {
+				// 	title: '鏄惁杈撻�佺嚎搴撲綅',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'isTransPlace',
+				// 	scopedSlots: { customRender: 'isTransPlacescopedSlots' }
+				// },
+				// {
+				// 	title: '杈撻�佺嚎搴撲綅鍙�',
+				// 	align: 'center',
+				// 	customHeaderCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	customCell: () => {
+				// 		return {
+				// 			style: {
+				// 				'min-width': '120px'//鏈�灏忓垪瀹借缃�
+				// 			}
+				// 		}
+				// 	},
+				// 	sorter: true,
+				// 	dataIndex: 'transPlaceNo'
+				// },
+				{
+					title: '鏄惁婵�娲讳笌浠诲姟璋冨害',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'isActivateWCS',
+					scopedSlots: { customRender: 'isActivateWCSscopedSlots' }
+				},
+				{
+					title: '搴撳瓨鐜',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					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',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					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',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'verificationCode'
+				},
+				{
+					title: '鎺�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'rowNo'
+				},
+				{
+					title: '鍒�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'columnNo'
+				},
+				{
+					title: '灞�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'layerNo'
+				},
+				{
+					title: '宸烽亾',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'laneNo'
+				},
+				{
+					title: '搴撲綅X鍧愭爣',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'xzb'
+				},
+				{
+					title: '搴撲綅Y鍧愭爣',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'yzb'
+				},
+				{
+					title: '搴撲綅Z鍧愭爣',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'zzb'
+				},
+				{
+					title: '搴撲綅闀垮害',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'length'
+				},
+				{
+					title: '搴撲綅瀹藉害',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'width'
+				},
+				{
+					title: '搴撲綅楂樺害',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'height'
+				},
+				{
+					title: '鏈�澶ф壙閲�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'maxWeight'
+				},
+				{
+					title: '鍏ュ簱椤哄簭',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'inSequence'
+				},
+				{
+					title: '鍑哄簱椤哄簭',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '80px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'outSequence'
+				},
+				{
+					title: '鏄惁铏氭嫙',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'isVirtually',
+					scopedSlots: { customRender: 'isVirtuallyscopedSlots' }
+				},
+				{
+					title: '鏄惁绂佺敤',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'isDisabled',
+					scopedSlots: { customRender: 'isDisabledscopedSlots' }
+				},
+				{
+					title: '鍒涘缓鏃堕棿',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'createdTime'
+				},
+				{
+					title: '鏇存柊鏃堕棿',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'updatedTime'
+				},
+				{
+					title: '鍒涘缓鑰呭悕绉�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'createdUserName'
+				},
+				{
+					title: '淇敼鑰呭悕绉�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'updatedUserName'
+				}
+			],
+			tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+			// 鍔犺浇鏁版嵁鏂规硶 蹇呴』涓� Promise 瀵硅薄
+			loadData: parameter => {
+				return WmsPlacePage(Object.assign(parameter, this.switchingDate())).then((res) => {
+					return res.data
+				})
+			},
+			placeTypeData: [],
+			placeStatusData: [],
+			selectedRowKeys: [],
+			selectedRows: []
+		}
 	},
-	{
-	title: '搴撲綅缂栫爜',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'placeCode'
-	},
-	{
-	title: '搴撲綅鍚嶇О',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'placeName'
-	},
-	{
-	title: '搴撲綅鍒悕',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'placeAlias'
-	},
-	{
-	title: '搴撲綅绫诲瀷',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'placeType',
-	scopedSlots: { customRender: 'placeTypescopedSlots' }
-	},
-	{
-	title: '搴撲綅绫诲瀷鍚嶇О',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'placeTypeName'
-	},
-	{
-	title: '搴撲綅灞炴��',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'placeStatus',
-	scopedSlots: { customRender: 'placeStatusscopedSlots' }
-	},
-	{
-	title: '鏄惁鍫嗗灈鏈哄簱浣�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '140px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'isSrmPlace',
-	scopedSlots: { customRender: 'isSrmPlacescopedSlots' }
-	},
-	{
-	title: '鍫嗗灈鏈哄簱浣嶅彿',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'srmPlaceNo'
-	},
-	{
-	title: '鏄惁RGV搴撲綅',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'isRgvPlace',
-	scopedSlots: { customRender: 'isRgvPlacescopedSlots' }
-	},
-	{
-	title: 'RGV搴撲綅鍙�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'rgvPlaceNo'
-	},
-	{
-	title: '鏄惁AGV搴撲綅',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'isAgvPlace',
-	scopedSlots: { customRender: 'isAgvPlacescopedSlots' }
-	},
-	{
-	title: 'AGV搴撲綅鍙�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'agvPlaceNo'
-	},
-	{
-	title: '鏄惁杈撻�佺嚎搴撲綅',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'isTransPlace',
-	scopedSlots: { customRender: 'isTransPlacescopedSlots' }
-	},
-	{
-	title: '杈撻�佺嚎搴撲綅鍙�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'transPlaceNo'
-	},
-	{
-	title: '鏄惁婵�娲讳笌浠诲姟璋冨害',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'isActivateWCS',
-	scopedSlots: { customRender: 'isActivateWCSscopedSlots' }
-	},
-	{
-	title: '搴撳瓨鐜',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	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',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	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',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'verificationCode'
-	},
-	{
-	title: '鎺�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'rowNo'
-	},
-	{
-	title: '鍒�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'columnNo'
-	},
-	{
-	title: '灞�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'layerNo'
-	},
-	{
-	title: '宸烽亾',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'laneNo'
-	},
-	{
-	title: '搴撲綅X鍧愭爣',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'xzb'
-	},
-	{
-	title: '搴撲綅Y鍧愭爣',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'yzb'
-	},
-	{
-	title: '搴撲綅Z鍧愭爣',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'zzb'
-	},
-	{
-	title: '搴撲綅闀垮害',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'length'
-	},
-	{
-	title: '搴撲綅瀹藉害',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'width'
-	},
-	{
-	title: '搴撲綅楂樺害',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'height'
-	},
-	{
-	title: '鏈�澶ф壙閲�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'maxWeight'
-	},
-	{
-	title: '鍏ュ簱椤哄簭',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'inSequence'
-	},
-	{
-	title: '鍑哄簱椤哄簭',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '80px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'outSequence'
-	},
-	{
-	title: '鏄惁铏氭嫙',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'isVirtually',
-	scopedSlots: { customRender: 'isVirtuallyscopedSlots' }
-	},
-	{
-	title: '鏄惁绂佺敤',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'isDisabled',
-	scopedSlots: { customRender: 'isDisabledscopedSlots' }
-	},
-	{
-	title: '鍒涘缓鏃堕棿',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'createdTime'
-	},
-	{
-	title: '鏇存柊鏃堕棿',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'updatedTime'
-	},
-	{
-	title: '鍒涘缓鑰呭悕绉�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'createdUserName'
-	},
-	{
-	title: '淇敼鑰呭悕绉�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'updatedUserName'
-	}
-	],
-	tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
-	// 鍔犺浇鏁版嵁鏂规硶 蹇呴』涓� Promise 瀵硅薄
-	loadData: parameter => {
-	return WmsPlacePage(Object.assign(parameter, this.switchingDate())).then((res) => {
-	return res.data
-	})
-	},
-        placeTypeData: [],
-        placeStatusData: [],
-	selectedRowKeys: [],
-	selectedRows: []
-	}
-	},
-	created () {
-	if (this.hasPerm('WmsPlace:edit') || this.hasPerm('WmsPlace:delete')) {
-	this.columns.push({
-	title: '鎿嶄綔',
-	width: '150px',
-	dataIndex: 'action',
-	scopedSlots: { customRender: 'action' }
-	})
-	}
-	const path = this.$route.path
-	const columnStr = window.localStorage.getItem(path)
-	if(columnStr) {
-	var _columns = JSON.parse(columnStr)
-	this.columns.forEach(element => {
-	var fObj = _columns.find((item, index) => {
-	return item.dataIndex === element.dataIndex;
-	})
-	if(fObj!=undefined && fObj!=null){
-	element.checked=fObj.checked;
-	}
-	});
-	}
-	const placeTypeOption = this.$options
-	this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
-	const placeStatusOption = this.$options
-	this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
-	const isSrmPlaceOption = this.$options
-	this.isSrmPlaceData = isSrmPlaceOption.filters['dictData']('yes_true_false')
-	const isRgvPlaceOption = this.$options
-	this.isRgvPlaceData = isRgvPlaceOption.filters['dictData']('yes_true_false')
-	const isAgvPlaceOption = this.$options
-	this.isAgvPlaceData = isAgvPlaceOption.filters['dictData']('yes_true_false')
-	const isTransPlaceOption = this.$options
-	this.isTransPlaceData = isTransPlaceOption.filters['dictData']('yes_true_false')
-	const isActivateWCSOption = this.$options
-	this.isActivateWCSData = isActivateWCSOption.filters['dictData']('yes_true_false')
-	const isVirtuallyOption = this.$options
-	this.isVirtuallyData = isVirtuallyOption.filters['dictData']('yes_true_false')
-	const isDisabledOption = this.$options
-	this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
+	created() {
+		if (this.hasPerm('WmsPlace:edit') || this.hasPerm('WmsPlace:delete')) {
+			this.columns.push({
+				title: '鎿嶄綔',
+				width: '150px',
+				dataIndex: 'action',
+				scopedSlots: { customRender: 'action' }
+			})
+		}
+		const path = this.$route.path
+		const columnStr = window.localStorage.getItem(path)
+		if (columnStr) {
+			var _columns = JSON.parse(columnStr)
+			this.columns.forEach(element => {
+				var fObj = _columns.find((item, index) => {
+					return item.dataIndex === element.dataIndex;
+				})
+				if (fObj != undefined && fObj != null) {
+					element.checked = fObj.checked;
+				}
+			});
+		}
+		const placeTypeOption = this.$options
+		this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
+		const placeStatusOption = this.$options
+		this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
+		const isSrmPlaceOption = this.$options
+		this.isSrmPlaceData = isSrmPlaceOption.filters['dictData']('yes_true_false')
+		const isRgvPlaceOption = this.$options
+		this.isRgvPlaceData = isRgvPlaceOption.filters['dictData']('yes_true_false')
+		const isAgvPlaceOption = this.$options
+		this.isAgvPlaceData = isAgvPlaceOption.filters['dictData']('yes_true_false')
+		const isTransPlaceOption = this.$options
+		this.isTransPlaceData = isTransPlaceOption.filters['dictData']('yes_true_false')
+		const isActivateWCSOption = this.$options
+		this.isActivateWCSData = isActivateWCSOption.filters['dictData']('yes_true_false')
+		const isVirtuallyOption = this.$options
+		this.isVirtuallyData = isVirtuallyOption.filters['dictData']('yes_true_false')
+		const isDisabledOption = this.$options
+		this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
 
-	this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
-	window.addEventListener(
-	'resize',
-	() => {
-	this.handleTableHt() // 鐩戝惉灞忓箷澶у皬鏀瑰彉琛ㄦ牸楂樺害
-	},
-	false
-	)
-	
+		this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
+		window.addEventListener(
+			'resize',
+			() => {
+				this.handleTableHt() // 鐩戝惉灞忓箷澶у皬鏀瑰彉琛ㄦ牸楂樺害
+			},
+			false
+		)
+
 	},
 	methods: {
-	moment,
-	/**
-	* 鏌ヨ鍙傛暟缁勮
-	*/
-	switchingDate () {
-	const obj = JSON.parse(JSON.stringify(this.queryParam))
-	return obj
-	},
-	WmsPlaceDelete (record) {
-	WmsPlaceDelete(record).then((res) => {
-	if (res.success) {
-	this.$message.success('鍒犻櫎鎴愬姛')
-	this.$refs.table.refresh()
-	} else {
-	this.$message.error('鍒犻櫎澶辫触') // + res.message
-	}
-	})
-	},
+		moment,
+		/**
+		* 鏌ヨ鍙傛暟缁勮
+		*/
+		switchingDate() {
+			const obj = JSON.parse(JSON.stringify(this.queryParam))
+			return obj
+		},
+		WmsPlaceDelete(record) {
+			WmsPlaceDelete(record).then((res) => {
+				if (res.success) {
+					this.$message.success('鍒犻櫎鎴愬姛')
+					this.$refs.table.refresh()
+				} else {
+					this.$message.error('鍒犻櫎澶辫触') // + res.message
+				}
+			})
+		},
 
 
-	WmsPlaceToExcel() {
-	this.loading = true
-	let entozh = {};
-	const path = this.$route.path;
-	if (window.localStorage.getItem(path)) {
-	JSON.parse(window.localStorage.getItem(path)).forEach(item => {
-	if (item.dataIndex != 'action' && item.checked) {
-	entozh[item.dataIndex] = item.title
-	}
-	})
-	} else { //鐩存帴鐐瑰鍑�
-	this.columns.forEach(item => {
-	if (item.dataIndex != 'action') {
-	entozh[item.dataIndex] = item.title
-	}
-	})
-	}
-	WmsPlacePage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
-	this.loading = false;
-	//闇�瑕佹埅鍙栨棩鏈熺殑瀛楁
-	var arrDataCutout = this.columns.filter(v => v.customCutout == true);
-	res.data.rows.forEach(item => {
-	var arrKeys = Object.keys(item);
-	arrKeys.forEach(key => {
-	var strFieldDic = key + 'Data';
-	//鏋氫妇杞��
-	if (this[strFieldDic] && this[strFieldDic].length > 0) {
-	let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
-	if (arrFieldDic.length > 0) {
-	item[key] = arrFieldDic[0]?.name || '娌℃湁鏋氫妇鍊�';
-	}
-	}
-	// 鏃ユ湡鎴彇
-	if (arrDataCutout.length > 0) {
-	arrDataCutout.forEach(itemIn => {
-	if (key == itemIn.dataIndex && item[key]) {
-	item[key] = item[key].split(" ")[0]
-	}
-	})
-	}
-	});
-	})
-	exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
-	}).catch((err) => {
-	this.loading = false
-	this.$message.error('涓嬭浇閿欒锛氳幏鍙栨枃浠舵祦閿欒' + err)
-	})
-	},
+		WmsPlaceToExcel() {
+			this.loading = true
+			let entozh = {};
+			const path = this.$route.path;
+			if (window.localStorage.getItem(path)) {
+				JSON.parse(window.localStorage.getItem(path)).forEach(item => {
+					if (item.dataIndex != 'action' && item.checked) {
+						entozh[item.dataIndex] = item.title
+					}
+				})
+			} else { //鐩存帴鐐瑰鍑�
+				this.columns.forEach(item => {
+					if (item.dataIndex != 'action') {
+						entozh[item.dataIndex] = item.title
+					}
+				})
+			}
+			WmsPlacePage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
+				this.loading = false;
+				//闇�瑕佹埅鍙栨棩鏈熺殑瀛楁
+				var arrDataCutout = this.columns.filter(v => v.customCutout == true);
+				res.data.rows.forEach(item => {
+					var arrKeys = Object.keys(item);
+					arrKeys.forEach(key => {
+						var strFieldDic = key + 'Data';
+						//鏋氫妇杞��
+						if (this[strFieldDic] && this[strFieldDic].length > 0) {
+							let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
+							if (arrFieldDic.length > 0) {
+								item[key] = arrFieldDic[0]?.name || '娌℃湁鏋氫妇鍊�';
+							}
+						}
+						// 鏃ユ湡鎴彇
+						if (arrDataCutout.length > 0) {
+							arrDataCutout.forEach(itemIn => {
+								if (key == itemIn.dataIndex && item[key]) {
+									item[key] = item[key].split(" ")[0]
+								}
+							})
+						}
+					});
+				})
+				exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
+			}).catch((err) => {
+				this.loading = false
+				this.$message.error('涓嬭浇閿欒锛氳幏鍙栨枃浠舵祦閿欒' + err)
+			})
+		},
 
 
-	toggleAdvanced () {
-	this.advanced = !this.advanced
-	this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
-	},
-	onChangecreatedTime(date, dateString) {
-	  this.queryParam.createdTime = dateString
-	},
-	onChangeupdatedTime(date, dateString) {
-	  this.queryParam.updatedTime = dateString
-	},
-	handleOk () {
-	this.$refs.table.refresh()
-	},
-	onSelectChange (selectedRowKeys, selectedRows) {
-	this.selectedRowKeys = selectedRowKeys
-	this.selectedRows = selectedRows
+		toggleAdvanced() {
+			this.advanced = !this.advanced
+			this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
+		},
+		onChangecreatedTime(date, dateString) {
+			this.queryParam.createdTime = dateString
+		},
+		onChangeupdatedTime(date, dateString) {
+			this.queryParam.updatedTime = dateString
+		},
+		handleOk() {
+			this.$refs.table.refresh()
+		},
+		onSelectChange(selectedRowKeys, selectedRows) {
+			this.selectedRowKeys = selectedRowKeys
+			this.selectedRows = selectedRows
+		}
 	}
-	}
-	}
+}
 </script>
-<style lang="less">
-  .table-operator {
-    margin-bottom: 18px;
-  }
-  button {
-    margin-right: 8px;
-  }
-</style>
+<style lang="less">.table-operator {
+	margin-bottom: 18px;
+}
+
+button {
+	margin-right: 8px;
+}</style>

--
Gitblit v1.9.3