Merge branch 'master' into xbnl_20260904(应知应会区分学生/教职工)

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

@@ -555,23 +555,23 @@
                   </div>
                 </el-form-item>
 
-                <el-form-item label="证书复审周期" prop="certificateReviewMonths" v-if="newData.certificateEnabled == 1">
-                  <div class="stepper-row">
-                    <div class="number-stepper">
-                      <el-input-number
-                        :disabled="showType"
-                        class="form-input-number"
-                        style="width:160px;"
-                        :min="0"
-                        :max="9999"
-                        :step="1" :precision="0" step-strictly
-                        v-model="newData.certificateReviewMonths"
-                      >
-                      </el-input-number>
-                    </div>
-                    <span class="unit-text">个月</span>
-                  </div>
-                </el-form-item>
+                <!--<el-form-item label="证书复审周期" prop="certificateReviewMonths" v-if="newData.certificateEnabled == 1">-->
+                  <!--<div class="stepper-row">-->
+                    <!--<div class="number-stepper">-->
+                      <!--<el-input-number-->
+                        <!--:disabled="showType"-->
+                        <!--class="form-input-number"-->
+                        <!--style="width:160px;"-->
+                        <!--:min="0"-->
+                        <!--:max="9999"-->
+                        <!--:step="1" :precision="0" step-strictly-->
+                        <!--v-model="newData.certificateReviewMonths"-->
+                      <!--&gt;-->
+                      <!--</el-input-number>-->
+                    <!--</div>-->
+                    <!--<span class="unit-text">个月</span>-->
+                  <!--</div>-->
+                <!--</el-form-item>-->
 
                 <el-form-item label="安全承诺书" prop="securityCommitmentEnabled">
                   <div class="switch-row">

src/views/safetyEducationExaminationNew/featurePage/startTheExam/index.vue

@@ -117,7 +117,7 @@
       <div style="height:600px;display: flex;flex-direction: column;overflow: hidden">
         <safetyCommitmentLetter ref="dataStatisticsReport" :safetyCommitmentLetterPropsData="safetyCommitmentLetterPropsData"></safetyCommitmentLetter>
       </div>
-      <div slot="footer" class="dialog-footer dialog-footer-box" v-if="safetyCommitmentLetterPropsData.securityCommitmentPrintEnabled == 1 && safetyCommitmentLetterPropsData.securityCommitmentStatus != 1">
+      <div slot="footer" class="dialog-footer dialog-footer-box" v-if="safetyCommitmentLetterPropsData.securityCommitmentEnabled == 1 && safetyCommitmentLetterPropsData.securityCommitmentStatus != 1">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-border" v-if="safetyCommitmentLetterPropsData.securityCommitmentPrintEnabled == 1" @click="safetyCommitmentLetterDialogButton(2)">下载</p>
         <p class="dialog-footer-button-primary" v-if="safetyCommitmentLetterPropsData.securityCommitmentStatus != 1" @click="safetyCommitmentLetterDialogButton(3)">确认</p>
@@ -179,6 +179,7 @@
         //安全承诺书
         safetyCommitmentLetterDialogType:false,
         safetyCommitmentLetterPropsData:{
+          securityCommitmentEnabled:0,
           securityCommitmentPath:'',
           securityCommitmentPrintEnabled:0,
           securityCommitmentStatus:0,
@@ -408,6 +409,7 @@
               //最佳记录
               this.$set(this,'safetyCommitmentLetterPropsData',{
                 examId:this.newData.examId,
+                securityCommitmentEnabled:response.data.securityCommitmentEnabled,
                 securityCommitmentPath:response.data.securityCommitmentPath,
                 securityCommitmentPrintEnabled:response.data.securityCommitmentPrintEnabled,
                 securityCommitmentStatus:response.data.securityCommitmentStatus,

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

@@ -107,7 +107,7 @@
       <div style="height:600px;display: flex;flex-direction: column;overflow: hidden">
         <safetyCommitmentLetter ref="dataStatisticsReport" :safetyCommitmentLetterPropsData="safetyCommitmentLetterPropsData"></safetyCommitmentLetter>
       </div>
-      <div slot="footer" class="dialog-footer dialog-footer-box" v-if="safetyCommitmentLetterPropsData.securityCommitmentPrintEnabled == 1 || !safetyCommitmentLetterPropsData.securityCommitmentConfirmed">
+      <div slot="footer" class="dialog-footer dialog-footer-box" v-if="safetyCommitmentLetterPropsData.securityCommitmentEnabled == 1 || !safetyCommitmentLetterPropsData.securityCommitmentConfirmed">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-border" v-if="safetyCommitmentLetterPropsData.securityCommitmentPrintEnabled == 1" @click="safetyCommitmentLetterDialogButton(2)">下载</p>
         <p class="dialog-footer-button-primary" v-if="!safetyCommitmentLetterPropsData.securityCommitmentConfirmed" @click="safetyCommitmentLetterDialogButton(3)">确认</p>
@@ -165,6 +165,7 @@
         //安全承诺书
         safetyCommitmentLetterDialogType:false,
         safetyCommitmentLetterPropsData:{
+          securityCommitmentEnabled:0,
           securityCommitmentPath:'',
           securityCommitmentPrintEnabled:0,
           securityCommitmentConfirmed:false,
@@ -305,6 +306,7 @@
         if(type == 1){
           this.$set(this,'safetyCommitmentLetterPropsData',{
             examId:item.examId,
+            securityCommitmentEnabled:item.securityCommitmentEnabled,
             securityCommitmentPath:item.securityCommitmentPath,
             securityCommitmentPrintEnabled:item.securityCommitmentPrintEnabled,
             securityCommitmentConfirmed:item.securityCommitmentConfirmed,