fix(wms/coil/stock, wms/report): 修复两处功能问题
1. 补充卷库存查询的质检状态参数 2. 修复自定义导出列重复添加和缓存解析重复数据的问题
This commit is contained in:
@@ -497,7 +497,11 @@ export default {
|
|||||||
loadDialogData() {
|
loadDialogData() {
|
||||||
if (!this.currentWarehouse) return;
|
if (!this.currentWarehouse) return;
|
||||||
this.dialogLoading = true;
|
this.dialogLoading = true;
|
||||||
const baseParams = { warehouseId: this.currentWarehouse.warehouseId, dataType: 1, status: 0 };
|
const baseParams = {
|
||||||
|
warehouseId: this.currentWarehouse.warehouseId,
|
||||||
|
qualityStatusCsv: this.queryParams.qualityStatusCsv || '',
|
||||||
|
dataType: 1, status: 0,
|
||||||
|
};
|
||||||
Promise.all([
|
Promise.all([
|
||||||
listLightCoil({ ...baseParams, pageSize: 99999, pageNum: 1 }),
|
listLightCoil({ ...baseParams, pageSize: 99999, pageNum: 1 }),
|
||||||
listMaterialCoil({ ...baseParams, pageNum: this.dialogPageNum, pageSize: this.dialogPageSize }),
|
listMaterialCoil({ ...baseParams, pageNum: this.dialogPageNum, pageSize: this.dialogPageSize }),
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ export default {
|
|||||||
const newSet = new Set(nv)
|
const newSet = new Set(nv)
|
||||||
const oldSet = ov ? new Set(ov) : new Set()
|
const oldSet = ov ? new Set(ov) : new Set()
|
||||||
this.orderedColumns = this.orderedColumns.filter(f => newSet.has(f))
|
this.orderedColumns = this.orderedColumns.filter(f => newSet.has(f))
|
||||||
const added = nv.filter(f => !oldSet.has(f))
|
const added = nv.filter(f => !oldSet.has(f) && !this.orderedColumns.includes(f))
|
||||||
if (added.length) {
|
if (added.length) {
|
||||||
this.orderedColumns.push(...added)
|
this.orderedColumns.push(...added)
|
||||||
}
|
}
|
||||||
@@ -114,8 +114,9 @@ export default {
|
|||||||
try {
|
try {
|
||||||
const arr = JSON.parse(cached)
|
const arr = JSON.parse(cached)
|
||||||
if (Array.isArray(arr) && arr.length) {
|
if (Array.isArray(arr) && arr.length) {
|
||||||
this.selectedColumns = [...arr]
|
const uniqueArr = [...new Set(arr)]
|
||||||
this.orderedColumns = [...arr]
|
this.selectedColumns = uniqueArr
|
||||||
|
this.orderedColumns = uniqueArr
|
||||||
this.$emit('update:visible', true)
|
this.$emit('update:visible', true)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user