From 2c5b6c86a5f57162608aeaa96577d1884473e267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Sat, 7 May 2022 17:06:10 +0800
Subject: [PATCH] fix: BUG

---
 src/layouts/components/profile.vue                |  1 -
 src/store/modules/operation/limit/limitProduct.js |  2 ++
 src/store/modules/sales/orderShip.js              |  3 +--
 src/views/operation/limit/product.vue             | 13 ++++++++++++-
 src/views/sales/category/form.vue                 | 14 ++++++++++++--
 src/views/sales/order/ship.vue                    |  9 +--------
 src/views/sales/product/picker.vue                | 14 ++++++++++----
 7 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/layouts/components/profile.vue b/src/layouts/components/profile.vue
index 6c7c135..77b7159 100644
--- a/src/layouts/components/profile.vue
+++ b/src/layouts/components/profile.vue
@@ -1,6 +1,5 @@
 <template>
     <div class="layout-profile">
-        <el-avatar :src="userInfo?.avatar" />
         <el-dropdown :opts="opts">
             <span>{{ userInfo?.employeeName }}</span>
         </el-dropdown>
diff --git a/src/store/modules/operation/limit/limitProduct.js b/src/store/modules/operation/limit/limitProduct.js
index 96d957d..2205c4e 100644
--- a/src/store/modules/operation/limit/limitProduct.js
+++ b/src/store/modules/operation/limit/limitProduct.js
@@ -1,5 +1,6 @@
 import * as api from '@/api/operation/limit/limitProduct.js';
 import * as limitTimeAPI from '@/api/operation/limit/limitTime.js';
+import * as categoryAPI from '@/api/sales/category.js';
 import { ElMessage, ElMessageBox } from '@/plugins/element-plus';
 const state = () => ({
     code: 'LimitProduct',
@@ -35,6 +36,7 @@ const actions = {
         commit('setOpts', {
             ...state.opts,
             init: true,
+            category: await categoryAPI.search({ pageIndex: 1, length: 9999 }),
             timeRange: await limitTimeAPI.search({ activityId }),
         });
     },
diff --git a/src/store/modules/sales/orderShip.js b/src/store/modules/sales/orderShip.js
index 72b4282..209447b 100644
--- a/src/store/modules/sales/orderShip.js
+++ b/src/store/modules/sales/orderShip.js
@@ -37,7 +37,7 @@ const actions = {
             company: await api.searchShip(),
         });
     },
-    save: async ({ dispatch, state }, data) => {
+    save: async ({ state }, data) => {
         let res = null;
         if (data.every((item) => item.logistics.companyCode && item.logistics.trackingNo)) {
             res = await api.sendAll(
@@ -55,7 +55,6 @@ const actions = {
             );
             if (res) {
                 ElMessage.success('批量发货成功');
-                dispatch('search');
             } else {
                 ElMessage.error('批量发货失败');
             }
diff --git a/src/views/operation/limit/product.vue b/src/views/operation/limit/product.vue
index 15a9012..f8921f0 100644
--- a/src/views/operation/limit/product.vue
+++ b/src/views/operation/limit/product.vue
@@ -28,7 +28,18 @@
                         <el-input v-model="state.condition.productName" />
                     </el-form-item>
                     <el-form-item label="商品分类" prop="categoryId">
-                        <el-select v-model="state.condition.categoryId" :opts="opts.category" />
+                        <el-cascader
+                            v-model="state.condition.categoryId"
+                            :options="opts.category"
+                            :props="{
+                                checkStrictly: true,
+                                expandTrigger: 'hover',
+                                label: 'name',
+                                value: 'id',
+                                children: 'childList',
+                                emitPath: false,
+                            }"
+                        />
                     </el-form-item>
                 </el-form>
             </template>
diff --git a/src/views/sales/category/form.vue b/src/views/sales/category/form.vue
index 2a529de..0b99c92 100644
--- a/src/views/sales/category/form.vue
+++ b/src/views/sales/category/form.vue
@@ -22,7 +22,7 @@
             <el-form-item label="分类名称" prop="name">
                 <el-input v-model="form.name" />
             </el-form-item>
-            <el-form-item label="分类图片" prop="picture">
+            <el-form-item label="分类图片" prop="picture" :required="!form.parentId">
                 <el-upload-image v-model="form.picture" config-id="product-category/" />
             </el-form-item>
             <el-form-item label="是否显示" prop="isEnable">
@@ -55,7 +55,17 @@
     });
     const rules = reactive({
         name: [{ required: true, message: '分类名称不能为空' }],
-        picture: [{ required: true, message: '分类图片不能为空' }],
+        picture: [
+            {
+                validator(rule, value, cb) {
+                    if (!form.parentId && !value) {
+                        cb('一级分类图片不能为空');
+                    } else {
+                        cb();
+                    }
+                },
+            },
+        ],
         isEnable: [{ required: true, message: '是否显示不能为空' }],
     });
     const list = computed(() => store.state.category.list);
diff --git a/src/views/sales/order/ship.vue b/src/views/sales/order/ship.vue
index 7733536..2d5800c 100644
--- a/src/views/sales/order/ship.vue
+++ b/src/views/sales/order/ship.vue
@@ -1,13 +1,6 @@
 <template>
     <el-dialog v-model="visible" height="500px" title="批量发货" width="800px">
-        <TableList
-            v-loading="loading"
-            :code="code"
-            :config="config"
-            :data="list"
-            :operation="[]"
-            @search="handleSearch"
-        />
+        <TableList 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/picker.vue b/src/views/sales/product/picker.vue
index 493349d..cdd5eac 100644
--- a/src/views/sales/product/picker.vue
+++ b/src/views/sales/product/picker.vue
@@ -17,10 +17,17 @@
                         <el-input v-model="state.condition.name" />
                     </el-form-item>
                     <el-form-item label="商品分类" prop="categoryId">
-                        <el-select
+                        <el-cascader
                             v-model="state.condition.categoryId"
-                            :config="{ label: 'name', value: 'id' }"
-                            :opts="opts.category"
+                            :options="opts.category"
+                            :props="{
+                                checkStrictly: true,
+                                expandTrigger: 'hover',
+                                label: 'name',
+                                value: 'id',
+                                children: 'childList',
+                                emitPath: false,
+                            }"
                         />
                     </el-form-item>
                 </el-form>
@@ -97,7 +104,6 @@
 
     /* 列表配置 */
     const config = reactive({
-        page: false,
         columns: [
             {
                 type: 'selection',