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

src/views/core/edu/task/index.vue

@@ -100,6 +100,19 @@
             @click="handleRecorded(scope.row.id)"
             v-hasPermi="['system:eduTask:remove']"
           >培训登记</el-button>
+          <el-button type="text" v-if="scope.row.pdfUrl" @click="onDown(scope.row.pdfUrl)"
+            >培训登记簿
+          </el-button>
+          <!-- <el-button type="text" @click="onEdit(scope.row)">查看</el-button>            
+          <el-button
+              type="text"
+              v-if="
+              r.row.auditFlag == 'PASS' &&
+                (isExecute || loginOrgId == r.row.orgId) && canPerform(r.row.eduJobIds)&&isOverOrUnStart(r.row)
+            "
+              @click="onPerform(r.row.id, r.row.eduJobIds, r.row.endDate)"
+          >执行
+          </el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -114,7 +127,7 @@
   </el-col>
   </el-row>
     <!-- 添加或修改教育任务对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="教育培训计划Id" prop="planId">
           <el-input v-model="form.planId" placeholder="请输入教育培训计划Id" />
@@ -199,7 +212,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
 
     <dialog-info ref="infoDialog" @success="handleQuery(true)"></dialog-info>
     <dialog-perform ref="performDialog" @success="handleQuery(true)"></dialog-perform>
@@ -400,6 +413,10 @@ export default {
       // 如果不是同一天，则判断当前时间是否早于开始时间或晚于结束时间
       return !(currentTime < startDate || currentTime > endDate);
     },
+    async onDown(pdfUrl) {
+      // const data = await this.$api.eduTraining.predown(id);
+      window.open(pdfUrl);
+    },
   }
 };
 </script>