diff --git a/src/views/kanbanManagement/FqcWarehouseBoard/index.vue b/src/views/kanbanManagement/FqcWarehouseBoard/index.vue index 97353ae..dac7db3 100644 --- a/src/views/kanbanManagement/FqcWarehouseBoard/index.vue +++ b/src/views/kanbanManagement/FqcWarehouseBoard/index.vue @@ -535,7 +535,7 @@ export default { }, created() { // 列表数据查询 - this.getList() + this.init() }, mounted() { this.createTimer() @@ -544,6 +544,18 @@ export default { this.clearTimer() }, methods: { + init(){ + const params = { + startTime:this.$dayjs().toDate(), + endTime:this.$dayjs().toDate() + } + GetProductAndPolishAndOneTimeFqcBoardData(params).then((res) => { + if (res.code == 200) { + this.queryParams.startTime = this.$dayjs(res.data.polishStockTime).toDate() + this.getList() + } + }) + }, // 查询数据 getList() { // 查询报表数据 @@ -551,6 +563,7 @@ export default { GetProductAndPolishAndOneTimeFqcBoardData(this.queryParams).then((res) => { if (res.code == 200) { this.boardData = res.data + this.loading = false } }) diff --git a/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue b/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue index 8bc2310..e31c956 100644 --- a/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue +++ b/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue @@ -48,9 +48,9 @@
- 一次合格品仓库零件数:{{ partTotal }} - 盘点零件数:{{ totalQuantity }} - 当前零件数:{{ realTotalQuantity }} + 导入盘点总数:{{ StocktakingTotal }} + 当前查询盘点零件数:{{ QuantitySum }} + 当前查询实际零件数:{{ RealQuantitySum }}
@@ -363,6 +363,9 @@ export default { // 上传的地址 url: process.env.VUE_APP_BASE_API + '/mes/wm/WmOneTimeInventory/importData', }, + StocktakingTotal:0, + QuantitySum:0, + RealQuantitySum:0 } }, computed: { @@ -388,23 +391,13 @@ export default { listWmOneTimeInventory(this.queryParams).then((res) => { if (res.code == 200) { this.dataList = res.data.result - this.total = res.data.totalNum + this.total = res.data.total + this.StocktakingTotal = res.data.stocktakingTotal + this.QuantitySum = res.data.quantitySum + this.RealQuantitySum = res.data.realQuantitySum this.loading = false } }) - let params = JSON.parse(JSON.stringify(this.queryParams)) - params.pageNum = 1 - params.pageSize = 100000 - listWmOneTimeInventory(params).then((res) => { - if (res.code == 200) { - this.allDataList = res.data.result - } - }) - getPartNumber().then((res) => { - if (res.code === 200) { - this.partTotal = res.data - } - }) }, // 取消按钮 cancel() { diff --git a/src/views/wmsManagement/WmPolishInventory/index.vue b/src/views/wmsManagement/WmPolishInventory/index.vue index 5877687..a30bf87 100644 --- a/src/views/wmsManagement/WmPolishInventory/index.vue +++ b/src/views/wmsManagement/WmPolishInventory/index.vue @@ -47,9 +47,9 @@
- 抛光仓库总零件数:{{ partTotal }} - 盘点零件数:{{ totalQuantity }} - 当前零件数:{{ realTotalQuantity }} + 导入盘点总数:{{ StocktakingTotal }} + 当前查询盘点零件数:{{ QuantitySum }} + 当前查询实际零件数:{{ RealQuantitySum }}
@@ -358,18 +358,21 @@ export default { // 上传的地址 url: process.env.VUE_APP_BASE_API + '/mes/wm/WmPolishInventory/importData', }, + StocktakingTotal:0, + QuantitySum:0, + RealQuantitySum:0 } }, - computed: { - // 当前查询库存数量(盘点) - totalQuantity() { - return this.allDataList.reduce((acc, data) => acc + data.quantity, 0) - }, - // 当前查询库存数量(查询结果) - realTotalQuantity() { - return this.allDataList.reduce((acc, data) => acc + data.realQuantity, 0) - }, - }, + // computed: { + // // 当前查询库存数量(盘点) + // totalQuantity() { + // return this.allDataList.reduce((acc, data) => acc + data.quantity, 0) + // }, + // // 当前查询库存数量(查询结果) + // realTotalQuantity() { + // return this.allDataList.reduce((acc, data) => acc + data.realQuantity, 0) + // }, + // }, created() { // 列表数据查询 this.getList() @@ -383,23 +386,26 @@ export default { listWmPolishInventory(this.queryParams).then((res) => { if (res.code == 200) { this.dataList = res.data.result - this.total = res.data.totalNum + this.total = res.data.total + this.StocktakingTotal = res.data.stocktakingTotal + this.QuantitySum = res.data.quantitySum + this.RealQuantitySum = res.data.realQuantitySum this.loading = false } }) - let params = JSON.parse(JSON.stringify(this.queryParams)) - params.pageNum = 1 - params.pageSize = 100000 - listWmPolishInventory(params).then((res) => { - if (res.code == 200) { - this.allDataList = res.data.result - } - }) - getPartNumber().then((res) => { - if (res.code === 200) { - this.partTotal = res.data - } - }) + // let params = JSON.parse(JSON.stringify(this.queryParams)) + // params.pageNum = 1 + // params.pageSize = 100000 + // listWmPolishInventory(params).then((res) => { + // if (res.code == 200) { + // this.allDataList = res.data.result + // } + // }) + // getPartNumber().then((res) => { + // if (res.code === 200) { + // this.partTotal = res.data + // } + // }) }, // 取消按钮 cancel() {