diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..cb8a9af --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,24 @@ +// 审批接口 +import request from './index' +const approvalType: { [key: string]: string } = { + agree: '/approval/operate/agree', + refuse: '/approval/operate/refuse', + reject: '/approval/operate/reject', + revoke: '/approval/operate/revoke', +} +// 审批操作接口 +export function submitApproval(type: string, data: { taskId: string; comments: string }) { + return request({ + url: approvalType[type], + method: 'post', + data, + }) +} +// 查询审批记录 +export function fetchApproval(processId: string) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params: { processId }, + }) +} diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..cb8a9af --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,24 @@ +// 审批接口 +import request from './index' +const approvalType: { [key: string]: string } = { + agree: '/approval/operate/agree', + refuse: '/approval/operate/refuse', + reject: '/approval/operate/reject', + revoke: '/approval/operate/revoke', +} +// 审批操作接口 +export function submitApproval(type: string, data: { taskId: string; comments: string }) { + return request({ + url: approvalType[type], + method: 'post', + data, + }) +} +// 查询审批记录 +export function fetchApproval(processId: string) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params: { processId }, + }) +} diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue new file mode 100644 index 0000000..036ebbd --- /dev/null +++ b/src/components/Approval/ApprovalDialog.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..cb8a9af --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,24 @@ +// 审批接口 +import request from './index' +const approvalType: { [key: string]: string } = { + agree: '/approval/operate/agree', + refuse: '/approval/operate/refuse', + reject: '/approval/operate/reject', + revoke: '/approval/operate/revoke', +} +// 审批操作接口 +export function submitApproval(type: string, data: { taskId: string; comments: string }) { + return request({ + url: approvalType[type], + method: 'post', + data, + }) +} +// 查询审批记录 +export function fetchApproval(processId: string) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params: { processId }, + }) +} diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue new file mode 100644 index 0000000..036ebbd --- /dev/null +++ b/src/components/Approval/ApprovalDialog.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts new file mode 100644 index 0000000..21d3721 --- /dev/null +++ b/src/utils/scheduleDict.ts @@ -0,0 +1,20 @@ +/** + * 流程字典， 流程代号：流程id + */ +export enum SCHEDULE { + FILE_APPROVAL = '1', // 文件审批, + TRAIN_APPROVAL = '2', // 培训计划审批 + SUPPLIER_APPROVAL = '3', // 溯源供方审批 + STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请 + STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请 + STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请 + STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请 + STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请 + DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请 + DEVICE_SEALED_APPROVAL = '10', // 设备封存申请 + DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请 + DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请 + DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请 + DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请 + DEVICE_BORROW_APPROVAL = '15', // 设备借用申请 +} diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..cb8a9af --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,24 @@ +// 审批接口 +import request from './index' +const approvalType: { [key: string]: string } = { + agree: '/approval/operate/agree', + refuse: '/approval/operate/refuse', + reject: '/approval/operate/reject', + revoke: '/approval/operate/revoke', +} +// 审批操作接口 +export function submitApproval(type: string, data: { taskId: string; comments: string }) { + return request({ + url: approvalType[type], + method: 'post', + data, + }) +} +// 查询审批记录 +export function fetchApproval(processId: string) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params: { processId }, + }) +} diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue new file mode 100644 index 0000000..036ebbd --- /dev/null +++ b/src/components/Approval/ApprovalDialog.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts new file mode 100644 index 0000000..21d3721 --- /dev/null +++ b/src/utils/scheduleDict.ts @@ -0,0 +1,20 @@ +/** + * 流程字典， 流程代号：流程id + */ +export enum SCHEDULE { + FILE_APPROVAL = '1', // 文件审批, + TRAIN_APPROVAL = '2', // 培训计划审批 + SUPPLIER_APPROVAL = '3', // 溯源供方审批 + STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请 + STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请 + STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请 + STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请 + STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请 + DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请 + DEVICE_SEALED_APPROVAL = '10', // 设备封存申请 + DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请 + DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请 + DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请 + DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请 + DEVICE_BORROW_APPROVAL = '15', // 设备借用申请 +} diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue index 207c39f..1cc883e 100644 --- a/src/views/measure/source/components/listPage.vue +++ b/src/views/measure/source/components/listPage.vue @@ -7,6 +7,8 @@ import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source' import { uploadApi } from '@/api/system/notice' import { exportExcel } from '@/utils/exportXlsx' +import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue' +import { SCHEDULE } from '@/utils/scheduleDict' const props = defineProps({ name: { type: String, @@ -25,7 +27,7 @@ companyArea: '', companyCity: '', companyProvince: '', - formId: '1', + formId: SCHEDULE.SUPPLIER_APPROVAL, supplierName: '', supplierNo: '', offset: 1, @@ -164,6 +166,8 @@ } }) } + +const approvalDialog = ref() // 点击每条数据操作 const handleEdit = (row: rowReturn, pageType: string) => { if (pageType === '编辑' || pageType === '查看') { @@ -171,7 +175,8 @@ $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`) } else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') { - applyShow.value = true + // applyShow.value = true + approvalDialog.value.initDialog('agree', '1') } else { handleDelete(row, pageType) @@ -268,7 +273,10 @@ const exportAll = () => { exportExcelBtn() } - +// 审批结束回调 +const approvalSuccess = () => { + fetchData(true) +} // 审批弹窗关闭 const handleClose = () => { applyShow.value = false @@ -361,5 +369,6 @@ + diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..cb8a9af --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,24 @@ +// 审批接口 +import request from './index' +const approvalType: { [key: string]: string } = { + agree: '/approval/operate/agree', + refuse: '/approval/operate/refuse', + reject: '/approval/operate/reject', + revoke: '/approval/operate/revoke', +} +// 审批操作接口 +export function submitApproval(type: string, data: { taskId: string; comments: string }) { + return request({ + url: approvalType[type], + method: 'post', + data, + }) +} +// 查询审批记录 +export function fetchApproval(processId: string) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params: { processId }, + }) +} diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue new file mode 100644 index 0000000..036ebbd --- /dev/null +++ b/src/components/Approval/ApprovalDialog.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts new file mode 100644 index 0000000..21d3721 --- /dev/null +++ b/src/utils/scheduleDict.ts @@ -0,0 +1,20 @@ +/** + * 流程字典， 流程代号：流程id + */ +export enum SCHEDULE { + FILE_APPROVAL = '1', // 文件审批, + TRAIN_APPROVAL = '2', // 培训计划审批 + SUPPLIER_APPROVAL = '3', // 溯源供方审批 + STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请 + STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请 + STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请 + STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请 + STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请 + DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请 + DEVICE_SEALED_APPROVAL = '10', // 设备封存申请 + DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请 + DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请 + DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请 + DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请 + DEVICE_BORROW_APPROVAL = '15', // 设备借用申请 +} diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue index 207c39f..1cc883e 100644 --- a/src/views/measure/source/components/listPage.vue +++ b/src/views/measure/source/components/listPage.vue @@ -7,6 +7,8 @@ import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source' import { uploadApi } from '@/api/system/notice' import { exportExcel } from '@/utils/exportXlsx' +import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue' +import { SCHEDULE } from '@/utils/scheduleDict' const props = defineProps({ name: { type: String, @@ -25,7 +27,7 @@ companyArea: '', companyCity: '', companyProvince: '', - formId: '1', + formId: SCHEDULE.SUPPLIER_APPROVAL, supplierName: '', supplierNo: '', offset: 1, @@ -164,6 +166,8 @@ } }) } + +const approvalDialog = ref() // 点击每条数据操作 const handleEdit = (row: rowReturn, pageType: string) => { if (pageType === '编辑' || pageType === '查看') { @@ -171,7 +175,8 @@ $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`) } else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') { - applyShow.value = true + // applyShow.value = true + approvalDialog.value.initDialog('agree', '1') } else { handleDelete(row, pageType) @@ -268,7 +273,10 @@ const exportAll = () => { exportExcelBtn() } - +// 审批结束回调 +const approvalSuccess = () => { + fetchData(true) +} // 审批弹窗关闭 const handleClose = () => { applyShow.value = false @@ -361,5 +369,6 @@ + diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue index c510755..93a0a2e 100644 --- a/src/views/system/dict/listDict.vue +++ b/src/views/system/dict/listDict.vue @@ -16,7 +16,7 @@ const defaultQuery = { condition: '', offset: 1, - limit: 10, + limit: 20, sort: '', order: '', } @@ -107,7 +107,7 @@ - +