王子文 专项培训

1) 系统里所有“培训”改成“培养”
2) “学时”字段隐藏

ui/src/views/training/spec/myplan/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="培训内容" prop="plantName">
+      <el-form-item label="课程内容" prop="plantName">
         <el-input
           v-model="queryParams.plantName"
-          placeholder="请输入培训内容"
+          placeholder="请输入课程内容"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -26,7 +26,7 @@
           placeholder="选择结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="学时" prop="classHour">
+      <!-- <el-form-item label="学时" prop="classHour">
         <el-input
           v-model="queryParams.classHour"
           placeholder="请输入学时"
@@ -34,7 +34,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="学习状态" prop="studyState">
         <el-select v-model="queryParams.studyState" placeholder="请选择学习状态" clearable size="small">
           <el-option
@@ -112,31 +112,24 @@
     <!-- 表格 -->
     <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange" :height="clientHeight" border :cell-style="tableCellStyle">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="培训员工" align="center" prop="staffName" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训内容" align="center" prop="plantName" :show-overflow-tooltip="true"/>
-      <el-table-column label="开始日期" align="center" prop="startDate">
+      <el-table-column label="课程内容" align="center" prop="plantName" :show-overflow-tooltip="true"/>
+      <el-table-column label="具体内容" align="center" prop="classContent" :show-overflow-tooltip="true"/>
+      <el-table-column label="开始日期" align="center" prop="startDate" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束日期" align="center" prop="endDate">
+      <el-table-column label="结束日期" align="center" prop="endDate" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="实际完成培训日期" align="center" prop="dateOfCompletion">
+      <el-table-column label="实际完成日期" align="center" prop="dateOfCompletion" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.dateOfCompletion, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="学时" align="center" prop="classHour" :show-overflow-tooltip="true"/>
-      <el-table-column label="具体内容" align="center" prop="classContent" :show-overflow-tooltip="true"/>
-      <el-table-column label="学习状态" align="center" prop="studyState" :formatter="studyStateFormat">
-        <!-- <template slot-scope="scope">
-          <span>{{scope.row.studyState}}</span>
-          <el-button icon="el-icon-view" style="color:#6e96fa" v-if="scope.row.studyState == 2" @click="handleFeedback(scope.row)"  circle></el-button>
-        </template> -->
-      </el-table-column>
+      <el-table-column label="学习状态" align="center" prop="studyState" :formatter="studyStateFormat" width="120"/>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -185,7 +178,7 @@
     <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="培训员工" prop="staffId" v-if="this.operation=='add'">
+        <el-form-item label="员工" prop="staffId" v-if="this.operation=='add'">
           <el-select v-model="form.staffId" placeholder="请选择学员">
             <el-option
               v-for="successor in successorOptions"
@@ -196,11 +189,11 @@
           </el-select>
         </el-form-item>
         <!-- 修改对话框显示员工姓名 -->
-        <el-form-item label="培训员工" prop="staffName" v-if="this.operation=='modify'">
+        <el-form-item label="员工" prop="staffName" v-if="this.operation=='modify'">
           <el-input v-model="form.staffName" readonly />
         </el-form-item>
-        <el-form-item label="培训内容" prop="plantName">
-          <el-input v-model="form.plantName" placeholder="请输入培训内容" />
+        <el-form-item label="课程内容" prop="plantName">
+          <el-input v-model="form.plantName" placeholder="请输入课程内容" />
         </el-form-item>
         <el-form-item label="部门编号" prop="deptId">
           <el-input v-model="form.deptId" placeholder="请输入部门编号" />
@@ -221,9 +214,9 @@
             placeholder="选择结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="学时" prop="classHour">
+        <!-- <el-form-item label="学时" prop="classHour">
           <el-input v-model="form.classHour" placeholder="请输入学时" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="具体内容">
           <!-- <editor v-model="form.classContent" :min-height="192"/> -->
           <el-input
