diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts new file mode 100644 index 0000000..d5bb694 --- /dev/null +++ b/src/api/eqpt/subpackage/review.ts @@ -0,0 +1,83 @@ +/** + * 分包评审表管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontract/review/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontract/review/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontract/review/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontract/review/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontract/review/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editReview(data: object) { + return request({ + url: '/subcontract/review/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitReview(data: object) { + return request({ + url: '/subcontract/review/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteReview(data: object) { + return request({ + url: `/subcontract/review/approval/delete?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelReview(data: object) { + return request({ + url: '/subcontract/review/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontract/review/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts new file mode 100644 index 0000000..d5bb694 --- /dev/null +++ b/src/api/eqpt/subpackage/review.ts @@ -0,0 +1,83 @@ +/** + * 分包评审表管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontract/review/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontract/review/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontract/review/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontract/review/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontract/review/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editReview(data: object) { + return request({ + url: '/subcontract/review/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitReview(data: object) { + return request({ + url: '/subcontract/review/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteReview(data: object) { + return request({ + url: `/subcontract/review/approval/delete?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelReview(data: object) { + return request({ + url: '/subcontract/review/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontract/review/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 1b8de9c..bf750fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -998,7 +998,19 @@ auth: '/tested/subpackage/review', sidebar: false, breadcrumb: false, - activeMenu: '/reviewpage', + activeMenu: '/reviewlist', + }, + }, + { + path: '/reviewpage/:type', + name: 'ReviewPageEdit', + component: () => import('@/views/tested/subpackage/review/components/edit.vue'), + meta: { + title: '测试、校准或检定工作分包评审表', + auth: '/tested/subpackage/review', + sidebar: false, + breadcrumb: false, + activeMenu: '/reviewlist', }, }, ], diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts new file mode 100644 index 0000000..d5bb694 --- /dev/null +++ b/src/api/eqpt/subpackage/review.ts @@ -0,0 +1,83 @@ +/** + * 分包评审表管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontract/review/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontract/review/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontract/review/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontract/review/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontract/review/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editReview(data: object) { + return request({ + url: '/subcontract/review/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitReview(data: object) { + return request({ + url: '/subcontract/review/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteReview(data: object) { + return request({ + url: `/subcontract/review/approval/delete?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelReview(data: object) { + return request({ + url: '/subcontract/review/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontract/review/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 1b8de9c..bf750fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -998,7 +998,19 @@ auth: '/tested/subpackage/review', sidebar: false, breadcrumb: false, - activeMenu: '/reviewpage', + activeMenu: '/reviewlist', + }, + }, + { + path: '/reviewpage/:type', + name: 'ReviewPageEdit', + component: () => import('@/views/tested/subpackage/review/components/edit.vue'), + meta: { + title: '测试、校准或检定工作分包评审表', + auth: '/tested/subpackage/review', + sidebar: false, + breadcrumb: false, + activeMenu: '/reviewlist', }, }, ], diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue new file mode 100644 index 0000000..66c85b1 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/certificateTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts new file mode 100644 index 0000000..d5bb694 --- /dev/null +++ b/src/api/eqpt/subpackage/review.ts @@ -0,0 +1,83 @@ +/** + * 分包评审表管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontract/review/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontract/review/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontract/review/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontract/review/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontract/review/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editReview(data: object) { + return request({ + url: '/subcontract/review/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitReview(data: object) { + return request({ + url: '/subcontract/review/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteReview(data: object) { + return request({ + url: `/subcontract/review/approval/delete?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelReview(data: object) { + return request({ + url: '/subcontract/review/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontract/review/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 1b8de9c..bf750fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -998,7 +998,19 @@ auth: '/tested/subpackage/review', sidebar: false, breadcrumb: false, - activeMenu: '/reviewpage', + activeMenu: '/reviewlist', + }, + }, + { + path: '/reviewpage/:type', + name: 'ReviewPageEdit', + component: () => import('@/views/tested/subpackage/review/components/edit.vue'), + meta: { + title: '测试、校准或检定工作分包评审表', + auth: '/tested/subpackage/review', + sidebar: false, + breadcrumb: false, + activeMenu: '/reviewlist', }, }, ], diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue new file mode 100644 index 0000000..66c85b1 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/certificateTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index 45752c6..418818f 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -9,6 +9,7 @@ import { routeLocationKey } from 'vue-router' import personTable from './personTable.vue' import capacityTable from './capacityTable.vue' +import certificateTable from './certificateTable.vue' import ApprovalDialog from './ApprovalDialog.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { editBtn, submitBtn } from '@/utils/applyBtns' @@ -78,6 +79,9 @@ // 能力列表 const capacityList = ref() const capacityRef = ref() +// 证书列表 +const certificateRef = ref() +const certificateList = ref() const radio = ref('基本信息') // 表单1验证规则 const rules = ref({ @@ -139,6 +143,7 @@ ruleForm.value = data.subcontractor personList.value = data.staffList capacityList.value = data.abilityList + certificateList.value = data.certificateList }) } if ($route.path.includes('create') || $route.path.includes('update')) { @@ -232,7 +237,7 @@ // 删除 const delForm = () => { ElMessageBox.confirm( - '确认删除设备信息吗?', + '确认删除吗?', '确认', { confirmButtonText: '确认', @@ -240,10 +245,10 @@ type: 'warning', }, ).then(() => { - // deleteInfo({ id: ruleForm.value.id }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + deleteDirectory({ id: ruleForm.value.id }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 取消 @@ -257,10 +262,10 @@ type: 'warning', }, ).then(() => { - // cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + cancelDirectory({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 审批 @@ -282,8 +287,6 @@ uploadApi(fd).then((res) => { if (res.code === 200) { ruleForm.value.attachments = res.data[0] - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') ElMessage.success('文件上传成功') loading.close() } @@ -308,12 +311,12 @@ diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts new file mode 100644 index 0000000..d5bb694 --- /dev/null +++ b/src/api/eqpt/subpackage/review.ts @@ -0,0 +1,83 @@ +/** + * 分包评审表管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontract/review/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontract/review/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontract/review/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontract/review/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontract/review/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editReview(data: object) { + return request({ + url: '/subcontract/review/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitReview(data: object) { + return request({ + url: '/subcontract/review/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteReview(data: object) { + return request({ + url: `/subcontract/review/approval/delete?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelReview(data: object) { + return request({ + url: '/subcontract/review/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontract/review/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 1b8de9c..bf750fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -998,7 +998,19 @@ auth: '/tested/subpackage/review', sidebar: false, breadcrumb: false, - activeMenu: '/reviewpage', + activeMenu: '/reviewlist', + }, + }, + { + path: '/reviewpage/:type', + name: 'ReviewPageEdit', + component: () => import('@/views/tested/subpackage/review/components/edit.vue'), + meta: { + title: '测试、校准或检定工作分包评审表', + auth: '/tested/subpackage/review', + sidebar: false, + breadcrumb: false, + activeMenu: '/reviewlist', }, }, ], diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue new file mode 100644 index 0000000..66c85b1 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/certificateTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index 45752c6..418818f 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -9,6 +9,7 @@ import { routeLocationKey } from 'vue-router' import personTable from './personTable.vue' import capacityTable from './capacityTable.vue' +import certificateTable from './certificateTable.vue' import ApprovalDialog from './ApprovalDialog.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { editBtn, submitBtn } from '@/utils/applyBtns' @@ -78,6 +79,9 @@ // 能力列表 const capacityList = ref() const capacityRef = ref() +// 证书列表 +const certificateRef = ref() +const certificateList = ref() const radio = ref('基本信息') // 表单1验证规则 const rules = ref({ @@ -139,6 +143,7 @@ ruleForm.value = data.subcontractor personList.value = data.staffList capacityList.value = data.abilityList + certificateList.value = data.certificateList }) } if ($route.path.includes('create') || $route.path.includes('update')) { @@ -232,7 +237,7 @@ // 删除 const delForm = () => { ElMessageBox.confirm( - '确认删除设备信息吗?', + '确认删除吗?', '确认', { confirmButtonText: '确认', @@ -240,10 +245,10 @@ type: 'warning', }, ).then(() => { - // deleteInfo({ id: ruleForm.value.id }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + deleteDirectory({ id: ruleForm.value.id }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 取消 @@ -257,10 +262,10 @@ type: 'warning', }, ).then(() => { - // cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + cancelDirectory({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 审批 @@ -282,8 +287,6 @@ uploadApi(fd).then((res) => { if (res.code === 200) { ruleForm.value.attachments = res.data[0] - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') ElMessage.success('文件上传成功') loading.close() } @@ -308,12 +311,12 @@ diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue index 98716af..2bae678 100644 --- a/src/views/tested/subpackage/directory/components/list.vue +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -2,8 +2,7 @@ + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index 45752c6..418818f 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -9,6 +9,7 @@ import { routeLocationKey } from 'vue-router' import personTable from './personTable.vue' import capacityTable from './capacityTable.vue' +import certificateTable from './certificateTable.vue' import ApprovalDialog from './ApprovalDialog.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { editBtn, submitBtn } from '@/utils/applyBtns' @@ -78,6 +79,9 @@ // 能力列表 const capacityList = ref() const capacityRef = ref() +// 证书列表 +const certificateRef = ref() +const certificateList = ref() const radio = ref('基本信息') // 表单1验证规则 const rules = ref({ @@ -139,6 +143,7 @@ ruleForm.value = data.subcontractor personList.value = data.staffList capacityList.value = data.abilityList + certificateList.value = data.certificateList }) } if ($route.path.includes('create') || $route.path.includes('update')) { @@ -232,7 +237,7 @@ // 删除 const delForm = () => { ElMessageBox.confirm( - '确认删除设备信息吗?', + '确认删除吗?', '确认', { confirmButtonText: '确认', @@ -240,10 +245,10 @@ type: 'warning', }, ).then(() => { - // deleteInfo({ id: ruleForm.value.id }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + deleteDirectory({ id: ruleForm.value.id }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 取消 @@ -257,10 +262,10 @@ type: 'warning', }, ).then(() => { - // cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + cancelDirectory({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 审批 @@ -282,8 +287,6 @@ uploadApi(fd).then((res) => { if (res.code === 200) { ruleForm.value.attachments = res.data[0] - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') ElMessage.success('文件上传成功') loading.close() } @@ -308,12 +311,12 @@ diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue index 98716af..2bae678 100644 --- a/src/views/tested/subpackage/directory/components/list.vue +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -2,8 +2,7 @@ + + + + diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts new file mode 100644 index 0000000..d5bb694 --- /dev/null +++ b/src/api/eqpt/subpackage/review.ts @@ -0,0 +1,83 @@ +/** + * 分包评审表管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontract/review/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontract/review/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontract/review/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontract/review/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontract/review/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editReview(data: object) { + return request({ + url: '/subcontract/review/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitReview(data: object) { + return request({ + url: '/subcontract/review/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteReview(data: object) { + return request({ + url: `/subcontract/review/approval/delete?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelReview(data: object) { + return request({ + url: '/subcontract/review/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontract/review/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 1b8de9c..bf750fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -998,7 +998,19 @@ auth: '/tested/subpackage/review', sidebar: false, breadcrumb: false, - activeMenu: '/reviewpage', + activeMenu: '/reviewlist', + }, + }, + { + path: '/reviewpage/:type', + name: 'ReviewPageEdit', + component: () => import('@/views/tested/subpackage/review/components/edit.vue'), + meta: { + title: '测试、校准或检定工作分包评审表', + auth: '/tested/subpackage/review', + sidebar: false, + breadcrumb: false, + activeMenu: '/reviewlist', }, }, ], diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue new file mode 100644 index 0000000..66c85b1 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/certificateTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index 45752c6..418818f 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -9,6 +9,7 @@ import { routeLocationKey } from 'vue-router' import personTable from './personTable.vue' import capacityTable from './capacityTable.vue' +import certificateTable from './certificateTable.vue' import ApprovalDialog from './ApprovalDialog.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { editBtn, submitBtn } from '@/utils/applyBtns' @@ -78,6 +79,9 @@ // 能力列表 const capacityList = ref() const capacityRef = ref() +// 证书列表 +const certificateRef = ref() +const certificateList = ref() const radio = ref('基本信息') // 表单1验证规则 const rules = ref({ @@ -139,6 +143,7 @@ ruleForm.value = data.subcontractor personList.value = data.staffList capacityList.value = data.abilityList + certificateList.value = data.certificateList }) } if ($route.path.includes('create') || $route.path.includes('update')) { @@ -232,7 +237,7 @@ // 删除 const delForm = () => { ElMessageBox.confirm( - '确认删除设备信息吗?', + '确认删除吗?', '确认', { confirmButtonText: '确认', @@ -240,10 +245,10 @@ type: 'warning', }, ).then(() => { - // deleteInfo({ id: ruleForm.value.id }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + deleteDirectory({ id: ruleForm.value.id }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 取消 @@ -257,10 +262,10 @@ type: 'warning', }, ).then(() => { - // cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + cancelDirectory({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 审批 @@ -282,8 +287,6 @@ uploadApi(fd).then((res) => { if (res.code === 200) { ruleForm.value.attachments = res.data[0] - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') ElMessage.success('文件上传成功') loading.close() } @@ -308,12 +311,12 @@ diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue index 98716af..2bae678 100644 --- a/src/views/tested/subpackage/directory/components/list.vue +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -2,8 +2,7 @@ + + + + diff --git a/src/views/tested/subpackage/review/components/deviceTable.vue b/src/views/tested/subpackage/review/components/deviceTable.vue new file mode 100644 index 0000000..5065b78 --- /dev/null +++ b/src/views/tested/subpackage/review/components/deviceTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts new file mode 100644 index 0000000..d5bb694 --- /dev/null +++ b/src/api/eqpt/subpackage/review.ts @@ -0,0 +1,83 @@ +/** + * 分包评审表管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontract/review/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontract/review/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontract/review/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontract/review/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontract/review/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editReview(data: object) { + return request({ + url: '/subcontract/review/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitReview(data: object) { + return request({ + url: '/subcontract/review/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteReview(data: object) { + return request({ + url: `/subcontract/review/approval/delete?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelReview(data: object) { + return request({ + url: '/subcontract/review/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontract/review/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 1b8de9c..bf750fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -998,7 +998,19 @@ auth: '/tested/subpackage/review', sidebar: false, breadcrumb: false, - activeMenu: '/reviewpage', + activeMenu: '/reviewlist', + }, + }, + { + path: '/reviewpage/:type', + name: 'ReviewPageEdit', + component: () => import('@/views/tested/subpackage/review/components/edit.vue'), + meta: { + title: '测试、校准或检定工作分包评审表', + auth: '/tested/subpackage/review', + sidebar: false, + breadcrumb: false, + activeMenu: '/reviewlist', }, }, ], diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue new file mode 100644 index 0000000..66c85b1 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/certificateTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index 45752c6..418818f 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -9,6 +9,7 @@ import { routeLocationKey } from 'vue-router' import personTable from './personTable.vue' import capacityTable from './capacityTable.vue' +import certificateTable from './certificateTable.vue' import ApprovalDialog from './ApprovalDialog.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { editBtn, submitBtn } from '@/utils/applyBtns' @@ -78,6 +79,9 @@ // 能力列表 const capacityList = ref() const capacityRef = ref() +// 证书列表 +const certificateRef = ref() +const certificateList = ref() const radio = ref('基本信息') // 表单1验证规则 const rules = ref({ @@ -139,6 +143,7 @@ ruleForm.value = data.subcontractor personList.value = data.staffList capacityList.value = data.abilityList + certificateList.value = data.certificateList }) } if ($route.path.includes('create') || $route.path.includes('update')) { @@ -232,7 +237,7 @@ // 删除 const delForm = () => { ElMessageBox.confirm( - '确认删除设备信息吗?', + '确认删除吗?', '确认', { confirmButtonText: '确认', @@ -240,10 +245,10 @@ type: 'warning', }, ).then(() => { - // deleteInfo({ id: ruleForm.value.id }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + deleteDirectory({ id: ruleForm.value.id }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 取消 @@ -257,10 +262,10 @@ type: 'warning', }, ).then(() => { - // cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + cancelDirectory({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 审批 @@ -282,8 +287,6 @@ uploadApi(fd).then((res) => { if (res.code === 200) { ruleForm.value.attachments = res.data[0] - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') ElMessage.success('文件上传成功') loading.close() } @@ -308,12 +311,12 @@ diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue index 98716af..2bae678 100644 --- a/src/views/tested/subpackage/directory/components/list.vue +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -2,8 +2,7 @@ + + + + diff --git a/src/views/tested/subpackage/review/components/deviceTable.vue b/src/views/tested/subpackage/review/components/deviceTable.vue new file mode 100644 index 0000000..5065b78 --- /dev/null +++ b/src/views/tested/subpackage/review/components/deviceTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue new file mode 100644 index 0000000..65e8fce --- /dev/null +++ b/src/views/tested/subpackage/review/components/edit.vue @@ -0,0 +1,479 @@ + + + + + + diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts new file mode 100644 index 0000000..d5bb694 --- /dev/null +++ b/src/api/eqpt/subpackage/review.ts @@ -0,0 +1,83 @@ +/** + * 分包评审表管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontract/review/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontract/review/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontract/review/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontract/review/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontract/review/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editReview(data: object) { + return request({ + url: '/subcontract/review/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitReview(data: object) { + return request({ + url: '/subcontract/review/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteReview(data: object) { + return request({ + url: `/subcontract/review/approval/delete?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelReview(data: object) { + return request({ + url: '/subcontract/review/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontract/review/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 1b8de9c..bf750fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -998,7 +998,19 @@ auth: '/tested/subpackage/review', sidebar: false, breadcrumb: false, - activeMenu: '/reviewpage', + activeMenu: '/reviewlist', + }, + }, + { + path: '/reviewpage/:type', + name: 'ReviewPageEdit', + component: () => import('@/views/tested/subpackage/review/components/edit.vue'), + meta: { + title: '测试、校准或检定工作分包评审表', + auth: '/tested/subpackage/review', + sidebar: false, + breadcrumb: false, + activeMenu: '/reviewlist', }, }, ], diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue new file mode 100644 index 0000000..66c85b1 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/certificateTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index 45752c6..418818f 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -9,6 +9,7 @@ import { routeLocationKey } from 'vue-router' import personTable from './personTable.vue' import capacityTable from './capacityTable.vue' +import certificateTable from './certificateTable.vue' import ApprovalDialog from './ApprovalDialog.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { editBtn, submitBtn } from '@/utils/applyBtns' @@ -78,6 +79,9 @@ // 能力列表 const capacityList = ref() const capacityRef = ref() +// 证书列表 +const certificateRef = ref() +const certificateList = ref() const radio = ref('基本信息') // 表单1验证规则 const rules = ref({ @@ -139,6 +143,7 @@ ruleForm.value = data.subcontractor personList.value = data.staffList capacityList.value = data.abilityList + certificateList.value = data.certificateList }) } if ($route.path.includes('create') || $route.path.includes('update')) { @@ -232,7 +237,7 @@ // 删除 const delForm = () => { ElMessageBox.confirm( - '确认删除设备信息吗?', + '确认删除吗?', '确认', { confirmButtonText: '确认', @@ -240,10 +245,10 @@ type: 'warning', }, ).then(() => { - // deleteInfo({ id: ruleForm.value.id }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + deleteDirectory({ id: ruleForm.value.id }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 取消 @@ -257,10 +262,10 @@ type: 'warning', }, ).then(() => { - // cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + cancelDirectory({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 审批 @@ -282,8 +287,6 @@ uploadApi(fd).then((res) => { if (res.code === 200) { ruleForm.value.attachments = res.data[0] - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') ElMessage.success('文件上传成功') loading.close() } @@ -308,12 +311,12 @@ diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue index 98716af..2bae678 100644 --- a/src/views/tested/subpackage/directory/components/list.vue +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -2,8 +2,7 @@ + + + + diff --git a/src/views/tested/subpackage/review/components/deviceTable.vue b/src/views/tested/subpackage/review/components/deviceTable.vue new file mode 100644 index 0000000..5065b78 --- /dev/null +++ b/src/views/tested/subpackage/review/components/deviceTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue new file mode 100644 index 0000000..65e8fce --- /dev/null +++ b/src/views/tested/subpackage/review/components/edit.vue @@ -0,0 +1,479 @@ + + + + + + diff --git a/src/views/tested/subpackage/review/components/list.vue b/src/views/tested/subpackage/review/components/list.vue new file mode 100644 index 0000000..1d84c6e --- /dev/null +++ b/src/views/tested/subpackage/review/components/list.vue @@ -0,0 +1,315 @@ + + + + + + + diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts new file mode 100644 index 0000000..d5bb694 --- /dev/null +++ b/src/api/eqpt/subpackage/review.ts @@ -0,0 +1,83 @@ +/** + * 分包评审表管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontract/review/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontract/review/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontract/review/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontract/review/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontract/review/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editReview(data: object) { + return request({ + url: '/subcontract/review/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitReview(data: object) { + return request({ + url: '/subcontract/review/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteReview(data: object) { + return request({ + url: `/subcontract/review/approval/delete?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelReview(data: object) { + return request({ + url: '/subcontract/review/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontract/review/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 1b8de9c..bf750fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -998,7 +998,19 @@ auth: '/tested/subpackage/review', sidebar: false, breadcrumb: false, - activeMenu: '/reviewpage', + activeMenu: '/reviewlist', + }, + }, + { + path: '/reviewpage/:type', + name: 'ReviewPageEdit', + component: () => import('@/views/tested/subpackage/review/components/edit.vue'), + meta: { + title: '测试、校准或检定工作分包评审表', + auth: '/tested/subpackage/review', + sidebar: false, + breadcrumb: false, + activeMenu: '/reviewlist', }, }, ], diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue new file mode 100644 index 0000000..66c85b1 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/certificateTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index 45752c6..418818f 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -9,6 +9,7 @@ import { routeLocationKey } from 'vue-router' import personTable from './personTable.vue' import capacityTable from './capacityTable.vue' +import certificateTable from './certificateTable.vue' import ApprovalDialog from './ApprovalDialog.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { editBtn, submitBtn } from '@/utils/applyBtns' @@ -78,6 +79,9 @@ // 能力列表 const capacityList = ref() const capacityRef = ref() +// 证书列表 +const certificateRef = ref() +const certificateList = ref() const radio = ref('基本信息') // 表单1验证规则 const rules = ref({ @@ -139,6 +143,7 @@ ruleForm.value = data.subcontractor personList.value = data.staffList capacityList.value = data.abilityList + certificateList.value = data.certificateList }) } if ($route.path.includes('create') || $route.path.includes('update')) { @@ -232,7 +237,7 @@ // 删除 const delForm = () => { ElMessageBox.confirm( - '确认删除设备信息吗?', + '确认删除吗?', '确认', { confirmButtonText: '确认', @@ -240,10 +245,10 @@ type: 'warning', }, ).then(() => { - // deleteInfo({ id: ruleForm.value.id }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + deleteDirectory({ id: ruleForm.value.id }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 取消 @@ -257,10 +262,10 @@ type: 'warning', }, ).then(() => { - // cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + cancelDirectory({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 审批 @@ -282,8 +287,6 @@ uploadApi(fd).then((res) => { if (res.code === 200) { ruleForm.value.attachments = res.data[0] - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') ElMessage.success('文件上传成功') loading.close() } @@ -308,12 +311,12 @@ diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue index 98716af..2bae678 100644 --- a/src/views/tested/subpackage/directory/components/list.vue +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -2,8 +2,7 @@ + + + + diff --git a/src/views/tested/subpackage/review/components/deviceTable.vue b/src/views/tested/subpackage/review/components/deviceTable.vue new file mode 100644 index 0000000..5065b78 --- /dev/null +++ b/src/views/tested/subpackage/review/components/deviceTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue new file mode 100644 index 0000000..65e8fce --- /dev/null +++ b/src/views/tested/subpackage/review/components/edit.vue @@ -0,0 +1,479 @@ + + + + + + diff --git a/src/views/tested/subpackage/review/components/list.vue b/src/views/tested/subpackage/review/components/list.vue new file mode 100644 index 0000000..1d84c6e --- /dev/null +++ b/src/views/tested/subpackage/review/components/list.vue @@ -0,0 +1,315 @@ + + + + + + + diff --git a/src/views/tested/subpackage/review/components/subpackageDialog.vue b/src/views/tested/subpackage/review/components/subpackageDialog.vue new file mode 100644 index 0000000..c824f9b --- /dev/null +++ b/src/views/tested/subpackage/review/components/subpackageDialog.vue @@ -0,0 +1,190 @@ + + + + + + diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts new file mode 100644 index 0000000..d5bb694 --- /dev/null +++ b/src/api/eqpt/subpackage/review.ts @@ -0,0 +1,83 @@ +/** + * 分包评审表管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontract/review/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontract/review/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontract/review/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontract/review/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontract/review/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editReview(data: object) { + return request({ + url: '/subcontract/review/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitReview(data: object) { + return request({ + url: '/subcontract/review/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteReview(data: object) { + return request({ + url: `/subcontract/review/approval/delete?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelReview(data: object) { + return request({ + url: '/subcontract/review/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontract/review/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 1b8de9c..bf750fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -998,7 +998,19 @@ auth: '/tested/subpackage/review', sidebar: false, breadcrumb: false, - activeMenu: '/reviewpage', + activeMenu: '/reviewlist', + }, + }, + { + path: '/reviewpage/:type', + name: 'ReviewPageEdit', + component: () => import('@/views/tested/subpackage/review/components/edit.vue'), + meta: { + title: '测试、校准或检定工作分包评审表', + auth: '/tested/subpackage/review', + sidebar: false, + breadcrumb: false, + activeMenu: '/reviewlist', }, }, ], diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue new file mode 100644 index 0000000..66c85b1 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/certificateTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index 45752c6..418818f 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -9,6 +9,7 @@ import { routeLocationKey } from 'vue-router' import personTable from './personTable.vue' import capacityTable from './capacityTable.vue' +import certificateTable from './certificateTable.vue' import ApprovalDialog from './ApprovalDialog.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { editBtn, submitBtn } from '@/utils/applyBtns' @@ -78,6 +79,9 @@ // 能力列表 const capacityList = ref() const capacityRef = ref() +// 证书列表 +const certificateRef = ref() +const certificateList = ref() const radio = ref('基本信息') // 表单1验证规则 const rules = ref({ @@ -139,6 +143,7 @@ ruleForm.value = data.subcontractor personList.value = data.staffList capacityList.value = data.abilityList + certificateList.value = data.certificateList }) } if ($route.path.includes('create') || $route.path.includes('update')) { @@ -232,7 +237,7 @@ // 删除 const delForm = () => { ElMessageBox.confirm( - '确认删除设备信息吗?', + '确认删除吗?', '确认', { confirmButtonText: '确认', @@ -240,10 +245,10 @@ type: 'warning', }, ).then(() => { - // deleteInfo({ id: ruleForm.value.id }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + deleteDirectory({ id: ruleForm.value.id }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 取消 @@ -257,10 +262,10 @@ type: 'warning', }, ).then(() => { - // cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { - // ElMessage.success('操作成功') - // close() - // }) + cancelDirectory({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => { + ElMessage.success('操作成功') + close() + }) }) } // 审批 @@ -282,8 +287,6 @@ uploadApi(fd).then((res) => { if (res.code === 200) { ruleForm.value.attachments = res.data[0] - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') ElMessage.success('文件上传成功') loading.close() } @@ -308,12 +311,12 @@ diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue index 98716af..2bae678 100644 --- a/src/views/tested/subpackage/directory/components/list.vue +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -2,8 +2,7 @@ + + + + diff --git a/src/views/tested/subpackage/review/components/deviceTable.vue b/src/views/tested/subpackage/review/components/deviceTable.vue new file mode 100644 index 0000000..5065b78 --- /dev/null +++ b/src/views/tested/subpackage/review/components/deviceTable.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue new file mode 100644 index 0000000..65e8fce --- /dev/null +++ b/src/views/tested/subpackage/review/components/edit.vue @@ -0,0 +1,479 @@ + + + + + + diff --git a/src/views/tested/subpackage/review/components/list.vue b/src/views/tested/subpackage/review/components/list.vue new file mode 100644 index 0000000..1d84c6e --- /dev/null +++ b/src/views/tested/subpackage/review/components/list.vue @@ -0,0 +1,315 @@ + + + + + + + diff --git a/src/views/tested/subpackage/review/components/subpackageDialog.vue b/src/views/tested/subpackage/review/components/subpackageDialog.vue new file mode 100644 index 0000000..c824f9b --- /dev/null +++ b/src/views/tested/subpackage/review/components/subpackageDialog.vue @@ -0,0 +1,190 @@ + + + + + + diff --git a/src/views/tested/subpackage/review/index.vue b/src/views/tested/subpackage/review/index.vue index 4de19e6..68cc0a4 100644 --- a/src/views/tested/subpackage/review/index.vue +++ b/src/views/tested/subpackage/review/index.vue @@ -1,3 +1,79 @@ + + + + + +