DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
朱昊天
2026-07-08 13:10:56 +08:00
parent 1be7612eb5 6e28ba0342
commit 6e8028c1a0
11 changed files with 65 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-ui/src/views/wms/coil/stock/index.vue
View File

@@ -497,7 +497,11 @@ export default {
loadDialogData() {
if (!this.currentWarehouse) return;
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([
listLightCoil({ ...baseParams, pageSize: 99999, pageNum: 1 }),
listMaterialCoil({ ...baseParams, pageNum: this.dialogPageNum, pageSize: this.dialogPageSize }),

7
klp-ui/src/views/wms/report/components/CustomExport.vue
View File

@@ -98,7 +98,7 @@ export default {
const newSet = new Set(nv)
const oldSet = ov ? new Set(ov) : new Set()
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) {
this.orderedColumns.push(...added)
}
@@ -114,8 +114,9 @@ export default {
try {
const arr = JSON.parse(cached)
if (Array.isArray(arr) && arr.length) {
this.selectedColumns = [...arr]
this.orderedColumns = [...arr]
const uniqueArr = [...new Set(arr)]
this.selectedColumns = uniqueArr
this.orderedColumns = uniqueArr
this.$emit('update:visible', true)
return
}