fix: 清理禅道BUG

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

@@ -95,6 +95,7 @@
                         :config="employeeConfig"
                         :data="employeeList"
                         :operation="['search']"
+                        :reset="handleResetEmployee"
                         @search="handleSearchEmployee"
                     >
                         <template #search>
@@ -234,9 +235,15 @@
             proxy.$message.error('请先选择部门');
         }
     };
+    const handleResetEmployee = () => {
+        state.condition2.employeeName = '';
+        state.condition2.userName = '';
+        state.condition2.phone = '';
+    };
     watch(
         () => state.condition2,
         (value) => {
+            console.log(value, 'xxxxxx');
             let search = value?.departmentId && value?.departmentId !== store.state.deptEmployee.condition.departmentId;
             store.commit('deptEmployee/setCondition', _.cloneDeep(value));
             if (search) {
@@ -285,7 +292,9 @@
                 label: '状态',
                 width: 160,
                 slots: {
-                    default: ({ row }) => <ElSwitch v-model={row.isEnable} />,
+                    default: ({ row }) => (
+                        <ElSwitch v-model={row.isEnable} onClick={() => handleEmployeeEnabled(row)} />
+                    ),
                 },
             },
             {
@@ -416,6 +425,13 @@
     const handleEnabled = (row) => {
         store.dispatch('dept/enable', row);
     };
+    const handleEmployeeEnabled = (row) => {
+        const data = {
+            id: row.id,
+            isEnable: row.isEnable,
+        };
+        store.dispatch('employee/save', data);
+    };
     const handleDelete = (row) => {
         store.dispatch('dept/remove', [row.id]);
     };
@@ -454,6 +470,7 @@
             }
             .aside-body {
                 :deep(.el-tree) {
+                    font-size: 14px;
                     .flex {
                         width: 100%;
                         display: flex;

src/views/permission/employee/form.vue

@@ -86,11 +86,11 @@
                     </template>
                 </el-dialog>
             </el-form-item>
+            <el-form-item>
+                <el-button @click="handleCancel">取消</el-button>
+                <el-button :disabled="loading" :loading="submitting" type="primary" @click="handleSave">保存</el-button>
+            </el-form-item>
         </el-form>
-        <div class="form-footer">
-            <el-button @click="handleCancel">取消</el-button>
-            <el-button :disabled="loading" :loading="submitting" type="primary" @click="handleSave">保存</el-button>
-        </div>
     </div>
 </template>
 
@@ -152,6 +152,9 @@
         try {
             await proxy.$validate(refsForm);
             let data = { ...unref(form) };
+            if (!data.password) {
+                delete data.password;
+            }
             data.voucherClueUrls = data.voucherClueUrls || [];
             data.voucherClueUrl = data.voucherClueUrls.join(',');
             let res = await store.dispatch('employee/save', data);
@@ -185,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);
@@ -216,6 +220,8 @@
 
 <style lang="less" scoped>
     .form-container {
+        flex-direction: row-reverse !important;
+        align-items: flex-start !important;
         .el-form {
             width: 480px;
         }

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