Selaa lähdekoodia

sop执行计划剩余内容接口对接,上一个提交也是sop的内容名称错写成了作业执行

wyn 3 kuukautta sitten
vanhempi
sitoutus
6a0c6ff134

+ 53 - 0
src/api/sop/executePlan.ts

@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+export interface  sopExecutionPlanSaveReqVO{
+  id:number,
+  sopId:number,
+  frequencyUnit:number,
+  frequency:number,
+  timePoint:number,
+  startTime?:string,
+  endType?:string,
+  endValue?:string,
+  duration?:string,
+  nonWorkDay?:number,
+  nonWorkMoveDay?:number,
+}
+
+export interface PageParam {
+  pageNo: number
+  pageSize: number
+  sopId?: number
+  status?: number
+  frequencyUnit?: number
+  frequency?: number,
+}
+
+
+//创建sop计划
+export const insertSopExecutionPlan=async(data:sopExecutionPlanSaveReqVO)=>{
+  return await request.post({url:'/iscs/sop-execution-plan/insertSopExecutionPlan',data})
+}
+
+//修改sop计划
+export const updateSopExecutionPlan=async(data:sopExecutionPlanSaveReqVO)=>{
+  return await request.put({url:'/iscs/sop-execution-plan/updateSopExecutionPlan',data})
+}
+
+//获得sop计划执行分页
+export const getSopExecutionPlanPage=async(params:PageParam)=>{
+  return await request.get({url:'/iscs/sop-execution-plan/getSopExecutionPlanPage',params})
+}
+
+//获得sop计划执行
+// export const selectSopExecutionPlanById=async(id:number)=>{
+//   return await request.get({url:'/iscs/sop-execution-plan/selectSopExecutionPlanById',params:{id:id} })
+// }
+export const selectSopExecutionPlanBySopId=async(sopId:number)=>{
+  return await request.get({url:'/iscs/sop-execution-plan/selectSopExecutionPlanBySopId',params:{sopId:sopId} })
+}
+
+// 批量删除sop计划执行
+export const deleteSopExecutionPlanList=async(ids:number)=>{
+  return await request.delete({url:'/iscs/sop-execution-plan/deleteSopExecutionPlanList='+ids})
+}

+ 16 - 0
src/api/sop/index.ts

@@ -23,6 +23,14 @@ export interface PageParam {
   workstationId: number,
 }
 
+export interface NotificationsVO{
+  id: number,
+  enableNotifications:number
+}
+export interface ExecutionPlanVO{
+  id: number,
+  enableExecutionPlan:number
+}
 // 查询SOP列表
 export const getSopPage = async (params: PageParam) => {
   return await request.get({ url: '/iscs/sop/getSopPage', params })
@@ -47,6 +55,14 @@ export const updateSop = async (data: sopVO) => {
 export const updateSopStatus = async (data: sopVO) => {
   return await request.put({ url: '/iscs/sop/updateSopStatus', data })
 }
+// 更新启用通知
+export const updateSopEnableNotification=async(data:NotificationsVO)=>{
+return await request.put({ url: '/iscs/sop/updateSopEnableNotification', data })
+}
+// 更新执行计划
+export const updateSopEnableExecutionPlan=async(data:ExecutionPlanVO)=>{
+  return await request.put({ url: '/iscs/sop/updateSopEnableExecutionPlan', data })
+}
 // 删除SOP
 export const deleteSopList = async (ids: number) => {
   return await request.delete({

+ 1 - 0
src/config/axios/errorCode.ts

@@ -2,5 +2,6 @@ export default {
   '401': '认证失败,无法访问系统资源',
   '403': '当前操作没有权限',
   '404': '访问资源不存在',
+  '902':'数据未创建',
   default: '系统未知错误,请反馈给管理员'
 }

+ 2 - 1
src/config/axios/service.ts

@@ -178,6 +178,7 @@ service.interceptors.response.use(
       })
       return Promise.reject(new Error(msg))
     } else if (code !== 200) {
+
       if (msg === '无效的刷新令牌') {
         // hard coding:忽略这个提示,直接登出
         console.log(msg)
@@ -185,7 +186,7 @@ service.interceptors.response.use(
       } else {
         ElNotification.error({ title: msg })
       }
-      return Promise.reject('error')
+      return Promise.reject(data)
     } else {
       return data
     }

+ 3 - 1
src/utils/dict.ts

@@ -303,5 +303,7 @@ export enum DICT_TYPE {
   SLOT_TYPE = 'slot_type',
   SLOT_STATUS = 'slot_status',
   HOLIDAY_TYPE='holiday_type',
-  HOLIDAY_UNIT='holiday_unit'
+  HOLIDAY_UNIT='holiday_unit',
+  SOP_PLAN_NOWORKING='sop_plan_noworking',
+  SOP_PLAN_TERMINATE_TYPE='sop_plan_terminate_type'
 }