refactor(wms): 移除materialType限制并统一使用selectType
- 在ship.vue中移除coilFilters的materialType默认值 - 在base.vue和CoilSelector中将itemType改为selectType - 在ActualWarehouseSelect组件中添加cascader的filterable属性
This commit is contained in:
@@ -124,7 +124,7 @@ export default {
|
|||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
currentCoilNo: null,
|
currentCoilNo: null,
|
||||||
grade: null,
|
grade: null,
|
||||||
itemType: 'raw_material',
|
selectType: 'raw_material',
|
||||||
dataType: 1 // 只查询当前数据,不查询历史数据
|
dataType: 1 // 只查询当前数据,不查询历史数据
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -252,7 +252,7 @@ export default {
|
|||||||
currentCoilNo: null,
|
currentCoilNo: null,
|
||||||
grade: null,
|
grade: null,
|
||||||
dataType: 1,
|
dataType: 1,
|
||||||
itemType: 'raw_material',
|
selectType: 'raw_material',
|
||||||
};
|
};
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
:style="wrapperStyle"
|
:style="wrapperStyle"
|
||||||
>
|
>
|
||||||
<el-cascader
|
<el-cascader
|
||||||
|
filterable
|
||||||
ref="cascader"
|
ref="cascader"
|
||||||
v-model="innerPath"
|
v-model="innerPath"
|
||||||
:props="cascaderProps"
|
:props="cascaderProps"
|
||||||
|
|||||||
@@ -213,7 +213,6 @@ export default {
|
|||||||
// 钢卷选择器筛选参数
|
// 钢卷选择器筛选参数
|
||||||
coilFilters: {
|
coilFilters: {
|
||||||
dataType: 1,
|
dataType: 1,
|
||||||
materialType: '成品'
|
|
||||||
},
|
},
|
||||||
coilSelectorVisible: false,
|
coilSelectorVisible: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
|
|||||||
@@ -441,9 +441,7 @@ export default {
|
|||||||
endTime: this.queryParams.updateTime?.[1],
|
endTime: this.queryParams.updateTime?.[1],
|
||||||
}
|
}
|
||||||
// 如果没有设置itemType,则设置为raw_material
|
// 如果没有设置itemType,则设置为raw_material
|
||||||
if (!query.itemType) {
|
query.selectType = 'raw_material';
|
||||||
query.itemType = 'raw_material';
|
|
||||||
}
|
|
||||||
listMaterialCoil(query).then(response => {
|
listMaterialCoil(query).then(response => {
|
||||||
if (this.querys.warehouseId != 111) {
|
if (this.querys.warehouseId != 111) {
|
||||||
// 排除掉111仓库的
|
// 排除掉111仓库的
|
||||||
|
|||||||
Reference in New Issue
Block a user