diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts index 678eaa4..151081d 100644 --- a/src/api/business/schedule/order.ts +++ b/src/api/business/schedule/order.ts @@ -33,6 +33,15 @@ }) } +// 删除 +export function deleteList(data: { id: string }) { + return request({ + url: '/business/order/delete', + method: 'post', + data, + }) +} + // 退回 export function backOrder(data: { id: string }) { return request({ diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts index 678eaa4..151081d 100644 --- a/src/api/business/schedule/order.ts +++ b/src/api/business/schedule/order.ts @@ -33,6 +33,15 @@ }) } +// 删除 +export function deleteList(data: { id: string }) { + return request({ + url: '/business/order/delete', + method: 'post', + data, + }) +} + // 退回 export function backOrder(data: { id: string }) { return request({ diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index c778f8e..eb627ad 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -32,6 +32,15 @@ }) } +// 全部里面的删除 +export function deleteAll(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + // 删除 export function deleteListItem(data: { id: string }) { return request({ diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts index 678eaa4..151081d 100644 --- a/src/api/business/schedule/order.ts +++ b/src/api/business/schedule/order.ts @@ -33,6 +33,15 @@ }) } +// 删除 +export function deleteList(data: { id: string }) { + return request({ + url: '/business/order/delete', + method: 'post', + data, + }) +} + // 退回 export function backOrder(data: { id: string }) { return request({ diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index c778f8e..eb627ad 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -32,6 +32,15 @@ }) } +// 全部里面的删除 +export function deleteAll(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + // 删除 export function deleteListItem(data: { id: string }) { return request({ diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index c086cdf..cf976d8 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -7,6 +7,7 @@ default: () => [], }, }) +const emits = defineEmits(['giveRejectRemark']) const typeMap: { [key: string]: string } = { 1: '同意', 2: '拒绝', @@ -68,7 +69,11 @@ data: itemIn.duration, }, ], + }) + if (typeMap[itemIn.comment.type] === '驳回') { + emits('giveRejectRemark', itemIn.comment.comment) + } } else { approvalRecord.value.push({ // 发起人处理 diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts index 678eaa4..151081d 100644 --- a/src/api/business/schedule/order.ts +++ b/src/api/business/schedule/order.ts @@ -33,6 +33,15 @@ }) } +// 删除 +export function deleteList(data: { id: string }) { + return request({ + url: '/business/order/delete', + method: 'post', + data, + }) +} + // 退回 export function backOrder(data: { id: string }) { return request({ diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index c778f8e..eb627ad 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -32,6 +32,15 @@ }) } +// 全部里面的删除 +export function deleteAll(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + // 删除 export function deleteListItem(data: { id: string }) { return request({ diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index c086cdf..cf976d8 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -7,6 +7,7 @@ default: () => [], }, }) +const emits = defineEmits(['giveRejectRemark']) const typeMap: { [key: string]: string } = { 1: '同意', 2: '拒绝', @@ -68,7 +69,11 @@ data: itemIn.duration, }, ], + }) + if (typeMap[itemIn.comment.type] === '驳回') { + emits('giveRejectRemark', itemIn.comment.comment) + } } else { approvalRecord.value.push({ // 发起人处理 diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts index 36b0c1f..1a365f6 100644 --- a/src/views/business/fieldTest/approve/approve-interface.ts +++ b/src/views/business/fieldTest/approve/approve-interface.ts @@ -64,4 +64,6 @@ equipmentInfoList: any // 携带仪器设备 remark: string // 备注 processId: string // 流程实例id + + rejectRemark?: string // 历次原因 } diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts index 678eaa4..151081d 100644 --- a/src/api/business/schedule/order.ts +++ b/src/api/business/schedule/order.ts @@ -33,6 +33,15 @@ }) } +// 删除 +export function deleteList(data: { id: string }) { + return request({ + url: '/business/order/delete', + method: 'post', + data, + }) +} + // 退回 export function backOrder(data: { id: string }) { return request({ diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index c778f8e..eb627ad 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -32,6 +32,15 @@ }) } +// 全部里面的删除 +export function deleteAll(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + // 删除 export function deleteListItem(data: { id: string }) { return request({ diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index c086cdf..cf976d8 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -7,6 +7,7 @@ default: () => [], }, }) +const emits = defineEmits(['giveRejectRemark']) const typeMap: { [key: string]: string } = { 1: '同意', 2: '拒绝', @@ -68,7 +69,11 @@ data: itemIn.duration, }, ], + }) + if (typeMap[itemIn.comment.type] === '驳回') { + emits('giveRejectRemark', itemIn.comment.comment) + } } else { approvalRecord.value.push({ // 发起人处理 diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts index 36b0c1f..1a365f6 100644 --- a/src/views/business/fieldTest/approve/approve-interface.ts +++ b/src/views/business/fieldTest/approve/approve-interface.ts @@ -64,4 +64,6 @@ equipmentInfoList: any // 携带仪器设备 remark: string // 备注 processId: string // 流程实例id + + rejectRemark?: string // 历次原因 } diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue index e727600..94de1f2 100644 --- a/src/views/business/fieldTest/approve/edit.vue +++ b/src/views/business/fieldTest/approve/edit.vue @@ -71,6 +71,8 @@ equipmentInfoList: [] as any, // 携带仪器设备 remark: '', // 备注 processId: '', // 流程实例id + + rejectRemark: '', // 历次原因 }) // 自定义校验规则--要求预计结束时间大于预计开始时间 @@ -545,6 +547,19 @@ form.value.applyPersonName = user.name // 申请人名字 form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间 }) + +// 监听到驳回原因 +const giveRejectRemark = (reason: string) => { + if (form.value.rejectRemark) { + const lastIndex = form.value.rejectRemark.lastIndexOf(reason) + if (lastIndex === -1) { // 本次原因和上次最后一次原因不同才去拼接 + form.value.rejectRemark = `${form.value.rejectRemark};${reason}` + } + } + else { + form.value.rejectRemark = reason + } +}