hanst
/
wms-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
常熟吴彦祖 1 day ago
parent
0b46f82c43
commit
0fb36d7bbb
2 changed files with 475 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 268
      src/views/modules/check/currentPhysicalInventory.vue
  2. 282
      src/views/modules/check/searchPhysicalInventory.vue

268
src/views/modules/check/currentPhysicalInventory.vue
View File

@ -116,6 +116,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="headerData"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('label', val)"
@current-change="val => tabCurrentChange('label', val)"
:current-page="tabPage.label.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.label.pageSize"
:total="tabPage.label.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="物料汇总" name="summary"> <el-tab-pane label="物料汇总" name="summary">
<!-- 物料汇总表格 - rqrq --> <!-- 物料汇总表格 - rqrq -->
@ -135,6 +147,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="headerData"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('summary', val)"
@current-change="val => tabCurrentChange('summary', val)"
:current-page="tabPage.summary.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.summary.pageSize"
:total="tabPage.summary.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="栈板明细" name="pallet"> <el-tab-pane label="栈板明细" name="pallet">
<!-- 栈板明细表格 - rqrq --> <!-- 栈板明细表格 - rqrq -->
@ -156,6 +180,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="headerData"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('pallet', val)"
@current-change="val => tabCurrentChange('pallet', val)"
:current-page="tabPage.pallet.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.pallet.pageSize"
:total="tabPage.pallet.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="盘点结果" name="result"> <el-tab-pane label="盘点结果" name="result">
<!-- 盘点结果表格 - rqrq --> <!-- 盘点结果表格 - rqrq -->
@ -179,6 +215,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="headerData"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('result', val)"
@current-change="val => tabCurrentChange('result', val)"
:current-page="tabPage.result.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.result.pageSize"
:total="tabPage.result.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<!-- 盘点结果差异页签 - rqrq --> <!-- 盘点结果差异页签 - rqrq -->
<el-tab-pane label="盘点结果差异" name="resultDiff"> <el-tab-pane label="盘点结果差异" name="resultDiff">
@ -213,6 +261,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="headerData"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('resultDiff', val)"
@current-change="val => tabCurrentChange('resultDiff', val)"
:current-page="tabPage.resultDiff.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.resultDiff.pageSize"
:total="tabPage.resultDiff.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<!-- 任务单页签 - rqrq --> <!-- 任务单页签 - rqrq -->
<el-tab-pane label="任务单" name="task"> <el-tab-pane label="任务单" name="task">
@ -236,6 +296,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="headerData"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('task', val)"
@current-change="val => tabCurrentChange('task', val)"
:current-page="tabPage.task.pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="tabPage.task.pageSize"
:total="tabPage.task.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</div> </div>
<!-- 右边：任务单明细 - rqrq --> <!-- 右边：任务单明细 - rqrq -->
<div style="flex: 1;"> <div style="flex: 1;">
@ -249,6 +321,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="headerData && currentTask"
small
style="margin-top: 8px; text-align: right;"
@size-change="tabTaskDetailSizeChange"
@current-change="tabTaskDetailCurrentChange"
:current-page="tabPage.taskDetail.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.taskDetail.pageSize"
:total="tabPage.taskDetail.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
@ -279,6 +363,18 @@
<el-table-column prop="warehouseId" label="仓库" min-width="80" header-align="center" align="center"></el-table-column> <el-table-column prop="warehouseId" label="仓库" min-width="80" header-align="center" align="center"></el-table-column>
<el-table-column prop="userName" label="操作人" min-width="80" header-align="center" align="center"></el-table-column> <el-table-column prop="userName" label="操作人" min-width="80" header-align="center" align="center"></el-table-column>
</el-table> </el-table>
<el-pagination
v-if="headerData"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('adjustment', val)"
@current-change="val => tabCurrentChange('adjustment', val)"
:current-page="tabPage.adjustment.pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="tabPage.adjustment.pageSize"
:total="tabPage.adjustment.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</div> </div>
<!-- 右边：标签明细 - rqrq --> <!-- 右边：标签明细 - rqrq -->
<div style="flex: 1;"> <div style="flex: 1;">
@ -296,6 +392,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="headerData && currentAdjustmentTrans"
small
style="margin-top: 8px; text-align: right;"
@size-change="tabAdjustmentSubSizeChange"
@current-change="tabAdjustmentSubCurrentChange"
:current-page="tabPage.adjustmentSub.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.adjustmentSub.pageSize"
:total="tabPage.adjustmentSub.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
@ -513,7 +621,20 @@ export default {
adjustmentTransLoading: false, adjustmentTransLoading: false,
adjustmentTransSubList: [], // 标签明细列表 adjustmentTransSubList: [], // 标签明细列表
adjustmentTransSubLoading: false, 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() { mounted() {
@ -534,6 +655,7 @@ export default {
if (data && data.code === 0) { if (data && data.code === 0) {
this.headerData = data.row this.headerData = data.row
if (this.headerData) { if (this.headerData) {
this.resetTabPages()
this.loadTabData() this.loadTabData()
} else { } else {
// 清空Tab数据 - rqrq // 清空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 // 加载标签明细 - rqrq
loadLabelList(params) { loadLabelList(params) {
this.labelListLoading = true 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(() => { }).finally(() => {
this.labelListLoading = false this.labelListLoading = false
}) })
@ -598,10 +783,8 @@ export default {
// 加载栈板明细 - rqrq // 加载栈板明细 - rqrq
loadPalletList(params) { loadPalletList(params) {
this.palletListLoading = true 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(() => { }).finally(() => {
this.palletListLoading = false this.palletListLoading = false
}) })
@ -610,23 +793,18 @@ export default {
// 加载盘点结果 - rqrq // 加载盘点结果 - rqrq
loadResultList(params) { loadResultList(params) {
this.resultListLoading = true 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(() => { }).finally(() => {
this.resultListLoading = false this.resultListLoading = false
}) })
}, },
// 加载盘点结果差异（只显示非OK的结果）- rqrq
// 加载盘点结果差异（服务端过滤非OK）- rqrq
loadResultDiffList(params) { loadResultDiffList(params) {
this.resultDiffListLoading = true 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(() => { }).finally(() => {
this.resultDiffListLoading = false this.resultDiffListLoading = false
}) })
@ -635,10 +813,8 @@ export default {
// 加载物料汇总 - rqrq // 加载物料汇总 - rqrq
loadSummaryList(params) { loadSummaryList(params) {
this.summaryListLoading = true 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(() => { }).finally(() => {
this.summaryListLoading = false this.summaryListLoading = false
}) })
@ -650,12 +826,20 @@ export default {
this.taskList = [] this.taskList = []
this.taskDetailList = [] this.taskDetailList = []
this.currentTask = null this.currentTask = null
searchOrderTaskByCountNo(params).then(({ data }) => {
searchOrderTaskByCountNo(this.buildTabQuery(params, 'task')).then(({ data }) => {
if (data && data.code === 0) { 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) { if (this.taskList.length > 0) {
this.currentTask = this.taskList[0] this.currentTask = this.taskList[0]
this.tabPage.taskDetail.pageIndex = 1
this.loadTaskDetailList() this.loadTaskDetailList()
} }
} }
@ -667,6 +851,7 @@ export default {
// 任务单行点击 - rqrq // 任务单行点击 - rqrq
onTaskRowClick(row) { onTaskRowClick(row) {
this.currentTask = row this.currentTask = row
this.tabPage.taskDetail.pageIndex = 1
this.loadTaskDetailList() this.loadTaskDetailList()
}, },
@ -679,12 +864,12 @@ export default {
this.taskDetailListLoading = true this.taskDetailListLoading = true
const params = { const params = {
site: this.$store.state.user.site, 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 }) => { searchOrderTaskDetail(params).then(({ data }) => {
if (data && data.code === 0) {
this.taskDetailList = data.rows || []
}
this.applyTabPageData(data, 'taskDetail', 'taskDetailList')
}).finally(() => { }).finally(() => {
this.taskDetailListLoading = false this.taskDetailListLoading = false
}) })
@ -696,12 +881,20 @@ export default {
this.adjustmentTransList = [] this.adjustmentTransList = []
this.adjustmentTransSubList = [] this.adjustmentTransSubList = []
this.currentAdjustmentTrans = null this.currentAdjustmentTrans = null
queryAdjustmentTransList(params).then(({ data }) => {
queryAdjustmentTransList(this.buildTabQuery(params, 'adjustment')).then(({ data }) => {
if (data && data.code === 0) { 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) { if (this.adjustmentTransList.length > 0) {
this.currentAdjustmentTrans = this.adjustmentTransList[0] this.currentAdjustmentTrans = this.adjustmentTransList[0]
this.tabPage.adjustmentSub.pageIndex = 1
this.loadAdjustmentTransSubList() this.loadAdjustmentTransSubList()
} }
} }
@ -713,6 +906,7 @@ export default {
// 盘盈盘亏事务行点击 - rqrq // 盘盈盘亏事务行点击 - rqrq
onAdjustmentTransRowClick(row) { onAdjustmentTransRowClick(row) {
this.currentAdjustmentTrans = row this.currentAdjustmentTrans = row
this.tabPage.adjustmentSub.pageIndex = 1
this.loadAdjustmentTransSubList() this.loadAdjustmentTransSubList()
}, },
@ -725,12 +919,12 @@ export default {
this.adjustmentTransSubLoading = true this.adjustmentTransSubLoading = true
const params = { const params = {
site: this.$store.state.user.site, 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 }) => { queryAdjustmentTransSubList(params).then(({ data }) => {
if (data && data.code === 0) {
this.adjustmentTransSubList = data.rows || []
}
this.applyTabPageData(data, 'adjustmentSub', 'adjustmentTransSubList')
}).finally(() => { }).finally(() => {
this.adjustmentTransSubLoading = false this.adjustmentTransSubLoading = false
}) })

282
src/views/modules/check/searchPhysicalInventory.vue
View File

@ -122,6 +122,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="currentRow"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('label', val)"
@current-change="val => tabCurrentChange('label', val)"
:current-page="tabPage.label.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.label.pageSize"
:total="tabPage.label.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="物料汇总" name="summary"> <el-tab-pane label="物料汇总" name="summary">
<!-- 物料汇总表格 - rqrq --> <!-- 物料汇总表格 - rqrq -->
@ -141,6 +153,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="currentRow"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('summary', val)"
@current-change="val => tabCurrentChange('summary', val)"
:current-page="tabPage.summary.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.summary.pageSize"
:total="tabPage.summary.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="栈板明细" name="pallet"> <el-tab-pane label="栈板明细" name="pallet">
<!-- 栈板明细表格 - rqrq --> <!-- 栈板明细表格 - rqrq -->
@ -162,6 +186,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="currentRow"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('pallet', val)"
@current-change="val => tabCurrentChange('pallet', val)"
:current-page="tabPage.pallet.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.pallet.pageSize"
:total="tabPage.pallet.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="盘点结果" name="result"> <el-tab-pane label="盘点结果" name="result">
<!-- 盘点结果表格 - rqrq --> <!-- 盘点结果表格 - rqrq -->
@ -185,6 +221,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="currentRow"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('result', val)"
@current-change="val => tabCurrentChange('result', val)"
:current-page="tabPage.result.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.result.pageSize"
:total="tabPage.result.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<!-- 盘点结果差异页签 - rqrq --> <!-- 盘点结果差异页签 - rqrq -->
<el-tab-pane label="盘点结果差异" name="resultDiff"> <el-tab-pane label="盘点结果差异" name="resultDiff">
@ -208,6 +256,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="currentRow"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('resultDiff', val)"
@current-change="val => tabCurrentChange('resultDiff', val)"
:current-page="tabPage.resultDiff.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.resultDiff.pageSize"
:total="tabPage.resultDiff.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<!-- 任务单页签 - rqrq --> <!-- 任务单页签 - rqrq -->
<el-tab-pane label="任务单" name="task"> <el-tab-pane label="任务单" name="task">
@ -231,6 +291,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="currentRow"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('task', val)"
@current-change="val => tabCurrentChange('task', val)"
:current-page="tabPage.task.pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="tabPage.task.pageSize"
:total="tabPage.task.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</div> </div>
<!-- 右边：任务单明细 - rqrq --> <!-- 右边：任务单明细 - rqrq -->
<div style="flex: 1;"> <div style="flex: 1;">
@ -244,6 +316,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="currentRow && currentTask"
small
style="margin-top: 8px; text-align: right;"
@size-change="tabTaskDetailSizeChange"
@current-change="tabTaskDetailCurrentChange"
:current-page="tabPage.taskDetail.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.taskDetail.pageSize"
:total="tabPage.taskDetail.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
@ -274,6 +358,18 @@
<el-table-column prop="warehouseId" label="仓库" min-width="80" header-align="center" align="center"></el-table-column> <el-table-column prop="warehouseId" label="仓库" min-width="80" header-align="center" align="center"></el-table-column>
<el-table-column prop="userName" label="操作人" min-width="80" header-align="center" align="center"></el-table-column> <el-table-column prop="userName" label="操作人" min-width="80" header-align="center" align="center"></el-table-column>
</el-table> </el-table>
<el-pagination
v-if="currentRow"
small
style="margin-top: 8px; text-align: right;"
@size-change="val => tabSizeChange('adjustment', val)"
@current-change="val => tabCurrentChange('adjustment', val)"
:current-page="tabPage.adjustment.pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="tabPage.adjustment.pageSize"
:total="tabPage.adjustment.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</div> </div>
<!-- 右边：标签明细 - rqrq --> <!-- 右边：标签明细 - rqrq -->
<div style="flex: 1;"> <div style="flex: 1;">
@ -291,6 +387,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="currentRow && currentAdjustmentTrans"
small
style="margin-top: 8px; text-align: right;"
@size-change="tabAdjustmentSubSizeChange"
@current-change="tabAdjustmentSubCurrentChange"
:current-page="tabPage.adjustmentSub.pageIndex"
:page-sizes="[20, 50, 100, 200]"
:page-size="tabPage.adjustmentSub.pageSize"
:total="tabPage.adjustmentSub.total"
layout="total, sizes, prev, pager, next">
</el-pagination>
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
@ -324,6 +432,12 @@
<el-option label="年末盘点" value="YEAR_END"></el-option> <el-option label="年末盘点" value="YEAR_END"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="盘点范围" required>
<el-select v-model="yearReportForm.reportScope" placeholder="请选择" style="width: 280px;">
<el-option label="仅立库内部" value="WAREHOUSE_ONLY"></el-option>
<el-option label="所有区域" value="ALL_AREAS"></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="yearReportForm.remark" type="textarea" :rows="3" placeholder="可选" style="width: 280px;"></el-input> <el-input v-model="yearReportForm.remark" type="textarea" :rows="3" placeholder="可选" style="width: 280px;"></el-input>
</el-form-item> </el-form-item>
@ -586,6 +700,7 @@ export default {
yearReportLoading: false, yearReportLoading: false,
yearReportForm: { yearReportForm: {
countType: 'MID_YEAR', countType: 'MID_YEAR',
reportScope: 'ALL_AREAS',
remark: '' remark: ''
}, },
@ -652,6 +767,19 @@ export default {
adjustmentTransSubLoading: false, 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 }
},
// 导出相关 - rqrq // 导出相关 - rqrq
exportLoading: false exportLoading: false
} }
@ -778,6 +906,7 @@ export default {
// 行点击 - rqrq // 行点击 - rqrq
handleRowClick(row) { handleRowClick(row) {
this.currentRow = row this.currentRow = row
this.resetTabPages()
this.loadTabData() 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 // 加载标签明细 - rqrq
loadLabelList(params) { loadLabelList(params) {
this.labelListLoading = true 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(() => { }).finally(() => {
this.labelListLoading = false this.labelListLoading = false
}) })
@ -826,10 +1018,8 @@ export default {
// 加载栈板明细 - rqrq // 加载栈板明细 - rqrq
loadPalletList(params) { loadPalletList(params) {
this.palletListLoading = true 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(() => { }).finally(() => {
this.palletListLoading = false this.palletListLoading = false
}) })
@ -838,23 +1028,18 @@ export default {
// 加载盘点结果 - rqrq // 加载盘点结果 - rqrq
loadResultList(params) { loadResultList(params) {
this.resultListLoading = true 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(() => { }).finally(() => {
this.resultListLoading = false this.resultListLoading = false
}) })
}, },
// 加载盘点结果差异（只显示非OK的结果）- rqrq
// 加载盘点结果差异（服务端过滤非OK）- rqrq
loadResultDiffList(params) { loadResultDiffList(params) {
this.resultDiffListLoading = true 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(() => { }).finally(() => {
this.resultDiffListLoading = false this.resultDiffListLoading = false
}) })
@ -863,10 +1048,8 @@ export default {
// 加载物料汇总 - rqrq // 加载物料汇总 - rqrq
loadSummaryList(params) { loadSummaryList(params) {
this.summaryListLoading = true 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(() => { }).finally(() => {
this.summaryListLoading = false this.summaryListLoading = false
}) })
@ -878,12 +1061,20 @@ export default {
this.taskList = [] this.taskList = []
this.taskDetailList = [] this.taskDetailList = []
this.currentTask = null this.currentTask = null
searchOrderTaskByCountNo(params).then(({ data }) => {
searchOrderTaskByCountNo(this.buildTabQuery(params, 'task')).then(({ data }) => {
if (data && data.code === 0) { 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) { if (this.taskList.length > 0) {
this.currentTask = this.taskList[0] this.currentTask = this.taskList[0]
this.tabPage.taskDetail.pageIndex = 1
this.loadTaskDetailList() this.loadTaskDetailList()
} }
} }
@ -895,6 +1086,7 @@ export default {
// 任务单行点击 - rqrq // 任务单行点击 - rqrq
onTaskRowClick(row) { onTaskRowClick(row) {
this.currentTask = row this.currentTask = row
this.tabPage.taskDetail.pageIndex = 1
this.loadTaskDetailList() this.loadTaskDetailList()
}, },
@ -907,12 +1099,12 @@ export default {
this.taskDetailListLoading = true this.taskDetailListLoading = true
const params = { const params = {
site: this.$store.state.user.site, 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 }) => { searchOrderTaskDetail(params).then(({ data }) => {
if (data && data.code === 0) {
this.taskDetailList = data.rows || []
}
this.applyTabPageData(data, 'taskDetail', 'taskDetailList')
}).finally(() => { }).finally(() => {
this.taskDetailListLoading = false this.taskDetailListLoading = false
}) })
@ -924,12 +1116,20 @@ export default {
this.adjustmentTransList = [] this.adjustmentTransList = []
this.adjustmentTransSubList = [] this.adjustmentTransSubList = []
this.currentAdjustmentTrans = null this.currentAdjustmentTrans = null
queryAdjustmentTransList(params).then(({ data }) => {
queryAdjustmentTransList(this.buildTabQuery(params, 'adjustment')).then(({ data }) => {
if (data && data.code === 0) { 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) { if (this.adjustmentTransList.length > 0) {
this.currentAdjustmentTrans = this.adjustmentTransList[0] this.currentAdjustmentTrans = this.adjustmentTransList[0]
this.tabPage.adjustmentSub.pageIndex = 1
this.loadAdjustmentTransSubList() this.loadAdjustmentTransSubList()
} }
} }
@ -941,6 +1141,7 @@ export default {
// 盘盈盘亏事务行点击 - rqrq // 盘盈盘亏事务行点击 - rqrq
onAdjustmentTransRowClick(row) { onAdjustmentTransRowClick(row) {
this.currentAdjustmentTrans = row this.currentAdjustmentTrans = row
this.tabPage.adjustmentSub.pageIndex = 1
this.loadAdjustmentTransSubList() this.loadAdjustmentTransSubList()
}, },
@ -953,12 +1154,12 @@ export default {
this.adjustmentTransSubLoading = true this.adjustmentTransSubLoading = true
const params = { const params = {
site: this.$store.state.user.site, 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 }) => { queryAdjustmentTransSubList(params).then(({ data }) => {
if (data && data.code === 0) {
this.adjustmentTransSubList = data.rows || []
}
this.applyTabPageData(data, 'adjustmentSub', 'adjustmentTransSubList')
}).finally(() => { }).finally(() => {
this.adjustmentTransSubLoading = false this.adjustmentTransSubLoading = false
}) })
@ -996,22 +1197,27 @@ export default {
// 年度盘点报告 - rqrq // 年度盘点报告 - rqrq
openYearReportDialog() { openYearReportDialog() {
this.yearReportForm = { countType: 'MID_YEAR', remark: '' }
this.yearReportForm = { countType: 'MID_YEAR', reportScope: 'ALL_AREAS', remark: '' }
this.yearReportDialogVisible = true this.yearReportDialogVisible = true
}, },
resetYearReportForm() { resetYearReportForm() {
this.yearReportForm = { countType: 'MID_YEAR', remark: '' }
this.yearReportForm = { countType: 'MID_YEAR', reportScope: 'ALL_AREAS', remark: '' }
}, },
submitYearReport(forceContinue) { submitYearReport(forceContinue) {
if (!this.yearReportForm.countType) { if (!this.yearReportForm.countType) {
this.$message.warning('请选择盘点报告类型') this.$message.warning('请选择盘点报告类型')
return return
} }
if (!this.yearReportForm.reportScope) {
this.$message.warning('请选择盘点范围')
return
}
this.yearReportLoading = true this.yearReportLoading = true
const params = { const params = {
site: this.$store.state.user.site, site: this.$store.state.user.site,
username: this.$store.state.user.name, username: this.$store.state.user.name,
countType: this.yearReportForm.countType, countType: this.yearReportForm.countType,
reportScope: this.yearReportForm.reportScope,
remark: this.yearReportForm.remark, remark: this.yearReportForm.remark,
forceContinue: forceContinue === true forceContinue: forceContinue === true
} }

Write Preview
Loading…
Cancel
Save