~shaocx/iWare_RawMaterialWarehouse.git

			@@ -16,22 +16,22 @@
			<a-input v-model="queryParam.containerName" allow-clear placeholder="请输入名称" />
			</a-form-item>
			</a-col><template v-if="advanced">
			<a-col :md="8" :sm="24">
			<!-- <a-col :md="8" :sm="24">
			<a-form-item label="类型ID">
			<a-input v-model="queryParam.containerTypeId" allow-clear placeholder="请输入类型ID" />
			</a-form-item>
			</a-col>
			</a-col> -->
			<a-col :md="8" :sm="24">
			<a-form-item label="类型名称">
			<a-input v-model="queryParam.containerTypeName" allow-clear placeholder="请输入类型名称" />
			</a-form-item>
			</a-col>
			<a-col :md="8" :sm="24">
			<!-- <a-col :md="8" :sm="24">
			<a-form-item label="容器关系ID">
			<a-input v-model="queryParam.packagingId" allow-clear placeholder="请输入容器关系ID" />
			</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 v-model="queryParam.specLength" allow-clear placeholder="请输入长度" />
			</a-form-item>
			@@ -71,13 +71,15 @@
			<a-input v-model="queryParam.parentContainerName" 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="父容器Id">
			<a-input v-model="queryParam.parentContainerId" allow-clear
			placeholder="请输入父容器Id" />
			</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.isVirtually" style="width: 100%" allow-clear
			placeholder="请输入是否虚拟" />
			@@ -95,7 +97,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')]
			@@ -104,11 +106,11 @@
			format="YYYY-MM-DD HH:mm:ss" @change="onChangecreatedTime" />

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

			<a-col :md="8" :sm="24">
			<!-- <a-col :md="8" :sm="24">
			<a-form-item label="更新时间">
			<a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']" :show-time="{
			format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
			@@ -120,15 +122,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">
			@@ -311,26 +314,26 @@
			sorter: true,
			dataIndex: 'containerTypeName'
			},
			{
			title: '容器关系ID',
			align: 'center',
			customHeaderCell: () => {
			return {
			style: {
			'min-width': '120px'//最小列宽设置
			}
			}
			},
			customCell: () => {
			return {
			style: {
			'min-width': '120px'//最小列宽设置
			}
			}
			},
			sorter: true,
			dataIndex: 'packagingId'
			},
			// {
			// title: '容器关系ID',
			// align: 'center',
			// customHeaderCell: () => {
			// return {
			// style: {
			// 'min-width': '120px'//最小列宽设置
			// }
			// }
			// },
			// customCell: () => {
			// return {
			// style: {
			// 'min-width': '120px'//最小列宽设置
			// }
			// }
			// },
			// sorter: true,
			// dataIndex: 'packagingId'
			// },
			{
			title: '长度',
			align: 'center',
			@@ -471,26 +474,26 @@
			sorter: true,
			dataIndex: 'maxWeight'
			},
			{
			title: '父容器名称',
			align: 'center',
			customHeaderCell: () => {
			return {
			style: {
			'min-width': '120px'//最小列宽设置
			}
			}
			},
			customCell: () => {
			return {
			style: {
			'min-width': '120px'//最小列宽设置
			}
			}
			},
			sorter: true,
			dataIndex: 'parentContainerName'
			},
			// {
			// title: '父容器名称',
			// align: 'center',
			// customHeaderCell: () => {
			// return {
			// style: {
			// 'min-width': '120px'//最小列宽设置
			// }
			// }
			// },
			// customCell: () => {
			// return {
			// style: {
			// 'min-width': '120px'//最小列宽设置
			// }
			// }
			// },
			// sorter: true,
			// dataIndex: 'parentContainerName'
			// },
			// {
			// title: '父容器Id',
			// align: 'center',
			@@ -594,7 +597,7 @@
			dataIndex: 'updatedTime'
			},
			{
			title: '创建者名称',
			title: '创建人',
			align: 'center',
			customHeaderCell: () => {
			return {
			@@ -614,7 +617,7 @@
			dataIndex: 'createdUserName'
			},
			{
			title: '修改者名称',
			title: '修改人',
			align: 'center',
			customHeaderCell: () => {
			return {