diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts index 1760871..47874ea 100644 --- a/src/api/resource/reviewNotice.ts +++ b/src/api/resource/reviewNotice.ts @@ -63,15 +63,6 @@ }) } -// 编辑(发送至受检单位人员也调用该接口) -export function updateReviewNotice(data: object) { - return request({ - url: `${prefix}/reviewNotice/update`, - method: 'post', - data, - }) -} - // 删除 - 草稿箱 export function deleteReviewNotice(data: object) { return request({ @@ -98,6 +89,15 @@ }) } +// 发送到受检单位 +export function sendTo(data: object) { + return request({ + url: `${prefix}/reviewNotice/sendTo`, + method: 'post', + data, + }) +} + // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ @@ -107,7 +107,7 @@ }) } -// 委托方名录审批-拒绝 +// 审批-拒绝 export function refuseApproval(data: object) { return request({ url: `${prefix}/reviewNotice/approval/refuse`, diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts index 1760871..47874ea 100644 --- a/src/api/resource/reviewNotice.ts +++ b/src/api/resource/reviewNotice.ts @@ -63,15 +63,6 @@ }) } -// 编辑(发送至受检单位人员也调用该接口) -export function updateReviewNotice(data: object) { - return request({ - url: `${prefix}/reviewNotice/update`, - method: 'post', - data, - }) -} - // 删除 - 草稿箱 export function deleteReviewNotice(data: object) { return request({ @@ -98,6 +89,15 @@ }) } +// 发送到受检单位 +export function sendTo(data: object) { + return request({ + url: `${prefix}/reviewNotice/sendTo`, + method: 'post', + data, + }) +} + // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ @@ -107,7 +107,7 @@ }) } -// 委托方名录审批-拒绝 +// 审批-拒绝 export function refuseApproval(data: object) { return request({ url: `${prefix}/reviewNotice/approval/refuse`, diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index fd1ef36..2aeb65c 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -1106,6 +1106,18 @@ }, }, { + path: 'reviewNotice/approved/:id?', + name: 'NoticeDetailApproved', + component: () => import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), + meta: { + title: '检测结果复查通知详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/customer/reviewNoticeList', + }, + }, + { path: 'situationReportList', name: 'SituationReportList', component: () => import('@/views/resource/customer/situationReport/list.vue'), diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts index 1760871..47874ea 100644 --- a/src/api/resource/reviewNotice.ts +++ b/src/api/resource/reviewNotice.ts @@ -63,15 +63,6 @@ }) } -// 编辑(发送至受检单位人员也调用该接口) -export function updateReviewNotice(data: object) { - return request({ - url: `${prefix}/reviewNotice/update`, - method: 'post', - data, - }) -} - // 删除 - 草稿箱 export function deleteReviewNotice(data: object) { return request({ @@ -98,6 +89,15 @@ }) } +// 发送到受检单位 +export function sendTo(data: object) { + return request({ + url: `${prefix}/reviewNotice/sendTo`, + method: 'post', + data, + }) +} + // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ @@ -107,7 +107,7 @@ }) } -// 委托方名录审批-拒绝 +// 审批-拒绝 export function refuseApproval(data: object) { return request({ url: `${prefix}/reviewNotice/approval/refuse`, diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index fd1ef36..2aeb65c 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -1106,6 +1106,18 @@ }, }, { + path: 'reviewNotice/approved/:id?', + name: 'NoticeDetailApproved', + component: () => import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), + meta: { + title: '检测结果复查通知详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/customer/reviewNoticeList', + }, + }, + { path: 'situationReportList', name: 'SituationReportList', component: () => import('@/views/resource/customer/situationReport/list.vue'), diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue index af37787..69cde3d 100644 --- a/src/views/resource/common/filterCustomerStaff.vue +++ b/src/views/resource/common/filterCustomerStaff.vue @@ -70,7 +70,10 @@ } // 查询委托方名录列表 -const getCustomerList = () => { +const getCustomerList = (customerName = '') => { + if (customerName !== undefined && customerName !== '') { + customerQuery.value.customerName = customerName + } getCustomerInfoList(customerQuery.value).then((res) => { if (res.code === 200) { customerTree.value = res.data.rows @@ -108,7 +111,7 @@ emit('recordSelected', row) } -const showOrHideFilterDialog = (show: boolean) => { +const showOrHideFilterDialog = (show: boolean, customerName = '') => { if (show === false) { customerQuery.value.customerName = '' customerQuery.value.approvalStatus = '0' @@ -118,7 +121,7 @@ sysUserQuery.value.limit = 10 } else { - getCustomerList() + getCustomerList(customerName) } showFilterDialog.value = show diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts index 1760871..47874ea 100644 --- a/src/api/resource/reviewNotice.ts +++ b/src/api/resource/reviewNotice.ts @@ -63,15 +63,6 @@ }) } -// 编辑(发送至受检单位人员也调用该接口) -export function updateReviewNotice(data: object) { - return request({ - url: `${prefix}/reviewNotice/update`, - method: 'post', - data, - }) -} - // 删除 - 草稿箱 export function deleteReviewNotice(data: object) { return request({ @@ -98,6 +89,15 @@ }) } +// 发送到受检单位 +export function sendTo(data: object) { + return request({ + url: `${prefix}/reviewNotice/sendTo`, + method: 'post', + data, + }) +} + // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ @@ -107,7 +107,7 @@ }) } -// 委托方名录审批-拒绝 +// 审批-拒绝 export function refuseApproval(data: object) { return request({ url: `${prefix}/reviewNotice/approval/refuse`, diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index fd1ef36..2aeb65c 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -1106,6 +1106,18 @@ }, }, { + path: 'reviewNotice/approved/:id?', + name: 'NoticeDetailApproved', + component: () => import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), + meta: { + title: '检测结果复查通知详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/customer/reviewNoticeList', + }, + }, + { path: 'situationReportList', name: 'SituationReportList', component: () => import('@/views/resource/customer/situationReport/list.vue'), diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue index af37787..69cde3d 100644 --- a/src/views/resource/common/filterCustomerStaff.vue +++ b/src/views/resource/common/filterCustomerStaff.vue @@ -70,7 +70,10 @@ } // 查询委托方名录列表 -const getCustomerList = () => { +const getCustomerList = (customerName = '') => { + if (customerName !== undefined && customerName !== '') { + customerQuery.value.customerName = customerName + } getCustomerInfoList(customerQuery.value).then((res) => { if (res.code === 200) { customerTree.value = res.data.rows @@ -108,7 +111,7 @@ emit('recordSelected', row) } -const showOrHideFilterDialog = (show: boolean) => { +const showOrHideFilterDialog = (show: boolean, customerName = '') => { if (show === false) { customerQuery.value.customerName = '' customerQuery.value.approvalStatus = '0' @@ -118,7 +121,7 @@ sysUserQuery.value.limit = 10 } else { - getCustomerList() + getCustomerList(customerName) } showFilterDialog.value = show diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue new file mode 100644 index 0000000..1840151 --- /dev/null +++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue @@ -0,0 +1,129 @@ + + + + diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts index 1760871..47874ea 100644 --- a/src/api/resource/reviewNotice.ts +++ b/src/api/resource/reviewNotice.ts @@ -63,15 +63,6 @@ }) } -// 编辑(发送至受检单位人员也调用该接口) -export function updateReviewNotice(data: object) { - return request({ - url: `${prefix}/reviewNotice/update`, - method: 'post', - data, - }) -} - // 删除 - 草稿箱 export function deleteReviewNotice(data: object) { return request({ @@ -98,6 +89,15 @@ }) } +// 发送到受检单位 +export function sendTo(data: object) { + return request({ + url: `${prefix}/reviewNotice/sendTo`, + method: 'post', + data, + }) +} + // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ @@ -107,7 +107,7 @@ }) } -// 委托方名录审批-拒绝 +// 审批-拒绝 export function refuseApproval(data: object) { return request({ url: `${prefix}/reviewNotice/approval/refuse`, diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index fd1ef36..2aeb65c 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -1106,6 +1106,18 @@ }, }, { + path: 'reviewNotice/approved/:id?', + name: 'NoticeDetailApproved', + component: () => import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), + meta: { + title: '检测结果复查通知详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/customer/reviewNoticeList', + }, + }, + { path: 'situationReportList', name: 'SituationReportList', component: () => import('@/views/resource/customer/situationReport/list.vue'), diff --git a/src/views/resource/common/filterCustomerStaff.vue b/src/views/resource/common/filterCustomerStaff.vue index af37787..69cde3d 100644 --- a/src/views/resource/common/filterCustomerStaff.vue +++ b/src/views/resource/common/filterCustomerStaff.vue @@ -70,7 +70,10 @@ } // 查询委托方名录列表 -const getCustomerList = () => { +const getCustomerList = (customerName = '') => { + if (customerName !== undefined && customerName !== '') { + customerQuery.value.customerName = customerName + } getCustomerInfoList(customerQuery.value).then((res) => { if (res.code === 200) { customerTree.value = res.data.rows @@ -108,7 +111,7 @@ emit('recordSelected', row) } -const showOrHideFilterDialog = (show: boolean) => { +const showOrHideFilterDialog = (show: boolean, customerName = '') => { if (show === false) { customerQuery.value.customerName = '' customerQuery.value.approvalStatus = '0' @@ -118,7 +121,7 @@ sysUserQuery.value.limit = 10 } else { - getCustomerList() + getCustomerList(customerName) } showFilterDialog.value = show diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue new file mode 100644 index 0000000..1840151 --- /dev/null +++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue @@ -0,0 +1,129 @@ + + + + diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue index 227e2fa..e566fb0 100644 --- a/src/views/resource/customer/reviewNotice/detail.vue +++ b/src/views/resource/customer/reviewNotice/detail.vue @@ -5,15 +5,15 @@ import ApprovalDialog from '@/views/resource/common/approvalDialog.vue' import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue' import useUserStore from '@/store/modules/user' -import { deleteReviewNotice, deleteReviewNoticeRevoked, detailSampleEqptList, exportFile, failUpdateNotice, refuseApproval, revokeApproval, saveReviewNotice, sumbitNotice, updateDraftNotice, updateReviewNotice } from '@/api/resource/reviewNotice' +import { deleteReviewNotice, deleteReviewNoticeRevoked, detailSampleEqptList, failUpdateNotice, refuseApproval, revokeApproval, saveReviewNotice, sendTo, sumbitNotice, updateDraftNotice } from '@/api/resource/reviewNotice' import type { TableColumn } from '@/components/NormalTable/table_interface' import type { IDictType } from '@/commonInterface/resource-interface' import { SCHEDULE } from '@/utils/scheduleDict' import { getDictByCode } from '@/api/system/dict' import { findDictNameByCode } from '@/commonMethods/useDictCheck' -import FilterSysUser from '@/views/resource/common/filterSysUser.vue' import FilterCustomer from '@/views/resource/common/filterCustomer.vue' import FilterSample from '@/views/resource/common/filterSample.vue' +import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue' // 从路由中传过来的参数 const type = ref('') @@ -41,7 +41,7 @@ // 弹窗子组件 const apprDial = ref() const noticeFormRef = ref() -const refFilterSysUser = ref() +const refCustomerStaffFilter = ref() const refFilterCustomer = ref() const refFilterSample = ref() @@ -386,21 +386,6 @@ }) } -// 打印Word -const printToWord = () => { - // exportFile({ id: noticeInfo.value.id, pdf: false }) -} - -// 打印PDF -const printToPDF = () => { - -} - -// 打印通知 -const printNotice = () => { - -} - const sampleMultiSelect = (e: any) => { sampleSelectedList.value = e } @@ -429,24 +414,21 @@ // 点击 发送 按钮 const sendToCustomer = () => { - refFilterSysUser.value.showOrHideFilterDialog(true) + refCustomerStaffFilter.value.showOrHideFilterDialog(true, noticeInfo.value.customerName) } const sysUserSelectedHandler = (row: any) => { - refFilterSysUser.value.showOrHideFilterDialog(false) + refCustomerStaffFilter.value.showOrHideFilterDialog(false) if (row.id !== '') { - noticeInfo.value.noticeUserId = row.id - noticeInfo.value.noticeUserName = row.name - - updateReviewNotice(noticeInfo.value).then((res) => { + sendTo({ id: noticeInfo.value.id, noticeUserId: row.id }).then((res) => { if (res.code === 200) { // 提示保存成功 - ElMessage.success(`发送到 ${noticeInfo.value.customerName} 的 ${noticeInfo.value.noticeUserName} 成功`) + ElMessage.success(`发送到送检单位 ${noticeInfo.value.customerName} 的 ${row.name} 成功`) } else { // 提示失败信息 - ElMessage.error(`通知单发送至受检单位失败:${res.message}`) + ElMessage.error(`通知单发送至送检单位失败:${res.message}`) } }) } @@ -641,19 +623,10 @@