优化考核方案和指标

ruoyi-ui/src/api/jxzxkhgl/jzxzkhsh.js

@@ -2,52 +2,52 @@ import request from '@/utils/request'
 
 // 查询考核审核过程列表
 export function listJzxzkhsh(query) {
-  return request({
+    return request({
-    url: '/jxzxkhgl/jzxzkhsh/list',
+        url: '/jxzxkhgl/jzxzkhsh/list',
-    method: 'get',
+        method: 'get',
-    params: query
+        params: query
-  })
+    })
 }
 
 // 查询考核审核过程详细
 export function getJzxzkhsh(id) {
-  return request({
+    return request({
-    url: '/jxzxkhgl/jzxzkhsh/' + id,
+        url: '/jxzxkhgl/jzxzkhsh/' + id,
-    method: 'get'
+        method: 'get'
-  })
+    })
 }
 
 // 新增考核审核过程
 export function addJzxzkhsh(data) {
-  return request({
+    return request({
-    url: '/jxzxkhgl/jzxzkhsh',
+        url: '/jxzxkhgl/jzxzkhsh',
-    method: 'post',
+        method: 'post',
-    data: data
+        data: data
-  })
+    })
 }
 
 // 修改考核审核过程
 export function updateJzxzkhsh(data) {
-  return request({
+    return request({
-    url: '/jxzxkhgl/jzxzkhsh',
+        url: '/jxzxkhgl/jzxzkhsh',
-    method: 'put',
+        method: 'put',
-    data: data
+        data: data
-  })
+    })
 }
 
 // 删除考核审核过程
 export function delJzxzkhsh(id) {
-  return request({
+    return request({
-    url: '/jxzxkhgl/jzxzkhsh/' + id,
+        url: '/jxzxkhgl/jzxzkhsh/' + id,
-    method: 'delete'
+        method: 'delete'
-  })
+    })
 }
 
 // 导出考核审核过程
 export function exportJzxzkhsh(query) {
-  return request({
+    return request({
-    url: '/jxzxkhgl/jzxzkhsh/export',
+        url: '/jxzxkhgl/jzxzkhsh/export',
-    method: 'get',
+        method: 'get',
-    params: query
+        params: query
-  })
+    })
 }

ruoyi-ui/src/views/jxzxkhgl/jxzxkhfa/index.vue

@@ -192,8 +192,22 @@
         <el-form-item label="考核文件名称" prop="filename">
           <el-input v-model="form.filename" placeholder="请输入考核文件名称" />
         </el-form-item>
-        <el-form-item label="文件路径" prop="filepath">
+        <el-form-item label="考核文件" prop="filepath" >
-          <el-input v-model="form.filepath" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.filepath" v-if="false" />
+          <el-upload
+            class="upload-demo"
+            :action="uploadFileUrl"
+            :headers="headers"
+            :on-preview="handlePreview"
+            :on-remove="handleRemove"
+            :before-remove="beforeRemove"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :file-list="fileList"
+            :on-success="handleAvatarSuccess"
+          >
+            <el-button size="small" type="primary">选择文件</el-button>
+          </el-upload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -206,6 +220,7 @@
 
 <script>
 import { listJxzxkhfa, getJxzxkhfa, delJxzxkhfa, addJxzxkhfa, updateJxzxkhfa, exportJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa";
+import { getToken } from "@/utils/auth";
 
 export default {
   name: "Jxzxkhfa",
@@ -231,6 +246,8 @@ export default {
       open: false,
       // 考核方案状态
       statusOptions: [],
+      // 上传文件list
+      fileList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -255,7 +272,11 @@ export default {
         filename: [{ required: true, message: "考核文件名称不能为空", trigger: "blur" }],
         filepath: [{ required: true, message: "文件路径不能为空", trigger: "blur" }],
         khnf: [{ required: true, message: "考核年份不能为空", trigger: "blur" }],
-      }
+      },
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
     };
   },
   created() {
@@ -278,6 +299,40 @@ export default {
     statusFormat(row, column) {
       return this.selectDictLabel(this.statusOptions, row.status);
     },
+    // 文件上传
+    handlePreview(file) {
+      //console.log(file);
+    },
+    // 文件上传移除
+    handleRemove(file, fileList) {
+      //console.log(file, fileList);
+      if (file.response.code == "200") {
+        this.form.filepath = "";
+      }
+    },
+    // 文件上传 弹窗
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    // 文件上传  限制
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    // 文件上传 成功钩子
+    handleAvatarSuccess(res, file) {
+      console.log(res, file);
+      if (res.code == "200") {
+        this.form.filepath = res.fileName;
+        this.form.filename = file.name;
+      } else {
+        this.msgError(res.msg);
+      }
+    },
+
     // 取消按钮
     cancel() {
       this.open = false;
@@ -298,6 +353,7 @@ export default {
         createTime: null
       };
       this.resetForm("form");
+      this.fileList = [];
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -329,6 +385,10 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改见习之星考核方案";
+        this.fileList.push({
+          name: response.data.filename,
+          url: response.data.filepath,
+        });
       });
     },
     /** 提交按钮 */

ruoyi-ui/src/views/jxzxkhgl/jzxzkhsh/index.vue

