diff --git a/src/views/modules/check/currentPhysicalInventory.vue b/src/views/modules/check/currentPhysicalInventory.vue
index d9d2256..15f2ca5 100644
--- a/src/views/modules/check/currentPhysicalInventory.vue
+++ b/src/views/modules/check/currentPhysicalInventory.vue
@@ -116,6 +116,18 @@
+
+
@@ -135,6 +147,18 @@
+
+
@@ -156,6 +180,18 @@
+
+
@@ -179,6 +215,18 @@
+
+
@@ -213,6 +261,18 @@
+
+
@@ -236,6 +296,18 @@
+
+
@@ -249,6 +321,18 @@
+
+
@@ -279,6 +363,18 @@
+
+
@@ -296,6 +392,18 @@
+
+
@@ -513,7 +621,20 @@ export default {
adjustmentTransLoading: false,
adjustmentTransSubList: [], // 标签明细列表
adjustmentTransSubLoading: false,
- currentAdjustmentTrans: null // 当前选中的事务
+ currentAdjustmentTrans: null, // 当前选中的事务
+
+ // Tab页签分页 - rqrq
+ tabPage: {
+ label: { pageIndex: 1, pageSize: 50, total: 0 },
+ summary: { pageIndex: 1, pageSize: 50, total: 0 },
+ pallet: { pageIndex: 1, pageSize: 50, total: 0 },
+ result: { pageIndex: 1, pageSize: 50, total: 0 },
+ resultDiff: { pageIndex: 1, pageSize: 50, total: 0 },
+ task: { pageIndex: 1, pageSize: 20, total: 0 },
+ taskDetail: { pageIndex: 1, pageSize: 50, total: 0 },
+ adjustment: { pageIndex: 1, pageSize: 20, total: 0 },
+ adjustmentSub: { pageIndex: 1, pageSize: 50, total: 0 }
+ }
}
},
mounted() {
@@ -534,6 +655,7 @@ export default {
if (data && data.code === 0) {
this.headerData = data.row
if (this.headerData) {
+ this.resetTabPages()
this.loadTabData()
} else {
// 清空Tab数据 - rqrq
@@ -583,13 +705,76 @@ export default {
}
},
+ // 重置Tab分页 - rqrq
+ resetTabPages() {
+ Object.keys(this.tabPage).forEach(key => {
+ this.tabPage[key].pageIndex = 1
+ this.tabPage[key].total = 0
+ })
+ },
+
+ // 构建Tab分页查询参数 - rqrq
+ buildTabQuery(params, tabKey, extra = {}) {
+ return {
+ ...params,
+ ...extra,
+ page: this.tabPage[tabKey].pageIndex,
+ limit: this.tabPage[tabKey].pageSize
+ }
+ },
+
+ // 应用Tab分页响应 - rqrq
+ applyTabPageData(data, tabKey, listField) {
+ if (!(data && data.code === 0)) return
+ if (data.page) {
+ this[listField] = data.page.list || []
+ this.tabPage[tabKey].total = data.page.totalCount || 0
+ if (data.page.currPage) {
+ this.tabPage[tabKey].pageIndex = data.page.currPage
+ }
+ } else {
+ this[listField] = data.rows || []
+ }
+ },
+
+ tabSizeChange(tabKey, val) {
+ this.tabPage[tabKey].pageSize = val
+ this.tabPage[tabKey].pageIndex = 1
+ this.loadTabData()
+ },
+
+ tabCurrentChange(tabKey, val) {
+ this.tabPage[tabKey].pageIndex = val
+ this.loadTabData()
+ },
+
+ tabTaskDetailSizeChange(val) {
+ this.tabPage.taskDetail.pageSize = val
+ this.tabPage.taskDetail.pageIndex = 1
+ this.loadTaskDetailList()
+ },
+
+ tabTaskDetailCurrentChange(val) {
+ this.tabPage.taskDetail.pageIndex = val
+ this.loadTaskDetailList()
+ },
+
+ tabAdjustmentSubSizeChange(val) {
+ this.tabPage.adjustmentSub.pageSize = val
+ this.tabPage.adjustmentSub.pageIndex = 1
+ this.loadAdjustmentTransSubList()
+ },
+
+ tabAdjustmentSubCurrentChange(val) {
+ this.tabPage.adjustmentSub.pageIndex = val
+ this.loadAdjustmentTransSubList()
+ },
+
// 加载标签明细 - rqrq
loadLabelList(params) {
this.labelListLoading = true
- searchCountLabelList(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.labelList = data.rows
- }
+ searchCountLabelList(this.buildTabQuery(params, 'label')).then(({ data }) => {
+ this.applyTabPageData(data, 'label', 'labelList')
}).finally(() => {
this.labelListLoading = false
})
@@ -598,10 +783,8 @@ export default {
// 加载栈板明细 - rqrq
loadPalletList(params) {
this.palletListLoading = true
- searchCountPalletList(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.palletList = data.rows
- }
+ searchCountPalletList(this.buildTabQuery(params, 'pallet')).then(({ data }) => {
+ this.applyTabPageData(data, 'pallet', 'palletList')
}).finally(() => {
this.palletListLoading = false
})
@@ -610,23 +793,18 @@ export default {
// 加载盘点结果 - rqrq
loadResultList(params) {
this.resultListLoading = true
- searchCountResultList(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.resultList = data.rows
- }
+ searchCountResultList(this.buildTabQuery(params, 'result')).then(({ data }) => {
+ this.applyTabPageData(data, 'result', 'resultList')
}).finally(() => {
this.resultListLoading = false
})
},
- // 加载盘点结果差异（只显示非OK的结果）- rqrq
+ // 加载盘点结果差异（服务端过滤非OK）- rqrq
loadResultDiffList(params) {
this.resultDiffListLoading = true
- searchCountResultList(params).then(({ data }) => {
- if (data && data.code === 0) {
- // 过滤出非OK的结果 - rqrq
- this.resultDiffList = (data.rows || []).filter(item => item.countResult !== 'OK')
- }
+ searchCountResultList(this.buildTabQuery(params, 'resultDiff', { searchNonOkOnly: true })).then(({ data }) => {
+ this.applyTabPageData(data, 'resultDiff', 'resultDiffList')
}).finally(() => {
this.resultDiffListLoading = false
})
@@ -635,10 +813,8 @@ export default {
// 加载物料汇总 - rqrq
loadSummaryList(params) {
this.summaryListLoading = true
- searchMaterialSummary(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.summaryList = data.rows
- }
+ searchMaterialSummary(this.buildTabQuery(params, 'summary')).then(({ data }) => {
+ this.applyTabPageData(data, 'summary', 'summaryList')
}).finally(() => {
this.summaryListLoading = false
})
@@ -650,12 +826,20 @@ export default {
this.taskList = []
this.taskDetailList = []
this.currentTask = null
- searchOrderTaskByCountNo(params).then(({ data }) => {
+ searchOrderTaskByCountNo(this.buildTabQuery(params, 'task')).then(({ data }) => {
if (data && data.code === 0) {
- this.taskList = data.rows || []
- // 默认选中第一行
+ if (data.page) {
+ this.taskList = data.page.list || []
+ this.tabPage.task.total = data.page.totalCount || 0
+ if (data.page.currPage) {
+ this.tabPage.task.pageIndex = data.page.currPage
+ }
+ } else {
+ this.taskList = data.rows || []
+ }
if (this.taskList.length > 0) {
this.currentTask = this.taskList[0]
+ this.tabPage.taskDetail.pageIndex = 1
this.loadTaskDetailList()
}
}
@@ -667,6 +851,7 @@ export default {
// 任务单行点击 - rqrq
onTaskRowClick(row) {
this.currentTask = row
+ this.tabPage.taskDetail.pageIndex = 1
this.loadTaskDetailList()
},
@@ -679,12 +864,12 @@ export default {
this.taskDetailListLoading = true
const params = {
site: this.$store.state.user.site,
- taskNo: this.currentTask.taskNo
+ taskNo: this.currentTask.taskNo,
+ page: this.tabPage.taskDetail.pageIndex,
+ limit: this.tabPage.taskDetail.pageSize
}
searchOrderTaskDetail(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.taskDetailList = data.rows || []
- }
+ this.applyTabPageData(data, 'taskDetail', 'taskDetailList')
}).finally(() => {
this.taskDetailListLoading = false
})
@@ -696,12 +881,20 @@ export default {
this.adjustmentTransList = []
this.adjustmentTransSubList = []
this.currentAdjustmentTrans = null
- queryAdjustmentTransList(params).then(({ data }) => {
+ queryAdjustmentTransList(this.buildTabQuery(params, 'adjustment')).then(({ data }) => {
if (data && data.code === 0) {
- this.adjustmentTransList = data.rows || []
- // 默认选中第一行
+ if (data.page) {
+ this.adjustmentTransList = data.page.list || []
+ this.tabPage.adjustment.total = data.page.totalCount || 0
+ if (data.page.currPage) {
+ this.tabPage.adjustment.pageIndex = data.page.currPage
+ }
+ } else {
+ this.adjustmentTransList = data.rows || []
+ }
if (this.adjustmentTransList.length > 0) {
this.currentAdjustmentTrans = this.adjustmentTransList[0]
+ this.tabPage.adjustmentSub.pageIndex = 1
this.loadAdjustmentTransSubList()
}
}
@@ -713,6 +906,7 @@ export default {
// 盘盈盘亏事务行点击 - rqrq
onAdjustmentTransRowClick(row) {
this.currentAdjustmentTrans = row
+ this.tabPage.adjustmentSub.pageIndex = 1
this.loadAdjustmentTransSubList()
},
@@ -725,12 +919,12 @@ export default {
this.adjustmentTransSubLoading = true
const params = {
site: this.$store.state.user.site,
- transNo: this.currentAdjustmentTrans.transNo
+ transNo: this.currentAdjustmentTrans.transNo,
+ page: this.tabPage.adjustmentSub.pageIndex,
+ limit: this.tabPage.adjustmentSub.pageSize
}
queryAdjustmentTransSubList(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.adjustmentTransSubList = data.rows || []
- }
+ this.applyTabPageData(data, 'adjustmentSub', 'adjustmentTransSubList')
}).finally(() => {
this.adjustmentTransSubLoading = false
})
diff --git a/src/views/modules/check/searchPhysicalInventory.vue b/src/views/modules/check/searchPhysicalInventory.vue
index 234470f..671cd1f 100644
--- a/src/views/modules/check/searchPhysicalInventory.vue
+++ b/src/views/modules/check/searchPhysicalInventory.vue
@@ -122,6 +122,18 @@
+
+
@@ -141,6 +153,18 @@
+
+
@@ -162,6 +186,18 @@
+
+
@@ -185,6 +221,18 @@
+
+
@@ -208,6 +256,18 @@
+
+
@@ -231,6 +291,18 @@
+
+
@@ -244,6 +316,18 @@
+
+
@@ -274,6 +358,18 @@
+
+
@@ -291,6 +387,18 @@
+
+
@@ -324,6 +432,12 @@
+
+
+
+
+
+
@@ -586,6 +700,7 @@ export default {
yearReportLoading: false,
yearReportForm: {
countType: 'MID_YEAR',
+ reportScope: 'ALL_AREAS',
remark: ''
},
@@ -652,6 +767,19 @@ export default {
adjustmentTransSubLoading: false,
currentAdjustmentTrans: null, // 当前选中的事务
+ // Tab页签分页 - rqrq
+ tabPage: {
+ label: { pageIndex: 1, pageSize: 50, total: 0 },
+ summary: { pageIndex: 1, pageSize: 50, total: 0 },
+ pallet: { pageIndex: 1, pageSize: 50, total: 0 },
+ result: { pageIndex: 1, pageSize: 50, total: 0 },
+ resultDiff: { pageIndex: 1, pageSize: 50, total: 0 },
+ task: { pageIndex: 1, pageSize: 20, total: 0 },
+ taskDetail: { pageIndex: 1, pageSize: 50, total: 0 },
+ adjustment: { pageIndex: 1, pageSize: 20, total: 0 },
+ adjustmentSub: { pageIndex: 1, pageSize: 50, total: 0 }
+ },
+
// 导出相关 - rqrq
exportLoading: false
}
@@ -778,6 +906,7 @@ export default {
// 行点击 - rqrq
handleRowClick(row) {
this.currentRow = row
+ this.resetTabPages()
this.loadTabData()
},
@@ -811,13 +940,76 @@ export default {
}
},
+ // 重置Tab分页 - rqrq
+ resetTabPages() {
+ Object.keys(this.tabPage).forEach(key => {
+ this.tabPage[key].pageIndex = 1
+ this.tabPage[key].total = 0
+ })
+ },
+
+ // 构建Tab分页查询参数 - rqrq
+ buildTabQuery(params, tabKey, extra = {}) {
+ return {
+ ...params,
+ ...extra,
+ page: this.tabPage[tabKey].pageIndex,
+ limit: this.tabPage[tabKey].pageSize
+ }
+ },
+
+ // 应用Tab分页响应 - rqrq
+ applyTabPageData(data, tabKey, listField) {
+ if (!(data && data.code === 0)) return
+ if (data.page) {
+ this[listField] = data.page.list || []
+ this.tabPage[tabKey].total = data.page.totalCount || 0
+ if (data.page.currPage) {
+ this.tabPage[tabKey].pageIndex = data.page.currPage
+ }
+ } else {
+ this[listField] = data.rows || []
+ }
+ },
+
+ tabSizeChange(tabKey, val) {
+ this.tabPage[tabKey].pageSize = val
+ this.tabPage[tabKey].pageIndex = 1
+ this.loadTabData()
+ },
+
+ tabCurrentChange(tabKey, val) {
+ this.tabPage[tabKey].pageIndex = val
+ this.loadTabData()
+ },
+
+ tabTaskDetailSizeChange(val) {
+ this.tabPage.taskDetail.pageSize = val
+ this.tabPage.taskDetail.pageIndex = 1
+ this.loadTaskDetailList()
+ },
+
+ tabTaskDetailCurrentChange(val) {
+ this.tabPage.taskDetail.pageIndex = val
+ this.loadTaskDetailList()
+ },
+
+ tabAdjustmentSubSizeChange(val) {
+ this.tabPage.adjustmentSub.pageSize = val
+ this.tabPage.adjustmentSub.pageIndex = 1
+ this.loadAdjustmentTransSubList()
+ },
+
+ tabAdjustmentSubCurrentChange(val) {
+ this.tabPage.adjustmentSub.pageIndex = val
+ this.loadAdjustmentTransSubList()
+ },
+
// 加载标签明细 - rqrq
loadLabelList(params) {
this.labelListLoading = true
- searchCountLabelList(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.labelList = data.rows
- }
+ searchCountLabelList(this.buildTabQuery(params, 'label')).then(({ data }) => {
+ this.applyTabPageData(data, 'label', 'labelList')
}).finally(() => {
this.labelListLoading = false
})
@@ -826,10 +1018,8 @@ export default {
// 加载栈板明细 - rqrq
loadPalletList(params) {
this.palletListLoading = true
- searchCountPalletList(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.palletList = data.rows
- }
+ searchCountPalletList(this.buildTabQuery(params, 'pallet')).then(({ data }) => {
+ this.applyTabPageData(data, 'pallet', 'palletList')
}).finally(() => {
this.palletListLoading = false
})
@@ -838,23 +1028,18 @@ export default {
// 加载盘点结果 - rqrq
loadResultList(params) {
this.resultListLoading = true
- searchCountResultList(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.resultList = data.rows
- }
+ searchCountResultList(this.buildTabQuery(params, 'result')).then(({ data }) => {
+ this.applyTabPageData(data, 'result', 'resultList')
}).finally(() => {
this.resultListLoading = false
})
},
- // 加载盘点结果差异（只显示非OK的结果）- rqrq
+ // 加载盘点结果差异（服务端过滤非OK）- rqrq
loadResultDiffList(params) {
this.resultDiffListLoading = true
- searchCountResultList(params).then(({ data }) => {
- if (data && data.code === 0) {
- // 过滤出非OK的结果 - rqrq
- this.resultDiffList = (data.rows || []).filter(item => item.countResult !== 'OK')
- }
+ searchCountResultList(this.buildTabQuery(params, 'resultDiff', { searchNonOkOnly: true })).then(({ data }) => {
+ this.applyTabPageData(data, 'resultDiff', 'resultDiffList')
}).finally(() => {
this.resultDiffListLoading = false
})
@@ -863,10 +1048,8 @@ export default {
// 加载物料汇总 - rqrq
loadSummaryList(params) {
this.summaryListLoading = true
- searchMaterialSummary(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.summaryList = data.rows
- }
+ searchMaterialSummary(this.buildTabQuery(params, 'summary')).then(({ data }) => {
+ this.applyTabPageData(data, 'summary', 'summaryList')
}).finally(() => {
this.summaryListLoading = false
})
@@ -878,12 +1061,20 @@ export default {
this.taskList = []
this.taskDetailList = []
this.currentTask = null
- searchOrderTaskByCountNo(params).then(({ data }) => {
+ searchOrderTaskByCountNo(this.buildTabQuery(params, 'task')).then(({ data }) => {
if (data && data.code === 0) {
- this.taskList = data.rows || []
- // 默认选中第一行
+ if (data.page) {
+ this.taskList = data.page.list || []
+ this.tabPage.task.total = data.page.totalCount || 0
+ if (data.page.currPage) {
+ this.tabPage.task.pageIndex = data.page.currPage
+ }
+ } else {
+ this.taskList = data.rows || []
+ }
if (this.taskList.length > 0) {
this.currentTask = this.taskList[0]
+ this.tabPage.taskDetail.pageIndex = 1
this.loadTaskDetailList()
}
}
@@ -895,6 +1086,7 @@ export default {
// 任务单行点击 - rqrq
onTaskRowClick(row) {
this.currentTask = row
+ this.tabPage.taskDetail.pageIndex = 1
this.loadTaskDetailList()
},
@@ -907,12 +1099,12 @@ export default {
this.taskDetailListLoading = true
const params = {
site: this.$store.state.user.site,
- taskNo: this.currentTask.taskNo
+ taskNo: this.currentTask.taskNo,
+ page: this.tabPage.taskDetail.pageIndex,
+ limit: this.tabPage.taskDetail.pageSize
}
searchOrderTaskDetail(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.taskDetailList = data.rows || []
- }
+ this.applyTabPageData(data, 'taskDetail', 'taskDetailList')
}).finally(() => {
this.taskDetailListLoading = false
})
@@ -924,12 +1116,20 @@ export default {
this.adjustmentTransList = []
this.adjustmentTransSubList = []
this.currentAdjustmentTrans = null
- queryAdjustmentTransList(params).then(({ data }) => {
+ queryAdjustmentTransList(this.buildTabQuery(params, 'adjustment')).then(({ data }) => {
if (data && data.code === 0) {
- this.adjustmentTransList = data.rows || []
- // 默认选中第一行
+ if (data.page) {
+ this.adjustmentTransList = data.page.list || []
+ this.tabPage.adjustment.total = data.page.totalCount || 0
+ if (data.page.currPage) {
+ this.tabPage.adjustment.pageIndex = data.page.currPage
+ }
+ } else {
+ this.adjustmentTransList = data.rows || []
+ }
if (this.adjustmentTransList.length > 0) {
this.currentAdjustmentTrans = this.adjustmentTransList[0]
+ this.tabPage.adjustmentSub.pageIndex = 1
this.loadAdjustmentTransSubList()
}
}
@@ -941,6 +1141,7 @@ export default {
// 盘盈盘亏事务行点击 - rqrq
onAdjustmentTransRowClick(row) {
this.currentAdjustmentTrans = row
+ this.tabPage.adjustmentSub.pageIndex = 1
this.loadAdjustmentTransSubList()
},
@@ -953,12 +1154,12 @@ export default {
this.adjustmentTransSubLoading = true
const params = {
site: this.$store.state.user.site,
- transNo: this.currentAdjustmentTrans.transNo
+ transNo: this.currentAdjustmentTrans.transNo,
+ page: this.tabPage.adjustmentSub.pageIndex,
+ limit: this.tabPage.adjustmentSub.pageSize
}
queryAdjustmentTransSubList(params).then(({ data }) => {
- if (data && data.code === 0) {
- this.adjustmentTransSubList = data.rows || []
- }
+ this.applyTabPageData(data, 'adjustmentSub', 'adjustmentTransSubList')
}).finally(() => {
this.adjustmentTransSubLoading = false
})
@@ -996,22 +1197,27 @@ export default {
// 年度盘点报告 - rqrq
openYearReportDialog() {
- this.yearReportForm = { countType: 'MID_YEAR', remark: '' }
+ this.yearReportForm = { countType: 'MID_YEAR', reportScope: 'ALL_AREAS', remark: '' }
this.yearReportDialogVisible = true
},
resetYearReportForm() {
- this.yearReportForm = { countType: 'MID_YEAR', remark: '' }
+ this.yearReportForm = { countType: 'MID_YEAR', reportScope: 'ALL_AREAS', remark: '' }
},
submitYearReport(forceContinue) {
if (!this.yearReportForm.countType) {
this.$message.warning('请选择盘点报告类型')
return
}
+ if (!this.yearReportForm.reportScope) {
+ this.$message.warning('请选择盘点范围')
+ return
+ }
this.yearReportLoading = true
const params = {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
countType: this.yearReportForm.countType,
+ reportScope: this.yearReportForm.reportScope,
remark: this.yearReportForm.remark,
forceContinue: forceContinue === true
}