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

project/qujing/app/AppCertificateIssuance/components/Detail.vue

@@ -19,7 +19,7 @@
       </ai-card>
       <ai-card title="考试记录">
         <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 #content>
           <ai-wrapper

project/qujing/app/AppExaminationManage/components/Add.vue

@@ -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-input-number size="small" v-model="form.examination_duration" :min="1"></el-input-number>（分钟）
             </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
                 v-model="form.certificateId"
                 clearable
@@ -405,7 +405,7 @@
             this.instance.post(`/app/appexaminationinfo/addOrUpdate`, {
               ...this.form,
               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 => {
               if (res.code == 0) {
                 this.$message.success('提交成功')