From 3007f5fdf2df31fad836bd8f1efcfe067ff7ac14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Fri, 13 May 2022 15:21:21 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=BB=84=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/operation/limit/index.vue     |   4 +-
 src/views/operation/limit/product.vue   |   4 +-
 src/views/operation/limit/sku.vue       |   4 +-
 src/views/operation/limit/time.vue      |   4 +-
 src/views/operation/recommend/index.vue |   4 +-
 src/views/permission/dept/index.vue     | 254 ++++++++++++++++++++++++
 src/views/sales/category/index.vue      |   2 +-
 src/views/sales/order/detail.vue        |  10 +-
 src/views/sales/order/index.vue         |  10 +-
 src/views/sales/order/ship.vue          |   2 +-
 src/views/sales/product/index.vue       |   4 +-
 src/views/sales/product/picker.vue      |   4 +-
 src/views/sales/service/detail.vue      |   2 +-
 src/views/sales/service/index.vue       |   4 +-
 src/views/system/customer/index.vue     |   4 +-
 src/views/system/employee/index.vue     |   4 +-
 src/views/system/notify/index.vue       |   4 +-
 vite.config.js                          |   4 +-
 18 files changed, 291 insertions(+), 37 deletions(-)
 create mode 100644 src/views/permission/dept/index.vue

diff --git a/src/views/operation/limit/index.vue b/src/views/operation/limit/index.vue
index 2357f7e..2542dde 100644
--- a/src/views/operation/limit/index.vue
+++ b/src/views/operation/limit/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="list-container">
-        <TableList
+        <table-list
             v-loading="loading"
             :code="code"
             :config="config"
@@ -22,7 +22,7 @@
                     </el-form-item>
                 </el-form>
             </template>
-        </TableList>
+        </table-list>
         <el-dialog v-model="formState.formVisible" :title="formState.form.id ? '编辑' : '添加' + '活动'" width="480px">
             <el-form ref="refsForm" label-width="100px" :model="formState.form" :rules="formState.rules">
                 <el-form-item label="活动名称" prop="name">
diff --git a/src/views/operation/limit/product.vue b/src/views/operation/limit/product.vue
index f8921f0..a0700a0 100644
--- a/src/views/operation/limit/product.vue
+++ b/src/views/operation/limit/product.vue
@@ -10,7 +10,7 @@
                 </el-button>
             </li>
         </ul>
-        <TableList
+        <table-list
             v-loading="loading"
             :code="code"
             :config="config"
@@ -43,7 +43,7 @@
                     </el-form-item>
                 </el-form>
             </template>
-        </TableList>
+        </table-list>
         <ProductPicker ref="refsPicker" @pick="handlePick" />
         <ProductSku ref="refsSku" @save="handleSkuSave" />
     </div>
diff --git a/src/views/operation/limit/sku.vue b/src/views/operation/limit/sku.vue
index 4a527a7..75e77d0 100644
--- a/src/views/operation/limit/sku.vue
+++ b/src/views/operation/limit/sku.vue
@@ -1,6 +1,6 @@
 <template>
     <el-dialog v-model="visible" title="编辑SKU" width="max-content">
-        <TableList
+        <table-list
             v-loading="loading"
             :code="code"
             :config="config"
@@ -13,7 +13,7 @@
                 <el-button type="primary" @click="handleSave">保存</el-button>
                 <h3 style="margin-left: 10px">{{ activityProduct?.productName }}</h3>
             </template>
-        </TableList>
+        </table-list>
     </el-dialog>
 </template>
 
diff --git a/src/views/operation/limit/time.vue b/src/views/operation/limit/time.vue
index 881ffbc..54bd68c 100644
--- a/src/views/operation/limit/time.vue
+++ b/src/views/operation/limit/time.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="list-container">
-        <TableList
+        <table-list
             v-loading="loading"
             :code="code"
             :config="config"
@@ -15,7 +15,7 @@
             <template #operation>
                 <el-button type="success" @click="handleProduct">下一步，设置秒杀商品</el-button>
             </template>
