界面名称调整

src/components/DictTag/index.vue

@@ -16,6 +16,7 @@
           :index="index"
           :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
           :class="item.raw.cssClass"
+          effect="dark"
         >
           {{ item.label + " " }}
         </el-tag>

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

@@ -79,12 +79,12 @@
         <el-table
           border
           height="550"
-          size="small" :data="planList" @selection-change="handleSelectionChange" row-key="id"
-                  :tree-props="{ children: 'children' }">
+          size="small" :data="planList" @selection-change="handleSelectionChange" row-key="id">
+                  <!-- :tree-props="{ children: 'children' }" -->
           <el-table-column label="序号" align="center" prop="no" width="60"/>
           <el-table-column label="培训主题" align="left" width="200" prop="planName"/>
           <el-table-column label="创建机构" align="left" width="180" prop="createOrgName"/>
-          <el-table-column label="所属机构" align="left" width="180" prop="belongOrgName"/>
+          <!-- <el-table-column label="所属机构" align="left" width="180" prop="belongOrgName"/> -->
           <el-table-column label="培训机构类型" align="center" width="180" prop="execOrgType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.execOrgType"/>

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

@@ -16,7 +16,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="任务时间" prop="rangen">
+      <el-form-item label="培训进度" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择培训进度" clearable>
+            <el-option
+              v-for="dict in dict.type.edu_task_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+      </el-form-item>
+      <el-form-item label="计划时间" prop="rangen">
         <el-date-picker
           v-model="queryParams.range"
           type="daterange"
@@ -34,16 +44,7 @@
             />
           </el-select>
       </el-form-item>-->
-      <el-form-item label="培训状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择培训状态" clearable>
-            <el-option
-              v-for="dict in dict.type.edu_task_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-      </el-form-item>
+      
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -56,8 +57,20 @@
       height="600"
       size="small" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
       <el-table-column label="序号" align="center" 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="培训角色" width="180" align="center" >
+      <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" >
+        <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>
+
+      <!-- <el-table-column label="培训角色" width="180" align="center" >
         <template slot-scope="scope">
             <template v-if="scope.row.taskRoleNameList  ">
               <el-tag size="mini" type="success" v-for="(item, index) in (scope.row.taskRoleNameList || '').split(',')"
@@ -66,8 +79,8 @@
               </el-tag>
             </template>
           </template>
-      </el-table-column>
-      <el-table-column label="培训主题" width="200" align="left" prop="title" />
+      </el-table-column> -->
+      
 <!--      <el-table-column label="培训类型" width="180" align="center"  >
         <template slot-scope="scope">
             <dict-tag :options="dict.type.edu_type" :value="scope.row.type"/>
@@ -75,18 +88,9 @@
       </el-table-column>
 
       <el-table-column label="主持人" width="140" align="center" prop="hostName" />-->
-      <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="trainingStartDateTime" width="180">
-      </el-table-column>-->
-      <el-table-column label="培训状态" align="center" prop="status" >
-        <template slot-scope="scope">
-            <dict-tag :options="dict.type.edu_task_status" :value="scope.row.status"/>
-          </template>
-      </el-table-column>
+      
       <el-table-column label="操作" fixed="right" width="120px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button