~shaocx/iWare_RawMaterialWarehouse.git

			@@ -39,10 +39,11 @@
			<a-form-item label="ERP代码">
			<a-input v-model="queryParam.erpCode" allow-clear placeholder="请输入ERP代码"/>
			</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.warehouseId" allow-clear placeholder="请输入所属仓库"/>
			<a-select :allowClear="true" style="width: 100%" v-model="queryParam.warehouseId" placeholder="请选择所属仓库">
			<a-select-option v-for="(item,index) in warehouseIdData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
			</a-select>
			</a-form-item>
			</a-col>
			<a-col :md="8" :sm="24">
			@@ -168,6 +169,9 @@
			<a-button type="primary" v-if="hasPerm('WmsArea:add')" icon="plus" @click="$refs.addForm.add()">新增库区信息</a-button>
			</div>
			</template>
			<span slot="warehouseIdscopedSlots" slot-scope="text">
			{{ 'area_type' \| dictType(text) }}
			</span>
			<span slot="isBarcodeLevelControlscopedSlots" slot-scope="text">
			<div v-if="text===true ">
			<a-tag color="green">是</a-tag>
			@@ -438,7 +442,8 @@
			}
			},
			sorter: true,
			dataIndex: 'warehouseId'
			dataIndex: 'warehouseId',
			scopedSlots: { customRender: 'warehouseIdscopedSlots' }
			},
			{
			title: '零件级管控',
			@@ -675,6 +680,7 @@
			return res.data
			})
			},
			warehouseIdData: [],
			selectedRowKeys: [],
			selectedRows: []
			}
			@@ -701,6 +707,8 @@
			}
			});
			}
			const warehouseIdOption = this.$options
			this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
			const isBarcodeLevelControlOption = this.$options
			this.isBarcodeLevelControlData = isBarcodeLevelControlOption.filters['dictData']('yes_true_false')
			const isFIFOOption = this.$options
			@@ -824,4 +832,5 @@
			button {
			margin-right: 8px;
			}

			</style>