diff --git a/src/api/group/groupSetting.js b/src/api/group/groupSetting.js index ab211c58..73902961 100644 --- a/src/api/group/groupSetting.js +++ b/src/api/group/groupSetting.js @@ -26,6 +26,13 @@ export function getGroup(id) { method: 'get' }) } +// 检查更新-生产班组 +export function updateIsProduction(id) { + return request({ + url: '/base/group-team/updateIsProduction?id=' + id, + method: 'get' + }) +} // 获得班组基础信息分页 export function getGroupPage(query) { diff --git a/src/mixins/basic-page.js b/src/mixins/basic-page.js index 549a15a6..050a141e 100644 --- a/src/mixins/basic-page.js +++ b/src/mixins/basic-page.js @@ -16,7 +16,7 @@ export default { }, tableData: [], //table数据 listQuery: { //分页 - pageSize: 10, + pageSize: 20, pageNo: 1, total: 1, }, diff --git a/src/utils/request.js b/src/utils/request.js index 89cd58b7..6a3cf0c7 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,10 +1,10 @@ import axios from 'axios' -import {Message, MessageBox, Notification, Loading} from 'element-ui' +import { Message, MessageBox, Notification, Loading } from 'element-ui' import store from '@/store' -import {getAccessToken, getRefreshToken, getTenantId, setToken} from '@/utils/auth' +import { getAccessToken, getRefreshToken, getTenantId, setToken } from '@/utils/auth' import errorCode from '@/utils/errorCode' -import {getPath, getTenantEnable} from "@/utils/ruoyi"; -import {refreshToken} from "@/api/login"; +import { getPath, getTenantEnable } from "@/utils/ruoyi"; +import { refreshToken } from "@/api/login"; // 需要忽略的提示。忽略后，自动 Promise.reject('error') const ignoreMsgs = [ @@ -86,7 +86,7 @@ service.interceptors.request.use(config => { for (const propName of Object.keys(config.params)) { const value = config.params[propName]; const part = encodeURIComponent(propName) + '=' - if (value !== null && typeof(value) !== "undefined") { + if (value !== null && typeof (value) !== "undefined") { if (typeof value === 'object') { for (const key of Object.keys(value)) { let params = propName + '[' + key + ']'; @@ -104,9 +104,9 @@ service.interceptors.request.use(config => { } return config }, error => { - tryHideFullScreenLoading() - console.log(error) - Promise.reject(error) + tryHideFullScreenLoading() + console.log(error) + Promise.reject(error) }) // 响应拦截器 @@ -176,36 +176,38 @@ service.interceptors.response.use(async res => { + '
5 分钟搭建本地环境
', }) return Promise.reject(new Error(msg)) + } else if (code === 400) { + //【班组管理】【排班计划】提交的校验按照原型图补充完整,排班计划是否重叠code400 有两个不同的返回信息 + return res.data } else if (code !== 200) { if (msg === '无效的刷新令牌') { // hard coding：忽略这个提示，直接登出 console.log(msg) } else { - Notification.error({ - title: msg - }) + //【班组管理】【排班计划】提交的校验按照原型图补充完整,排班计划是否重叠code400 有两个不同的返回信息 + return res.data } return Promise.reject('error') } else { return res.data } }, error => { - tryHideFullScreenLoading() - console.log('err' + error) - let {message} = error; - if (message === "Network Error") { - message = "后端接口连接异常"; - } else if (message.includes("timeout")) { - message = "系统接口请求超时"; - } else if (message.includes("Request failed with status code")) { - message = "系统接口" + message.substr(message.length - 3) + "异常"; - } - Message({ - message: message, - type: 'error', - duration: 5 * 1000 - }) - return Promise.reject(error) + tryHideFullScreenLoading() + console.log('err' + error) + let { message } = error; + if (message === "Network Error") { + message = "后端接口连接异常"; + } else if (message.includes("timeout")) { + message = "系统接口请求超时"; + } else if (message.includes("Request failed with status code")) { + message = "系统接口" + message.substr(message.length - 3) + "异常"; } + Message({ + message: message, + type: 'error', + duration: 5 * 1000 + }) + return Promise.reject(error) +} ) export function getBaseHeader() { @@ -219,10 +221,10 @@ function handleAuthorized() { if (!isRelogin.show) { isRelogin.show = true; MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } ).then(() => { isRelogin.show = false; store.dispatch('LogOut').then(() => { diff --git a/src/views/group/Calendar/holidayLog.vue b/src/views/group/Calendar/holidayLog.vue index d89adc7b..d29287f3 100644 --- a/src/views/group/Calendar/holidayLog.vue +++ b/src/views/group/Calendar/holidayLog.vue @@ -2,14 +2,14 @@ * @Author: zwq * @Date: 2025-10-23 13:43:55 * @LastEditors: zwq - * @LastEditTime: 2025-11-10 10:39:33 + * @LastEditTime: 2025-11-14 21:13:10 * @Description: -->