Browse Source

LY 专项培训 年度培训

ly 3 years ago
parent
commit
e0afeefb51

+ 7 - 7
ui/src/api/training/spec/bank.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import request from '@/utils/request'
 
 
-// 查询专项培训题库列表
+// 查询 专项培养题库列表
 export function listBank(query) {
 export function listBank(query) {
   return request({
   return request({
     url: '/spec/bank/list',
     url: '/spec/bank/list',
@@ -9,7 +9,7 @@ export function listBank(query) {
   })
   })
 }
 }
 
 
-// 查询专项培训题库详细
+// 查询 专项培养题库详细
 export function getBank(id) {
 export function getBank(id) {
   return request({
   return request({
     url: '/spec/bank/' + id,
     url: '/spec/bank/' + id,
@@ -17,7 +17,7 @@ export function getBank(id) {
   })
   })
 }
 }
 
 
-// 新增专项培训题库
+// 新增 专项培养题库
 export function addBank(data) {
 export function addBank(data) {
   return request({
   return request({
     url: '/spec/bank',
     url: '/spec/bank',
@@ -26,7 +26,7 @@ export function addBank(data) {
   })
   })
 }
 }
 
 
-// 修改专项培训题库
+// 修改 专项培养题库
 export function updateBank(data) {
 export function updateBank(data) {
   return request({
   return request({
     url: '/spec/bank',
     url: '/spec/bank',
@@ -35,7 +35,7 @@ export function updateBank(data) {
   })
   })
 }
 }
 
 
-// 删除专项培训题库
+// 删除 专项培养题库
 export function delBank(id) {
 export function delBank(id) {
   return request({
   return request({
     url: '/spec/bank/' + id,
     url: '/spec/bank/' + id,
@@ -43,11 +43,11 @@ export function delBank(id) {
   })
   })
 }
 }
 
 
-// 导出专项培训题库
+// 导出 专项培养题库
 export function exportBank(query) {
 export function exportBank(query) {
   return request({
   return request({
     url: '/spec/bank/export',
     url: '/spec/bank/export',
     method: 'get',
     method: 'get',
     params: query
     params: query
   })
   })
-}
+}

+ 7 - 7
ui/src/api/training/spec/feedback.js

@@ -36,7 +36,7 @@ export function listSuccessorMonthlyFeedback(query) {
   })
   })
 }
 }
 
 
