diff --git a/sgzb-ui/prettier.config.js b/sgzb-ui/prettier.config.js new file mode 100644 index 00000000..bd8b610c --- /dev/null +++ b/sgzb-ui/prettier.config.js @@ -0,0 +1,10 @@ +module.exports = { + tabWidth: 2, + semi: false, + vueIndentScriptAndStyle: true, + singleQuote: true, + trailingComma: 'all', + proseWrap: 'never', + htmlWhitespaceSensitivity: 'strict', + endOfLine: 'auto', +} diff --git a/sgzb-ui/src/utils/request.js b/sgzb-ui/src/utils/request.js index f0a9eb65..ee657082 100644 --- a/sgzb-ui/src/utils/request.js +++ b/sgzb-ui/src/utils/request.js @@ -67,47 +67,47 @@ service.interceptors.request.use(config => { } return config }, error => { - console.log(error) - Promise.reject(error) + console.log(error) + Promise.reject(error) }) // 响应拦截器 service.interceptors.response.use(res => { - // 未设置状态码则默认成功状态 - const code = res.data.code || 200; - // 获取错误信息 - const msg = errorCode[code] || res.data.msg || errorCode['default'] - // 二进制数据则直接返回 - if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { - return res.data - } - if (code === 401) { - if (!isRelogin.show) { - isRelogin.show = true; - MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { - isRelogin.show = false; - store.dispatch('LogOut').then(() => { - location.href = '/login'; - // location.href = '/gl/login'; - }) + // 未设置状态码则默认成功状态 + const code = res.data.code || 200; + // 获取错误信息 + const msg = errorCode[code] || res.data.msg || errorCode['default'] + // 二进制数据则直接返回 + if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { + return res.data + } + if (code === 401) { + if (!isRelogin.show) { + isRelogin.show = true; + MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { + isRelogin.show = false; + store.dispatch('LogOut').then(() => { + location.href = '/login'; + // location.href = '/gl/login'; + }) }).catch(() => { isRelogin.show = false; }); } - return Promise.reject('无效的会话，或者会话已过期，请重新登录。') - } else if (code === 500) { - Message({ message: msg, type: 'error' }) - return Promise.reject(new Error(msg)) - } else if (code === 601) { - Message({ message: msg, type: 'warning' }) - return Promise.reject('error') - } else if (code !== 200) { - Notification.error({ title: msg }) - return Promise.reject('error') - } else { - return res.data - } - }, + return Promise.reject('无效的会话，或者会话已过期，请重新登录。') + } else if (code === 500) { + Message({ message: msg, type: 'error' }) + return Promise.reject(new Error(msg)) + } else if (code === 601) { + Message({ message: msg, type: 'warning' }) + return Promise.reject('error') + } else if (code !== 200) { + Notification.error({ title: msg }) + return Promise.reject('error') + } else { + return res.data + } +}, error => { console.log('err' + error) let { message } = error; diff --git a/sgzb-ui/src/views/claimAndRefund/return/apply.json b/sgzb-ui/src/views/claimAndRefund/return/apply.json deleted file mode 100644 index ebbf78cc..00000000 --- a/sgzb-ui/src/views/claimAndRefund/return/apply.json +++ /dev/null @@ -1,143 +0,0 @@ -/** 退料ID */ -@ApiModelProperty(value = "退料ID") -private Long id; - -/** 退料ID-字符串 */ -@ApiModelProperty(value = "退料ID-字符串") -private String ids; - -/** 退料单号 */ -@Excel(name = "退料单号") -@ApiModelProperty(value = "退料单号") -private String code; - -/** 任务ID */ -@ApiModelProperty(value = "任务ID") -private Integer taskId; - -/** 任务ID */ -@ApiModelProperty(value = "任务类型") -private Integer taskType; - -/** 签订日期 */ -@ApiModelProperty(value = "签订日期") -private String signTime; - -/** 退料人员 */ -@Excel(name = "退料人员") -@ApiModelProperty(value = "退料人员") -private String backPerson; - -/** 联系电话 */ -@Excel(name = "退料人联系电话") -@ApiModelProperty(value = "联系电话") -private String phone; - -/** 机具公司审核人 */ -@ApiModelProperty(value = "机具公司审核人") -private Integer directAuditBy; - -/** 机具公司审批时间 */ -@ApiModelProperty(value = "机具公司审批时间") -private String directAuditTime; - -/** 机具公司审批备注 */ -@ApiModelProperty(value = "机具公司审批备注") -private String directAuditRemark; - - -/** 创建者 */ -@ApiModelProperty(value = "创建者") -private String createBy; - -/** 创建时间 */ -@ApiModelProperty(value = "创建时间") -private Date createTime; - -/** 更新者 */ -@ApiModelProperty(value = "更新者") -private String updateBy; - -/** 更新时间 */ -@ApiModelProperty(value = "更新时间") -private Date updateTime; - -/** 备注 */ -@ApiModelProperty(value = "备注") -private String remark; - -/** 数据所属组织 */ -@ApiModelProperty(value = "数据所属组织") -private Long companyId; - -@ApiModelProperty(value = "关键字") -private String keyWord; - -@ApiModelProperty(value = "工程id") -private Integer lotId; - -@Excel(name = "退料工程名称") -@ApiModelProperty(value = "工程名称") -private String lotName; - -@ApiModelProperty(value = "单位id") -private Integer unitId; - -@Excel(name = "退料单位名称") -@ApiModelProperty(value = "单位名称") -private String unitName; - -@Excel(name = "退料申请时间") -@ApiModelProperty(value = "退料日期") -private String backTime; - -@Excel(name = "协议号") -@ApiModelProperty(value = "协议编号") -private String agreementCode; - -@Excel(name = "退料状态") -@ApiModelProperty(value = "任务状态") -private String taskStatus; - -@ApiModelProperty(value = "协议id") -private Integer agreementId; - -@ApiModelProperty(value = "类型id") -private String typeId; - -@Excel(name = "退料工机具类型") -@ApiModelProperty(value = "类型名称") -private String typeName; - -@ApiModelProperty(value = "规格编号") -private String typeCode; - -@ApiModelProperty(value = "数量") -private String num; - -@ApiModelProperty(value = "详情id和数量") -private String detailsIdByNum; - -@ApiModelProperty(value = "类型id和数量") -private String typeIdByNum; - -@ApiModelProperty(value = "详情id") -private String detailsId; - -@ApiModelProperty(value = "编码") -private String maCode; - -@ApiModelProperty(value = "在用数量") -private String useNum; - -@ApiModelProperty(value = "操作人") -private String createName; - -@ApiModelProperty(value = "审核人") -private String examineName; - -@ApiModelProperty(value = "开始时间") -private String startTime; - -@ApiModelProperty(value = "结束时间") -private String endTime; \ No newline at end of file diff --git a/sgzb-ui/src/views/login.vue b/sgzb-ui/src/views/login.vue index 8dc512e2..7144b430 100644 --- a/sgzb-ui/src/views/login.vue +++ b/sgzb-ui/src/views/login.vue @@ -3,155 +3,309 @@

智慧仓储管理平台

- - - + + + + + + + + + -
- -
- Copyright © 2018-2023 ruoyi.vip All Rights Reserved. -
+ + + + + + + + 这是一段信息 + + 取 消 + 确 定 + +