KouJin hace 1 año
padre
commit
6442f7ed6e

+ 2 - 1
build/vite/index.ts

@@ -48,7 +48,8 @@ export function createVitePlugins() {
48 48
           '@/hooks/web/useTable': ['useTable'],
49 49
           '@/hooks/web/useCrudSchemas': ['useCrudSchemas'],
50 50
           '@/utils/formRules': ['required'],
51
-          '@/utils/dict': ['DICT_TYPE']
51
+          '@/utils/dict': ['DICT_TYPE'],
52
+          '@/utils/message': ['Message'],
52 53
         }
53 54
       ],
54 55
       dts: 'src/types/auto-imports.d.ts',

+ 18 - 15
src/config/axios/service.ts

@@ -1,6 +1,6 @@
1 1
 import axios, { AxiosError, AxiosInstance, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
2 2
 
3
-import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
3
+import { ElMessageBox, ElNotification } from 'element-plus'
4 4
 import qs from 'qs'
5 5
 import { config } from '@/config/axios/config'
6 6
 import { getAccessToken, getRefreshToken, getTenantId, removeToken, setToken } from '@/utils/auth'
@@ -149,21 +149,23 @@ service.interceptors.response.use(
149 149
         })
150 150
       }
151 151
     } else if (code === 500) {
152
-      ElMessage.error(t('sys.api.errMsg500'))
152
+      Message.error(t('sys.api.errMsg500'))
153
+      // ElMessage.error()
153 154
       return Promise.reject(new Error(msg))
154 155
     } else if (code === 901) {
155
-      ElMessage.error({
156
-        offset: 300,
157
-        dangerouslyUseHTMLString: true,
158
-        message:
159
-          '<div>' +
160
-          t('sys.api.errMsg901') +
161
-          '</div>' +
162
-          '<div> &nbsp; </div>' +
163
-          '<div>参考 https://doc.iocoder.cn/ 教程</div>' +
164
-          '<div> &nbsp; </div>' +
165
-          '<div>5 分钟搭建本地环境</div>'
166
-      })
156
+      Message.error(t('sys.api.errMsg901'))
157
+      // ElMessage.error({
158
+      //   offset: 300,
159
+      //   dangerouslyUseHTMLString: true,
160
+      //   message:
161
+      //     '<div>' +
162
+      //     t('sys.api.errMsg901') +
163
+      //     '</div>' +
164
+      //     '<div> &nbsp; </div>' +
165
+      //     '<div>参考 https://doc.iocoder.cn/ 教程</div>' +
166
+      //     '<div> &nbsp; </div>' +
167
+      //     '<div>5 分钟搭建本地环境</div>'
168
+      // })
167 169
       return Promise.reject(new Error(msg))
168 170
     } else if (code !== 200) {
169 171
       if (msg === '无效的刷新令牌') {
@@ -189,7 +191,8 @@ service.interceptors.response.use(
189 191
     } else if (message.includes('Request failed with status code')) {
190 192
       message = t('sys.api.apiRequestFailed') + message.substr(message.length - 3)
191 193
     }
192
-    ElMessage.error(message)
194
+    Message.error(message)
195
+    // ElMessage.error(message)
193 196
     return Promise.reject(error)
194 197
   }
195 198
 )

+ 19 - 0
src/utils/message.ts

@@ -0,0 +1,19 @@
1
+import { ElNotification,NotificationParams } from 'element-plus';
2
+
3
+export class Message {
4
+  private static showMessage(options: NotificationParams) {
5
+    ElNotification(options);
6
+  }
7
+  static success(title: string, options?: Partial<NotificationParams>) {
8
+    this.showMessage({ title, type: 'success', ...options });
9
+  }
10
+  static error(title: string, options?: Partial<NotificationParams>) {
11
+    this.showMessage({ title, type: 'error', ...options });
12
+  }
13
+  static warning(title: string, options?: Partial<NotificationParams>) {
14
+    this.showMessage({ title, type: 'warning', ...options });
15
+  }
16
+  static info(title: string, options?: Partial<NotificationParams>) {
17
+    this.showMessage({ title, type: 'info', ...options });
18
+  }
19
+}

+ 1 - 0
src/views/DeliveryWarehouse/DeliveryWarehouseList/index.vue

@@ -1,5 +1,6 @@
1 1
 <script lang="ts" setup>
2 2
 import {AdministrativeDivisionApi} from "@/api/system/administrativeDivision";
3
+// import {success} from "@/types/auto-imports";
3 4
 
4 5
 let queryParams = ref(
5 6
   {

+ 4 - 2
src/views/DeliveryWarehouse/DeliveryWarehouseSelect/compontents/CreateForm.vue

@@ -499,9 +499,11 @@ const submitForm = async () => {
499 499
       // console.log(formData.value, '提交的表单')
500 500
       // return
501 501
       await DeliveryWarehouseSelectApi.createByAll(formData.value)
502
-      message.success(t('common.createSuccess'))
502
+      Message.success(t('common.createSuccess'))
503
+      // message.success(t('common.createSuccess'))
503 504
     } else {
504
-      message.success(t('common.updateSuccess'))
505
+      Message.success(t('common.updateSuccess'))
506
+      // message.success(t('common.updateSuccess'))
505 507
     }
506 508
     dialogVisible.value = false
507 509
     // 发送操作成功的事件