@@ -549,7 +542,7 @@ export default {
   methods: {
     // 单元格样式
     tableCellStyle (row, column, rowIndex, columnIndex) {
-      if (row.column.label === "实际完成培训日期" && row.row.dateOfCompletion > row.row.endDate) {
+      if (row.column.label === "实际完成日期" && row.row.dateOfCompletion > row.row.endDate) {
         return "background: #FFEEEE"
       }
     },
@@ -728,7 +721,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加培训计划";
+      this.title = "添加培养计划";
       this.operation = "add";
     },
     /** 修改按钮操作 */
@@ -738,7 +731,7 @@ export default {
       getPlan(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改培训计划";
+        this.title = "修改培养计划";
         this.operation = "modify";
       });
     },
@@ -779,7 +772,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有培训计划数据项?', "警告", {
+      this.$confirm('是否确认导出所有培养计划数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

ui/src/views/training/spec/plan/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container barchart">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="培训内容" prop="plantName">
+      <el-form-item label="课程内容" prop="plantName">
         <el-input
           v-model="queryParams.plantName"
-          placeholder="请输入培训内容"
+          placeholder="请输入课程内容"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -26,14 +26,14 @@
           placeholder="选择结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="学时" prop="classHour">
+      <!-- <el-form-item label="学时" prop="classHour">
         <el-input
           v-model="queryParams.classHour"
           placeholder="请输入学时"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        /> -->
       </el-form-item>
       <el-form-item :label="$t('申请状态')" prop="approveStatus">
         <el-select v-model="queryParams.approveStatus" :placeholder="$t('请选择') + $t('申请状态')" clearable size="small">
@@ -114,8 +114,8 @@
     <!-- 表格 -->
     <el-table v-loading="loading" ref="planTable" :data="planList" @selection-change="handleSelectionChange" :height="clientHeight" border :cell-style="tableCellStyle">
       <el-table-column type="selection" width="55"   align="center" />
-      <el-table-column label="培训员工" fixed="left"align="center"   prop="staffName" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训内容" fixed="left" align="center" width="150"   prop="plantName" :show-overflow-tooltip="true"/>
+      <el-table-column label="员工" fixed="left"align="center"   prop="staffName" :show-overflow-tooltip="true"/>
+      <el-table-column label="课程内容" fixed="left" align="center" width="150"   prop="plantName" :show-overflow-tooltip="true"/>
       <el-table-column label="开始日期" width="90" fixed="left" align="center"   prop="startDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
@@ -126,12 +126,12 @@
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="实际完成培训日期" width="105" align="center"   prop="dateOfCompletion">
+      <el-table-column label="实际完成日期" width="105" align="center"   prop="dateOfCompletion">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.dateOfCompletion, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="学时" align="center"   prop="classHour" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="学时" align="center"   prop="classHour" :show-overflow-tooltip="true"/> -->
       <el-table-column label="具体内容" align="center" width="200"   prop="classContent" :show-overflow-tooltip="true"/>
       <el-table-column label="学习状态" align="center"   prop="studyState" :formatter="studyStateFormat">
         <!-- <template slot-scope="scope">
@@ -314,7 +314,7 @@
     <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="培训员工" prop="staffId" >
+        <el-form-item label="员工" prop="staffId" >
           <el-select v-model="form.staffId" placeholder="请选择学员" disabled>
             <el-option
               v-for="successor in successorOptions"
@@ -325,8 +325,8 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="培训内容" prop="plantName">
-          <el-input v-model="form.plantName" placeholder="请输入培训内容" />
+        <el-form-item label="课程内容" prop="plantName">
+          <el-input v-model="form.plantName" placeholder="请输入课程内容" />
         </el-form-item>
         <el-form-item label="开始日期" prop="startDate">
           <el-date-picker clearable size="small" style="width: 220px"
@@ -344,9 +344,9 @@
             placeholder="选择结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="学时" prop="classHour">
+        <!-- <el-form-item label="学时" prop="classHour">
           <el-input v-model="form.classHour" placeholder="请输入学时" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="具体内容">
           <el-input
             type="textarea"
@@ -744,7 +744,7 @@ export default {
   methods: {
     // 单元格样式
     tableCellStyle (row, column, rowIndex, columnIndex) {
-      if (row.column.label === "实际完成培训日期" && row.row.dateOfCompletion > row.row.endDate) {
+      if (row.column.label === "实际完成日期" && row.row.dateOfCompletion > row.row.endDate) {
         return "background: #FFEEEE"
       }
       if (row.column.label === "修改人" && row.row.updateBy!=null) {
@@ -959,11 +959,11 @@ export default {
       getYearplan(this.queryParams.yearPlanId).then(response => {
         this.form.staffId = response.data.staffId.toString();
         this.open = true;
-        this.title = "修改专项培训年度计划";
+        this.title = "添加培养计划";
         this.operation = "modify";
       });
       this.open = true;
-      this.title = "添加培训计划";
+      this.title = "添加培养计划";
       this.operation = "add";
     },
     /** 修改按钮操作 */
@@ -973,7 +973,7 @@ export default {
       getPlan(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改培训计划";
+        this.title = "修改培养计划";
         this.operation = "modify";
       });
     },
@@ -1016,7 +1016,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有培训计划数据项?', "警告", {
+      this.$confirm('是否确认导出所有培养计划数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

ui/src/views/training/spec/yearplan/index.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="培训员工编号" prop="staffId">
+      <el-form-item label="学员编号" prop="staffId">
         <el-input
           v-model="queryParams.staffId"
-          placeholder="请输入培训员工编号"
+          placeholder="请输入学员编号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="年度培训标题" prop="name">
+      <el-form-item label="年度计划标题" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入年度培训标题"
+          placeholder="请输入年度计划标题"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -96,9 +96,9 @@
 
     <el-table v-loading="loading" :data="yearplanList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="培训员工编号" align="center" prop="staffId" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训员工" align="center" fixed="left" prop="staffName" :show-overflow-tooltip="true"/>
-      <el-table-column label="年度培训标题" align="center" prop="name" :show-overflow-tooltip="true"/>
+      <el-table-column label="学员编号" align="center" prop="staffId" :show-overflow-tooltip="true"/>
+      <el-table-column label="学员" align="center" fixed="left" prop="staffName" :show-overflow-tooltip="true"/>
+      <el-table-column label="年度计划标题" align="center" prop="name" :show-overflow-tooltip="true"/>
 <!--      <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createdate" width="100">
         <template slot-scope="scope">
@@ -161,7 +161,7 @@
     <!-- 添加或修改专项培训年度计划对话框 -->
     <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="培训员工" prop="staffId" v-if="this.operation=='add'">
+        <el-form-item label="学员" prop="staffId" v-if="this.operation=='add'">
           <el-select v-model="form.staffId" placeholder="请选择学员">
             <el-option
               v-for="successor in this.successorOptions"
@@ -171,7 +171,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="培训员工" prop="staffName" v-if="this.operation=='modify'">
+        <el-form-item label="学员" prop="staffName" v-if="this.operation=='modify'">
           <el-select v-model="form.staffId" placeholder="请选择学员" disabled>
             <el-option
               v-for="successor in this.successorOptions"
@@ -181,8 +181,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="年度培训标题" prop="name">
-          <el-input v-model="form.name" placeholder="请输入年度培训标题" />
+        <el-form-item label="年度计划标题" prop="name">
+          <el-input v-model="form.name" placeholder="请输入年度计划标题" />
         </el-form-item>
         <el-form-item label="年份" prop="planYear">
           <el-date-picker clearable size="small" style="width: 200px"
@@ -405,7 +405,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加专项培训年度计划";
+      this.title = "添加年度计划";
       this.operation = "add";
     },
     /** 修改按钮操作 */
@@ -416,7 +416,7 @@ export default {
         this.form = response.data;
         this.form.planYear = response.data.planYear.toString();
         this.open = true;
-        this.title = "修改专项培训年度计划";
+        this.title = "修改年度计划";
         this.operation = "modify";
       });
     },
@@ -457,7 +457,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有专项培训年度计划数据项?', "警告", {
+      this.$confirm('是否确认导出所有年度培养计划数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"