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

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

@@ -1,7 +1,7 @@
 <template>
   <ai-detail>
     <template slot="title">
-      <ai-title title="学习记录" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title title="考试详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
       </ai-title>
     </template>
     <template slot="content">
@@ -124,7 +124,8 @@
           params: {
             ...this.search2,
             bizType: 1,
-            openId: this.params.openId
+            openId: this.params.openId,
+            bizId: this.params.id
           }
         }).then(res => {
           if (res.code == 0) {

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

@@ -8,7 +8,7 @@
         :hideLevel="user.info.areaList.length - 1"
         v-model="areaId"
         :instance="instance"
-        @change="onChange()">
+        @change="onChange">
       </ai-title>
     </template>
     <template slot="content">
@@ -44,7 +44,7 @@
             class="search-input"
             size="small"
             v-throttle="() => {search.current = 1, getList()}"
-            placeholder="请输入姓名/身份证/手机号/微信昵称"
+            placeholder="请输入姓名/身份证/手机号"
             clearable
             @clear="search.current = 1, getList()"
             suffix-icon="iconfont iconSearch">
@@ -62,7 +62,7 @@
         <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-button type="text" v-if="!row.haveCertificate && row.examinationType === '1'" @click="audit(row)">审核发证</el-button>
+              <el-button type="text" v-if="!row.haveCertificate && row.examinationType === '1' && row.status === '1'" @click="audit(row)">审核发证</el-button>
               <el-button type="text" @click="toDetail(row.bizId, row.openId)">详情</el-button>
             </div>
           </template>
@@ -120,6 +120,14 @@
     },
 
     methods: {
+      onChange () {
+        this.search.current = 1
+
+        this.$nextTick(() => {
+          this.getList()
+        })
+      },
+
       getList() {
         this.instance.post(`/app/appexaminationinfo/learningList`, null, {
           params: {

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

@@ -21,8 +21,8 @@
                 :selectList="dict.getDict('qjExaminationType')">
               </ai-select>
             </el-form-item>
-            <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="examinationDuration" 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.examinationDuration" :min="1"></el-input-number>（分钟）
             </el-form-item>
             <el-form-item prop="certificateId"  v-if="form.examinationType === '1'" label="关联证书" :rules="[{required: true, message: '请选择关联证书', trigger: 'change'}]">
               <ai-select
@@ -171,7 +171,7 @@
         form: {
           examinationName: '',
           title: '',
-          examination_duration: '',
+          examinationDuration : '',
           certificateId: '',
           certificateName: '',
           examinationType: '',

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

@@ -15,6 +15,8 @@
             <ai-info-item label="选题方式" isLine :value="dict.getLabel('qjEIChooseType', info.chooseType)">
             </ai-info-item>
             <ai-info-item label="考试类型" isLine :value="dict.getLabel('qjExaminationType', info.examinationType)"></ai-info-item>
+            <ai-info-item label="考试学时" :value="info.examinationDuration"></ai-info-item>
+            <ai-info-item label="关联证书" :value="info.certificateName"></ai-info-item>
             <ai-info-item label="试题总数" :value="info.questions && info.questions.length"></ai-info-item>
             <ai-info-item label="总分数" :value="info.subjectScore"></ai-info-item>
             <ai-info-item label="考试人数" :value="info.examinationNumber"></ai-info-item>