-        </TableList>
+        </table-list>
     </div>
 </template>
 
diff --git a/src/views/operation/recommend/index.vue b/src/views/operation/recommend/index.vue
index 4a2268a..712e046 100644
--- a/src/views/operation/recommend/index.vue
+++ b/src/views/operation/recommend/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="list-container">
-        <TableList
+        <table-list
             v-loading="loading"
             :code="code"
             :config="config"
@@ -22,7 +22,7 @@
                     </el-form-item>
                 </el-form>
             </template>
-        </TableList>
+        </table-list>
         <ProductPicker ref="refsPicker" @pick="handlePick" />
     </div>
 </template>
diff --git a/src/views/permission/dept/index.vue b/src/views/permission/dept/index.vue
new file mode 100644
index 0000000..8f80474
--- /dev/null
+++ b/src/views/permission/dept/index.vue
@@ -0,0 +1,254 @@
+<template>
+    <div class="list-container">
+        <table-list
+            ref="refsTable"
+            v-loading="loading"
+            :code="code"
+            :config="config"
+            :data="list"
+            :operation="['create']"
+            sortable
+            title="分类"
+            :total="total"
+            @create="handleCreate()"
+            @row-click="handleExpand"
+            @row-sort="handleSort"
+        />
+        <el-dialog v-model="formState.formVisible" title="转移商品" width="360px">
+            <el-form ref="refsForm" label-width="100px" :model="formState.form" :rules="formState.rules">
+                <el-form-item label="源分类" prop="sourceId">
+                    <el-cascader
+                        v-model="formState.form.sourceId"
+                        :options="list"
+                        :props="{
+                            checkStrictly: true,
+                            expandTrigger: 'hover',
+                            label: 'name',
+                            value: 'id',
+                            children: 'childList',
+                            emitPath: false,
+                        }"
+                    />
+                </el-form-item>
+                <el-form-item label="目标分类" prop="targetId">
+                    <el-cascader
+                        v-model="formState.form.targetId"
+                        :options="list"
+                        :props="{
+                            checkStrictly: true,
+                            expandTrigger: 'hover',
+                            label: 'name',
+                            value: 'id',
+                            children: 'childList',
+                            emitPath: false,
+                        }"
+                    />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <el-button @click="formState.formVisible = false">取消</el-button>
+                <el-button :loading="formState.submitting" type="primary" @click="handleSave">保存</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang="jsx">
+    import ElButton from '@/components/extra/ElButton.vue';
+    import ElImage from '@/components/extra/ElImage.vue';
+    import ElSwitch from '@/components/extra/ElSwitch.vue';
+    import TableList from '@/components/TableList.vue';
+    const router = useRouter();
+    const store = useStore();
+    const { proxy } = getCurrentInstance();
+    const loading = ref(false);
+    const refsTable = ref(null);
+    const code = computed(() => store.state.category.code);
+    const list = computed(() => _.cloneDeep(store.state.category.list));
+    const total = computed(() => store.state.category.total);
+    const opts = computed(() => store.state.category.opts);
+    if (!unref(opts).init) {
+        store.dispatch('category/load');
+    }
+
+    /* 查询订单 */
+    const state = reactive({
+        condition: {},
+    });
+    watch(
+        () => state.condition,
+        (value) => {
+            store.commit('category/setCondition', _.cloneDeep(value));
+        },
+        { immediate: true, deep: true }
+    );
+    const handleSearch = async () => {
+        loading.value = true;
+        await store.dispatch('category/search');
+        loading.value = false;
+    };
+    onActivated(handleSearch);
+    const handleCreate = (row) => {
+        router.push({ name: 'CreateCategory', query: { pid: row?.id } });
+    };
+    const handleUpdate = (row) => {
+        router.push({ name: 'UpdateCategory', params: { id: row.id } });
+    };
+    const handleVisible = async (row) => {
+        loading.value = true;
+        await store.dispatch('category/save', row);
+        loading.value = false;
+    };
+    const handleRemove = async (rows) => {
+        await store.dispatch(
+            'category/remove',
+            rows.map((item) => item.id)
+        );
+    };
+    const handleSort = async (newSort, oldSort, e, arr) => {
+        arr = arr || unref(list);
+        let direction = (oldSort - newSort) / Math.abs(oldSort - newSort);
+        let currentSort = arr[newSort].sort;
+        oldSort = arr[newSort + direction].sort;
+        loading.value = true;
+        await store.dispatch('category/sort', { id: arr[newSort].id, currentSort, oldSort });
+        loading.value = false;
+    };
+    const handleExpand = (row) => {
+        unref(list).forEach((item) => {
+            unref(refsTable).toggleRowExpansion(item, false);
+        });
+        unref(refsTable).toggleRowExpansion(row);
+    };
+
+    /* 表单 */
+    const refsForm = ref(null);
+    const formState = reactive({
+        formVisible: false,
+        submitting: false,
+        form: {
+            sourceId: null,
+            targetId: false,
+        },
+        rules: {
+            sourceId: [{ required: true, message: '源分类不能为空' }],
+            targetId: [{ required: true, message: '目标分类不能为空' }],
+        },
+    });
+    // 转移商品
+    const handleTransform = (row) => {
+        formState.form = {
+            sourceId: row.id,
+            targetId: null,
+        };
+        formState.formVisible = true;
+    };
+    const handleSave = async () => {
+        formState.submitting = true;
+        try {
+            await proxy.$validate(refsForm);
+            let data = _.cloneDeep(formState.form);
+            await store.dispatch('category/transform', data);
+            formState.formVisible = false;
+        } catch (e) {
+            console.info('取消保存', e);
+        }
+        formState.submitting = false;
+    };
+
+    /* 列表配置 */
+    const handleConfig = (parent) => {
+        let res = reactive({
+            setting: !parent,
+            page: false,
+            columns: [
+                {
+                    label: '分类名称',
+                    prop: 'name',
+                    minWidth: 300,
+                },
+                {
+                    label: '图片',
+                    minWidth: 300,
+                    slots: {
+                        default: ({ row }) => <ElImage src={row.picture} alt={row.name} height="64px" />,
+                    },
+                },
+                {
+                    label: '是否显示',
+                    width: 120,
+                    slots: {
+                        default: ({ row }) => (
+                            <ElSwitch v-model={row.isEnable} onChange={(visible) => handleVisible(row, visible)} />
+                        ),
+                    },
+                },
+                {
+                    label: '操作',
+                    width: 300,
+                    slots: {
+                        default: ({ row }) => (
+                            <div>
+                                {!parent ? (
+                                    <ElButton type="text" onClick={() => handleCreate(row)}>
+                                        新增下级
+                                    </ElButton>
+                                ) : (
+                                    ''
+                                )}
+
+                                <ElButton type="text" onClick={() => handleTransform(row)}>
+                                    转移商品
+                                </ElButton>
+                                <ElButton type="text" onClick={() => handleUpdate(row)}>
+                                    编辑
+                                </ElButton>
+                                <ElButton type="text" onClick={() => handleRemove([row])}>
+                                    删除
+                                </ElButton>
+                            </div>
+                        ),
+                    },
+                },
+            ],
+        });
+        if (!parent) {
+            res.columns.unshift({
+                type: 'expand',
+                width: 60,
+                slots: {
+                    default: ({ row }) => (
+                        <TableList
+                            code={Date.now() + ''}
+                            config={handleConfig(row)}
+                            data={row.childList || []}
+                            operation={[]}
+                            sortable
+                            onRowSort={(newSort, oldSort, e) => handleSort(newSort, oldSort, e, row.childList)}
+                        />
+                    ),
+                },
+            });
+        } else {
+            res.columns.unshift({
+                type: 'index',
+                width: 60,
+            });
+        }
+        return res;
+    };
+    const config = handleConfig(null);
+</script>
+
+<style lang="less" scoped>
+    :deep(.el-table__expanded-cell) {
+        .common-list {
+            width: 100%;
+            min-height: 300px;
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            overflow: hidden;
+        }
+    }
+</style>
diff --git a/src/views/sales/category/index.vue b/src/views/sales/category/index.vue
index 270321d..8f80474 100644
--- a/src/views/sales/category/index.vue
+++ b/src/views/sales/category/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="list-container">
-        <TableList
+        <table-list
             ref="refsTable"
             v-loading="loading"
             :code="code"
