diff --git a/src/api/sales/order.js b/src/api/sales/order.js index bcfcd72..0c2d2bb 100644 --- a/src/api/sales/order.js +++ b/src/api/sales/order.js @@ -38,10 +38,11 @@ export const logistics = (id) => { method: 'get', }); }; -export const summary = () => { +export const summary = (params) => { return request({ url: '/mall/trade/admin/tradeOrder/statistics', method: 'get', + params, }); }; export const updateFees = (data) => { diff --git a/src/store/modules/sales/order.js b/src/store/modules/sales/order.js index 2494687..9f985e2 100644 --- a/src/store/modules/sales/order.js +++ b/src/store/modules/sales/order.js @@ -52,7 +52,7 @@ const actions = { if (!res) { ElMessage.error('查询订单列表失败'); } - res = await api.summary(); + res = await api.summary({ userId: data.userId }); if (res) { commit( 'setSummary', diff --git a/src/views/permission/dept/index.vue b/src/views/permission/dept/index.vue index 01d6dcb..779eb2b 100644 --- a/src/views/permission/dept/index.vue +++ b/src/views/permission/dept/index.vue @@ -470,6 +470,7 @@ } .aside-body { :deep(.el-tree) { + font-size: 14px; .flex { width: 100%; display: flex; diff --git a/src/views/permission/employee/form.vue b/src/views/permission/employee/form.vue index 86483bb..aeac775 100644 --- a/src/views/permission/employee/form.vue +++ b/src/views/permission/employee/form.vue @@ -188,7 +188,8 @@ } }; const handleClose = () => { - router.push({ name: 'EmployeeManagement' }); + store.commit('layout/closeTab', { current: true }); + router.replace({ name: 'EmployeeManagement' }); }; const loading2 = ref(false); const roleVisible = ref(false); diff --git a/src/views/permission/employee/transfer.vue b/src/views/permission/employee/transfer.vue index 3cbf7a8..b8b9080 100644 --- a/src/views/permission/employee/transfer.vue +++ b/src/views/permission/employee/transfer.vue @@ -16,6 +16,7 @@ emitPath: false, children: 'childDepartment', }" + style="width: 500px" /> diff --git a/src/views/sales/category/form.vue b/src/views/sales/category/form.vue index 0b99c92..0628508 100644 --- a/src/views/sales/category/form.vue +++ b/src/views/sales/category/form.vue @@ -118,7 +118,8 @@ } }; const handleClose = () => { - router.push({ name: 'CategoryManagement' }); + store.commit('layout/closeTab', { current: true }); + router.replace({ name: 'CategoryManagement' }); }; diff --git a/src/views/sales/order/index.vue b/src/views/sales/order/index.vue index f4f25da..b4ec47d 100644 --- a/src/views/sales/order/index.vue +++ b/src/views/sales/order/index.vue @@ -158,6 +158,9 @@ if (route.query.status) { state.condition.orderStatus = route.query.status.split(',').map((item) => +item); } else { + if (route.query.id) { + state.condition.orderStatus = [0]; + } handleSearch(); } }); diff --git a/src/views/sales/product/form/step2.vue b/src/views/sales/product/form/step2.vue index 228d4e4..4c3f0c4 100644 --- a/src/views/sales/product/form/step2.vue +++ b/src/views/sales/product/form/step2.vue @@ -294,7 +294,7 @@ } await store.dispatch('productSkus/save', { id: route.params.id, data }); store.commit('layout/closeTab', { current: true }); - router.push({ name: 'ProductManagement' }); + router.replace({ name: 'ProductManagement' }); } state.loading = false; };