From 4925790a0221b34b00135afc08b8071250babe8b Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Wed, 2 Sep 2020 10:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=81=E4=B9=A0=E4=B9=8B=E6=98=9F=E8=80=83?=
 =?UTF-8?q?=E6=A0=B8-=E5=8C=BA=E7=BA=A7=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml    |   2 +-
 .../src/views/jxzxkhgl/jxzxkhfa/index.vue     | 166 ++++++-----
 .../src/views/jxzxkhgl/jxzxqjsh/index.vue     | 281 ++++++++----------
 3 files changed, 216 insertions(+), 233 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml b/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
index 18784b401..ca97d429b 100644
--- a/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
@@ -47,7 +47,7 @@
     </resultMap>
 
     <sql id="selectTsbzJxzxkhshVo">
-select d.id,d.faid,d.jsid,d.status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,d.create_time,b.name from tsbz_jxzxkhsh d
+select d.id,d.faid,d.jsid,d.status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,d.create_time,b.name,b.prdwmc from tsbz_jxzxkhsh d
 left join tsbz_jxjsjbxx b on b.id=d.jsid
     </sql>
 
diff --git a/ruoyi-ui/src/views/jxzxkhgl/jxzxkhfa/index.vue b/ruoyi-ui/src/views/jxzxkhgl/jxzxkhfa/index.vue
index 9c0b1f161..3d3cc2f7d 100644
--- a/ruoyi-ui/src/views/jxzxkhgl/jxzxkhfa/index.vue
+++ b/ruoyi-ui/src/views/jxzxkhgl/jxzxkhfa/index.vue
@@ -1,6 +1,12 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="102px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="102px"
+    >
       <el-form-item label="考核方案名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -21,21 +27,27 @@
         </el-select>
       </el-form-item>
       <el-form-item label="考核开始时间" prop="starttime">
-        <el-date-picker clearable size="small" style="width: 200px"
+        <el-date-picker
+          clearable
+          size="small"
+          style="width: 200px"
           v-model="queryParams.starttime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择考核开始时间">
-        </el-date-picker>
+          placeholder="选择考核开始时间"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item label="考核结束时间" prop="endtime">
-        <el-date-picker clearable size="small" style="width: 200px"
+        <el-date-picker
+          clearable
+          size="small"
+          style="width: 200px"
           v-model="queryParams.endtime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择考核结束时间">
-        </el-date-picker>
-      </el-form-item> 
+          placeholder="选择考核结束时间"
+        ></el-date-picker>
+      </el-form-item>
       <!-- <el-form-item label="考核年份" prop="khnf">
         <el-date-picker clearable size="small" style="width: 200px"
           v-model="queryParams.khnf"
@@ -43,7 +55,7 @@
           value-format="yyyy-MM-dd"
           placeholder="选择考核年份">
         </el-date-picker>
-      </el-form-item> -->
+      </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>
@@ -80,16 +92,7 @@
           v-hasPermi="['jxzxkhgl:jxzxkhfa: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:jxzxkhfa:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="jxzxkhfaList" @selection-change="handleSelectionChange">
@@ -101,7 +104,7 @@
             <span>{{ scope.row.name }}</span>
           </router-link>
         </template>
-      </el-table-column>  
+      </el-table-column>
       <el-table-column label="考核方案状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="考核开始时间" align="center" prop="starttime" width="180">
         <template slot-scope="scope">
