kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/build' into build

Browse Source
This commit is contained in:
aixianling
2023-03-23 11:30:02 +08:00
parent c02b19f3eb 86bbb552c5
commit d4f1c04f07
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/qujing/app/AppCertificateIssuance/components/Detail.vue
View File

@@ -19,7 +19,7 @@
</ai-card> </ai-card>
<ai-card title="考试记录"> <ai-card title="考试记录">
<template #right> <template #right>
<el-button type="primary" v-if="!info.haveCertificate" @click="audit(row.id, row.openId)">审核发证</el-button> <el-button type="primary" v-if="!info.haveCertificate" @click="audit">审核发证</el-button>
</template> </template>
<template #content> <template #content>
<ai-wrapper <ai-wrapper

4
project/qujing/app/AppExaminationManage/components/Add.vue
View File

@@ -24,7 +24,7 @@
<el-form-item prop="examination_duration" v-if="form.examinationType === '1'" label="考试学时" style="width: 100%" :rules="[{required: true, message: '请输入', trigger: 'change'}]"> <el-form-item prop="examination_duration" v-if="form.examinationType === '1'" label="考试学时" style="width: 100%" :rules="[{required: true, message: '请输入', trigger: 'change'}]">
<el-input-number size="small" v-model="form.examination_duration" :min="1"></el-input-number>（分钟） <el-input-number size="small" v-model="form.examination_duration" :min="1"></el-input-number>（分钟）
</el-form-item> </el-form-item>
<el-form-item prop="certificateId" label="关联证书" :rules="[{required: true, message: '请选择关联证书', trigger: 'change'}]"> <el-form-item prop="certificateId" v-if="form.examinationType === '1'" label="关联证书" :rules="[{required: true, message: '请选择关联证书', trigger: 'change'}]">
<ai-select <ai-select
v-model="form.certificateId" v-model="form.certificateId"
clearable clearable
@@ -405,7 +405,7 @@
this.instance.post(`/app/appexaminationinfo/addOrUpdate`, { this.instance.post(`/app/appexaminationinfo/addOrUpdate`, {
...this.form, ...this.form,
id: this.params.id || '', id: this.params.id || '',
certificateName: this.certificateList.filter(v => v.dictValue === this.form.certificateId)[0].dictName certificateName: this.form.examinationType === '1' ? this.certificateList.filter(v => v.dictValue === this.form.certificateId)[0].dictName : ''
}).then(res => { }).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.$message.success('提交成功') this.$message.success('提交成功')