wangggziwen 3 gadi atpakaļ
vecāks
revīzija
a4cdd65195

+ 53 - 0
ui/src/api/training/spec/feedback.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询专项培训反馈列表
+export function listFeedback(query) {
+  return request({
+    url: '/spec/feedback/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询专项培训反馈详细
+export function getFeedback(id) {
+  return request({
+    url: '/spec/feedback/' + id,
+    method: 'get'
+  })
+}
+
+// 新增专项培训反馈
+export function addFeedback(data) {
+  return request({
+    url: '/spec/feedback',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改专项培训反馈
+export function updateFeedback(data) {
+  return request({
+    url: '/spec/feedback',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除专项培训反馈
+export function delFeedback(id) {
+  return request({
+    url: '/spec/feedback/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出专项培训反馈
+export function exportFeedback(query) {
+  return request({
+    url: '/spec/feedback/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,828 @@
+<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-input
+          v-model="queryParams.plantName"
+          placeholder="请输入培训内容"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始日期" prop="startDate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.startDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择开始日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束日期" prop="endDate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <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="学习状态" prop="studyState">
+        <el-select v-model="queryParams.studyState" placeholder="请选择学习状态" clearable size="small">
+          <el-option
+            v-for="dict in studyStateOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 顶部工具栏 -->
+    <!-- <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['spec:plan:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['spec:plan:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['spec:plan:remove']"
+        >删除</el-button>
+      </el-col>
+        <el-col :span="1.5">
+            <el-button
+                    type="info"
+                    icon="el-icon-upload2"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['spec:plan:edit']"
+            >导入</el-button>
+        </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['spec:plan:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          size="mini"
+          :disabled="multiple"
+          @click="addAprrove('')"
+        >{{ $t('提交申请') }}</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
+    <!-- 表格 -->
+    <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 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">
+        <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">
+        <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-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" 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"
+            icon="el-icon-s-flag"
+            v-hasPermi="['spec:plan:edit']"
+            @click="handleStart(scope.row)"
+            v-if="scope.row.studyState == 0"
+          >开始</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-circle-check"
+            v-hasPermi="['spec:plan:edit']"
+            @click="handleEnd(scope.row)"
+            v-if="scope.row.studyState == 1"
+          >结束</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            v-hasPermi="['spec:plan:edit']"
+            @click="handleDetail(scope.row)"
+            v-if="scope.row.studyState == 2 || scope.row.studyState == 3"
+          >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document"
+            @click="handleDoc(scope.row)"
+            v-hasPermi="['spec:plan:edit']"
+          >附件</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 添加或修改培训计划对话框 -->
+    <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
+              v-for="successor in successorOptions"
+              :key="successor.key"
+              :label="successor.value"
+              :value="successor.key"
+            ></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>
+        <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="请输入部门编号" />
+        </el-form-item>
+        <el-form-item label="开始日期" prop="startDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.startDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束日期" prop="endDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.endDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="学时" prop="classHour">
+          <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"
+            placeholder="请输入内容"
+            v-model="form.classContent">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="学习状态" prop="studyState" v-if="this.operation=='modify'">
+          <el-select v-model="form.studyState" placeholder="请选择学习状态">
+            <el-option
+              v-for="dict in studyStateOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+          <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+        <el-upload
+                ref="upload"
+                :limit="1"
+                accept=".xlsx, .xls"
+                :headers="upload.headers"
+                :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                :disabled="upload.isUploading"
+                :on-progress="handleFileUploadProgress"
+                :on-success="handleFileSuccess"
+                :auto-upload="false"
+                drag
+        >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">
+                将文件拖到此处,或
+                <em>点击上传</em>
+            </div>
+            <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+            </div>
+            <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+    </el-dialog>
+    <!-- 报告附件对话框 -->
+    <el-dialog v-dialogDrag :title="doc.title" :visible.sync="doc.open" width="700px" append-to-body>
+      <el-upload
+        ref="doc"
+        :limit="50"
+        :headers="doc.headers"
+        :action="doc.url + '?pType=' + doc.pType + '&pId=' + doc.pId"
+        :disabled="doc.isUploading"
+        :on-progress="handleFileDocProgress"
+        :on-success="handleFileDocSuccess"
+        :auto-upload="true"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          {{ $t('将文件拖到此处,或') }}
+          <em>{{ $t('点击上传') }}</em>
+        </div>
+      </el-upload>
+      <el-table :data="doc.commonfileList" border>
+        <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <a  class="link-type"  @click="handleDownload(scope.row)">
+              <span>{{ scope.row.fileName }}</span>
+            </a>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
+        <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.fileName.endsWith('pdf')"
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="handleSee(scope.row)"
+            >{{ $t('预览') }}</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-download"
+              @click="handleDownload(scope.row)"
+            >{{ $t('下载') }}</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDeleteDoc(scope.row)"
+            >{{ $t('删除') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog v-dialogDrag :title="pdf.title" :visible.sync="pdf.open" width="1300px" append-to-body>
+        <div style="margin-top: -60px;float: right;margin-right: 40px;">
+          <el-button size="mini" type="text" @click="openPdf">{{$t('新页面打开PDF')}}</el-button></div>
+        <div style="margin-top: -30px">
+          <iframe :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"></iframe>
+        </div>
+      </el-dialog>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="doc.open = false">{{ $t('返 回') }}</el-button>
+      </div>
+    </el-dialog>
+    <!-- 查看培训详情对话框 -->
+    <el-dialog v-dialogDrag :title="detail.title" :visible.sync="detail.open" width="700px" append-to-body>
+      
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="detail.open = false">{{ $t('返 回') }}</el-button>
+      </div>
+    </el-dialog>
+    <!-- 反馈对话框 -->
+    <el-dialog v-dialogDrag :title="feedback.title" :visible.sync="feedback.open" width="400px" append-to-body>
+      <div>{{feedbackParams.question1}}</div>
+      <el-input v-model="feedbackParams.question1" type="hidden"></el-input>
+      <el-input v-model="feedbackParams.answer1" placeholder="请输入答案" type="textarea" rows="3"></el-input>
+      <div style="margin-top:20px;">{{feedbackParams.question2}}</div>
+      <el-input value="feedbackParams.question2" type="hidden"></el-input>
+      <el-input v-model="feedbackParams.answer2" placeholder="请输入答案" type="textarea" rows="3"></el-input>
+      <div style="margin-top:20px;">{{feedbackParams.question3}}</div>
+      <el-input value="feedbackParams.question3" type="hidden"></el-input>
+      <el-input v-model="feedbackParams.answer3" placeholder="请输入答案" type="textarea" rows="3"></el-input>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="handleAddFeedback()">{{ $t('提 交') }}</el-button>
+        <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>
+
+<script>
+import { listFeedback, getFeedback, addFeedback, updateFeedback, delFeedback, exportFeedback } from "@/api/training/spec/feedback";
+import { getPlan, delPlan, addPlan, updatePlan, exportPlan, importTemplate, getSuccessorListByMentorId, listPlanByStaffId } from "@/api/training/spec/plan";
+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 },
+  data() {
+    return {
+      // 反馈对话框参数
+      feedbackParams: {
+        planId: 0,
+        question1: "我学到了什么?",
+        question2: "理论学习和平时操作的不同之处?",
+        question3: "完成此课程后有什么更好的合理化建议?",
+        answer1: "",
+        answer2: "",
+        answer3: ""
+      },
+      // 遮罩层
+      loading: true,
+      planApproveVisible: false,
+      // 选中数组
+      ids: [],
+      dataListSelections: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 培训计划表格数据
+      planList: [],
+      // 弹出层标题
+      title: "",
+      // 操作
+      operation: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+      // 学习状态字典
+      studyStateOptions: [],
+      // 学员列表
+      successorOptions: [],
+      // 包含导师ID的查询对象
+      queryObject: {
+        mentorStaffId: "00427"
+      },
+      // 用户导入参数
+      upload: {
+          // 是否显示弹出层(用户导入)
+          open: false,
+          // 弹出层标题(用户导入)
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: { Authorization: "Bearer " + getToken() },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/spec/plan/importData"
+      },
+      // 报告附件参数
+      doc: {
+        file: "",
+        // 是否显示弹出层(报告附件)
+        open: false,
+        // 弹出层标题(报告附件)
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 报告附件上传位置编号
+        ids: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/common/commonfile/uploadFile",
+        commonfileList: null,
+        queryParams: {
+          pId: null,
+          pType: 'plan'
+        },
+        pType: 'plan',
+        pId: null
+      },
+      // 查看培训详情参数
+      detail: {
+        // 是否显示弹出层(报告附件)
+        open: false,
+        // 弹出层标题(报告附件)
+        title: ""
+      },
+      // 反馈参数
+      feedback: {
+        // 是否显示弹出层(报告附件)
+        open: false,
+        // 弹出层标题(报告附件)
+        title: ""
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        staffId: "00431",
+        plantName: null,
+        startDate: null,
+        endDate: null,
+        classHour: null,
+        studyState: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      pdf : {
+          title: '',
+          pdfUrl: '',
+          numPages: null,
+          open: false,
+          pageNum: 1,
+          pageTotalNum: 1,
+          loadedRatio: 0,
+      },
+      // 开始修改参数
+      startParams: {
+        id: 0,
+        studyState: 1
+      },
+      // 结束修改参数
+      endParams: {
+        id: 0,
+        studyState: 3
+      },
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+        this.clientHeight = document.body.clientHeight -250
+    })
+    this.getList();
+    this.getTreeselect();
+    this.getDicts("st_study_state").then(response => {
+      this.studyStateOptions = response.data;
+    });
+    this.getSuccessorOptions();
+  },
+  methods: {
+    /** 结束学习处理 */
+    handleEnd(row) {
+      this.handleFeedback(row);
+    },
+    /** 反馈处理 */
+    handleFeedback(row) {
+      this.endParams.id = row.id;
+      this.feedback.id = row.id;
+      this.feedback.title = row.plantName + this.$t('反馈');
+      this.feedback.open = true;
+    },
+    /** 处理新增反馈 */
+    handleAddFeedback() {
+      this.feedbackParams.planId = this.endParams.id;
+      addFeedback(this.feedbackParams).then(response => {
+        this.feedback.open = false;
+        updatePlan(this.endParams).then(response => {
+          this.msgSuccess("已结束学习");
+          this.getList();
+        });
+      });
+    },
+    /** 开始学习处理 */
+    handleStart(row) {
+      this.startParams.id = row.id;
+      updatePlan(this.startParams).then(response => {
+        this.msgSuccess("已开始学习");
+        this.getList();
+      });
+    },
+    /** 查看培训详情处理 */
+    handleDetail(row) {
+      this.detail.id = row.id;
+      this.detail.title = row.plantName + this.$t('详情');
+      this.detail.open = true;
+    },
+    /** 文件下载处理 */
+    handleDownload(row) {
+      var name = row.fileName;
+      var url = row.fileUrl;
+      var suffix = url.substring(url.lastIndexOf("."), url.length);
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
+      a.click()
+    },
+    openPdf(){
+      window.open(this.pdf.pdfUrl);//path是文件的全路径地址
+    },
+    handleSee (row){
+      this.pdf.open =true
+      this.pdf.title = row.fileName
+      this.pdf.pdfUrl = process.env.VUE_APP_BASE_API +'/pdf/web/viewer.html?file=' + process.env.VUE_APP_BASE_API + row.fileUrl
+    },
+    /** 报告附件按钮操作 */
+    handleDoc(row) {
+      this.doc.id = row.id;
+      this.doc.title = row.plantName + this.$t('附件');
+      this.doc.open = true;
+      this.doc.queryParams.pId = row.id
+      this.doc.pId = row.id
+      this.getFileList()
+      this.$nextTick(() => {
+        this.$refs.doc.clearFiles()
+      })
+    },
+    getFileList (){
+      allFileList(this.doc.queryParams).then(response => {
+        this.doc.commonfileList = response;
+      });
+    },
+    /** 附件上传中处理 */
+    handleFileDocProgress(event, file, fileList) {
+      this.doc.file = file;
+      this.doc.isUploading = true;
+    },
+    /** 附件上传成功处理 */
+    handleFileDocSuccess(response, file, fileList) {
+      this.doc.isUploading = false;
+      this.$alert(response.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
+      this.getFileList()
+    },
+    /** 删除按钮操作 */
+    handleDeleteDoc(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function() {
+        return delCommonfile(ids);
+      }).then(() => {
+        this.getFileList()
+        this.msgSuccess(this.$t('删除成功'));
+      })
+    },
+    /** 查询学员下拉列表 */
+    getSuccessorOptions() {
+      getSuccessorListByMentorId(this.queryObject).then(response => {
+        let successorList = response.data;
+        for (let i = 0; i < successorList.length; i++) {
+          let successor = {};
+          successor.key = successorList[i].staffId;
+          successor.value = successorList[i].staffName;
+          this.successorOptions.push(successor);
+        }
+      });
+    },
+    /** 查询培训计划列表 */
+    getList() {
+      this.loading = true;
+      listPlanByStaffId(this.queryParams).then(response => {
+        this.planList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    /** 学习状态字典翻译 */
+    studyStateFormat(row, column) {
+      return this.selectDictLabel(this.studyStateOptions, row.studyState);
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: null,
+        staffId: null,
+        plantName: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        startDate: null,
+        endDate: null,
+        classHour: null,
+        classContent: null,
+        studyState: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 多选框选中数据 */
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+      this.dataListSelections = selection
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加培训计划";
+      this.operation = "add";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getPlan(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改培训计划";
+        this.operation = "modify";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePlan(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPlan(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delPlan(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有培训计划数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportPlan(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+        this.upload.title = "用户导入";
+        this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+        importTemplate().then(response => {
+            this.download(response.msg);
+        });
+    },
+    /** 文件上传中处理 */
+    handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true;
+    },
+    /** 文件上传成功处理 */
+    handleFileSuccess(response, file, fileList) {
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+        this.getList();
+    },
+    /** 提交上传文件 */
+    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>

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

@@ -0,0 +1,183 @@
+<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>

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

@@ -413,7 +413,8 @@ export default {
       commentParams: {
         id: 0,
         score: null,
-        overallComment: ""
+        overallComment: "",
+        studyState: 2
       },
       // 查看培训详情参数
       detail: {