diff --git a/src/views/sales/order/detail.vue b/src/views/sales/order/detail.vue
index 1545cd4..ea313b6 100644
--- a/src/views/sales/order/detail.vue
+++ b/src/views/sales/order/detail.vue
@@ -128,11 +128,11 @@
                 </el-table>
             </el-scrollbar>
         </div>
-        <CloseOrder ref="refsCloseOrder" @close="handleLoad" />
-        <CancelOrder ref="refsCancelOrder" @close="handleLoad" />
-        <UpdateAddress ref="refsUpdateAddress" @close="handleLoad" />
-        <UpdateFees ref="refsUpdateFees" @close="handleLoad" />
-        <OrderTrack ref="refsOrderTrack" />
+        <close-order ref="refsCloseOrder" @close="handleLoad" />
+        <cancel-order ref="refsCancelOrder" @close="handleLoad" />
+        <update-address ref="refsUpdateAddress" @close="handleLoad" />
+        <update-fees ref="refsUpdateFees" @close="handleLoad" />
+        <order-track ref="refsOrderTrack" />
     </div>
 </template>
 
diff --git a/src/views/sales/order/index.vue b/src/views/sales/order/index.vue
index 8ba96e5..f50a7bf 100644
--- a/src/views/sales/order/index.vue
+++ b/src/views/sales/order/index.vue
@@ -15,7 +15,7 @@
                 </el-button>
             </li>
         </ul>
