From 4e945a191d42c0ca73824b0241be0a5b730e56f3 Mon Sep 17 00:00:00 2001 From: wcq <744800102@qq.com> Date: Tue, 29 Aug 2023 14:50:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/EditTabel/fileUploadMd.vue | 2 +- src/views/smebiz/components/ExamineWork.vue | 39 +++++--- src/views/smebiz/components/RateWork.vue | 103 ++++++++++++++++---- 3 files changed, 110 insertions(+), 34 deletions(-) diff --git a/src/components/EditTabel/fileUploadMd.vue b/src/components/EditTabel/fileUploadMd.vue index 8c37dfa..805438b 100644 --- a/src/components/EditTabel/fileUploadMd.vue +++ b/src/components/EditTabel/fileUploadMd.vue @@ -37,7 +37,7 @@ import type {UploadInstance, UploadProps, UploadRawFile} from "element-plus"; import {getToken} from "@/utils/auth"; import {api} from "@/api/api"; -const props = defineProps<{ modelValue: string; showDownload?: boolean }>(); +const props = defineProps<{ modelValue: string | null; showDownload?: boolean }>(); const emit = defineEmits(["update:modelValue"]); const headers = ref({Authorization: ""}); const upload = ref(); diff --git a/src/views/smebiz/components/ExamineWork.vue b/src/views/smebiz/components/ExamineWork.vue index 9f5abf0..37f8b18 100644 --- a/src/views/smebiz/components/ExamineWork.vue +++ b/src/views/smebiz/components/ExamineWork.vue @@ -38,12 +38,12 @@ @@ -52,7 +52,7 @@ @@ -144,7 +145,8 @@ 实收款 @@ -177,8 +179,8 @@
- 取消 - 删除 + 驳回申请 + 删除申请 完成审核
@@ -261,9 +263,9 @@ const prop = defineProps<{ rateServe: RateServe }>() const cancelWorkVisible = ref(false) const deleteWorkVisible = ref(false) const finishWorkVisible = ref(false) -const cancelRemark = ref('资料审核不通过') -const deleteRemark = ref('取消该作业') -const finishRemark = ref('资料审核通过') +const cancelRemark = ref('资料审核不通过,请重新申请') +const deleteRemark = ref('该作业已删除') +const finishRemark = ref('资料审核已通过') const editRemarkNodeTemp = ref({ nodeName: '', @@ -319,8 +321,8 @@ const confirmNodeRemarkEdit = () => { ElMessage.success("保存成功") } -const showOriginFillSheet=()=>{ - window.open('https://view.officeapps.live.com/op/view.aspx?src=newteach.pbworks.com%2Ff%2Fele%2Bnewsletter.docx','_blank') +const showOriginFillSheet = () => { + window.open('https://view.officeapps.live.com/op/view.aspx?src=newteach.pbworks.com%2Ff%2Fele%2Bnewsletter.docx', '_blank') } @@ -388,8 +390,17 @@ const showOriginFillSheet=()=>{ font-size: 1rem !important; } +//html[class*='dark'] { +// .node-content { +// border: 1px solid rgb(110 110 110 / 47%); +// border-radius: 1rem; +// @apply pt-4 pb-6 +// } +//} + .node-content { - border: 1px dashed var(--el-border-color); + border: 1px solid var(--el-border-color); + border-radius: 1rem; @apply pt-4 pb-6 } diff --git a/src/views/smebiz/components/RateWork.vue b/src/views/smebiz/components/RateWork.vue index d9186fd..379cde6 100644 --- a/src/views/smebiz/components/RateWork.vue +++ b/src/views/smebiz/components/RateWork.vue @@ -44,11 +44,7 @@ - + - @@ -121,7 +117,6 @@ - - @@ -189,14 +183,14 @@
填报数据 - 导入 备注 - 编辑
- 原件 + 原件 审核 @@ -94,13 +94,14 @@ title="导入三方接口数据?" > 备注 - 编辑 备注 - 编辑 + 编辑 + 操作 分数 打分时间 打分详情有效期 - 编辑 - - 备注 编辑 @@ -68,7 +64,6 @@ 查看 1年 {{ rateServe.rate_work_node?.remark || '-' }}
初版报告 - 生成 + 生成 生成时间 上传时间 备注 编辑 @@ -132,20 +127,19 @@
- 预览 + 预览 下载 {{ rateServe.report_work_node?.origin_create_time || '-' }} - 预览 + 预览 下载 {{ rateServe.report_work_node?.final_create_time || '-' }} {{ rateServe.report_work_node?.remark || '-' }}
- - - @@ -317,6 +310,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -330,7 +361,7 @@ import { } from "@/views/smebiz/config"; import {ref} from "vue"; import {ElMessage} from "element-plus"; -import {WarningFilled} from '@element-plus/icons-vue' +import {WarningFilled, View} from '@element-plus/icons-vue' import FileUploadMd from "@/components/EditTabel/fileUploadMd.vue"; const prop = defineProps<{ rateServe: RateServe }>() @@ -340,6 +371,10 @@ const finishWorkVisible = ref(false) const cancelRemark = ref('取消该作业') const deleteRemark = ref('删除该作业') const finishRemark = ref('已完成评级作业') +const certCreateDialogVisible = ref(false) +const certCreateParams = ref({expiryYear: 1, certTime: Date.now()}) +const reportCreateDialogVisible = ref(false) +const reportCreateParams = ref({expiryYear: 1, reportTime: Date.now()}) const editRemarkNodeTemp = ref({ nodeName: '', remark: '' @@ -394,8 +429,37 @@ const confirmFinishWork = () => { ElMessage.success("已完成评级作业") } -const showExpiryDateEdit = () => { +const showCertCreateDialog = () => { + certCreateParams.value = {expiryYear: 1, certTime: Date.now()} + certCreateDialogVisible.value = true +} + +const confirmCertCreate = () => { + if (!certCreateParams.value.certTime || !reportCreateParams.value.expiryYear) { + return ElMessage.warning('请补充完整信息') + } else { + //生成报告 + certCreateDialogVisible.value = false + ElMessage.success('报告生成成功') + } +} + + +const showReportCreateDialog = () => { + reportCreateParams.value = {expiryYear: 1, reportTime: Date.now()} + reportCreateDialogVisible.value = true + +} + +const confirmReportCreate = () => { + if (!reportCreateParams.value.reportTime || !reportCreateParams.value.expiryYear) { + return ElMessage.warning('请补充完整信息') + } else { + //生成报告 + reportCreateDialogVisible.value = false + ElMessage.success('报告生成成功') + } } @@ -465,7 +529,8 @@ const showExpiryDateEdit = () => { } .node-content { - border: 1px dashed var(--el-border-color); + border: 1px solid var(--el-border-color); + border-radius: 1rem; @apply pt-4 pb-6 }
初版报告 - 生成 + 证书 + 生成 生成时间 备注
- 预览 + 预览 下载 @@ -216,7 +210,6 @@ {{ rateServe.report_work_node?.remark || '-' }}