条件教育培训任务 界面显示元素

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

@@ -26,7 +26,7 @@
             />
           </el-select>
       </el-form-item>
-      <el-form-item label="计划时间" prop="rangen">
+      <el-form-item label="任务时间" prop="rangen">
         <el-date-picker
           v-model="queryParams.range"
           type="daterange"
@@ -56,18 +56,27 @@
       border
       height="600"
       size="small" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
-      <el-table-column label="序号" align="center" prop="no" />
+      <el-table-column label="序号" align="center" width="70" prop="no" />
       <el-table-column label="培训主题" width="200" align="left" prop="title" />
       <el-table-column label="培训机构" width="200" align="left" prop="orgName" />
-      <el-table-column label="开始时间" align="center" prop="startDate" width="180">
+      <!-- <el-table-column label="开始时间" align="center" prop="startDate" width="180">
       </el-table-column>
-      <el-table-column label="截止时间" align="center" prop="endDate" width="180"></el-table-column>
-      <el-table-column label="培训进度" align="center" prop="status" >
+      <el-table-column label="截止时间" align="center" prop="endDate" width="180"></el-table-column> -->
+      <el-table-column label="任务时间" align="center" width="300">
+        <template slot-scope="scope">
+            {{ dayjs(scope.row.startDate).format("YYYY-MM-DD") +" ~ "+dayjs(scope.row.endDate).format("YYYY-MM-DD")}}
+          </template>
+      </el-table-column>
+      <el-table-column label="培训进度" align="center" prop="status" width="150" >
         <template slot-scope="scope">
             <dict-tag :options="dict.type.edu_task_status" :value="scope.row.status"/>
           </template>
       </el-table-column>
-      <el-table-column label="培训登记时间" align="center" prop="trainingStartDateTime" width="180">
+      <el-table-column label="培训时间" align="center" prop="trainingStartDateTime" width="300">
+        <template slot-scope="scope">
+            {{scope.row.trainingStartDateTime
+            ? (scope.row.trainingStartDateTime+" ~ "+scope.row.trainingEndDateTime) :''}}
+          </template>
       </el-table-column>
 
       <!-- <el-table-column label="培训角色" width="180" align="center" >
@@ -190,6 +199,7 @@ export default {
   },
 
   methods: {
+    dayjs,
     /** 查询教育任务列表 */
     getList() {
       this.loading = true;