@@ -0,0 +1,426 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="考核方案" prop="faid">
+        <el-input
+          v-model="queryParams.faid"
+          placeholder="请输入考核方案"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="教师" prop="jsid">
+        <el-input
+          v-model="queryParams.jsid"
+          placeholder="请输入教师"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="校级审核人" prop="xjshr">
+        <el-input
+          v-model="queryParams.xjshr"
+          placeholder="请输入校级审核人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="校级审核意见" prop="xjshyj">
+        <el-select v-model="queryParams.xjshyj" placeholder="请选择校级审核意见" clearable size="small">
+          <el-option
+            v-for="dict in xjshyjOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="区级审核人" prop="qjshr">
+        <el-input
+          v-model="queryParams.qjshr"
+          placeholder="请输入区级审核人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="区级审核意见" prop="qjshyj">
+        <el-select v-model="queryParams.qjshyj" placeholder="请选择区级审核意见" clearable size="small">
+          <el-option
+            v-for="dict in qjshyjOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建人" prop="createuseird">
+        <el-input
+          v-model="queryParams.createuseird"
+          placeholder="请输入创建人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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="['jxzxkhgl:jzxzkhsh: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="['jxzxkhgl:jzxzkhsh: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="['jxzxkhgl:jzxzkhsh:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['jxzxkhgl:jzxzkhsh:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="jzxzkhshList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="考核方案" align="center" prop="faid" />
+      <el-table-column label="教师" align="center" prop="jsid" />
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+      <el-table-column label="校级审核人" align="center" prop="xjshr" />
+      <el-table-column label="校级审核意见" align="center" prop="xjshyj" :formatter="xjshyjFormat" />
+      <el-table-column label="校级审核建议" align="center" prop="xjshjy" />
+      <el-table-column label="区级审核人" align="center" prop="qjshr" />
+      <el-table-column label="区级审核意见" align="center" prop="qjshyj" :formatter="qjshyjFormat" />
+      <el-table-column label="区级审核建议" align="center" prop="qjshjy" />
+      <el-table-column label="创建人" align="center" prop="createuseird" />
+      <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="['jxzxkhgl:jzxzkhsh:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['jxzxkhgl:jzxzkhsh: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="faid">
+          <el-input v-model="form.faid" placeholder="请输入考核方案" />
+        </el-form-item>
+        <el-form-item label="教师" prop="jsid">
+          <el-input v-model="form.jsid" placeholder="请输入教师" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择状态">
+            <el-option
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="校级审核人" prop="xjshr">
+          <el-input v-model="form.xjshr" placeholder="请输入校级审核人" />
+        </el-form-item>
+        <el-form-item label="校级审核意见" prop="xjshyj">
+          <el-select v-model="form.xjshyj" placeholder="请选择校级审核意见">
+            <el-option
+              v-for="dict in xjshyjOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="校级审核建议" prop="xjshjy">
+          <el-input v-model="form.xjshjy" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="区级审核人" prop="qjshr">
+          <el-input v-model="form.qjshr" placeholder="请输入区级审核人" />
+        </el-form-item>
+        <el-form-item label="区级审核意见" prop="qjshyj">
+          <el-select v-model="form.qjshyj" placeholder="请选择区级审核意见">
+            <el-option
+              v-for="dict in qjshyjOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区级审核建议" prop="qjshjy">
+          <el-input v-model="form.qjshjy" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="createuseird">
+          <el-input v-model="form.createuseird" 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 { listJzxzkhsh, getJzxzkhsh, delJzxzkhsh, addJzxzkhsh, updateJzxzkhsh, exportJzxzkhsh } from "@/api/jxzxkhgl/jzxzkhsh";
+
+export default {
+  name: "Jzxzkhsh",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 考核审核过程表格数据
+      jzxzkhshList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 状态字典
+      statusOptions: [],
+      // 校级审核意见字典
+      xjshyjOptions: [],
+      // 区级审核意见字典
+      qjshyjOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        faid: null,
+        jsid: null,
+        status: null,
+        xjshr: null,
+        xjshyj: null,
+        xjshjy: null,
+        qjshr: null,
+        qjshyj: null,
+        qjshjy: null,
+        createuseird: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_dm_khshgczt").then(response => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("sys_dm_shyj").then(response => {
+      this.xjshyjOptions = response.data;
+    });
+    this.getDicts("sys_dm_shyj").then(response => {
+      this.qjshyjOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询考核审核过程列表 */
+    getList() {
+      this.loading = true;
+      listJzxzkhsh(this.queryParams).then(response => {
+        this.jzxzkhshList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 校级审核意见字典翻译
+    xjshyjFormat(row, column) {
+      return this.selectDictLabel(this.xjshyjOptions, row.xjshyj);
+    },
+    // 区级审核意见字典翻译
+    qjshyjFormat(row, column) {
+      return this.selectDictLabel(this.qjshyjOptions, row.qjshyj);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        faid: null,
+        jsid: null,
+        status: null,
+        xjshr: null,
+        xjshyj: null,
+        xjshjy: null,
+        qjshr: null,
+        qjshyj: null,
+        qjshjy: null,
+        createuseird: null,
+        createTime: 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
+      getJzxzkhsh(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) {
+            updateJzxzkhsh(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addJzxzkhsh(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除考核审核过程编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delJzxzkhsh(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有考核审核过程数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportJzxzkhsh(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        }).catch(function() {});
+    }
+  }
+};
+</script>