-// 查询专项培训反馈列表
+// 查询 专项培养反馈列表
 export function listFeedback(query) {
 export function listFeedback(query) {
   return request({
   return request({
     url: '/spec/feedback/list',
     url: '/spec/feedback/list',
@@ -45,7 +45,7 @@ export function listFeedback(query) {
   })
   })
 }
 }
 
 
-// 查询专项培训反馈详细
+// 查询 专项培养反馈详细
 export function getFeedback(id) {
 export function getFeedback(id) {
   return request({
   return request({
     url: '/spec/feedback/' + id,
     url: '/spec/feedback/' + id,
@@ -53,7 +53,7 @@ export function getFeedback(id) {
   })
   })
 }
 }
 
 
-// 新增专项培训反馈
+// 新增 专项培养反馈
 export function addFeedback(data) {
 export function addFeedback(data) {
   return request({
   return request({
     url: '/spec/feedback',
     url: '/spec/feedback',
@@ -62,7 +62,7 @@ export function addFeedback(data) {
   })
   })
 }
 }
 
 
-// 修改专项培训反馈
+// 修改 专项培养反馈
 export function updateFeedback(data) {
 export function updateFeedback(data) {
   return request({
   return request({
     url: '/spec/feedback',
     url: '/spec/feedback',
@@ -71,7 +71,7 @@ export function updateFeedback(data) {
   })
   })
 }
 }
 
 
-// 删除专项培训反馈
+// 删除 专项培养反馈
 export function delFeedback(id) {
 export function delFeedback(id) {
   return request({
   return request({
     url: '/spec/feedback/' + id,
     url: '/spec/feedback/' + id,
@@ -79,11 +79,11 @@ export function delFeedback(id) {
   })
   })
 }
 }
 
 
-// 导出专项培训反馈
+// 导出 专项培养反馈
 export function exportFeedback(query) {
 export function exportFeedback(query) {
   return request({
   return request({
     url: '/spec/feedback/export',
     url: '/spec/feedback/export',
     method: 'get',
     method: 'get',
     params: query
     params: query
   })
   })
-}
+}

+ 7 - 7
ui/src/api/training/spec/planfeedback.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import request from '@/utils/request'
 
 
-// 查询专项培训反馈列表
+// 查询 专项培养反馈列表
 export function listFeedback(query) {
 export function listFeedback(query) {
   return request({
   return request({
     url: '/spec/planfeedback/list',
     url: '/spec/planfeedback/list',
@@ -9,7 +9,7 @@ export function listFeedback(query) {
   })
   })
 }
 }
 
 
-// 查询专项培训反馈详细
+// 查询 专项培养反馈详细
 export function getFeedback(id) {
 export function getFeedback(id) {
   return request({
   return request({
     url: '/spec/planfeedback/' + id,
     url: '/spec/planfeedback/' + id,
@@ -17,7 +17,7 @@ export function getFeedback(id) {
   })
   })
 }
 }
 
 
-// 新增专项培训反馈
+// 新增 专项培养反馈
 export function addFeedback(data) {
 export function addFeedback(data) {
   return request({
   return request({
     url: '/spec/planfeedback',
     url: '/spec/planfeedback',
@@ -26,7 +26,7 @@ export function addFeedback(data) {
   })
   })
 }
 }
 
 
-// 修改专项培训反馈
+// 修改 专项培养反馈
 export function updateFeedback(data) {
 export function updateFeedback(data) {
   return request({
   return request({
     url: '/spec/planfeedback',
     url: '/spec/planfeedback',
@@ -35,7 +35,7 @@ export function updateFeedback(data) {
   })
   })
 }
 }
 
 
-// 删除专项培训反馈
+// 删除 专项培养反馈
 export function delFeedback(id) {
 export function delFeedback(id) {
   return request({
   return request({
     url: '/spec/planfeedback/' + id,
     url: '/spec/planfeedback/' + id,
@@ -43,11 +43,11 @@ export function delFeedback(id) {
   })
   })
 }
 }
 
 
-// 导出专项培训反馈
+// 导出 专项培养反馈
 export function exportFeedback(query) {
 export function exportFeedback(query) {
   return request({
   return request({
     url: '/spec/planfeedback/export',
     url: '/spec/planfeedback/export',
     method: 'get',
     method: 'get',
     params: query
     params: query
   })
   })
-}
+}

+ 7 - 7
ui/src/api/training/spec/stapprove.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import request from '@/utils/request'
 
 
-// 查询专项培训计划申请列表
+// 查询 专项培养计划申请列表
 export function listStapprove(query) {
 export function listStapprove(query) {
   return request({
   return request({
     url: '/spec/stapprove/list',
     url: '/spec/stapprove/list',
@@ -9,7 +9,7 @@ export function listStapprove(query) {
   })
   })
 }
 }
 
 
-// 查询专项培训计划申请详细
+// 查询 专项培养计划申请详细
 export function getStapprove(id) {
 export function getStapprove(id) {
   return request({
   return request({
     url: '/spec/stapprove/' + id,
     url: '/spec/stapprove/' + id,
@@ -17,7 +17,7 @@ export function getStapprove(id) {
   })
   })
 }
 }
 
 
-// 查询专项培训计划申请详细
+// 查询 专项培养计划申请详细
 export function getStapproveInfo(id) {
 export function getStapproveInfo(id) {
   return request({
   return request({
     url: '/spec/stapprove/info/' + id,
     url: '/spec/stapprove/info/' + id,
@@ -42,7 +42,7 @@ export function handleApprove(data) {
   })
   })
 }
 }
 
 
-// 新增专项培训计划申请
+// 新增 专项培养计划申请
 export function addStapprove(data) {
 export function addStapprove(data) {
   return request({
   return request({
     url: '/spec/stapprove',
     url: '/spec/stapprove',
@@ -51,7 +51,7 @@ export function addStapprove(data) {
   })
   })
 }
 }
 
 
-// 修改专项培训计划申请
+// 修改 专项培养计划申请
 export function updateStapprove(data) {
 export function updateStapprove(data) {
   return request({
   return request({
     url: '/spec/stapprove',
     url: '/spec/stapprove',
@@ -60,7 +60,7 @@ export function updateStapprove(data) {
   })
   })
 }
 }
 
 
-// 删除专项培训计划申请
+// 删除 专项培养计划申请
 export function delStapprove(id) {
 export function delStapprove(id) {
   return request({
   return request({
     url: '/spec/stapprove/' + id,
     url: '/spec/stapprove/' + id,
@@ -68,7 +68,7 @@ export function delStapprove(id) {
   })
   })
 }
 }
 
 
-// 导出专项培训计划申请
+// 导出 专项培养计划申请
 export function exportStapprove(query) {
 export function exportStapprove(query) {
   return request({
   return request({
     url: '/spec/stapprove/export',
     url: '/spec/stapprove/export',

+ 6 - 6
ui/src/api/training/spec/yearplan.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import request from '@/utils/request'
 
 
-// 查询专项培训年度计划列表
+// 查询 专项培养年度计划列表
 export function listYearplan(query) {
 export function listYearplan(query) {
   return request({
   return request({
     url: '/spec/yearplan/list',
     url: '/spec/yearplan/list',
@@ -9,7 +9,7 @@ export function listYearplan(query) {
   })
   })
 }
 }
 
 
-// 查询专项培训年度计划详细
+// 查询 专项培养年度计划详细
 export function getYearplan(id) {
 export function getYearplan(id) {
   return request({
   return request({
     url: '/spec/yearplan/' + id,
     url: '/spec/yearplan/' + id,
@@ -17,7 +17,7 @@ export function getYearplan(id) {
   })
   })
 }
 }
 
 
-// 新增专项培训年度计划
+// 新增 专项培养年度计划
 export function addYearplan(data) {
 export function addYearplan(data) {
   return request({
   return request({
     url: '/spec/yearplan',
     url: '/spec/yearplan',
@@ -26,7 +26,7 @@ export function addYearplan(data) {
   })
   })
 }
 }
 
 
-// 修改专项培训年度计划
+// 修改 专项培养年度计划
 export function updateYearplan(data) {
 export function updateYearplan(data) {
   return request({
   return request({
     url: '/spec/yearplan',
     url: '/spec/yearplan',
@@ -35,7 +35,7 @@ export function updateYearplan(data) {
   })
   })
 }
 }
 
 
-// 删除专项培训年度计划
+// 删除 专项培养年度计划
 export function delYearplan(id) {
 export function delYearplan(id) {
   return request({
   return request({
     url: '/spec/yearplan/' + id,
     url: '/spec/yearplan/' + id,
@@ -43,7 +43,7 @@ export function delYearplan(id) {
   })
   })
 }
 }
 
 
-// 导出专项培训年度计划
+// 导出 专项培养年度计划
 export function exportYearplan(query) {
 export function exportYearplan(query) {
   return request({
   return request({
     url: '/spec/yearplan/export',
     url: '/spec/yearplan/export',

+ 1 - 1
ui/src/views/approve/pending/index.vue

@@ -343,7 +343,7 @@
             console.log(row.taskName)
             console.log(row.taskName)
             this.$refs.specModifyDeal.init(row.approveSpecModify.id, row.taskId, row.processId,row.taskName)
             this.$refs.specModifyDeal.init(row.approveSpecModify.id, row.taskId, row.processId,row.taskName)
           })
           })
-        }else if (row.processName == "专项培训计划审核"){
+        }else if (row.processName == " 专项培养计划审核"){
           this.specTrainingPlanDealVisible = true
           this.specTrainingPlanDealVisible = true
           this.$nextTick(() => {
           this.$nextTick(() => {
             console.log(row.taskName)
             console.log(row.taskName)

+ 9 - 9
ui/src/views/training/spec/mentorfeedback/index.vue

@@ -54,7 +54,7 @@
               <span>{{scope.row.feedbackYear}}年{{scope.row.feedbackMonth}}月</span>
               <span>{{scope.row.feedbackYear}}年{{scope.row.feedbackMonth}}月</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column label="培内容" align="center" :show-overflow-tooltip="true" prop="plantName"/>
+          <el-table-column label="培内容" align="center" :show-overflow-tooltip="true" prop="plantName"/>
           <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" width="120" prop="startDate"/>
           <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" width="120" prop="startDate"/>
           <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" width="120" prop="endDate"/>
           <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" width="120" prop="endDate"/>
           <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" width="120" prop="dateOfCompletion"/>
           <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" width="120" prop="dateOfCompletion"/>
@@ -157,7 +157,7 @@
               <span>{{scope.row.feedbackYear}}年{{scope.row.feedbackSeason}}季度</span>
               <span>{{scope.row.feedbackYear}}年{{scope.row.feedbackSeason}}季度</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column label="培内容" align="center" :show-overflow-tooltip="true" prop="plantName"/>
+          <el-table-column label="培内容" align="center" :show-overflow-tooltip="true" prop="plantName"/>
           <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" width="120" prop="startDate"/>
           <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" width="120" prop="startDate"/>
           <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" width="120" prop="endDate"/>
           <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" width="120" prop="endDate"/>
           <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" width="120" prop="dateOfCompletion"/>
           <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" width="120" prop="dateOfCompletion"/>
@@ -297,9 +297,9 @@ export default {
       showSearch: true,
       showSearch: true,
       // 总条数
       // 总条数
       total: 0,
       total: 0,
-      // 专项培训反馈表格数据
+      //  专项培养反馈表格数据
       feedbackList: [],
       feedbackList: [],
-      // 专项培训季度反馈表格数据
+      //  专项培养季度反馈表格数据
       feedbackListSeasonal: [],
       feedbackListSeasonal: [],
       // 弹出层标题
       // 弹出层标题
       title: "",
       title: "",
@@ -428,7 +428,7 @@ export default {
   methods: {
   methods: {
     // 单元格样式
     // 单元格样式
     tableCellStyle (row, column, rowIndex, columnIndex) {
     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"
         return "background: #FFEEEE"
       }
       }
     },
     },
@@ -510,7 +510,7 @@ export default {
     handleClick(tab, event) {
     handleClick(tab, event) {
         console.log(tab, event);
         console.log(tab, event);
       },
       },
-    /** 查询专项培训反馈列表 */
+    /** 查询 专项培养反馈列表 */
     getList() {
     getList() {
       this.loading = true;
       this.loading = true;
       this.spanArr = []
       this.spanArr = []
@@ -562,7 +562,7 @@ export default {
         this.loading = false;
         this.loading = false;
       });
       });
     },
     },
-    /** 查询专项培训季度反馈列表 */
+    /** 查询 专项培养季度反馈列表 */
     getListSeasonal() {
     getListSeasonal() {
       this.loading = true;
       this.loading = true;
       this.spanArr2 = []
       this.spanArr2 = []
@@ -739,7 +739,7 @@ export default {
     handleAdd() {
     handleAdd() {
       this.reset();
       this.reset();
       this.open = true;
       this.open = true;
-      this.title = "添加专项培训反馈";
+      this.title = "添加 专项培养反馈";
     },
     },
     /** 修改按钮操作 */
     /** 修改按钮操作 */
     handleUpdate(row) {
     handleUpdate(row) {
@@ -811,7 +811,7 @@ export default {
     /** 导出按钮操作 */
     /** 导出按钮操作 */
     handleExport() {
     handleExport() {
       const queryParams = this.queryParams;
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有专项培训反馈数据项?', "警告", {
+      this.$confirm('是否确认导出所有 专项培养反馈数据项?', "警告", {
           confirmButtonText: "确定",
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           cancelButtonText: "取消",
           type: "warning"
           type: "warning"

+ 13 - 13
ui/src/views/training/spec/myplan/index.vue

@@ -193,23 +193,23 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { 
+import {
   updateAnswer,
   updateAnswer,
   addAnswer,
   addAnswer,
-  getAnswerByPlanIdAndQuestionId 
+  getAnswerByPlanIdAndQuestionId
 } from "@/api/training/spec/answer";
 } from "@/api/training/spec/answer";
-import { 
-  getPlan, 
-  delPlan, 
-  addPlan, 
-  updatePlan, 
-  exportPlan, 
-  importTemplate, 
-  listPlanByStaffId 
+import {
+  getPlan,
+  delPlan,
+  addPlan,
+  updatePlan,
+  exportPlan,
+  importTemplate,
+  listPlanByStaffId
 } from "@/api/training/spec/plan";
 } from "@/api/training/spec/plan";
-import { 
-  allFileList, 
-  delCommonfile 
+import {
+  allFileList,
+  delCommonfile
 } from "@/api/common/commonfile";
 } from "@/api/common/commonfile";
 import { treeselect } from "@/api/system/dept";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import { getToken } from "@/utils/auth";

+ 13 - 13
ui/src/views/training/spec/plan/index.vue

@@ -487,19 +487,19 @@
 <script>
 <script>
 import { addFeedback } from "@/api/training/spec/feedback";
 import { addFeedback } from "@/api/training/spec/feedback";
 import { getAnswerByPlanIdAndQuestionId } from "@/api/training/spec/answer";
 import { getAnswerByPlanIdAndQuestionId } from "@/api/training/spec/answer";
-import { 
+import {
   getPlan,
   getPlan,
-  listPlanByYearId, 
-  delPlan, 
-  addPlan, 
-  updatePlan, 
-  updatePlan2, 
-  exportPlan, 
-  importTemplate, 
+  listPlanByYearId,
+  delPlan,
+  addPlan,
+  updatePlan,
+  updatePlan2,
+  exportPlan,
+  importTemplate,
 } from "@/api/training/spec/plan";
 } from "@/api/training/spec/plan";
-import { 
-  allFileList, 
-  delCommonfile 
+import {
+  allFileList,
+  delCommonfile
 } from "@/api/common/commonfile";
 } from "@/api/common/commonfile";
 import { treeselect } from "@/api/system/dept";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import { getToken } from "@/utils/auth";
@@ -527,7 +527,7 @@ export default {
       minDay:"", // 最小日期
       minDay:"", // 最小日期
       maxDay:"", // 最大日期
       maxDay:"", // 最大日期
       IsShowyear:true, // 显示年|月 、 月|日
       IsShowyear:true, // 显示年|月 、 月|日
-      // 查看培详情参数
+      // 查看培详情参数
       detail: {
       detail: {
         // 是否显示弹出层(报告附件)
         // 是否显示弹出层(报告附件)
         open: false,
         open: false,
@@ -556,7 +556,7 @@ export default {
       showSearch: false,
       showSearch: false,
       // 总条数
       // 总条数
       total: 0,
       total: 0,
-      // 培计划表格数据
+      // 培计划表格数据
       planList: [],
       planList: [],
       // 弹出层标题
       // 弹出层标题
       title: "",
       title: "",

+ 7 - 7
ui/src/views/training/spec/plan/plan-approve.vue

@@ -1,12 +1,12 @@
 <template>
 <template>
   <!--  -->
   <!--  -->
-  <el-dialog :title="$t('申请专项培训计划')" :visible.sync="visible" width="1200px" append-to-body>
+  <el-dialog :title="$t('申请 专项培养计划')" :visible.sync="visible" width="1200px" append-to-body>
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="" label-width="80px">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="" label-width="80px">
       <el-form-item label="年度计划">
       <el-form-item label="年度计划">
         <el-table  :data="yearplanList"  border>
         <el-table  :data="yearplanList"  border>
-          <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="planYear" width="100">
           <el-table-column label="年份" align="center" prop="planYear" width="100">
           </el-table-column>
           </el-table-column>
           <el-table-column label="部门" align="center" prop="deptName" :show-overflow-tooltip="true"/>
           <el-table-column label="部门" align="center" prop="deptName" :show-overflow-tooltip="true"/>
@@ -17,9 +17,9 @@
           :data="planList"
           :data="planList"
           border
           border
           style="width: 100%">
           style="width: 100%">
-          <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="plantName" :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="plantName" :show-overflow-tooltip="true"/>
           <el-table-column label="开始日期" align="center" prop="startDate" width="100">
           <el-table-column label="开始日期" align="center" prop="startDate" width="100">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
               <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>

+ 9 - 9
ui/src/views/training/spec/successor/index.vue

@@ -1,10 +1,10 @@
 <template>
 <template>
   <div class="app-container">
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
     <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
         <el-input
           v-model="queryParams.staffId"
           v-model="queryParams.staffId"
-          placeholder="请输入培员工编号"
+          placeholder="请输入培员工编号"
           clearable
           clearable
           size="small"
           size="small"
           @keyup.enter.native="handleQuery"
           @keyup.enter.native="handleQuery"
@@ -88,12 +88,12 @@
     <el-table v-loading="loading" :data="successorList" @selection-change="handleSelectionChange" :height="clientHeight" border>
     <el-table v-loading="loading" :data="successorList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <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" prop="staffId" :show-overflow-tooltip="true"/>
-      <el-table-column label="培员工" align="center" prop="staff.name" :show-overflow-tooltip="true"/>
+      <el-table-column label="培员工" align="center" prop="staff.name" :show-overflow-tooltip="true"/>
       <el-table-column label="当前岗位" align="center" prop="staff.actualpost" :formatter="postFormat" />
       <el-table-column label="当前岗位" align="center" prop="staff.actualpost" :formatter="postFormat" />
       <el-table-column label="班值" align="center" prop="staff.team" :formatter="teamFormat" />
       <el-table-column label="班值" align="center" prop="staff.team" :formatter="teamFormat" />
       <el-table-column label="目标岗位" align="center" prop="actualpost" :formatter="actualpostFormat" />
       <el-table-column label="目标岗位" align="center" prop="actualpost" :formatter="actualpostFormat" />
       <el-table-column label="导师" align="center" prop="mentorStaffName" :show-overflow-tooltip="true"/>
       <el-table-column label="导师" align="center" prop="mentorStaffName" :show-overflow-tooltip="true"/>
-      <el-table-column label="培状态" align="center" prop="state" :formatter="stSuccessorStatusFormat"/>
+      <el-table-column label="培状态" align="center" prop="state" :formatter="stSuccessorStatusFormat"/>
       <el-table-column label="一季度" align="center" prop="" :show-overflow-tooltip="true"/>
       <el-table-column label="一季度" align="center" prop="" :show-overflow-tooltip="true"/>
       <el-table-column label="二季度" align="center" prop="" :show-overflow-tooltip="true"/>
       <el-table-column label="二季度" align="center" prop="" :show-overflow-tooltip="true"/>
       <el-table-column label="三季度" align="center" prop="" :show-overflow-tooltip="true"/>
       <el-table-column label="三季度" align="center" prop="" :show-overflow-tooltip="true"/>
@@ -107,7 +107,7 @@
             size="mini"
             size="mini"
             type="text"
             type="text"
             @click="planList(scope.row)"
             @click="planList(scope.row)"
-          >培计划</el-button>
+          >培计划</el-button>
           <el-button
           <el-button
             size="mini"
             size="mini"
             type="text"
             type="text"
@@ -142,8 +142,8 @@
     <!-- 添加或修改继任者清单对话框 -->
     <!-- 添加或修改继任者清单对话框 -->
     <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 ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="培员工编号" prop="staffId">
-          <el-input v-model="form.staffId" placeholder="请输入培员工编号" />
+        <el-form-item label="培员工编号" prop="staffId">
+          <el-input v-model="form.staffId" placeholder="请输入培员工编号" />
         </el-form-item>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
           <el-input v-model="form.remarks" placeholder="请输入备注" />
@@ -161,8 +161,8 @@
         <el-form-item label="导师员工编号" prop="mentorStaffId">
         <el-form-item label="导师员工编号" prop="mentorStaffId">
           <el-input v-model="form.mentorStaffId" placeholder="请输入导师员工编号" />
           <el-input v-model="form.mentorStaffId" placeholder="请输入导师员工编号" />
         </el-form-item>
         </el-form-item>
-        <el-form-item label="培状态" prop="state">
-          <el-select v-model="form.state" placeholder="请选择培状态">
+        <el-form-item label="培状态" prop="state">
+          <el-select v-model="form.state" placeholder="请选择培状态">
             <el-option
             <el-option
               v-for="dict in stSuccessorStatusOptions"
               v-for="dict in stSuccessorStatusOptions"
               :key="dict.dictValue"
               :key="dict.dictValue"

+ 6 - 6
ui/src/views/training/spec/successor/staffResume.vue

@@ -46,20 +46,20 @@
     </el-card>
     </el-card>
     <el-card>
     <el-card>
       <div slot="header" class="clearfix">
       <div slot="header" class="clearfix">
-        <span>公司级培</span>
+        <span>公司级培</span>
       </div>
       </div>
     </el-card>
     </el-card>
     <el-card>
     <el-card>
       <div slot="header" class="clearfix">
       <div slot="header" class="clearfix">
-        <span>装置级培</span>
+        <span>装置级培</span>
       </div>
       </div>
     </el-card>
     </el-card>
     <el-card>
     <el-card>
       <div slot="header" class="clearfix">
       <div slot="header" class="clearfix">
-        <span>专项培训</span>
+        <span> 专项培养</span>
       </div>
       </div>
       <el-table :data="planList"  border>
       <el-table :data="planList"  border>
-        <el-table-column label="培内容" align="center" prop="plantName" :show-overflow-tooltip="true"/>
+        <el-table-column label="培内容" align="center" prop="plantName" :show-overflow-tooltip="true"/>
         <el-table-column label="开始日期" align="center" prop="startDate" width="100">
         <el-table-column label="开始日期" align="center" prop="startDate" width="100">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
             <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
@@ -119,7 +119,7 @@ export default {
       showSearch: false,
       showSearch: false,
       // 总条数
       // 总条数
       total: 0,
       total: 0,
-      // 培计划表格数据
+      // 培计划表格数据
       planList: [],
       planList: [],
       // 弹出层标题
       // 弹出层标题
       title: "",
       title: "",
@@ -185,7 +185,7 @@ export default {
       this.queryParams.staffId = row.staff.staffid
       this.queryParams.staffId = row.staff.staffid
       this.getPlanList()
       this.getPlanList()
     },
     },
-    /** 查询培计划列表 */
+    /** 查询培计划列表 */
     getPlanList() {
     getPlanList() {
       this.loading = true;
       this.loading = true;
       listPlan(this.queryParams).then(response => {
       listPlan(this.queryParams).then(response => {

+ 11 - 11
ui/src/views/training/spec/successor/successorPlan.vue

@@ -3,8 +3,8 @@
 
 
     <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange" :height="clientHeight" border>
     <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <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="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" width="100">
       <el-table-column label="开始日期" align="center" prop="startDate" width="100">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
@@ -31,11 +31,11 @@
       @pagination="getList"
       @pagination="getList"
     />
     />
 
 
-    <!-- 添加或修改培计划对话框 -->
+    <!-- 添加或修改培计划对话框 -->
     <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 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="请选择学员">
           <el-select v-model="form.staffId" placeholder="请选择学员">
             <el-option
             <el-option
               v-for="successor in successorOptions"
               v-for="successor in successorOptions"
@@ -45,8 +45,8 @@
             ></el-option>
             ></el-option>
           </el-select>
           </el-select>
         </el-form-item>
         </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>
         <el-form-item label="部门编号" prop="deptId">
         <el-form-item label="部门编号" prop="deptId">
           <el-input v-model="form.deptId" placeholder="请输入部门编号" />
           <el-input v-model="form.deptId" placeholder="请输入部门编号" />
@@ -158,7 +158,7 @@ export default {
       showSearch: false,
       showSearch: false,
       // 总条数
       // 总条数
       total: 0,
       total: 0,
-      // 培计划表格数据
+      // 培计划表格数据
       planList: [],
       planList: [],
       // 弹出层标题
       // 弹出层标题
       title: "",
       title: "",
@@ -243,7 +243,7 @@ export default {
         }
         }
       });
       });
     },
     },
-    /** 查询培计划列表 */
+    /** 查询培计划列表 */
     getList() {
     getList() {
       this.loading = true;
       this.loading = true;
       listPlan(this.queryParams).then(response => {
       listPlan(this.queryParams).then(response => {
@@ -308,7 +308,7 @@ export default {
     handleAdd() {
     handleAdd() {
       this.reset();
       this.reset();
       this.open = true;
       this.open = true;
-      this.title = "添加培计划";
+      this.title = "添加培计划";
       this.operation = "add";
       this.operation = "add";
     },
     },
     /** 修改按钮操作 */
     /** 修改按钮操作 */
@@ -318,7 +318,7 @@ export default {
       getPlan(id).then(response => {
       getPlan(id).then(response => {
         this.form = response.data;
         this.form = response.data;
         this.open = true;
         this.open = true;
-        this.title = "修改培计划";
+        this.title = "修改培计划";
         this.operation = "modify";
         this.operation = "modify";
       });
       });
     },
     },
@@ -359,7 +359,7 @@ export default {
     /** 导出按钮操作 */
     /** 导出按钮操作 */
     handleExport() {
     handleExport() {
       const queryParams = this.queryParams;
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有培计划数据项?', "警告", {
+      this.$confirm('是否确认导出所有培计划数据项?', "警告", {
         confirmButtonText: "确定",
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         cancelButtonText: "取消",
         type: "warning"
         type: "warning"

+ 20 - 20
ui/src/views/training/spec/successorfeedback/index.vue

@@ -30,12 +30,12 @@
         </el-form>
         </el-form>
         <!-- 列表 -->
         <!-- 列表 -->
         <el-table
         <el-table
-          :span-method="spanMethod" 
-          v-loading="loading" 
-          :data="feedbackList" 
-          @selection-change="handleSelectionChange" 
-          :height="clientHeight" 
-          border 
+          :span-method="spanMethod"
+          v-loading="loading"
+          :data="feedbackList"
+          @selection-change="handleSelectionChange"
+          :height="clientHeight"
+          border
           :cell-style="tableCellStyle"
           :cell-style="tableCellStyle"
         >
         >
           <el-table-column label="时间" align="center" :show-overflow-tooltip="true" width="120">
           <el-table-column label="时间" align="center" :show-overflow-tooltip="true" width="120">
@@ -43,7 +43,7 @@
               <span>{{scope.row.feedbackYear}}年{{scope.row.feedbackMonth}}月</span>
               <span>{{scope.row.feedbackYear}}年{{scope.row.feedbackMonth}}月</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column label="培内容" align="center" :show-overflow-tooltip="true" prop="plantName"/>
+          <el-table-column label="培内容" align="center" :show-overflow-tooltip="true" prop="plantName"/>
           <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" width="120" prop="startDate"/>
           <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" width="120" prop="startDate"/>
           <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" width="120" prop="endDate"/>
           <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" width="120" prop="endDate"/>
           <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" width="120" prop="dateOfCompletion"/>
           <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" width="120" prop="dateOfCompletion"/>
@@ -132,11 +132,11 @@
         <!-- 列表 -->
         <!-- 列表 -->
         <el-table
         <el-table
           :cell-style="tableCellStyle"
           :cell-style="tableCellStyle"
-          :span-method="spanMethod" 
-          v-loading="loading" 
-          :data="feedbackListSeasonal" 
-          @selection-change="handleSelectionChange" 
-          :height="clientHeight" 
+          :span-method="spanMethod"
+          v-loading="loading"
+          :data="feedbackListSeasonal"
+          @selection-change="handleSelectionChange"
+          :height="clientHeight"
           border
           border
         >
         >
           <el-table-column label="时间" align="center" :show-overflow-tooltip="true" width="120">
           <el-table-column label="时间" align="center" :show-overflow-tooltip="true" width="120">
@@ -144,7 +144,7 @@
               <span>{{scope.row.feedbackYear}}年{{scope.row.feedbackSeason}}季度</span>
               <span>{{scope.row.feedbackYear}}年{{scope.row.feedbackSeason}}季度</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column label="培内容" align="center" :show-overflow-tooltip="true" prop="plantName"/>
+          <el-table-column label="培内容" align="center" :show-overflow-tooltip="true" prop="plantName"/>
           <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" width="120" prop="startDate"/>
           <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" width="120" prop="startDate"/>
           <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" width="120" prop="endDate"/>
           <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" width="120" prop="endDate"/>
           <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" width="120" prop="dateOfCompletion"/>
           <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" width="120" prop="dateOfCompletion"/>
@@ -267,9 +267,9 @@ export default {
       showSearch: true,
       showSearch: true,
       // 总条数
       // 总条数
       total: 0,
       total: 0,
-      // 专项培训反馈表格数据
+      //  专项培养反馈表格数据
       feedbackList: [],
       feedbackList: [],
-      // 专项培训季度反馈表格数据
+      //  专项培养季度反馈表格数据
       feedbackListSeasonal: [],
       feedbackListSeasonal: [],
       // 弹出层标题
       // 弹出层标题
       title: "",
       title: "",
@@ -429,7 +429,7 @@ export default {
     handleClick(tab, event) {
     handleClick(tab, event) {
         console.log(tab, event);
         console.log(tab, event);
       },
       },
-    /** 查询专项培训反馈列表 */
+    /** 查询 专项培养反馈列表 */
     getList() {
     getList() {
       this.loading = true;
       this.loading = true;
       listSuccessorMonthlyFeedback(this.queryParams).then(response => {
       listSuccessorMonthlyFeedback(this.queryParams).then(response => {
@@ -459,7 +459,7 @@ export default {
         this.loading = false;
         this.loading = false;
       });
       });
     },
     },
-    /** 查询专项培训季度反馈列表 */
+    /** 查询 专项培养季度反馈列表 */
     getListSeasonal() {
     getListSeasonal() {
       this.loading = true;
       this.loading = true;
       listSuccessorSeasonalFeedback(this.queryParams2).then(response => {
       listSuccessorSeasonalFeedback(this.queryParams2).then(response => {
@@ -595,7 +595,7 @@ export default {
     handleAdd() {
     handleAdd() {
       this.reset();
       this.reset();
       this.open = true;
       this.open = true;
-      this.title = "添加专项培训反馈";
+      this.title = "添加 专项培养反馈";
     },
     },
     /** 修改按钮操作 */
     /** 修改按钮操作 */
     handleUpdate(row) {
     handleUpdate(row) {
@@ -658,7 +658,7 @@ export default {
     /** 导出按钮操作 */
     /** 导出按钮操作 */
     handleExport() {
     handleExport() {
       const queryParams = this.queryParams;
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有专项培训反馈数据项?', "警告", {
+      this.$confirm('是否确认导出所有 专项培养反馈数据项?', "警告", {
           confirmButtonText: "确定",
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           cancelButtonText: "取消",
           type: "warning"
           type: "warning"
@@ -697,4 +697,4 @@ export default {
       }
       }
   }
   }
 };
 };
-</script>
+</script>

+ 2 - 2
ui/src/views/training/spec/yearplan/index.vue

@@ -263,7 +263,7 @@ export default {
       showSearch: false,
       showSearch: false,
       // 总条数
       // 总条数
       total: 0,
       total: 0,
-      // 专项培训年度计划表格数据
+      //  专项培养年度计划表格数据
       yearplanList: [],
       yearplanList: [],
       // 弹出层标题
       // 弹出层标题
       title: "",
       title: "",
@@ -332,7 +332,7 @@ export default {
     });
     });
   },
   },
   methods: {
   methods: {
-    /** 查询专项培训年度计划列表 */
+    /** 查询 专项培养年度计划列表 */
     getList() {
     getList() {
       this.loading = true;
       this.loading = true;
       listYearplan(this.queryParams).then(response => {
       listYearplan(this.queryParams).then(response => {