~shaocx/iWare_RawMaterialWarehouse.git

			@@ -105,24 +105,18 @@
			</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.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> -->

			<a-col :md="8" :sm="24">
			<a-form-item label="所在库区">
			<!-- <a-input v-model="queryParam.areaId" allow-clear placeholder="请输入所在库区" /> -->

			<a-select v-model="queryParam.areaCode" style="width: 100%" placeholder="请选择所在库区">
			<a-select v-model="queryParam.areaId" style="width: 100%" placeholder="请选择所在库区">
			<a-select-option v-for="(item, index) in WmsAreaData" :key="index"
			:value="item.id">{{ item.areaName
			:value="item.areaCode">{{ item.areaName
			}}</a-select-option>
			</a-select>

			@@ -133,11 +127,12 @@
			<a-input v-model="queryParam.areaName" allow-clear placeholder="请输入库区名称" />
			</a-form-item>
			</a-col> -->
			<a-col :md="8" :sm="24">
			<!-- <a-col :md="8" :sm="24">
			<a-form-item label="检验码">
			<a-input v-model="queryParam.verificationCode" 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.rowNo" style="width: 100%" allow-clear
			placeholder="请输入排" />
			@@ -152,13 +147,14 @@
			<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-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-col :md="8" :sm="24">
			<a-form-item label="库位X坐标">
			<a-input v-model="queryParam.xzb" allow-clear placeholder="请输入库位X坐标" />
			</a-form-item>
			@@ -202,7 +198,7 @@
			<a-input-number v-model="queryParam.outSequence" style="width: 100%" 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.isVirtually"
			@@ -225,7 +221,7 @@
			<!--年月日时分秒-->
			<!--时间范围-->

			<a-col :md="8" :sm="24">
			<!-- <a-col :md="8" :sm="24">
			<a-form-item label="创建时间">
			<a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']" :show-time="{
			format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
			@@ -233,11 +229,11 @@
			@change="onChangecreatedTime" />

			</a-form-item>
			</a-col>
			</a-col> -->
			<!--年月日时分秒-->
			<!--时间范围-->

			<a-col :md="8" :sm="24">
			<!-- <a-col :md="8" :sm="24">
			<a-form-item label="更新时间">
			<a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']" :show-time="{
			format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
			@@ -248,15 +244,16 @@
			</a-col>

			<a-col :md="8" :sm="24">
			<a-form-item label="创建者名称">
			<a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建者名称" />
			<a-form-item label="创建人">
			<a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建人" />
			</a-form-item>
			</a-col>
			<a-col :md="8" :sm="24">
			<a-form-item label="修改者名称">
			<a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改者名称" />
			<a-form-item label="修改人">
			<a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改人" />
			</a-form-item>
			</a-col> </template>
			</a-col> -->
			</template>

			<a-col :md="8" :sm="24">
			<span class="table-page-search-submitButtons">
			@@ -470,6 +467,46 @@
			},
			sorter: true,
			dataIndex: 'placeAlias'
			},
			{
			title: '所在库区',
			align: 'center',
			customHeaderCell: () => {
			return {
			style: {
			'min-width': '120px'//最小列宽设置
			}
			}
			},
			customCell: () => {
			return {
			style: {
			'min-width': '120px'//最小列宽设置
			}
			}
			},
			sorter: true,
			dataIndex: 'areaName'
			},
			{
			title: '库区编号',
			align: 'center',
			customHeaderCell: () => {
			return {
			style: {
			'min-width': '120px'//最小列宽设置
			}
			}
			},
			customCell: () => {
			return {
			style: {
			'min-width': '120px'//最小列宽设置
			}
			}
			},
			sorter: true,
			dataIndex: 'areaCode'
			},
			{
			title: '库位类型',
			@@ -738,26 +775,7 @@
			sorter: true,
			dataIndex: 'environment'
			},
			{
			title: '库区编号',
			align: 'center',
			customHeaderCell: () => {
			return {
			style: {
			'min-width': '120px'//最小列宽设置
			}
			}
			},
			customCell: () => {
			return {
			style: {
			'min-width': '120px'//最小列宽设置
			}
			}
			},
			sorter: true,
			dataIndex: 'areaCode'
			},

			// {
			// title: '所在库区',
			// align: 'center',
			@@ -778,26 +796,7 @@
			// sorter: true,
			// dataIndex: 'areaId'
			// },
			// {
			// title: '库区名称',
			// align: 'center',
			// customHeaderCell: () => {
			// return {
			// style: {
			// 'min-width': '120px'//最小列宽设置
			// }
			// }
			// },
			// customCell: () => {
			// return {
			// style: {
			// 'min-width': '120px'//最小列宽设置
			// }
			// }
			// },
			// sorter: true,
			// dataIndex: 'areaName'
			// },

			{
			title: '检验码',
			align: 'center',
			@@ -1161,7 +1160,7 @@
			dataIndex: 'updatedTime'
			},
			{
			title: '创建者名称',
			title: '创建人',
			align: 'center',
			customHeaderCell: () => {
			return {
			@@ -1181,7 +1180,7 @@
			dataIndex: 'createdUserName'
			},
			{
			title: '修改者名称',
			title: '修改人',
			align: 'center',
			customHeaderCell: () => {
			return {
			@@ -1264,8 +1263,8 @@
			},
			false
			)
			WmsAreaPage().then(res => {
			this.WmsAreaData = res.data.rows
			WmsAreaPage().then(d => {
			this.WmsAreaData = d.data.rows
			this.$refs.addForm.WmsAreaData = d.data.rows \|\| []
			})
			},