-        <TableList
+        <table-list
             v-loading="loading"
             :code="code"
             :config="config"
@@ -51,10 +51,10 @@
             <template #operation="{ selection }">
                 <el-button type="primary" @click="handleSend(selection)">批量发货</el-button>
             </template>
-        </TableList>
-        <CloseOrder ref="refsCloseOrder" />
-        <OrderTrack ref="refsOrderTrack" />
-        <OrderShip ref="refsOrderShip" @save="handleSearch" />
+        </table-list>
+        <close-order ref="refsCloseOrder" />
+        <order-track ref="refsOrderTrack" />
+        <order-ship ref="refsOrderShip" @save="handleSearch" />
     </div>
 </template>
 
diff --git a/src/views/sales/order/ship.vue b/src/views/sales/order/ship.vue
index 2d5800c..7888811 100644
--- a/src/views/sales/order/ship.vue
+++ b/src/views/sales/order/ship.vue
@@ -1,6 +1,6 @@
 <template>
     <el-dialog v-model="visible" height="500px" title="批量发货" width="800px">
-        <TableList v-loading="loading" :code="code" :config="config" :data="list" :operation="[]" />
+        <table-list v-loading="loading" :code="code" :config="config" :data="list" :operation="[]" />
         <template #footer>
             <el-button type="danger" @click="handleClose">取消</el-button>
             <el-button :loading="loading" type="primary" @click="handleSave">确定发货</el-button>
diff --git a/src/views/sales/product/index.vue b/src/views/sales/product/index.vue
index 4f84548..9444dd7 100644
--- a/src/views/sales/product/index.vue
+++ b/src/views/sales/product/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="list-container">
-        <TableList
+        <table-list
             v-loading="loading"
             :code="code"
             :config="config"
@@ -33,7 +33,7 @@
                     </el-form-item>
                 </el-form>
             </template>
-        </TableList>
+        </table-list>
     </div>
 </template>
 
