diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 599c2a8..0527e0b 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -2,7 +2,7 @@ - {{ + {{ item.meta.title }} {{ item.meta.title }} diff --git a/src/router/index.js b/src/router/index.js index 647bc31..247699a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -164,6 +164,34 @@ export const dynamicRoutes = [ } ] }, + { + path: '/qualification/escViewDetail', + component: Layout, + hidden: true, + permissions: ['qualification:viewDetail'], + children: [ + { + path: ':Id(\\d+)?', + component: () => import('@/views/qualification/escTask/components/QualificationDetailForm'), + name: 'escApprovalDetail', + meta: { title: 'ESC资质查看详情' } + } + ] + }, + { + path: '/escLable/viewDetail', + component: Layout, + hidden: true, + permissions: ['qualification:viewDetail'], + children: [ + { + path: ':Id(\\d+)?', + component: () => import('@/views/qualification/escTask/components/LableDetaiForm'), + name: 'myESCLableDetail', + meta: { title: 'ESC标签查看详情' } + } + ] + }, { path: '/lable/viewDetail', component: Layout, diff --git a/src/views/labelManage/adminApproval/approvalDetail.vue b/src/views/labelManage/adminApproval/approvalDetail.vue index 87e6d34..c70a811 100644 --- a/src/views/labelManage/adminApproval/approvalDetail.vue +++ b/src/views/labelManage/adminApproval/approvalDetail.vue @@ -115,7 +115,7 @@ @@ -125,14 +125,23 @@ - +
+
复训信息
+ + + + + + + +
审批记录
@@ -173,7 +182,7 @@ + \ No newline at end of file diff --git a/src/views/qualification/escTask/components/LableReApplyForm.vue b/src/views/qualification/escTask/components/LableReApplyForm.vue index 8be7016..f0ec083 100644 --- a/src/views/qualification/escTask/components/LableReApplyForm.vue +++ b/src/views/qualification/escTask/components/LableReApplyForm.vue @@ -80,7 +80,7 @@
-
今年复训信息
+
复训信息
@@ -303,7 +303,7 @@ const getSysSectionData = () => { const userRecurrentTrainingData = ref([]) -// 获取本人当年复训数据 +// 获取本人最近三年复训数据 const getCurrentUserRecurrentTraining = () => { currentUserRecurrentTraining({ workNo: ruleForm.value.workNo }).then(res => { if (res.code == 200) { @@ -398,11 +398,11 @@ const handleSubmit = () => { proxy.$modal.msgError(`未找到您的复训信息,不能提交申请!`) return false; } - const passTrainRecord = userRecurrentTrainingData.value.filter(item => item.state == '通过') - if (passTrainRecord.length == 0) { - proxy.$modal.msgError(`您今年的复训未通过,不能提交申请!`) - return false; - } + // const passTrainRecord = userRecurrentTrainingData.value.filter(item => item.state == '通过') + // if (passTrainRecord.length == 0) { + // proxy.$modal.msgError(`您今年的复训未通过,不能提交申请!`) + // return false; + // } const qualificArr = tableData.value.filter(item => item.certificateUrl) console.log('是否有资质证书', qualificArr) diff --git a/src/views/qualification/escTask/components/QualificationApply.vue b/src/views/qualification/escTask/components/QualificationApply.vue index 6a859af..463331a 100644 --- a/src/views/qualification/escTask/components/QualificationApply.vue +++ b/src/views/qualification/escTask/components/QualificationApply.vue @@ -67,9 +67,9 @@ 重新申请 - + - 查看 + 查看 diff --git a/src/views/qualification/escTask/components/QualificationApplyForm.vue b/src/views/qualification/escTask/components/QualificationApplyForm.vue index 8c39723..a0bf3cb 100644 --- a/src/views/qualification/escTask/components/QualificationApplyForm.vue +++ b/src/views/qualification/escTask/components/QualificationApplyForm.vue @@ -299,7 +299,8 @@ const router = useRouter() const { proxy } = getCurrentInstance() const { target_qualification } = proxy.useDict("target_qualification") console.log('目标资质', target_qualification) - +const certificatePhotoRef = ref(null) +const firstCertificateFileRef = ref(null) const data = reactive({ ruleForm: { qualificationId: undefined, @@ -499,25 +500,32 @@ const getUserQualification = (_userId) => { // 申请目标资质选择 const handleChoseQualification = (val) => { - if (val == 'LLP') { - const jjzInfo = choseUserQualification.value.filter(item => item.qualificationName === '急救证')[0] - if (jjzInfo && jjzInfo.startTime) { - ruleForm.value.beforeCondition.firstCollectionDate = jjzInfo.startTime - ruleForm.value.beforeCondition.firstCollectionExpireDate = jjzInfo.expireTime + nextTick(() => { + if (val == 'LLP') { + const jjzInfo = choseUserQualification.value.filter(item => item.qualificationName === '急救证')[0] + if (jjzInfo && jjzInfo.startTime) { + ruleForm.value.beforeCondition.firstCollectionDate = jjzInfo.startTime + ruleForm.value.beforeCondition.firstCollectionExpireDate = jjzInfo.expireTime + firstCertificateFileRef.value.setFileInfo(jjzInfo.certificateUrl) + } else { + ruleForm.value.beforeCondition.firstCollectionDate = undefined + ruleForm.value.beforeCondition.firstCollectionExpireDate = undefined + firstCertificateFileRef.value.setFileInfo(undefined) + } } else { - ruleForm.value.beforeCondition.firstCollectionDate = undefined - ruleForm.value.beforeCondition.firstCollectionExpireDate = undefined + const dgzInfo = choseUserQualification.value.filter(item => item.qualificationName === '电工证')[0] + if (dgzInfo && dgzInfo.startTime) { + ruleForm.value.beforeCondition.collectionDate = dgzInfo.startTime + ruleForm.value.beforeCondition.reviewDate = dgzInfo.expireTime + certificatePhotoRef.value.setFileInfo(dgzInfo.certificateUrl) + } else { + ruleForm.value.beforeCondition.collectionDate = undefined + ruleForm.value.beforeCondition.reviewDate = undefined + certificatePhotoRef.value.setFileInfo(undefined) + } } - } else { - const dgzInfo = choseUserQualification.value.filter(item => item.qualificationName === '电工证')[0] - if (dgzInfo && dgzInfo.startTime) { - ruleForm.value.beforeCondition.collectionDate = dgzInfo.startTime - ruleForm.value.beforeCondition.reviewDate = dgzInfo.expireTime - } else { - ruleForm.value.beforeCondition.collectionDate = undefined - ruleForm.value.beforeCondition.reviewDate = undefined - } - } + }) + } // 用户数据 const allUsers = ref([]) diff --git a/src/views/qualification/escTask/components/QualificationDetailForm.vue b/src/views/qualification/escTask/components/QualificationDetailForm.vue new file mode 100644 index 0000000..764683f --- /dev/null +++ b/src/views/qualification/escTask/components/QualificationDetailForm.vue @@ -0,0 +1,843 @@ + + + \ No newline at end of file diff --git a/src/views/qualification/escTask/components/QualificationManage.vue b/src/views/qualification/escTask/components/QualificationManage.vue index 593d86f..d2282fd 100644 --- a/src/views/qualification/escTask/components/QualificationManage.vue +++ b/src/views/qualification/escTask/components/QualificationManage.vue @@ -94,7 +94,7 @@ \ No newline at end of file