王子文

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

@@ -134,20 +134,6 @@
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['spec:plan:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['spec:plan:remove']"
-          >删除</el-button> -->
           <el-button
             size="mini"
             type="text"
@@ -357,25 +343,10 @@
     </el-dialog>
     <!-- 查看培训详情对话框 -->
     <el-dialog v-dialogDrag :title="detail.title" :visible.sync="detail.open" width="700px" append-to-body>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="id"
-          label="编号"
-          width="50">
-        </el-table-column>
-        <el-table-column
-          prop="question"
-          label="问题"
-          width="250">
-        </el-table-column>
-        <el-table-column
-          prop="answer"
-          label="答案">
-        </el-table-column>
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column prop="id" label="编号" width="50"></el-table-column>
+        <el-table-column prop="question" label="问题" width="250"></el-table-column>
+        <el-table-column prop="answer" label="答案"></el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button @click="detail.open = false">{{ $t('返 回') }}</el-button>
@@ -397,7 +368,6 @@
         <el-button @click="feedback.open = false">{{ $t('返 回') }}</el-button>
       </div>
     </el-dialog>
-    <plan-approve v-if="planApproveVisible" ref="planApprove" @refreshDataList="getList"></plan-approve>
   </div>
 </template>
 
@@ -407,15 +377,15 @@ import { getPlan, delPlan, addPlan, updatePlan, exportPlan, importTemplate, getS
 import { allFileList, delCommonfile } from "@/api/common/commonfile";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
-import PlanApprove from "./plan-approve"
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Plan",
-  components: { Treeselect,PlanApprove },
+  components: { Treeselect },
   data() {
     return {
+      // 表格数据
       tableData: [],
       // 反馈对话框参数
       feedbackParams: {
@@ -429,7 +399,6 @@ export default {
       },
       // 遮罩层
       loading: true,
-      planApproveVisible: false,
       // 选中数组
       ids: [],
       dataListSelections: [],
@@ -531,6 +500,7 @@ export default {
       // 表单校验
       rules: {
       },
+      // pdf文件参数
       pdf : {
           title: '',
           pdfUrl: '',
@@ -540,12 +510,12 @@ export default {
           pageTotalNum: 1,
           loadedRatio: 0,
       },
-      // 开始修改参数
+      // 开始参数
       startParams: {
         id: 0,
         studyState: 1
       },
-      // 结束修改参数
+      // 结束参数
       endParams: {
         id: 0,
         studyState: 3
@@ -582,18 +552,20 @@ export default {
       this.feedback.title = row.plantName + this.$t('反馈');
       this.feedback.open = true;
     },
-    /** 处理新增反馈 */
+    /** 新增反馈处理 */
     handleAddFeedback() {
       this.feedbackParams.planId = this.endParams.id;
+      // 新增feedback
       addFeedback(this.feedbackParams).then(response => {
         this.feedback.open = false;
+        // 修改plan学习状态
         updatePlan(this.endParams).then(response => {
           this.msgSuccess("已结束学习");
           this.getList();
         });
       });
     },
-    /** 开始学习处理 */
+    /** 开始学习 */
     handleStart(row) {
       this.startParams.id = row.id;
       updatePlan(this.startParams).then(response => {
@@ -843,17 +815,6 @@ export default {
     submitFileForm() {
         this.$refs.upload.submit();
     },
-    addAprrove (row, type) {
-      var rows = row ? [row] : this.dataListSelections.map(item => {
-        return item
-      })
-      this.planApproveVisible = true
-      console.log(rows)
-      console.log(type)
-      this.$nextTick(() => {
-        this.$refs.planApprove.init(rows, type)
-      })
-    },
   }
 };
 </script>

ui/src/views/training/spec/myplan/plan-approve.vue

@@ -1,183 +0,0 @@
-<template>
-  <!--  -->
-  <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-item label="申请列表">
-        <el-table
-          :data="planList"
-          border
-          style="width: 100%">
-          <el-table-column label="培训员工编号" align="center" prop="staffId" :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">
-            <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" width="100">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.endDate, '{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>
-      </el-form-item>
-      <el-form-item :label="$t('装置经理')" prop="zzjl">
-        <el-select v-model="dataForm.zzjl" filterable :placeholder="$t('请选择')+$t('装置经理')">
-          <el-option
-            v-for="item in userOption"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-            :disabled="item.disabled">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">{{ $t('提交') }}</el-button>
-      <el-button @click="cancel">{{ $t('取 消') }}</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import {getToken} from "@/utils/auth";
-import {addStPlanApprove} from "@/api/training/spec/stapprove";
-import {listPostUser} from "@/api/system/user";
-
-export default {
-  name: "tapprove-add",
-  data() {
-    return {
-      visible: false,
-      planList: [],
-      userOption:[],
-      fileTips: '',
-      showDelay: false,
-      dataForm: {
-        id: 0,
-        approveType: 8,
-        planId: '',
-        zzjl: '',
-      },
-      conOptions: [],
-      doc: {
-        file: "",
-        // 是否显示弹出层（报告附件）
-        open: false,
-        // 弹出层标题（报告附件）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 报告附件上传位置编号
-        ids: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/sems/specfile/uploadFile",
-        commonfileList: null,
-        pType: 'traning',
-        pId: null
-      },
-      dataRule: {
-        approveType: [
-          { required: true, message: this.$t('approveType') + this.$t('notEmpty'), trigger: 'blur' }
-        ],
-        content: [
-          { required: true, message: this.$t('content') + this.$t('notEmpty'), trigger: 'blur' }
-        ]
-      },
-      approveOption: [],
-      plantOptions: [],
-      belong: '',
-      fileList: [],
-    };
-  },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val);
-    }
-  },
-  created() {
-
-  },
-  methods: {
-    init (rows, type) {
-      this.visible = true
-      this.fileList = []
-      this.planList = rows
-      listPostUser(this.queryParams).then(response => {
-        this.userOption = response;
-      });
-    //这里的panId是指的计划的Id
-      for (let i = 0; i < rows.length; i++) {
-        if (i == 0){
-          this.dataForm.planId = rows[i].id
-        }else {
-          this.dataForm.planId += ',' + rows[i].id
-        }
-      }
-    },
-
-    // 审批类型字典翻译
-    approveTypeFormat(row, column) {
-      return this.selectDictLabel(this.approveTypeOptions, row.approveType);
-    },
-    // 取消按钮
-    cancel() {
-      this.visible = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: 0,
-        devType: 2,
-        approveType: 7,
-        devId: '',
-        inspectorOne: '',
-        inspectorTwo: '',
-        inspectorThree: '',
-        auditor: '',
-        approver: '',
-        checkDate: ''
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["dataForm"].validate(valid => {
-        if (valid) {
-          addStPlanApprove(this.dataForm).then(response => {
-              this.msgSuccess(this.$t('申请成功'));
-              this.visible = false;
-            });
-        }
-      });
-      this.$emit('refreshDataList')
-    },
-}
-}
-
-
-</script>
-
-<style scoped>
-
-</style>

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

@@ -197,7 +197,6 @@
     <!-- 添加或修改培训计划对话框 -->
     <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-select v-model="form.staffId" placeholder="请选择学员">
             <el-option
@@ -208,7 +207,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- 修改对话框显示员工姓名 -->
         <el-form-item label="培训员工" prop="staffName" v-if="this.operation=='modify'">
           <el-input v-model="form.staffName" readonly />
         </el-form-item>
@@ -235,7 +233,6 @@
           <el-input v-model="form.classHour" placeholder="请输入学时" />
         </el-form-item>
         <el-form-item label="具体内容">
-          <!-- <editor v-model="form.classContent" :min-height="192"/> -->
           <el-input
             type="textarea"
             :rows="6"
@@ -356,25 +353,10 @@
     <!-- 评价对话框 -->
     <el-dialog v-dialogDrag :title="comment.title" :visible.sync="comment.open" width="700px" append-to-body>
       <h3 style="margin-bottom:20px;text-align:center;">学员反馈</h3>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="id"
-          label="编号"
-          width="50">
-        </el-table-column>
-        <el-table-column
-          prop="question"
-          label="问题"
-          width="250">
-        </el-table-column>
-        <el-table-column
-          prop="answer"
-          label="答案">
-        </el-table-column>
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column prop="id" label="编号" width="50"></el-table-column>
+        <el-table-column prop="question" label="问题" width="250"></el-table-column>
+        <el-table-column prop="answer" label="答案"></el-table-column>
       </el-table>
       <h3 style="margin-top:50px;margin-bottom:20px;text-align:center;">导师反馈</h3>
       <el-form label-width="80px">
@@ -393,25 +375,10 @@
     <!-- 查看培训详情对话框 -->
     <el-dialog v-dialogDrag :title="detail.title" :visible.sync="detail.open" width="700px" append-to-body>
       <h3 style="margin-bottom:20px;text-align:center;">学员反馈</h3>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="id"
-          label="编号"
-          width="50">
-        </el-table-column>
-        <el-table-column
-          prop="question"
-          label="问题"
-          width="250">
-        </el-table-column>
-        <el-table-column
-          prop="answer"
-          label="答案">
-        </el-table-column>
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column prop="id" label="编号" width="50"></el-table-column>
+        <el-table-column prop="question" label="问题" width="250"></el-table-column>
+        <el-table-column prop="answer" label="答案"></el-table-column>
       </el-table>
       <h3 style="margin-top:50px;margin-bottom:20px;text-align:center;">导师反馈</h3>
       <el-form label-width="80px">
@@ -445,6 +412,7 @@ export default {
   components: { Treeselect,PlanApprove },
   data() {
     return {
+      // 评论参数
       commentParams: {
         id: 0,
         score: null,
@@ -556,6 +524,7 @@ export default {
       // 表单校验
       rules: {
       },
+      // pdf文件参数
       pdf : {
           title: '',
           pdfUrl: '',
@@ -565,6 +534,7 @@ export default {
           pageTotalNum: 1,
           loadedRatio: 0,
       },
+      // 表格参数
       tableData: [],
     };
   },