diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 63f09d2..710b10b 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -109,6 +109,16 @@ }) } +// 导出到期提醒 +export function exportRemindList(data: object) { + return request({ + url: '/meter/standard/exportRemindList', + method: 'post', + responseType: 'blob', + data, + }) +} + // 点击提醒 export function setRemind(data: object) { return request({ diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 63f09d2..710b10b 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -109,6 +109,16 @@ }) } +// 导出到期提醒 +export function exportRemindList(data: object) { + return request({ + url: '/meter/standard/exportRemindList', + method: 'post', + responseType: 'blob', + data, + }) +} + // 点击提醒 export function setRemind(data: object) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index db0b317..6d00a4f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -61,6 +61,26 @@ activeMenu: '/board/overdueReminderList', }, }, + { + path: 'equipmentReminderList', + name: 'EquipmentReminderList', + component: () => import('@/views/business/board/equipmentReminder/list.vue'), + meta: { + title: '设备到期提醒', + icon: 'ep:key', + auth: '/business/board/equipmentExpirationReminder', + }, + }, + { + path: 'standardReminderList', + name: 'StandardReminderList', + component: () => import('@/views/business/board/standardReminder/list.vue'), + meta: { + title: '装置到期提醒', + icon: 'ep:key', + auth: '/business/board/expirationReminder', + }, + }, ], }, { diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 63f09d2..710b10b 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -109,6 +109,16 @@ }) } +// 导出到期提醒 +export function exportRemindList(data: object) { + return request({ + url: '/meter/standard/exportRemindList', + method: 'post', + responseType: 'blob', + data, + }) +} + // 点击提醒 export function setRemind(data: object) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index db0b317..6d00a4f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -61,6 +61,26 @@ activeMenu: '/board/overdueReminderList', }, }, + { + path: 'equipmentReminderList', + name: 'EquipmentReminderList', + component: () => import('@/views/business/board/equipmentReminder/list.vue'), + meta: { + title: '设备到期提醒', + icon: 'ep:key', + auth: '/business/board/equipmentExpirationReminder', + }, + }, + { + path: 'standardReminderList', + name: 'StandardReminderList', + component: () => import('@/views/business/board/standardReminder/list.vue'), + meta: { + title: '装置到期提醒', + icon: 'ep:key', + auth: '/business/board/expirationReminder', + }, + }, ], }, { diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/views/business/board/equipmentReminder/detail.vue diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 63f09d2..710b10b 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -109,6 +109,16 @@ }) } +// 导出到期提醒 +export function exportRemindList(data: object) { + return request({ + url: '/meter/standard/exportRemindList', + method: 'post', + responseType: 'blob', + data, + }) +} + // 点击提醒 export function setRemind(data: object) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index db0b317..6d00a4f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -61,6 +61,26 @@ activeMenu: '/board/overdueReminderList', }, }, + { + path: 'equipmentReminderList', + name: 'EquipmentReminderList', + component: () => import('@/views/business/board/equipmentReminder/list.vue'), + meta: { + title: '设备到期提醒', + icon: 'ep:key', + auth: '/business/board/equipmentExpirationReminder', + }, + }, + { + path: 'standardReminderList', + name: 'StandardReminderList', + component: () => import('@/views/business/board/standardReminder/list.vue'), + meta: { + title: '装置到期提醒', + icon: 'ep:key', + auth: '/business/board/expirationReminder', + }, + }, ], }, { diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/views/business/board/equipmentReminder/detail.vue diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue new file mode 100644 index 0000000..ec6a9b7 --- /dev/null +++ b/src/views/business/board/equipmentReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 设备到期提醒 + + + + diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 63f09d2..710b10b 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -109,6 +109,16 @@ }) } +// 导出到期提醒 +export function exportRemindList(data: object) { + return request({ + url: '/meter/standard/exportRemindList', + method: 'post', + responseType: 'blob', + data, + }) +} + // 点击提醒 export function setRemind(data: object) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index db0b317..6d00a4f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -61,6 +61,26 @@ activeMenu: '/board/overdueReminderList', }, }, + { + path: 'equipmentReminderList', + name: 'EquipmentReminderList', + component: () => import('@/views/business/board/equipmentReminder/list.vue'), + meta: { + title: '设备到期提醒', + icon: 'ep:key', + auth: '/business/board/equipmentExpirationReminder', + }, + }, + { + path: 'standardReminderList', + name: 'StandardReminderList', + component: () => import('@/views/business/board/standardReminder/list.vue'), + meta: { + title: '装置到期提醒', + icon: 'ep:key', + auth: '/business/board/expirationReminder', + }, + }, ], }, { diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/views/business/board/equipmentReminder/detail.vue diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue new file mode 100644 index 0000000..ec6a9b7 --- /dev/null +++ b/src/views/business/board/equipmentReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 设备到期提醒 + + + + diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue new file mode 100644 index 0000000..200d601 --- /dev/null +++ b/src/views/business/board/standardReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 装置到期提醒 + + + + diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 63f09d2..710b10b 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -109,6 +109,16 @@ }) } +// 导出到期提醒 +export function exportRemindList(data: object) { + return request({ + url: '/meter/standard/exportRemindList', + method: 'post', + responseType: 'blob', + data, + }) +} + // 点击提醒 export function setRemind(data: object) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index db0b317..6d00a4f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -61,6 +61,26 @@ activeMenu: '/board/overdueReminderList', }, }, + { + path: 'equipmentReminderList', + name: 'EquipmentReminderList', + component: () => import('@/views/business/board/equipmentReminder/list.vue'), + meta: { + title: '设备到期提醒', + icon: 'ep:key', + auth: '/business/board/equipmentExpirationReminder', + }, + }, + { + path: 'standardReminderList', + name: 'StandardReminderList', + component: () => import('@/views/business/board/standardReminder/list.vue'), + meta: { + title: '装置到期提醒', + icon: 'ep:key', + auth: '/business/board/expirationReminder', + }, + }, ], }, { diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/views/business/board/equipmentReminder/detail.vue diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue new file mode 100644 index 0000000..ec6a9b7 --- /dev/null +++ b/src/views/business/board/equipmentReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 设备到期提醒 + + + + diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue new file mode 100644 index 0000000..200d601 --- /dev/null +++ b/src/views/business/board/standardReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 装置到期提醒 + + + + diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index c81ef0b..20f5e31 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -303,41 +303,41 @@ } // 取消 -const handleCancel = () => { - const params = { - taskId: fromListInfo.value.taskId!, - comments: '', - } - ElMessageBox.confirm('确认取消该审批吗?', '提示', { - confirmButtonText: '确认', - cancelButtonText: '取消', - type: 'warning', - }).then(() => { - submitApproval('revoke', params).then((res) => { - ElMessage({ - type: 'success', - message: '取消成功', - }) - }) - }) -} +// const handleCancel = () => { +// const params = { +// taskId: fromListInfo.value.taskId!, +// comments: '', +// } +// ElMessageBox.confirm('确认取消该审批吗?', '提示', { +// confirmButtonText: '确认', +// cancelButtonText: '取消', +// type: 'warning', +// }).then(() => { +// submitApproval('revoke', params).then((res) => { +// ElMessage({ +// type: 'success', +// message: '取消成功', +// }) +// }) +// }) +// } // 点击数据后的操作按钮 -const clickBtn = (buttonType: string) => { - switch (buttonType) { - case '同意': - approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) - break - case '驳回': - approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) - break - case '拒绝': - approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) - break - case '取消': - handleCancel() - break - } -} +// const clickBtn = (buttonType: string) => { +// switch (buttonType) { +// case '同意': +// approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) +// break +// case '驳回': +// approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) +// break +// case '拒绝': +// approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) +// break +// case '取消': +// handleCancel() +// break +// } +// } // 保存后的id,用于提交 const addId = ref('') @@ -375,16 +375,16 @@ cancelButtonText: '取消', type: 'warning', }).then(() => { - if (from.value === 'caogao') { // 草稿箱编辑 - draftUpdateReport(formInline.value).then((res) => { + if (from.value === 'reject') { // 未通过-驳回编辑 + failUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() } }) } - else if (from.value === 'reject') { // 未通过-驳回编辑 - failUpdateReport(formInline.value).then((res) => { + else { + draftUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() @@ -411,9 +411,6 @@ }) } } - else { - clickBtn(item) - } } // 审批完成后的回调 @@ -430,10 +427,6 @@ } applyListClose() } -// 标准装置发生改变data类型 -interface dataReturn { - id: string -} // 获取详情信息 const getInfo = () => { diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 63f09d2..710b10b 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -109,6 +109,16 @@ }) } +// 导出到期提醒 +export function exportRemindList(data: object) { + return request({ + url: '/meter/standard/exportRemindList', + method: 'post', + responseType: 'blob', + data, + }) +} + // 点击提醒 export function setRemind(data: object) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index db0b317..6d00a4f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -61,6 +61,26 @@ activeMenu: '/board/overdueReminderList', }, }, + { + path: 'equipmentReminderList', + name: 'EquipmentReminderList', + component: () => import('@/views/business/board/equipmentReminder/list.vue'), + meta: { + title: '设备到期提醒', + icon: 'ep:key', + auth: '/business/board/equipmentExpirationReminder', + }, + }, + { + path: 'standardReminderList', + name: 'StandardReminderList', + component: () => import('@/views/business/board/standardReminder/list.vue'), + meta: { + title: '装置到期提醒', + icon: 'ep:key', + auth: '/business/board/expirationReminder', + }, + }, ], }, { diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/views/business/board/equipmentReminder/detail.vue diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue new file mode 100644 index 0000000..ec6a9b7 --- /dev/null +++ b/src/views/business/board/equipmentReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 设备到期提醒 + + + + diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue new file mode 100644 index 0000000..200d601 --- /dev/null +++ b/src/views/business/board/standardReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 装置到期提醒 + + + + diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index c81ef0b..20f5e31 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -303,41 +303,41 @@ } // 取消 -const handleCancel = () => { - const params = { - taskId: fromListInfo.value.taskId!, - comments: '', - } - ElMessageBox.confirm('确认取消该审批吗?', '提示', { - confirmButtonText: '确认', - cancelButtonText: '取消', - type: 'warning', - }).then(() => { - submitApproval('revoke', params).then((res) => { - ElMessage({ - type: 'success', - message: '取消成功', - }) - }) - }) -} +// const handleCancel = () => { +// const params = { +// taskId: fromListInfo.value.taskId!, +// comments: '', +// } +// ElMessageBox.confirm('确认取消该审批吗?', '提示', { +// confirmButtonText: '确认', +// cancelButtonText: '取消', +// type: 'warning', +// }).then(() => { +// submitApproval('revoke', params).then((res) => { +// ElMessage({ +// type: 'success', +// message: '取消成功', +// }) +// }) +// }) +// } // 点击数据后的操作按钮 -const clickBtn = (buttonType: string) => { - switch (buttonType) { - case '同意': - approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) - break - case '驳回': - approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) - break - case '拒绝': - approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) - break - case '取消': - handleCancel() - break - } -} +// const clickBtn = (buttonType: string) => { +// switch (buttonType) { +// case '同意': +// approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) +// break +// case '驳回': +// approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) +// break +// case '拒绝': +// approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) +// break +// case '取消': +// handleCancel() +// break +// } +// } // 保存后的id,用于提交 const addId = ref('') @@ -375,16 +375,16 @@ cancelButtonText: '取消', type: 'warning', }).then(() => { - if (from.value === 'caogao') { // 草稿箱编辑 - draftUpdateReport(formInline.value).then((res) => { + if (from.value === 'reject') { // 未通过-驳回编辑 + failUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() } }) } - else if (from.value === 'reject') { // 未通过-驳回编辑 - failUpdateReport(formInline.value).then((res) => { + else { + draftUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() @@ -411,9 +411,6 @@ }) } } - else { - clickBtn(item) - } } // 审批完成后的回调 @@ -430,10 +427,6 @@ } applyListClose() } -// 标准装置发生改变data类型 -interface dataReturn { - id: string -} // 获取详情信息 const getInfo = () => { diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index f1031aa..586d91f 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -205,7 +205,7 @@ if (row.approvalStatusName === '草稿箱') { from = 'caogao' } - else { + else if (row.approvalStatusName === '未通过-驳回') { from = 'reject' } $router.push({ diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 63f09d2..710b10b 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -109,6 +109,16 @@ }) } +// 导出到期提醒 +export function exportRemindList(data: object) { + return request({ + url: '/meter/standard/exportRemindList', + method: 'post', + responseType: 'blob', + data, + }) +} + // 点击提醒 export function setRemind(data: object) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index db0b317..6d00a4f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -61,6 +61,26 @@ activeMenu: '/board/overdueReminderList', }, }, + { + path: 'equipmentReminderList', + name: 'EquipmentReminderList', + component: () => import('@/views/business/board/equipmentReminder/list.vue'), + meta: { + title: '设备到期提醒', + icon: 'ep:key', + auth: '/business/board/equipmentExpirationReminder', + }, + }, + { + path: 'standardReminderList', + name: 'StandardReminderList', + component: () => import('@/views/business/board/standardReminder/list.vue'), + meta: { + title: '装置到期提醒', + icon: 'ep:key', + auth: '/business/board/expirationReminder', + }, + }, ], }, { diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/views/business/board/equipmentReminder/detail.vue diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue new file mode 100644 index 0000000..ec6a9b7 --- /dev/null +++ b/src/views/business/board/equipmentReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 设备到期提醒 + + + + diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue new file mode 100644 index 0000000..200d601 --- /dev/null +++ b/src/views/business/board/standardReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 装置到期提醒 + + + + diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index c81ef0b..20f5e31 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -303,41 +303,41 @@ } // 取消 -const handleCancel = () => { - const params = { - taskId: fromListInfo.value.taskId!, - comments: '', - } - ElMessageBox.confirm('确认取消该审批吗?', '提示', { - confirmButtonText: '确认', - cancelButtonText: '取消', - type: 'warning', - }).then(() => { - submitApproval('revoke', params).then((res) => { - ElMessage({ - type: 'success', - message: '取消成功', - }) - }) - }) -} +// const handleCancel = () => { +// const params = { +// taskId: fromListInfo.value.taskId!, +// comments: '', +// } +// ElMessageBox.confirm('确认取消该审批吗?', '提示', { +// confirmButtonText: '确认', +// cancelButtonText: '取消', +// type: 'warning', +// }).then(() => { +// submitApproval('revoke', params).then((res) => { +// ElMessage({ +// type: 'success', +// message: '取消成功', +// }) +// }) +// }) +// } // 点击数据后的操作按钮 -const clickBtn = (buttonType: string) => { - switch (buttonType) { - case '同意': - approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) - break - case '驳回': - approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) - break - case '拒绝': - approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) - break - case '取消': - handleCancel() - break - } -} +// const clickBtn = (buttonType: string) => { +// switch (buttonType) { +// case '同意': +// approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) +// break +// case '驳回': +// approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) +// break +// case '拒绝': +// approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) +// break +// case '取消': +// handleCancel() +// break +// } +// } // 保存后的id,用于提交 const addId = ref('') @@ -375,16 +375,16 @@ cancelButtonText: '取消', type: 'warning', }).then(() => { - if (from.value === 'caogao') { // 草稿箱编辑 - draftUpdateReport(formInline.value).then((res) => { + if (from.value === 'reject') { // 未通过-驳回编辑 + failUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() } }) } - else if (from.value === 'reject') { // 未通过-驳回编辑 - failUpdateReport(formInline.value).then((res) => { + else { + draftUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() @@ -411,9 +411,6 @@ }) } } - else { - clickBtn(item) - } } // 审批完成后的回调 @@ -430,10 +427,6 @@ } applyListClose() } -// 标准装置发生改变data类型 -interface dataReturn { - id: string -} // 获取详情信息 const getInfo = () => { diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index f1031aa..586d91f 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -205,7 +205,7 @@ if (row.approvalStatusName === '草稿箱') { from = 'caogao' } - else { + else if (row.approvalStatusName === '未通过-驳回') { from = 'reject' } $router.push({ diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue index 0ebc982..b8fd4fb 100644 --- a/src/views/device/standardEquipment/components/listApply/listPage.vue +++ b/src/views/device/standardEquipment/components/listApply/listPage.vue @@ -1,3 +1,4 @@ + + + + + 设备到期提醒 + + + + diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue new file mode 100644 index 0000000..200d601 --- /dev/null +++ b/src/views/business/board/standardReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 装置到期提醒 + + + + diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index c81ef0b..20f5e31 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -303,41 +303,41 @@ } // 取消 -const handleCancel = () => { - const params = { - taskId: fromListInfo.value.taskId!, - comments: '', - } - ElMessageBox.confirm('确认取消该审批吗?', '提示', { - confirmButtonText: '确认', - cancelButtonText: '取消', - type: 'warning', - }).then(() => { - submitApproval('revoke', params).then((res) => { - ElMessage({ - type: 'success', - message: '取消成功', - }) - }) - }) -} +// const handleCancel = () => { +// const params = { +// taskId: fromListInfo.value.taskId!, +// comments: '', +// } +// ElMessageBox.confirm('确认取消该审批吗?', '提示', { +// confirmButtonText: '确认', +// cancelButtonText: '取消', +// type: 'warning', +// }).then(() => { +// submitApproval('revoke', params).then((res) => { +// ElMessage({ +// type: 'success', +// message: '取消成功', +// }) +// }) +// }) +// } // 点击数据后的操作按钮 -const clickBtn = (buttonType: string) => { - switch (buttonType) { - case '同意': - approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) - break - case '驳回': - approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) - break - case '拒绝': - approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) - break - case '取消': - handleCancel() - break - } -} +// const clickBtn = (buttonType: string) => { +// switch (buttonType) { +// case '同意': +// approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) +// break +// case '驳回': +// approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) +// break +// case '拒绝': +// approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) +// break +// case '取消': +// handleCancel() +// break +// } +// } // 保存后的id,用于提交 const addId = ref('') @@ -375,16 +375,16 @@ cancelButtonText: '取消', type: 'warning', }).then(() => { - if (from.value === 'caogao') { // 草稿箱编辑 - draftUpdateReport(formInline.value).then((res) => { + if (from.value === 'reject') { // 未通过-驳回编辑 + failUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() } }) } - else if (from.value === 'reject') { // 未通过-驳回编辑 - failUpdateReport(formInline.value).then((res) => { + else { + draftUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() @@ -411,9 +411,6 @@ }) } } - else { - clickBtn(item) - } } // 审批完成后的回调 @@ -430,10 +427,6 @@ } applyListClose() } -// 标准装置发生改变data类型 -interface dataReturn { - id: string -} // 获取详情信息 const getInfo = () => { diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index f1031aa..586d91f 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -205,7 +205,7 @@ if (row.approvalStatusName === '草稿箱') { from = 'caogao' } - else { + else if (row.approvalStatusName === '未通过-驳回') { from = 'reject' } $router.push({ diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue index 0ebc982..b8fd4fb 100644 --- a/src/views/device/standardEquipment/components/listApply/listPage.vue +++ b/src/views/device/standardEquipment/components/listApply/listPage.vue @@ -1,3 +1,4 @@ + + + + + 设备到期提醒 + + + + diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue new file mode 100644 index 0000000..200d601 --- /dev/null +++ b/src/views/business/board/standardReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 装置到期提醒 + + + + diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index c81ef0b..20f5e31 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -303,41 +303,41 @@ } // 取消 -const handleCancel = () => { - const params = { - taskId: fromListInfo.value.taskId!, - comments: '', - } - ElMessageBox.confirm('确认取消该审批吗?', '提示', { - confirmButtonText: '确认', - cancelButtonText: '取消', - type: 'warning', - }).then(() => { - submitApproval('revoke', params).then((res) => { - ElMessage({ - type: 'success', - message: '取消成功', - }) - }) - }) -} +// const handleCancel = () => { +// const params = { +// taskId: fromListInfo.value.taskId!, +// comments: '', +// } +// ElMessageBox.confirm('确认取消该审批吗?', '提示', { +// confirmButtonText: '确认', +// cancelButtonText: '取消', +// type: 'warning', +// }).then(() => { +// submitApproval('revoke', params).then((res) => { +// ElMessage({ +// type: 'success', +// message: '取消成功', +// }) +// }) +// }) +// } // 点击数据后的操作按钮 -const clickBtn = (buttonType: string) => { - switch (buttonType) { - case '同意': - approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) - break - case '驳回': - approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) - break - case '拒绝': - approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) - break - case '取消': - handleCancel() - break - } -} +// const clickBtn = (buttonType: string) => { +// switch (buttonType) { +// case '同意': +// approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) +// break +// case '驳回': +// approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) +// break +// case '拒绝': +// approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) +// break +// case '取消': +// handleCancel() +// break +// } +// } // 保存后的id,用于提交 const addId = ref('') @@ -375,16 +375,16 @@ cancelButtonText: '取消', type: 'warning', }).then(() => { - if (from.value === 'caogao') { // 草稿箱编辑 - draftUpdateReport(formInline.value).then((res) => { + if (from.value === 'reject') { // 未通过-驳回编辑 + failUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() } }) } - else if (from.value === 'reject') { // 未通过-驳回编辑 - failUpdateReport(formInline.value).then((res) => { + else { + draftUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() @@ -411,9 +411,6 @@ }) } } - else { - clickBtn(item) - } } // 审批完成后的回调 @@ -430,10 +427,6 @@ } applyListClose() } -// 标准装置发生改变data类型 -interface dataReturn { - id: string -} // 获取详情信息 const getInfo = () => { diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index f1031aa..586d91f 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -205,7 +205,7 @@ if (row.approvalStatusName === '草稿箱') { from = 'caogao' } - else { + else if (row.approvalStatusName === '未通过-驳回') { from = 'reject' } $router.push({ diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue index 0ebc982..b8fd4fb 100644 --- a/src/views/device/standardEquipment/components/listApply/listPage.vue +++ b/src/views/device/standardEquipment/components/listApply/listPage.vue @@ -1,3 +1,4 @@ + + + + + + + + + + + + + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + + + + + + + + + + + + 确认 + + 取消 + + + + + + + diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 63f09d2..710b10b 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -109,6 +109,16 @@ }) } +// 导出到期提醒 +export function exportRemindList(data: object) { + return request({ + url: '/meter/standard/exportRemindList', + method: 'post', + responseType: 'blob', + data, + }) +} + // 点击提醒 export function setRemind(data: object) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index db0b317..6d00a4f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -61,6 +61,26 @@ activeMenu: '/board/overdueReminderList', }, }, + { + path: 'equipmentReminderList', + name: 'EquipmentReminderList', + component: () => import('@/views/business/board/equipmentReminder/list.vue'), + meta: { + title: '设备到期提醒', + icon: 'ep:key', + auth: '/business/board/equipmentExpirationReminder', + }, + }, + { + path: 'standardReminderList', + name: 'StandardReminderList', + component: () => import('@/views/business/board/standardReminder/list.vue'), + meta: { + title: '装置到期提醒', + icon: 'ep:key', + auth: '/business/board/expirationReminder', + }, + }, ], }, { diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/views/business/board/equipmentReminder/detail.vue diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue new file mode 100644 index 0000000..ec6a9b7 --- /dev/null +++ b/src/views/business/board/equipmentReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 设备到期提醒 + + + + diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue new file mode 100644 index 0000000..200d601 --- /dev/null +++ b/src/views/business/board/standardReminder/list.vue @@ -0,0 +1,14 @@ + + + + + + 装置到期提醒 + + + + diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index c81ef0b..20f5e31 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -303,41 +303,41 @@ } // 取消 -const handleCancel = () => { - const params = { - taskId: fromListInfo.value.taskId!, - comments: '', - } - ElMessageBox.confirm('确认取消该审批吗?', '提示', { - confirmButtonText: '确认', - cancelButtonText: '取消', - type: 'warning', - }).then(() => { - submitApproval('revoke', params).then((res) => { - ElMessage({ - type: 'success', - message: '取消成功', - }) - }) - }) -} +// const handleCancel = () => { +// const params = { +// taskId: fromListInfo.value.taskId!, +// comments: '', +// } +// ElMessageBox.confirm('确认取消该审批吗?', '提示', { +// confirmButtonText: '确认', +// cancelButtonText: '取消', +// type: 'warning', +// }).then(() => { +// submitApproval('revoke', params).then((res) => { +// ElMessage({ +// type: 'success', +// message: '取消成功', +// }) +// }) +// }) +// } // 点击数据后的操作按钮 -const clickBtn = (buttonType: string) => { - switch (buttonType) { - case '同意': - approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) - break - case '驳回': - approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) - break - case '拒绝': - approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) - break - case '取消': - handleCancel() - break - } -} +// const clickBtn = (buttonType: string) => { +// switch (buttonType) { +// case '同意': +// approvalDialog.value.initDialog('agree', fromListInfo.value.taskId) +// break +// case '驳回': +// approvalDialog.value.initDialog('reject', fromListInfo.value.taskId) +// break +// case '拒绝': +// approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId) +// break +// case '取消': +// handleCancel() +// break +// } +// } // 保存后的id,用于提交 const addId = ref('') @@ -375,16 +375,16 @@ cancelButtonText: '取消', type: 'warning', }).then(() => { - if (from.value === 'caogao') { // 草稿箱编辑 - draftUpdateReport(formInline.value).then((res) => { + if (from.value === 'reject') { // 未通过-驳回编辑 + failUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() } }) } - else if (from.value === 'reject') { // 未通过-驳回编辑 - failUpdateReport(formInline.value).then((res) => { + else { + draftUpdateReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') close() @@ -411,9 +411,6 @@ }) } } - else { - clickBtn(item) - } } // 审批完成后的回调 @@ -430,10 +427,6 @@ } applyListClose() } -// 标准装置发生改变data类型 -interface dataReturn { - id: string -} // 获取详情信息 const getInfo = () => { diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index f1031aa..586d91f 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -205,7 +205,7 @@ if (row.approvalStatusName === '草稿箱') { from = 'caogao' } - else { + else if (row.approvalStatusName === '未通过-驳回') { from = 'reject' } $router.push({ diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue index 0ebc982..b8fd4fb 100644 --- a/src/views/device/standardEquipment/components/listApply/listPage.vue +++ b/src/views/device/standardEquipment/components/listApply/listPage.vue @@ -1,3 +1,4 @@ + + + + + + + + + + + + + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + + + + + + + + + + + + 确认 + + 取消 + + + + + + + diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue index 052487c..4344521 100644 --- a/src/views/device/standardEquipment/expirationRemind.vue +++ b/src/views/device/standardEquipment/expirationRemind.vue @@ -7,7 +7,7 @@ import type { IOptions, IexpiraListQuery } from './standard_interface' import { getTypeSelect } from '@/api/system/price' import type { TableColumn } from '@/components/NormalTable/table_interface' -import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard' +import { exportRemindList, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard' import { exportFile } from '@/utils/exportUtils' import { printJSON } from '@/utils/printUtils' // 逻辑代码 @@ -187,7 +187,7 @@ } // 多选发生改变时 const handleSelectionChange = (e: any) => { - checkoutList.value = e + checkoutList.value = e.map((item: { id: string }) => item.id) } // 导出id类型 interface ISupplier { @@ -215,27 +215,40 @@ } // 导出 -const exportExcelBtn = () => { +const exportAll = () => { const loading = ElLoading.service({ lock: true, text: 'Loading', background: 'rgba(255, 255, 255, 0.8)', }) - if (checkoutList.value.length <= 0 && list.value.length > 0) { - getExportExcel(listQuery.value).then((res) => { + if (list.value.length > 0) { + const params = { + category: '', // 类别 + id: '', // 主键id + managerState: '', // 管理状态 + preparationEndDate: '', // 结束时间 + preparationStartDate: '', // 开始时间 + standardLaboratory: '', // 标准所在部门 + standardName: '', // 标准名称 + standardNo: '', // 标准编号 + validEndTime: '', // 结束时间 + validStartTime: '', // 开始时间 + offset: 1, // 当前页 + limit: 20, // 每页多少条 + ids: checkoutList.value, + } + // 导出接口 + exportRemindList(params).then((res) => { const blob = new Blob([res.data]) exportFile(blob, '到期提醒列表.xlsx') }) } else { - ElMessage.warning('暂无数据') + ElMessage.warning('无数据可导出数据') } + // 关闭loading loading.close() } -// 点击导出 -const exportAll = () => { - exportExcelBtn() -} // 点击编辑id和删除row类型 interface rowReturn { id: string