diff --git a/src/views/sales/product/picker.vue b/src/views/sales/product/picker.vue
index cdd5eac..1869d48 100644
--- a/src/views/sales/product/picker.vue
+++ b/src/views/sales/product/picker.vue
@@ -1,6 +1,6 @@
 <template>
     <el-dialog v-model="visible" title="选择商品">
-        <TableList
+        <table-list
             ref="refsTable"
             v-loading="loading"
             :code="code"
@@ -32,7 +32,7 @@
                     </el-form-item>
                 </el-form>
             </template>
-        </TableList>
+        </table-list>
         <template #footer>
             <el-button @click="handleClose">取消</el-button>
             <el-button type="primary" @click="handlePick">确认选择</el-button>
diff --git a/src/views/sales/service/detail.vue b/src/views/sales/service/detail.vue
index e2b53cf..bbe1bb7 100644
--- a/src/views/sales/service/detail.vue
+++ b/src/views/sales/service/detail.vue
@@ -260,7 +260,7 @@
                 </template>
             </el-scrollbar>
         </div>
-        <OrderTrack ref="refsOrderTrack" service />
+        <order-track ref="refsOrderTrack" service />
     </div>
 </template>
 
diff --git a/src/views/sales/service/index.vue b/src/views/sales/service/index.vue
index dbe9ed0..088f6c9 100644
--- a/src/views/sales/service/index.vue
+++ b/src/views/sales/service/index.vue
@@ -15,7 +15,7 @@
                 </el-button>
             </li>
         </ul>
-        <TableList
+        <table-list
             v-loading="loading"
             :code="code"
             :config="config"
@@ -51,7 +51,7 @@
                     </el-form-item>
                 </el-form>
             </template>
-        </TableList>
+        </table-list>
     </div>
 </template>
 
diff --git a/src/views/system/customer/index.vue b/src/views/system/customer/index.vue
index 52c8a91..90e390d 100644
--- a/src/views/system/customer/index.vue
+++ b/src/views/system/customer/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <TableList
+    <table-list
         v-loading="loading"
         :code="code"
         :config="config"
@@ -28,7 +28,7 @@
                 </el-form-item>
             </el-form>
         </template>
-    </TableList>
+    </table-list>
 </template>
 
 <script setup lang="jsx">
diff --git a/src/views/system/employee/index.vue b/src/views/system/employee/index.vue
index 41bab07..59beec1 100644
--- a/src/views/system/employee/index.vue
+++ b/src/views/system/employee/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <TableList
+    <table-list
         v-loading="loading"
         :code="code"
         :config="config"
@@ -19,7 +19,7 @@
                 </el-form-item>
             </el-form>
         </template>
-    </TableList>
+    </table-list>
 </template>
 
 <script setup lang="jsx">
diff --git a/src/views/system/notify/index.vue b/src/views/system/notify/index.vue
index d9c4ab9..d324535 100644
--- a/src/views/system/notify/index.vue
+++ b/src/views/system/notify/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="list-container">
-        <TableList
+        <table-list
             v-loading="loading"
             :code="code"
             :config="config"
@@ -23,7 +23,7 @@
                     </el-form-item>
                 </el-form>
             </template>
-        </TableList>
+        </table-list>
         <el-dialog v-model="formState.formVisible" :title="formState.form.id ? '查看' : '添加' + '通知'">
             <el-form
                 ref="refsForm"
diff --git a/vite.config.js b/vite.config.js
index 6a1ff28..ff1c0d0 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -21,10 +21,10 @@ export default (configEnv) => {
             proxy: {
                 '/api': {
                     // target: 'http://192.168.10.109:8090/', // 显雨
-                    // target: 'http://192.168.10.251:8090', // 高玉
+                    target: 'http://192.168.10.5:4500', // 高玉
                     // target: 'http://192.168.10.67:8090', // 罗战
                     // target: 'http://192.168.10.93:8090', // 周渺
-                    target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址
+                    // target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址
                     // target: 'https://you-gateway.mashibing.com', // 生产环境
                     changeOrigin: true,
                     rewrite: (path) => path.replace(/^\/api/, ''),