Commit d74a0042 authored by honghy's avatar honghy Committed by wux

备货菜单显示待处理订单数量

parent 458dd2fc
...@@ -835,6 +835,13 @@ export function canShipmentPage(params) { ...@@ -835,6 +835,13 @@ export function canShipmentPage(params) {
params params
}) })
} }
// 待备货(可出)订单列表数量统计
export function dataScopeCanShipmentCount() {
return request({
url: "/air/order/data/scope/can/shipment/count",
method: "get"
})
}
// 待出订单列表 // 待出订单列表
export function waitingShipmentPage(params) { export function waitingShipmentPage(params) {
return request({ return request({
......
...@@ -2,7 +2,7 @@ import {login, logout, getInfo, socialLogin, socialLogin2} from '@/api/login' ...@@ -2,7 +2,7 @@ import {login, logout, getInfo, socialLogin, socialLogin2} from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth' import { getToken, setToken, removeToken } from '@/utils/auth'
import {getNotReadInternalMessageTotal,} from '@/api/system/internalMessage' import {getNotReadInternalMessageTotal,} from '@/api/system/internalMessage'
import {taskTodoCount, userMark} from "@/api/bpm/task"; import {taskTodoCount, userMark} from "@/api/bpm/task";
import {getWaitingShipmentCount} from "@/api/ecw/order"; import {getWaitingShipmentCount,dataScopeCanShipmentCount} from "@/api/ecw/order";
const user = { const user = {
state: { state: {
...@@ -17,7 +17,9 @@ const user = { ...@@ -17,7 +17,9 @@ const user = {
download: 0, download: 0,
badgeData:{ badgeData:{
// 待出订单数量 // 待出订单数量
waitingShipment: 0 waitingShipment: 0,
// 空运待备货
stocking: 0
} }
}, },
...@@ -211,6 +213,10 @@ const user = { ...@@ -211,6 +213,10 @@ const user = {
console.log('getWaitingShipmentCount', res.data) console.log('getWaitingShipmentCount', res.data)
commit('SET_BADGE_DATA', { waitingShipment: res.data}, ) commit('SET_BADGE_DATA', { waitingShipment: res.data}, )
}) })
dataScopeCanShipmentCount().then(res => {
console.log('stocking', res.data)
commit('SET_BADGE_DATA', { stocking: res.data}, )
})
} }
} }
} }
......
...@@ -709,6 +709,7 @@ export default { ...@@ -709,6 +709,7 @@ export default {
if (query.packageTypeArr && query.packageTypeArr.length) { if (query.packageTypeArr && query.packageTypeArr.length) {
query.packageType = query.packageTypeArr.join(","); query.packageType = query.packageTypeArr.join(",");
} }
this.$store.dispatch('getBadgeData')
// 执行查询 // 执行查询
canShipmentPage(query).then((response) => { canShipmentPage(query).then((response) => {
// 部分情况下,订单后面的操作下拉菜单会显示按钮,但是下来没有选项,在elTable组件更新的时候会导致渲染错误,所以要在更新渲染前清空一次list让table彻底重新渲染,避免部分更新导致异常 // 部分情况下,订单后面的操作下拉菜单会显示按钮,但是下来没有选项,在elTable组件更新的时候会导致渲染错误,所以要在更新渲染前清空一次list让table彻底重新渲染,避免部分更新导致异常
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment