From 155a30a172e4cf04838dcf7c8bb73ce6b200e574 Mon Sep 17 00:00:00 2001 From: qx <1084500556@qq.com> Date: 星期三, 26 三月 2025 14:52:54 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region --- src/utils/request.js | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index f48f57e..3a223a7 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -6,12 +6,14 @@ import { tansParams, blobValidate } from "@/utils/ruoyi"; import cache from '@/plugins/cache' import { saveAs } from 'file-saver' +import Cookies from "js-cookie" + let downloadLoadingInstance; // 鏄惁鏄剧ず閲嶆柊鐧诲綍 export let isRelogin = { show: false }; - axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' + // 鍒涘缓axios瀹炰緥 const service = axios.create({ // axios涓姹傞厤缃湁baseURL閫夐」锛岃〃绀鸿姹俇RL鍏叡閮ㄥ垎 @@ -26,6 +28,7 @@ const isRepeatSubmit = (config.headers || {}).repeatSubmit === false if (getToken() && !isToken) { config.headers['Authorization'] = 'Bearer ' + getToken() + config.headers['hospId'] = Cookies.get("hospId"); } if (config.method === 'get' && config.params) { let url = config.url + '?' + tansParams(config.params); @@ -59,6 +62,12 @@ Promise.reject(error) }) +// 闇�瑕佺‘璁ゆ鐨勬帴鍙h矾寰� +const confirmDialogUrls = [ + '/hosp/order/addtTransition', + '/hosp/customer/cusIdcard' +]; + // 鍝嶅簲鎷︽埅鍣� service.interceptors.response.use(res => { const code = res.data.code || 200; @@ -84,17 +93,13 @@ } return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�') } else if (code === 500) { - if (res.config.url === '/hosp/order/addtTransition') { + if (confirmDialogUrls.includes(res.config.url)) { // 浣跨敤MessageBox鍜孧essage鏉ユ浛浠his.$confirm鍜宼his.$message - MessageBox.confirm(res.data.msg, '鎻愮ず', { + MessageBox.confirm(res.data.msg, { confirmButtonText: '纭畾', - cancelButtonText: '鍙栨秷', - type: 'warning', - center: true - }).then(() => { - - }).catch(() => { - + type: 'error', + showCancelButton: false, + closeOnClickModal: false }); return Promise.reject('鐗瑰畾鎺ュ彛鍙戠敓500閿欒'); } -- Gitblit v1.8.0