@@ -120,7 +123,7 @@
           <span>{{ parseTime(scope.row.khnf, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createuserid" /> -->
+      <el-table-column label="创建人" align="center" prop="createuserid" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -140,7 +143,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -166,33 +169,42 @@
           </el-select>
         </el-form-item>
         <el-form-item label="考核年份" prop="khnf">
-          <el-date-picker clearable size="small" style="width: 200px"
+          <el-date-picker
+            clearable
+            size="small"
+            style="width: 200px"
             v-model="form.khnf"
             type="year"
             value-format="yyyy"
-            placeholder="选择考核年份">
-          </el-date-picker>
+            placeholder="选择考核年份"
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="考核开始时间" prop="starttime">
-          <el-date-picker clearable size="small" style="width: 200px"
+          <el-date-picker
+            clearable
+            size="small"
+            style="width: 200px"
             v-model="form.starttime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择考核开始时间">
-          </el-date-picker>
+            placeholder="选择考核开始时间"
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="考核结束时间" prop="endtime">
-          <el-date-picker clearable size="small" style="width: 200px"
+          <el-date-picker
+            clearable
+            size="small"
+            style="width: 200px"
             v-model="form.endtime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择考核结束时间">
-          </el-date-picker>
+            placeholder="选择考核结束时间"
+          ></el-date-picker>
         </el-form-item>
         <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" v-if="false" />
           <el-upload
             class="upload-demo"
@@ -219,7 +231,13 @@
 </template>
 
 <script>
-import { listJxzxkhfa, getJxzxkhfa, delJxzxkhfa, addJxzxkhfa, updateJxzxkhfa, exportJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa";
+import {
+  listJxzxkhfa,
+  getJxzxkhfa,
+  delJxzxkhfa,
+  addJxzxkhfa,
+  updateJxzxkhfa,
+} from "@/api/jxzxkhgl/jxzxkhfa";
 import { getToken } from "@/utils/auth";
 
 export default {
@@ -265,13 +283,27 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        name: [{ required: true, message: "考核方案名称不能为空", trigger: "blur" }],
-        status: [{ required: true, message: "考核方案状态不能为空", trigger: "blur" }],
-        starttime: [{ required: true, message: "考核开始时间不能为空", trigger: "blur" }],
-        endtime: [{ required: true, message: "考核结束时间不能为空", trigger: "blur" }],
-        filename: [{ required: true, message: "考核文件名称不能为空", trigger: "blur" }],
-        filepath: [{ required: true, message: "文件路径不能为空", trigger: "blur" }],
-        khnf: [{ required: true, message: "考核年份不能为空", trigger: "blur" }],
+        name: [
+          { required: true, message: "考核方案名称不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "考核方案状态不能为空", trigger: "blur" },
+        ],
+        starttime: [
+          { required: true, message: "考核开始时间不能为空", trigger: "blur" },
+        ],
+        endtime: [
+          { required: true, message: "考核结束时间不能为空", trigger: "blur" },
+        ],
+        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: {
@@ -281,7 +313,7 @@ export default {
   },
   created() {
     this.getList();
-    this.getDicts("sys_dm_khfazt").then(response => {
+    this.getDicts("sys_dm_khfazt").then((response) => {
       this.statusOptions = response.data;
     });
   },
@@ -289,7 +321,7 @@ export default {
     /** 查询见习之星考核方案列表 */
     getList() {
       this.loading = true;
-      listJxzxkhfa(this.queryParams).then(response => {
+      listJxzxkhfa(this.queryParams).then((response) => {
         this.jxzxkhfaList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -350,7 +382,7 @@ export default {
         filepath: null,
         khnf: null,
         createuserid: null,
-        createTime: null
+        createTime: null,
       };
       this.resetForm("form");
       this.fileList = [];
@@ -367,9 +399,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -380,8 +412,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getJxzxkhfa(id).then(response => {
+      const id = row.id || this.ids;
+      getJxzxkhfa(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改见习之星考核方案";
@@ -393,10 +425,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateJxzxkhfa(this.form).then(response => {
+            updateJxzxkhfa(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
                 this.open = false;
@@ -404,7 +436,7 @@ export default {
               }
             });
           } else {
-            addJxzxkhfa(this.form).then(response => {
+            addJxzxkhfa(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
                 this.open = false;
@@ -418,30 +450,24 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除见习之星考核方案编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm(
+        '是否确认删除见习之星考核方案编号为"' + ids + '"的数据项?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+          type: "warning",
+        }
+      )
+        .then(function () {
           return delJxzxkhfa(ids);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
+        .catch(function () {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有见习之星考核方案数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportJxzxkhfa(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        }).catch(function() {});
-    }
-  }
+  },
 };
 </script>
diff --git a/ruoyi-ui/src/views/jxzxkhgl/jxzxqjsh/index.vue b/ruoyi-ui/src/views/jxzxkhgl/jxzxqjsh/index.vue
index bcb7683d0..eb43bd974 100644
--- a/ruoyi-ui/src/views/jxzxkhgl/jxzxqjsh/index.vue
+++ b/ruoyi-ui/src/views/jxzxkhgl/jxzxqjsh/index.vue
@@ -1,16 +1,32 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="考核方案" prop="faid">
+        <el-select v-model="queryParams.faid" size="small">
+          <el-option
+            v-for="item in jxzxkhfaOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="选择学校" prop="prdwid">
         <el-input
-          v-model="queryParams.faid"
-          placeholder="请输入考核方案"
+          v-model="queryParams.prdwid"
+          placeholder="请选择学校"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="教师" prop="jsid">
+      <el-form-item label="选择教师" prop="jsid">
         <el-input
           v-model="queryParams.jsid"
           placeholder="请输入教师"
@@ -19,45 +35,7 @@
           @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-form-item label="区级意见" prop="qjshyj">
         <el-select v-model="queryParams.qjshyj" placeholder="请选择区级审核意见" clearable size="small">
           <el-option
             v-for="dict in qjshyjOptions"
@@ -67,15 +45,6 @@
           />
         </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>
@@ -83,15 +52,6 @@
     </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:jxzxkhsh:add']"
-        >新增</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -100,7 +60,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
-        >修改</el-button>
+        >审核</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -110,33 +70,22 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
-        >删除</el-button>
+        >清除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['jxzxkhgl:jxzxkhsh:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <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="faid" :formatter="faFormat"/>
+      <el-table-column label="聘任校" align="center" prop="tsbzJxjsjbxx.prdwmc" />
+      <el-table-column label="教师" align="center" prop="tsbzJxjsjbxx.name" />
       <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="xjshjy" :show-overflow-tooltip="true"/>
       <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" prop="qjshjy" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -145,18 +94,18 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
-          >修改</el-button>
+          >审核</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
-          >删除</el-button>
+          >清除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -169,41 +118,20 @@
     <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-select v-model="form.faid" size="small" :disabled="true">
+            <el-option
+              v-for="item in jxzxkhfaOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="教师" prop="jsid">
-          <el-input v-model="form.jsid" placeholder="请输入教师" />
+          <el-input v-model="jsxm" :disabled="true" />
+          <el-input v-model="form.jsid" v-if="false" />
         </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-form-item label="区级意见" prop="qjshyj">
           <el-select v-model="form.qjshyj" placeholder="请选择区级审核意见">
             <el-option
               v-for="dict in qjshyjOptions"
@@ -213,11 +141,8 @@
             ></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 label="区级建议" prop="qjshjy">
+          <el-input v-model="form.qjshjy" type="textarea" placeholder="请输入区级审核建议" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -229,12 +154,23 @@
 </template>
 
 <script>
-import { listJzxzkhsh, getJzxzkhsh, delJzxzkhsh, addJzxzkhsh, updateJzxzkhsh, exportJzxzkhsh } from "@/api/jxzxkhgl/jxzxkhsh";
+import {
+  listJzxzkhsh,
+  getJzxzkhsh,
+  delJzxzkhsh,
+  addJzxzkhsh,
+  updateJzxzkhsh,
+} from "@/api/jxzxkhgl/jxzxkhsh";
+import { listJxzxkhfa, getJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa";
 
 export default {
   name: "Jzxzkhsh",
   data() {
     return {
+      //教师姓名
+      jsxm: "",
+      //默认方案id
+      defaultFaid: "",
       // 遮罩层
       loading: true,
       // 选中数组
@@ -249,6 +185,8 @@ export default {
       total: 0,
       // 考核审核过程表格数据
       jzxzkhshList: [],
+      //考核方案
+      jxzxkhfaOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -265,7 +203,7 @@ export default {
         pageSize: 10,
         faid: null,
         jsid: null,
-        status: null,
+        status: "2",
         xjshr: null,
         xjshyj: null,
         xjshjy: null,
@@ -274,22 +212,30 @@ export default {
         qjshjy: null,
         createuseird: null,
       },
+      // 查询参数
+      queryParams_fa: {
+        status: "1",
+      },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+        qjshyj: [
+          { required: true, message: "区级审核意见不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
+    this.getKhfa();
     this.getList();
-    this.getDicts("sys_dm_khshgczt").then(response => {
+    this.getDicts("sys_dm_khshgczt").then((response) => {
       this.statusOptions = response.data;
     });
-    this.getDicts("sys_dm_shyj").then(response => {
+    this.getDicts("sys_dm_shyj").then((response) => {
       this.xjshyjOptions = response.data;
     });
-    this.getDicts("sys_dm_shyj").then(response => {
+    this.getDicts("sys_dm_shyj").then((response) => {
       this.qjshyjOptions = response.data;
     });
   },
@@ -297,12 +243,20 @@ export default {
     /** 查询考核审核过程列表 */
     getList() {
       this.loading = true;
-      listJzxzkhsh(this.queryParams).then(response => {
+      listJzxzkhsh(this.queryParams).then((response) => {
         this.jzxzkhshList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    //考核方案
+    getKhfa() {
+      listJxzxkhfa(this.queryParams_fa).then((response) => {
+        this.jxzxkhfaOptions = response.rows;
+        this.defaultFaid = response.rows[0].id;
+        this.queryParams.faid = this.defaultFaid;
+      });
+    },
     // 状态字典翻译
     statusFormat(row, column) {
       return this.selectDictLabel(this.statusOptions, row.status);
@@ -315,6 +269,19 @@ export default {
     qjshyjFormat(row, column) {
       return this.selectDictLabel(this.qjshyjOptions, row.qjshyj);
     },
+    // 字典翻译
+    faFormat(row, column) {
+      // return this.selectDictLabel(this.classOptions, row.classid);
+      var actions = [];
+      var datas = this.jxzxkhfaOptions;
+      Object.keys(datas).map((key) => {
+        if (datas[key].id == "" + row.faid) {
+          actions.push(datas[key].name);
+          return false;
+        }
+      });
+      return actions.join("");
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -334,7 +301,7 @@ export default {
         qjshyj: null,
         qjshjy: null,
         createuseird: null,
-        createTime: null
+        createTime: null,
       };
       this.resetForm("form");
     },
@@ -346,36 +313,32 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.faid = this.defaultFaid;
       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 = "添加考核审核过程";
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getJzxzkhsh(id).then(response => {
+      const id = row.id || this.ids;
+      getJzxzkhsh(id).then((response) => {
+        this.jsxm = response.data.tsbzJxjsjbxx.name;
         this.form = response.data;
         this.open = true;
-        this.title = "修改考核审核过程";
+        this.title = "区级考核审核";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateJzxzkhsh(this.form).then(response => {
+            updateJzxzkhsh(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
                 this.open = false;
@@ -383,7 +346,7 @@ export default {
               }
             });
           } else {
-            addJzxzkhsh(this.form).then(response => {
+            addJzxzkhsh(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
                 this.open = false;
@@ -397,30 +360,24 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除考核审核过程编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm(
+        '是否确认删除考核审核过程编号为"' + ids + '"的数据项?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+          type: "warning",
+        }
+      )
+        .then(function () {
           return delJzxzkhsh(ids);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
+        .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>