ly 3 years ago
parent
commit
8285d8627a

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

@@ -105,7 +105,6 @@ export default {
     }
   },
   created() {
-
   },
   methods: {
     init (rows, type) {

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

@@ -100,6 +100,11 @@
             type="text"
             @click="planList(scope.row)"
           >培训计划</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="planList(scope.row)"
+          >一人一档</el-button>
           <el-button
             size="mini"
             type="text"

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

@@ -1,114 +1,5 @@
 <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" />
@@ -128,22 +19,7 @@
       <el-table-column label="具体内容" align="center" prop="classContent" :show-overflow-tooltip="true"/>
       <el-table-column label="学习状态" align="center" prop="studyState" :formatter="studyStateFormat" />
       <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>
-        </template>
+
       </el-table-column>
     </el-table>
 
@@ -252,7 +128,6 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
-    <plan-approve v-if="planApproveVisible" ref="planApprove" @refreshDataList="getList"></plan-approve>
   </div>
 </template>
 
@@ -260,13 +135,12 @@
 import { listPlan, getPlan, delPlan, addPlan, updatePlan, exportPlan, importTemplate, getSuccessorListByMentorId} from "@/api/training/spec/plan";
 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 },
   // components: { Editor },
   data() {
     return {
@@ -347,6 +221,8 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight -250
     })
+    const staffId = this.$route.params && this.$route.params.staffId;
+    this.queryParams.staffId = staffId
     this.getList();
     this.getTreeselect();
     this.getDicts("st_study_state").then(response => {
@@ -520,17 +396,7 @@ 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>