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