|
|
@@ -156,6 +156,24 @@
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label-width="90px" label="仓库:" prop="warehouseId">
|
|
|
+ <el-select
|
|
|
+ v-model="formData.warehouseId"
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ placeholder="请选择"
|
|
|
+ :disabled="isView"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in warehouseList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col v-if="!isView" :span="12">
|
|
|
<div class="ele-form-actions filter-actions">
|
|
|
<el-button
|
|
|
@@ -241,6 +259,7 @@
|
|
|
import storageApi from '@/api/warehouseManagement';
|
|
|
import { allCategoryLevel } from '@/api/classifyManage';
|
|
|
import { getTreeByGroup } from '@/api/classifyManage';
|
|
|
+ import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
|
|
|
import {
|
|
|
warehousingType,
|
|
|
sceneState,
|
|
|
@@ -280,8 +299,10 @@
|
|
|
categoryCode: '',
|
|
|
colorKey: '',
|
|
|
batchNo: '',
|
|
|
+ warehouseId: '',
|
|
|
type: ''
|
|
|
},
|
|
|
+ warehouseList: [],
|
|
|
// 表单验证规则
|
|
|
rules: {
|
|
|
name: [
|
|
|
@@ -391,6 +412,13 @@
|
|
|
showOverflowTooltip: true,
|
|
|
width: 120
|
|
|
},
|
|
|
+ {
|
|
|
+ prop: 'warehouseName',
|
|
|
+ label: '仓库名称',
|
|
|
+ align: 'center',
|
|
|
+ showOverflowTooltip: true,
|
|
|
+ width: 150
|
|
|
+ },
|
|
|
{
|
|
|
prop: 'modelType',
|
|
|
label: '型号',
|
|
|
@@ -622,7 +650,8 @@
|
|
|
},
|
|
|
created() {
|
|
|
this.getTypeList();
|
|
|
- this.getAssetTypeList()
|
|
|
+ this.getAssetTypeList();
|
|
|
+ this.getWarehouseList();
|
|
|
},
|
|
|
methods: {
|
|
|
// 获取物品类型下拉选择树
|
|
|
@@ -632,6 +661,10 @@
|
|
|
return { dictCode: item.id, dictValue: item.name };
|
|
|
});
|
|
|
},
|
|
|
+ // 加载仓库筛选项，选择值作为仓库 ID 参与明细查询。
|
|
|
+ async getWarehouseList() {
|
|
|
+ this.warehouseList = await warehouseDefinition.list({});
|
|
|
+ },
|
|
|
handleOutInChange() {
|
|
|
// this.formData.bizType = '';
|
|
|
},
|
|
|
@@ -761,6 +794,7 @@
|
|
|
this.formData.categoryCode = row.categoryCode || '';
|
|
|
this.formData.colorKey = row.colorKey || '';
|
|
|
this.formData.batchNo = row.batchNo || '';
|
|
|
+ this.formData.warehouseId = row.warehouseId || '';
|
|
|
} else {
|
|
|
this.tableList = [];
|
|
|
this.formData = Object.assign({}, {
|
|
|
@@ -774,7 +808,8 @@
|
|
|
categoryLevelId: '',
|
|
|
categoryCode: '',
|
|
|
colorKey: '',
|
|
|
- batchNo: ''
|
|
|
+ batchNo: '',
|
|
|
+ warehouseId: ''
|
|
|
}, searchParams);
|
|
|
}
|
|
|
this.isView = isView;
|
|
|
@@ -818,6 +853,7 @@
|
|
|
this.formData.categoryCode = '';
|
|
|
this.formData.colorKey = '';
|
|
|
this.formData.batchNo = '';
|
|
|
+ this.formData.warehouseId = '';
|
|
|
this.$refs.formRef.resetFields()
|
|
|
this.search();
|
|
|
}
|
