Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

client/src/router/index.js

@@ -430,7 +430,7 @@ export const asyncRoutes = [
         path: 'course',
         name: 'course',
         component: () => import('@/views/testvideo/course.vue'),
-        meta: { title: '课程列表'}
+        meta: { title: '课程列表', perms: ['certificate']}
       },
       {
         path: 'videolist',

client/src/views/testvideo/certificate.vue

@@ -73,7 +73,8 @@
           </div>
           <el-button slot="reference">导入证书</el-button>
         </el-popover>
-        <el-link href="/media/cert/template/cert-202312.xlsx" target="_blank" type="primary">202312模板</el-link>
+        <!-- <el-link href="/media/cert/template/cert-202312.xlsx" target="_blank" type="primary">202312模板</el-link> -->
+        <el-link :href="fileUrl" target="downloadFile" type="primary">202312模板</el-link>
       </div>
     </el-card>
     <el-card style="margin-top: 10px">
@@ -96,6 +97,8 @@
       </el-table-column>
       <el-table-column label="所属单位" prop="所属单位" v-if="listQuery.证书方案=='202309'">
       </el-table-column>
+      <el-table-column label="单位名称" prop="单位名称" v-else>
+      </el-table-column>
       <el-table-column label="姓名" prop="姓名">
       </el-table-column>
       <el-table-column label="证书编号" prop="证书编号">
@@ -155,23 +158,26 @@
       >
       <el-row>
         <el-col :span="12">
-          <el-form-item label="证书方案">
+          <el-form-item label="证书方案" prop="证书方案">
             <el-select style="width: 100%" v-model="form.证书方案" placeholder="证书方案" :disabled="dialogType=='edit'">
               <el-option v-for="item in planOption" :key="item" :label="item" :value="item"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="姓名" prop="姓名">
+            <el-input v-model="form.姓名" />
+          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="证书编号" prop="证书编号">
             <el-input v-model="form.证书编号" />
           </el-form-item>
+          <el-form-item label="单位名称" prop="单位名称">
+            <el-input v-model="form.单位名称"/>
+          </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="form.证书方案=='202312'">
         <el-col :span="12">
-          <el-form-item label="姓名">
-            <el-input v-model="form.姓名" />
-          </el-form-item>
           <el-form-item label="培训开始日期" prop="培训日期">
             <el-date-picker
               v-model="form.培训日期"
@@ -184,16 +190,6 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="发证日期" prop="发证日期">
-            <el-date-picker
-              v-model="form.发证日期"
-              type="date"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-              placeholder="发证日期"
-              style="width:100%">
-            </el-date-picker>
-          </el-form-item>
           <el-form-item label="培训结束日期" prop="培训结束日期">
             <el-date-picker
               v-model="form.培训结束日期"
@@ -215,15 +211,21 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="发证日期" prop="发证日期">
+            <el-date-picker
+              v-model="form.发证日期"
+              type="date"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              placeholder="发证日期"
+              style="width:100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row v-if="form.证书方案=='202309'">
         <el-col :span="12">
-          <el-form-item label="姓名">
-            <el-input v-model="form.姓名" />
-          </el-form-item>
-          <el-form-item label="单位名称" prop="单位名称">
-            <el-input v-model="form.单位名称"/>
-          </el-form-item>
           <el-form-item label="性别">
             <el-input v-model="form.性别" />
           </el-form-item>
@@ -357,14 +359,19 @@ export default {
         证书编号: [{ required: true, message: "请填写", trigger: "blur" }],
         所属单位: [{ required: true, message: "请填写", trigger: "blur" }],
         单位名称: [{ required: true, message: "请填写", trigger: "blur" }],
+        证书方案: [{ required: true, message: "请选择", trigger: "blur" }],
+        姓名: [{ required: true, message: "请填写", trigger: "blur" }],
       },
       courseOption:[],
       planOption:["202309","202312"],
+      fileUrl:''
     };
   },
   mounted() {
     this.getList();
     this.getCourseList();
+    let timers = new Date().getTime();
+    this.fileUrl ='/media/cert/template/cert-202312.xlsx?time='+timers;
   },
   methods: {
     checkPermission,

server/dist/index_zs.html

@@ -215,10 +215,11 @@ user-scalable: 用户是否能缩放页面 -->
                     </div>
                     <div v-else-if="item.证书方案=='202312'">
                         <div>姓名：{{item.姓名}}</div>
+                        <div>单位名称：{{item.单位名称}}</div>
                         <div>证书编号：{{item.证书编号}}</div>
                         <div>培训日期：{{item.培训日期}}</div>
                         <div>培训结束日期：{{item.培训结束日期}}</div>
-                        <div>培训日期：{{item.发证日期}}</div>
+                        <div>发证日期{{item.发证日期}}</div>
                     </div>
                 </div>
             </div>