Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_pc

添加了就业指导页面，和加分项页面

.gitignore

@@ -22,3 +22,5 @@ selenium-debug.log
 
 package-lock.json
 yarn.lock
+package.json
+vue.config.js

package.json

@@ -5,11 +5,11 @@
   "author": "srs",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
-    "build": "vite build",
-    "preview": "node build/index.js --preview",
+    "dev": "cross-env vue-cli-service serve",
+    "build:prod": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build",
+    "build:stage": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build --mode staging",
+    "build": "cross-env NODE_OPTIONS=--openssl-legacy-provider vite build",
+    "preview": "cross-env NODE_OPTIONS=--openssl-legacy-provider node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "lint:fix": "eslint --ext .js,.vue src --fix"
   },
@@ -92,14 +92,17 @@
     "xlsx-style": "^0.8.13"
   },
   "devDependencies": {
+    "@babel/core": "^7.29.0",
     "@vue/cli-plugin-babel": "4.4.6",
     "@vue/cli-plugin-eslint": "4.4.6",
     "@vue/cli-service": "4.4.6",
     "babel-eslint": "10.1.0",
+    "babel-loader": "^8.4.1",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "4.1.0",
     "compression-webpack-plugin": "5.0.2",
     "connect": "3.6.6",
+    "cross-env": "^10.1.0",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
     "lint-staged": "10.5.3",

src/api/teacher/kpiFillingGuidance.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询业绩考核-个人填报-就业指导工作列表
+export function listKpiFillingGuidance(query) {
+  return request({
+    url: '/teacher/kpiFillingGraduationGuidance/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询业绩考核-个人填报-就业指导工作详细
+export function getKpiFillingGuidance(id) {
+  return request({
+    url: '/teacher/kpiFillingGraduationGuidance/' + id,
+    method: 'get'
+  })
+}
+
+// 根据辅导员名称、年份 月份 查询详细信息
+export function getByFdyNameAndYearAndMonth(query) {
+  return request({
+    url: '/teacher/kpiFillingGraduationGuidance/getByFdyNameAndYearAndMonth',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增业绩考核-个人填报-就业指导工作
+export function addKpiFillingGuidance(data) {
+  return request({
+    url: '/teacher/kpiFillingGraduationGuidance/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改业绩考核-个人填报-就业指导工作
+export function updateKpiFillingGuidance(data) {
+  return request({
+    url: '/teacher/kpiFillingGraduationGuidance/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除业绩考核-个人填报-就业指导工作
+export function delKpiFillingGuidance(id) {
+  return request({
+    url: '/teacher/kpiFillingGraduationGuidance/' + id,
+    method: 'post'
+  })
+}

src/api/teacher/kpiFillingPoints.js

@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+// 查询业绩考核-个人填报-加分项列表
+export function listKpiFillingPoints(query) {
+  return request({
+    url: '/teacher/kpiFillingBonusPoints/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询业绩考核-个人填报-加分项详细
+export function getKpiFillingPoints(id) {
+  return request({
+    url: '/teacher/kpiFillingBonusPoints/' + id,
+    method: 'get'
+  })
+}
+
+// 新增业绩考核-个人填报-加分项
+export function addKpiFillingPoints(data) {
+  return request({
+    url: '/teacher/kpiFillingBonusPoints/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改业绩考核-个人填报-加分项
+/**
+ * 更新KPI填报加分信息
+ * @param {Object} data - KPI填报加分数据对象
+ * @returns {Promise} 返回请求的Promise对象
+ */
+export function updateKpiFillingPoints(data) {
+  return request({
+    url: '/teacher/kpiFillingBonusPoints/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除业绩考核-个人填报-加分项
+export function delKpiFillingPoints(id) {
+  return request({
+    url: '/teacher/kpiFillingBonusPoints/' + id,
+    method: 'post'
+  })
+}

src/views/basedata/private/StuPic.vue

@@ -263,7 +263,8 @@ export default {
                         fontSize: 14
                     },
 
-                    data: [...stuYearNames]
+                    data: [...stuYearNames],
+                    selectedMode: 'single'
                 },
                 radar: {
                     indicator: [

src/views/flowable/task/myProcess/detail/index.vue

@@ -401,6 +401,218 @@
               </el-descriptions>
               <!-- 外宿申请表单 -->
               <div v-if="outsideAccommodationForm"><detailApply :formData="form" :isShwo="false"></detailApply></div>
+
+              <!-- 退伍复学表单 -->
+               <el-descriptions v-if="basicForm" class="margin-top" title="退伍复学申请表" :column="4" size="medium" border
+                style="width: 100%; ">
+
+                <el-descriptions-item>
+                  <template slot="label"> 姓名 </template>
+                  {{ form.stName }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 性别 </template>
+                  {{ form.sex }}
+                </el-descriptions-item>
+
+                <el-descriptions-item>
+                  <template slot="label"> 民族 </template>
+                  <!-- {{ form.nation }} -->
+                  <dict-tag :options="dict.type.rt_nation" :value="form.nations" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 年级 </template>
+                  {{ form.grade }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 班级 </template>
+                  {{ form.stClass }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 学号 </template>
+                  {{ form.stId }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 专业 </template>
+                  {{ form.majors }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 联系电话 </template>
+                  {{ form.datab }}
+                </el-descriptions-item>
+
+                <el-descriptions-item span="4">
+                  <template slot="label"> 申请理由 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    <p class="reason-text">本人于 {{ form.rwTime | formatDate }} 应征入伍，于 {{ form.dataa | formatDate }}
+                      日退役，退役后申请复学。</p>
+                    <p class="reason-text" v-if="form.conversion == 'Y'">是否申请转专业：（√）是 （）否</p>
+                    <p class="reason-text" v-else>是否申请转专业：（）是 （×）否</p>
+
+                    <p v-if="form.conversion === 'Y'" class="reason-text" style="color: red;">
+                      原年级和专业:__{{ form.maList.length > 0 ? form.maList[0].oldgrade : '' }}__{{ form.maList.length > 0 ?
+                        form.maList[0].oldmajor : '' }}__
+                      申请转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__
+                    </p>
+
+                    <!-- 附件预览区域 -->
+                    <div style="margin: 10px 0; display: flex; gap: 10px; flex-wrap: wrap;">
+                      <image-preview v-if="form.maList.length > 0 && form.maList[0].proof" :src="form.maList[0].proof"
+                        :width="240" :height="160" />
+                      <image-preview v-if="form.maList.length > 0 && form.maList[0].idcard" :src="form.maList[0].idcard"
+                        :width="240" :height="160" />
+                      <image-preview v-if="form.maList.length > 0 && form.maList[0].material"
+                        :src="form.maList[0].material" :width="240" :height="160" />
+                    </div>
+
+                    <!-- 申请人信息 -->
+                    <div class="applicant-info right-align" style="padding: 20px 0 0 0;">
+                      <span>申请人：</span>
+                      {{ form.stName }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.times | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 招生与就业处意见（仅转专业时显示） -->
+                <el-descriptions-item span="4" v-if="form.conversion === 'Y'">
+                  <template slot="label"> 招生与就业处意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    <p class="reason-text" style="color: red;">
+                      符合转专业条件，拟同意转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__
+                    </p>
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.zsStatus" placeholder="" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.zsIdea || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.zsTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 辅导员意见 -->
+                <el-descriptions-item span="4">
+                  <template slot="label"> 辅导员意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                     {{ form.fdIdea || '暂无意见' }}
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.fdStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.fdQm || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.fdTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 学务意见 -->
+                <el-descriptions-item span="4">
+                  <template slot="label"> 学务意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                      <div v-if="form.xwStatus == '0' ||  form.xwStatus == null || form.xwStatus == '2'" >{{ form.xwIdea }}拟编入____</div>
+                     <!-- 同意 -->
+                     <div v-if="form.xwStatus == '1'">{{ form.xwIdea || '暂无意见' }},拟编入__{{finalGradeName}}_{{finalClassName}}__</div> 
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.xwStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.xwQm || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.xwTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 二级学院意见 -->
+                <el-descriptions-item span="4">
+                  <template slot="label"> 二级学院意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    {{ form.twoIdea || '暂无意见' }}
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.twoStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.erQm || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.twoTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 学籍管理科意见 -->
+                <el-descriptions-item span="4">
+                  <template slot="label"> 学籍管理科意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    {{ form.xjIdea || '暂无意见' }}
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.xjglStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.xjQm || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.xjTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 教务处主管领导意见 -->
+                <el-descriptions-item span="4">
+                  <template slot="label"> 教务处主管领导意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    {{ form.jwIdea || '暂无意见' }}
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.jwStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.jwQm || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.jwTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+              </el-descriptions>
+              
             </div>
           </el-col>
         </el-tab-pane>
@@ -464,9 +676,12 @@ import { getRtStuQuitSchoolByProcInsId } from '@/api/routine/rtStuQuitSchool'
 import Parser from '@/components/parser/Parser'
 import flow from '@/views/flowable/task/myProcess/detail/flow'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import {getStname, getProcessId } from "@/api/routine/basic";
 import { getEnlistmentReserveByProcessInstanceId} from "@/api/routine/enlistmentReserve/enlistmentReserve";
 import { getOutsideAccommodationApplyByProcessInstanceId } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApply";
 import detailApply from "@/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply" // 外宿申请表详细
+import { listStudent, getClassName } from '@/api/stuCQS/basedata/student'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 export default {
   name: 'Record',
@@ -506,6 +721,7 @@ export default {
       quitSchoolForm: false, // 休学申请表单
       enlistmentReserveForm: false, // 入伍保留学籍表单
       outsideAccommodationForm: false, // 外宿申请表单
+      basicForm: false,//退伍复学表单
       form: {},
       // 学生基础信息
       stuInfo: {},
@@ -537,7 +753,10 @@ export default {
     } else if (this.category == 'outsideAccommodation') {
       this.outsideAccommodationForm = true
       this.getOutsideAccommodation(this.taskForm.procInsId)
-    }
+    }else if (this.category == '退伍复学') {
+        this.basicForm = true
+        this.getBasicApplication(this.taskForm.procInsId)
+      }
     // 回显流程记录
     // 流程任务重获取变量表单
     this.processVariables(this.taskForm.taskId)
@@ -630,6 +849,95 @@ export default {
         }
       })
     },
+     // 退伍复学申请表单数据
+    getBasicApplication(procInsId) {
+      getProcessId(procInsId.toString()).then((res) => {
+        // console.log("后端返回原始数据：",res.data);
+        this.form = res.data
+        this.getClassNameList()
+        this.listGrade()
+        this.getXWClassNameList()
+      });
+    },
+
+    //  获取学务班级名称列表
+      getXWClassNameList() {
+        getClassName().then(res => {
+          this.ClassNameList = res.data;
+          if (this.ClassNameList != null) {
+            this.ClassNameList.forEach(element => {
+              if (element.value == this.form.maList[0].finaldata1) {
+                element.children.forEach(elementTwo => {
+                  if (elementTwo.value == this.form.maList[0].finaldata2) {
+                    elementTwo.children.forEach(elementFree => {
+                      if (elementFree.value == this.form.maList[0].newmajor) {
+                        this.finalClassName = elementFree.label;
+                        this.classVlue1 = [element.value, elementTwo.value, elementFree.value];
+                        
+                        // 关键修复：从年级列表中查找年级名称，而不是直接使用 element.label
+                        const gradeId = element.value;
+                        const gradeItem = this.grade_list.find(item => item.gradeId === gradeId);
+                        if (gradeItem) {
+                          this.finalGradeName = gradeItem.gradeName; // 正确的年级名称
+                          this.$set(this.form.maList[0], 'finallabel', gradeItem.gradeId); // 正确的年级ID
+                        }
+                      }
+                    });
+                  }
+                });
+              }
+            });
+          }
+        })
+      },
+
+     /** 获取班级名称列表 */
+    getClassNameList() {
+      getClassName().then(res => {
+        this.ClassNameList = res.data
+        console.log(this.ClassNameList)
+        if (this.ClassNameList != null) {
+          this.ClassNameList.forEach(element => {
+            if (element.value == this.form.maList[0].data1) {
+              // console.log(element.label)
+              element.children.forEach(elementTwo => {
+                  if (elementTwo.value == this.form.maList[0].data2) {
+                    //  console.log(elementTwo.label)
+                    this.saveClassName =elementTwo.label
+                    // console.log("退伍复学",this.saveClassName)
+                    // 班级
+                    // elementTwo.children.forEach(elementFree => {
+                    //   this.saveClassName = elementFree.label
+                    //   // console.log(elementFree.label)
+                    // });
+                  }
+                });
+            }
+          });
+        }
+      })
+    },
+      /** 获取年级列表 */
+        async listGrade() {
+            try {
+                let res = await listGrade()
+                if (res.code == 200) {
+                    this.grade_list = [...res.rows]
+                    console.log(this.grade_list)
+                    this.grade_list.forEach(element => {
+                      if(element.gradeId == this.form.maList[0].newgrade){
+                          this.saveGradeName = element.gradeName
+                      }
+                       if (element.gradeId == this.form.maList[0].finallabel) {
+                        this.finalGradeName = element.gradeName
+                      }
+                    });
+                }
+            } catch (error) {
+                console.error('获取年级列表失败:', error)
+            }
+        },
+
     handleClick(tab, event) {
       if (tab.name === '3') {
         flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then((res) => {

src/views/teacher/kpiFilling/kpiFillingGuidance/index.vue

@@ -0,0 +1,314 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="辅导员" prop="fdyName">
+        <el-input
+          v-model="queryParams.fdyName"
+          placeholder="请输入辅导员名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="年份" prop="fillingYear">
+        <el-input
+          v-model="queryParams.fillingYear"
+          placeholder="请输入年份"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="月份" prop="fillingMonth">
+        <el-input
+          v-model="queryParams.fillingMonth"
+          placeholder="请输入月份"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班级类型" prop="classType">
+        <el-select v-model="queryParams.classType" placeholder="请选择班级类型" clearable>
+          <el-option label="毕业班" value="graduate" />
+          <el-option label="非毕业班" value="ungraduate" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" 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"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['teacher:kpiFillingGuidance:add']"
+        >新增</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['teacher:kpiFillingGuidance:edit']"
+        >修改</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['teacher:kpiFillingGuidance:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['teacher:kpiFillingGuidance:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="kpiFillingGuidanceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="毕业生就业去向登记审核分数" align="center" prop="gradFormAuditScoring" />
+      <el-table-column label="学生职业咨询与辅导分数" align="center" prop="stuCareerConsultScoring" />
+      <el-table-column label="毕业生就业指导与推荐分数" align="center" prop="gradFormGuidanceScoring" />
+      <el-table-column label="填报人名称" align="center" prop="fdyName" />
+      <el-table-column label="填报年份" align="center" prop="fillingYear">
+        <template slot-scope="scope">
+          <el-tag
+            type="success"
+            style="background-color: #f0f9eb; border-color: #e1f3d8; color: #2ecc71;"
+            v-if="scope.row.fillingYear"
+          >{{ scope.row.fillingYear + '年' }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="填报月份" align="center" prop="fillingMonth">
+        <template slot-scope="scope">
+          <el-tag
+            type="primary"
+            style="background-color: #ecf5ff; border-color: #d9ecff; color: #409eff;"
+            v-if="scope.row.fillingMonth"
+          >{{ scope.row.fillingMonth + '月' }}</el-tag>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="班级类型" align="center" prop="classType" /> -->
+      <el-table-column label="操作" align="center" 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="['teacher:kpiFillingGuidance:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['teacher:kpiFillingGuidance:remove']"
+          >删除</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="gradFormAuditScoring">
+          <el-input v-model="form.gradFormAuditScoring" placeholder="请输入毕业生就业去向登记审核分数" />
+        </el-form-item>
+        <el-form-item label="学生职业咨询与辅导分数" prop="stuCareerConsultScoring">
+          <el-input v-model="form.stuCareerConsultScoring" placeholder="请输入学生职业咨询与辅导分数" />
+        </el-form-item>
+        <el-form-item label="毕业生就业指导与推荐分数" prop="gradFormGuidanceScoring">
+          <el-input v-model="form.gradFormGuidanceScoring" placeholder="请输入毕业生就业指导与推荐分数" />
+        </el-form-item>
+        <el-form-item label="填报人名称" prop="fdyName">
+          <el-input v-model="form.fdyName" 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>
+  </div>
+</template>
+
+<script>
+import { listKpiFillingGuidance, getKpiFillingGuidance, delKpiFillingGuidance, addKpiFillingGuidance, updateKpiFillingGuidance, getByFdyNameAndYearAndMonth } from "@/api/teacher/kpiFillingGuidance";
+
+export default {
+  name: "KpiFillingGuidance",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 业绩考核-个人填报-就业指导工作表格数据
+      kpiFillingGuidanceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fdyName: null,
+        fillingYear: null,
+        fillingMonth: null,
+        classType: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询业绩考核-个人填报-就业指导工作列表 */
+    getList() {
+      this.loading = true;
+      if (this.queryParams.fdyName && this.queryParams.fillingYear && this.queryParams.fillingMonth) {
+        getByFdyNameAndYearAndMonth(this.queryParams).then(response => {
+          this.kpiFillingGuidanceList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      } else {
+        listKpiFillingGuidance(this.queryParams).then(response => {
+          this.kpiFillingGuidanceList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        gradFormAuditScoring: null,
+        stuCareerConsultScoring: null,
+        gradFormGuidanceScoring: null,
+        fdyName: null,
+        fillingYear: null,
+        fillingMonth: null,
+        classType: 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
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加业绩考核-个人填报-就业指导工作";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getKpiFillingGuidance(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改业绩考核-个人填报-就业指导工作";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateKpiFillingGuidance(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addKpiFillingGuidance(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除业绩考核-个人填报-就业指导工作编号为"' + ids + '"的数据项？').then(function() {
+        return delKpiFillingGuidance(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('teacher/kpiFillingGraduationGuidance/export', {
+        ...this.queryParams
+      }, `kpiFillingGuidance_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/teacher/kpiFilling/kpiFillingPoints/index.vue

@@ -0,0 +1,351 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="填报年份" prop="fillingYear">
+        <el-input
+          v-model="queryParams.fillingYear"
+          placeholder="请输入填报年份"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="填报月份" prop="fillingMonth">
+        <el-input
+          v-model="queryParams.fillingMonth"
+          placeholder="请输入填报月份"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" 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"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['teacher:kpiFillingPoints:add']"
+        >新增</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['teacher:kpiFillingPoints:edit']"
+        >修改</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['teacher:kpiFillingPoints:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['teacher:kpiFillingPoints:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="kpiFillingPointsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="分数" align="center" prop="bonusScoring" />
+      <el-table-column label="填报人名称" align="center" prop="fdyName" />
+      <el-table-column label="填报年份" align="center" prop="fillingYear">
+        <template slot-scope="scope">
+          <el-tag
+            type="success"
+            style="background-color: #f0f9eb; border-color: #e1f3d8; color: #2ecc71;"
+            v-if="scope.row.fillingYear"
+          >{{ scope.row.fillingYear + '年' }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="填报月份" align="center" prop="fillingMonth">
+        <template slot-scope="scope">
+          <el-tag
+            type="primary"
+            style="background-color: #ecf5ff; border-color: #d9ecff; color: #409eff;"
+            v-if="scope.row.fillingMonth"
+          >{{ scope.row.fillingMonth + '月' }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="班级类型" align="center">
+      <template slot-scope="scope">
+        <el-tag 
+          v-if="scope.row.classType === 'ungraduate'" 
+          type="success"
+          size="small">
+          非毕业班
+        </el-tag>
+        <el-tag 
+          v-else-if="scope.row.classType === 'graduate'" 
+          type="primary"
+          size="small">
+          毕业班
+        </el-tag>
+        <el-tag 
+          v-else 
+          type="warning"
+          size="small">
+          {{ scope.row.classType }}
+        </el-tag>
+      </template>
+    </el-table-column>
+      <el-table-column label="加分类型" align="center" prop="bonusType">
+        <template slot-scope="scope">
+           <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="showDetails(scope.row.bonusType)"
+          >详情</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" 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="['teacher:kpiFillingPoints:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['teacher:kpiFillingPoints:remove']"
+          >删除</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="fdyName">
+          <el-input v-model="form.fdyName" placeholder="请输入填报人名称" />
+        </el-form-item>
+        <el-form-item label="填报年份" prop="fillingYear">
+          <el-input v-model="form.fillingYear" placeholder="请输入填报年份" />
+        </el-form-item>
+        <el-form-item label="填报月份" prop="fillingMonth">
+          <el-input v-model="form.fillingMonth" placeholder="请输入填报月份" />
+        </el-form-item>
+        <el-form-item label="分数" prop="bonusScoring">
+          <el-input v-model="form.bonusScoring" 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="加分项详情"
+      :visible.sync="detailsOpen"
+      width="600px"
+      append-to-body
+    >
+      <div style="font-size: 16px; line-height: 1.8; padding: 20px;">
+        {{ detailsContent }}
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="detailsOpen = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listKpiFillingPoints, getKpiFillingPoints, delKpiFillingPoints, addKpiFillingPoints, updateKpiFillingPoints } from "@/api/teacher/kpiFillingPoints";
+
+export default {
+  name: "KpiFillingPoints",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 业绩考核-个人填报-加分项表格数据
+      kpiFillingPointsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 详情弹窗是否显示
+      detailsOpen: false,
+      // 详情内容
+      detailsContent: "",
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fillingYear: null,
+        fillingMonth: null,
+        classType: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询业绩考核-个人填报-加分项列表 */
+    getList() {
+      this.loading = true;
+      listKpiFillingPoints(this.queryParams).then(response => {
+        this.kpiFillingPointsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 显示加分项详情
+    showDetails(type) {
+      if (type === 'option1') {
+        this.detailsContent = "1.获得上级部门或学校表扬，妥善处置学生事件并形成典型案例，积极建言献策且建议被采纳，发挥模范带头作用。（+10分）";
+      } else if (type === 'option2') {
+        this.detailsContent = "2.在学校、学院阶段性重要任务推进过程中，主动担当作为，切实发挥作用。（+10分）";
+      } else if (type === 'option3') {
+        this.detailsContent = "3.协助学校开展辅导员培训、会议和学生活动，在活动中担任工作人员。（+10分）";
+      } else {
+        this.detailsContent = "暂无详情";
+      }
+      this.detailsOpen = true;
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        bonusType: null,
+        fdyName: null,
+        fillingYear: null,
+        fillingMonth: null,
+        classType: null,
+        bonusScoring: 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
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加业绩考核-个人填报-加分项";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getKpiFillingPoints(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改业绩考核-个人填报-加分项";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateKpiFillingPoints(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addKpiFillingPoints(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除业绩考核-个人填报-加分项编号为"' + ids + '"的数据项？').then(function() {
+        return delKpiFillingPoints(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('teacher/kpiFillingBonusPoints/export', {
+        ...this.queryParams
+      }, `kpiFillingPoints_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/teacher/kpiFilling/teacherKpiFillingMgt/index.vue

@@ -30,7 +30,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['teacher:teacherKpiFillingMgt:add']">新增</el-button>
       </el-col>
@@ -41,7 +41,7 @@
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['teacher:teacherKpiFillingMgt:remove']">删除</el-button>
-      </el-col> -->
+      </el-col>
       <el-col :span="1.5">
         <el-button v-hasPermi="['teacher:teacherKpiFillingMgt:export']" type="warning" plain icon="el-icon-download" size="mini"
                    @click="handleExport"

vue.config.js

@@ -60,6 +60,17 @@ module.exports = {
         '@': resolve('src')
       }
     },
+    module: {
+      rules: [
+        {
+          test: /\.js$/,
+          include: [/node_modules[\\/](domify|min-dom)[\\/]/],
+          use: {
+            loader: 'babel-loader'
+          }
+        }
+      ]
+    },
     plugins: [
       // http://doc.baidu.vip/baidu-vue/other/faq.html#使用gzip解压缩静态文件
       new CompressionPlugin({