Merge branch 'fix/0801-ch' into msb_test

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) => {

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',

src/views/permission/dept/index.vue

@@ -470,6 +470,7 @@
             }
             .aside-body {
                 :deep(.el-tree) {
+                    font-size: 14px;
                     .flex {
                         width: 100%;
                         display: flex;

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);

src/views/permission/employee/transfer.vue

@@ -16,6 +16,7 @@
                         emitPath: false,
                         children: 'childDepartment',
                     }"
+                    style="width: 500px"
                 />
             </el-form-item>
             <el-form-item label="选择角色权限" prop="handType">

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' });
     };
 </script>
 

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();
         }
     });

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;
             };