zc

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/index.vue

@@ -208,7 +208,7 @@
         //时间数据
         dateRange:[],
         //列表数据
-        dataList:[{}],
+        dataList:[],
         //数据数量
         total:0,
         //组件传参

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/selectCertificate.vue

@@ -10,16 +10,16 @@
             <el-option label="不共享" value="0"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="examTypeId">
-          <el-select v-model="queryParams.examTypeId" placeholder="考试类型" style="width: 140px">
-            <el-option
-              v-for="dict in optionListA"
-              :key="dict.id"
-              :label="dict.examTypeName"
-              :value="dict.id"
-            />
-          </el-select>
-        </el-form-item>
+        <!--<el-form-item label="" prop="templateType">-->
+          <!--<el-select v-model="queryParams.templateType" placeholder="考试类型" style="width: 140px">-->
+            <!--<el-option-->
+              <!--v-for="dict in optionListA"-->
+              <!--:key="dict.id"-->
+              <!--:label="dict.examTypeName"-->
+              <!--:value="dict.id"-->
+            <!--/>-->
+          <!--</el-select>-->
+        <!--</el-form-item>-->
         <el-form-item label="" prop="deptId">
           <el-cascader
             style="width: 180px"
@@ -101,12 +101,12 @@
           page:1,
           pageSize:20,
           shareStatus:null,
-          examTypeId :null,
+          templateType :1,
           deptId :null,
           searchValue :'',
         },
         //列表数据
-        dataList:[{}],
+        dataList:[],
         //数据数量
         total:0,
       }
@@ -138,7 +138,7 @@
           page:1,
           pageSize:20,
           shareStatus:null,
-          examTypeId :null,
+          templateType :1,
           deptId :null,
           searchValue :'',
         });

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/studentsTakingMakeUpExams.vue

@@ -248,7 +248,7 @@
         },
         //下拉列表数据
         optionListA: [],
-        optionListB: [{}],
+        optionListB: [],
         optionListC: [],
         //查询条件
         queryParams: {

src/views/safetyEducationExaminationNew/publicConfiguration/certificateTemplate/addPage.vue

@@ -12,13 +12,13 @@
           <el-form-item label="证书模板名称" prop="templateName" style="margin-top:20px;">
             <el-input v-model="newData.templateName" placeholder="请输入证书模板名称" maxLength="20" style="width:500px;"></el-input>
           </el-form-item>
-          <el-form-item label="适用考试类型" prop="examTypeId">
-            <el-select v-model="newData.examTypeId" placeholder="请选择考试类型" style="width: 500px">
+          <el-form-item label="适用考试类型" prop="templateType">
+            <el-select v-model="newData.templateType" placeholder="请选择证书类型" style="width: 500px">
               <el-option
                 v-for="dict in optionList"
-                :key="dict.id"
-                :label="dict.examTypeName"
-                :value="dict.id"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
               />
             </el-select>
           </el-form-item>
@@ -102,11 +102,11 @@
           Authorization: getToken(),
         },
         upData:[],
-        optionList:[],
+        optionList:[{value:'1',label:'考试证书'},{value:'2',label:'培训证书'},],
         optionDeptList:[],
         newData:{
           templateName:'',
-          examTypeId:null,
+          templateType:null,
           deptId:null,
           templateWordPath:'',
           description:'',
@@ -117,7 +117,7 @@
             { required: true, message: "请输入证书模板名称", trigger: "blur" },
             { required: true, message: "请输入证书模板名称", validator: this.spaceJudgment, trigger: "blur" }
           ],
-          examTypeId: [
+          templateType: [
             { required: true, message: "请选择考试类型", trigger: "blur" },
             { required: true, message: "请选择考试类型", validator: this.spaceJudgment, trigger: "blur" }
           ],
@@ -144,7 +144,7 @@
     },
     mounted(){
       this.initialize();
-      this.examElExamTypeList();
+      // this.examElExamTypeList();
       this.systemDeptCurrentDept();
     },
     methods:{
@@ -153,7 +153,7 @@
           this.$set(this,'newData',{
             id:this.propsData.id,
             templateName:this.propsData.templateName,
-            examTypeId:this.propsData.examTypeId,
+            templateType:this.propsData.templateType,
             deptId:this.propsData.deptId,
             templateWordPath:this.propsData.templateWordPath,
             description:this.propsData.description,

src/views/safetyEducationExaminationNew/publicConfiguration/certificateTemplate/index.vue

@@ -11,13 +11,13 @@
               <el-option label="不共享" value="0"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="" prop="examTypeId">
-            <el-select v-model="queryParams.examTypeId" placeholder="考试类型" style="width: 200px">
+          <el-form-item label="" prop="templateType">
+            <el-select v-model="queryParams.templateType" placeholder="证书类型" style="width: 200px">
               <el-option
                 v-for="dict in optionClassList"
-                :key="dict.id"
-                :label="dict.examTypeName"
-                :value="dict.id"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
               />
             </el-select>
           </el-form-item>
@@ -123,12 +123,12 @@
         //页面状态
         pageType:1,
         //下拉列表数据
-        optionClassList:[],
+        optionClassList:[{value:'1',label:'考试证书'},{value:'2',label:'培训证书'},],
         optionList:[],
         queryParams:{
           page:1,
           pageSize:20,
-          examTypeId:null,
+          templateType:null,
           deptId:null,
           searchValue:'',
         },
@@ -144,7 +144,7 @@
 
     },
     mounted () {
-      this.examElExamTypeList();
+      // this.examElExamTypeList();
       this.systemDeptCurrentDept();
       this.getList();
     },
@@ -159,7 +159,7 @@
         this.$set(this,'queryParams',{
           page:1,
           pageSize:20,
-          examTypeId:null,
+          templateType:null,
           deptId:null,
           shareStatus:'',
           searchValue:'',

src/views/safetyEducationExaminationNew/safetyTest/myCertificates/index.vue

@@ -24,6 +24,7 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
+                   v-if="scope.row.certificateStatus == 1 && scope.row.certificatePrintEnabled == 1"
                    @click="tableButton(1,scope.row)"
                 >查看下载</p>
                 <p class="table-button-null"></p>