fix(wms): 修正钢卷选择器筛选条件及显示逻辑
- 统一钢卷选择器的selectType为'product'并添加status过滤 - 修复materialType与selectType的映射关系 - 移除分页组件的rangeMode条件限制 - 更新部分字段显示名称
This commit is contained in:
@@ -161,7 +161,8 @@ export default {
|
||||
pageSize: 10,
|
||||
currentCoilNo: null,
|
||||
grade: null,
|
||||
selectType: 'raw_material',
|
||||
selectType: 'product',
|
||||
status: 0, // 不包含已发货的钢卷
|
||||
dataType: 1 // 只查询当前数据,不查询历史数据
|
||||
},
|
||||
columns: defaultColumns,
|
||||
|
||||
@@ -220,7 +220,9 @@ export default {
|
||||
// 钢卷选择器筛选参数
|
||||
coilFilters: {
|
||||
dataType: 1,
|
||||
materialType: '成品'
|
||||
materialType: '成品',
|
||||
selectType: 'product',
|
||||
status: 0,
|
||||
},
|
||||
coilSelectorVisible: false,
|
||||
loading: false,
|
||||
|
||||
@@ -633,7 +633,7 @@ export default {
|
||||
endTime: this.queryParams.updateTime?.[1],
|
||||
}
|
||||
// 如果没有设置itemType,则设置为raw_material
|
||||
query.selectType = this.querys.materialType === '成品' ? 'product' : 'raw_material';
|
||||
query.selectType = this.querys.materialType === '原料' ? 'raw_material' : 'product';
|
||||
listMaterialCoil(query).then(response => {
|
||||
if (this.querys.warehouseId != 111) {
|
||||
// 排除掉111仓库的
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
</el-table>
|
||||
|
||||
<!-- 分页 -->
|
||||
<pagination v-if="!rangeMode" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
|
||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize" @pagination="getList" />
|
||||
</div>
|
||||
</template>
|
||||
@@ -68,8 +68,9 @@ export default {
|
||||
currentCoilNo: null,
|
||||
grade: null,
|
||||
materialType: '成品',
|
||||
selectType: 'raw_material',
|
||||
dataType: 1 // 只查询当前数据,不查询历史数据
|
||||
selectType: 'product',
|
||||
dataType: 1, // 只查询当前数据,不查询历史数据
|
||||
// status: 0 // 只查询未发货的数据
|
||||
},
|
||||
columns: [
|
||||
{
|
||||
@@ -122,7 +123,7 @@ export default {
|
||||
width: '100'
|
||||
},
|
||||
{
|
||||
label: '库区',
|
||||
label: '逻辑库区',
|
||||
align: 'center',
|
||||
prop: 'warehouseName',
|
||||
width: '120',
|
||||
|
||||
@@ -223,6 +223,8 @@ export default {
|
||||
queryParamsWithSalesId: {
|
||||
selectType: 'product',
|
||||
materialType: '成品',
|
||||
dataType: 1,
|
||||
status: 0,
|
||||
saleId: undefined,
|
||||
pageNum: 1,
|
||||
pageSize: 10
|
||||
@@ -231,6 +233,8 @@ export default {
|
||||
queryParamsWithUnAssignedId: {
|
||||
selectType: 'product',
|
||||
materialType: '成品',
|
||||
dataType: 1,
|
||||
status: 0,
|
||||
saleId: -1,
|
||||
pageNum: 1,
|
||||
pageSize: 10
|
||||
|
||||
Reference in New Issue
Block a user