From e23d9b74a9997c4cbc20491a15200eb568160d6b Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Wed, 2 Sep 2020 14:35:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=80=83=E6=A0=B8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/jxzxkhgl/jxzxxxsh/index.vue     | 149 ++++++++++--------
 1 file changed, 85 insertions(+), 64 deletions(-)

diff --git a/ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue b/ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue
index d97c52907..73208620c 100644
--- a/ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue
+++ b/ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue
@@ -1,24 +1,29 @@
 <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="102px"
+    >
       <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-select v-model="form.faid" placeholder="请选择方案">
+          <el-option 
+          v-for="dict in faOptions" 
+          :key="dict.id" 
+          :label="dict.name" :value="dict.id"></el-option>
+        </el-select>
       </el-form-item>
+      <!-- <el-form-item label="教师" prop="jsid">
+        <el-select v-model="form.jsid" placeholder="请选择教师" >
+          <el-option 
+          v-for="dict in JssOptions" 
+          :key="dict.id" 
+          :label="dict.name" 
+          :value="dict.id"></el-option>
+        </el-select>
+      </el-form-item> -->
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
           <el-option
@@ -46,16 +51,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
-        >审核</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -66,7 +61,7 @@
           v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
         >删除</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">
@@ -75,7 +70,6 @@
       <el-table-column label="考核方案" align="center" prop="faid" :formatter="faFormat" />
       <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" class-name="small-padding fixed-width">
@@ -83,9 +77,10 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-check"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
+            v-show="isShow(scope.row)"
           >审核</el-button>
           <el-button
             size="mini"
@@ -97,7 +92,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -108,27 +103,22 @@
 
     <!-- 添加或修改考核审核过程对话框 -->
     <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 ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="考核方案" prop="faid">
           <el-select v-model="form.faid" placeholder="请选择方案">
+            <el-option v-for="dict in faOptions" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="教师" prop="jsid" :formatter="jsFormat">
+          <el-select v-model="form.jsid" placeholder="请选择教师" :disabled="true">
             <el-option
-              v-for="dict in faOptions"
+              v-for="dict in JssOptions"
               :key="dict.id"
               :label="dict.name"
               :value="dict.id"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="教师" prop="jsid" :formatter="jsFormat">
-          <el-select v-model="form.jsid" placeholder="请选择教师" :disabled="true"> 
-            <el-option 
-            v-for="dict in JssOptions" 
-            :key="dict.id" 
-            :label="dict.name" 
-            :value="dict.id" >
-            </el-option>
-          </el-select>
-        </el-form-item>
         <!-- <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
             <el-option
@@ -138,7 +128,7 @@
               :value="dict.dictValue"
             ></el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>-->
         <el-form-item label="校级审核意见" prop="xjshyj">
           <el-select v-model="form.xjshyj" placeholder="请选择校级审核意见">
             <el-option
@@ -162,7 +152,14 @@
 </template>
 
 <script>
-import { listJzxzkhsh, getJzxzkhsh, delJzxzkhsh, addJzxzkhsh, updateJzxzkhsh, exportJzxzkhsh } from "@/api/jxzxkhgl/jxzxkhsh";
+import {
+  listJzxzkhsh,
+  getJzxzkhsh,
+  delJzxzkhsh,
+  addJzxzkhsh,
+  updateJzxzkhsh,
+  exportJzxzkhsh
+} from "@/api/jxzxkhgl/jxzxkhsh";
 import { listJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa";
 import { listJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
 
@@ -170,7 +167,6 @@ export default {
   name: "Jzxzkhsh",
   data() {
     return {
-      
       // 遮罩层
       loading: true,
       // 选中数组
@@ -212,20 +208,29 @@ export default {
         qjshr: null,
         qjshyj: null,
         qjshjy: null,
-        createuseird: null,
+        createuseird: null
       },
       // 查询参数
       queryParams_fa: {
-        status: null,
+        status: null
       },
       // 查询参数
       queryParams_Jss: {
-        jsid: null,
+        jsid: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+        faid: [
+          { required: true, message: "方案编号不能为空", trigger: "blur" },
+        ],
+        xjshyj: [
+          { required: true, message: "方案编号不能为空", trigger: "blur" },
+        ],
+        xjshjy: [
+          { required: true, message: "方案编号不能为空", trigger: "blur" },
+        ],
       }
     };
   },
@@ -248,18 +253,26 @@ export default {
     getList() {
       this.loading = true;
       listJzxzkhsh(this.queryParams).then(response => {
-        console.log(response.rows);
         this.jzxzkhshList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    // 是否显示按钮
+    isShow(row) {
+      //console.log(row.status);
+      if (row.xjshyj == "0" || row.xjshyj == "1") {
+        return false;
+      } else {
+        return true;
+      }
+    },
     // 方案字典翻译
     faFormat(row, column) {
       // return this.selectDictLabel(this.classOptions, row.classid);
       var actions = [];
       var datas = this.faOptions;
-      Object.keys(datas).map((key) => {
+      Object.keys(datas).map(key => {
         if (datas[key].id == "" + row.faid) {
           actions.push(datas[key].name);
           return false;
@@ -270,23 +283,24 @@ export default {
     // 获取方案信息
     getFaList() {
       this.queryParams_fa.status = "1";
-      listJxzxkhfa(this.queryParams_fa).then((response) => {
+      listJxzxkhfa(this.queryParams_fa).then(response => {
         this.faOptions = response.rows;
       });
     },
     // 获取教师信息
     getJssList() {
       this.queryParams_Jss.jsid = this.queryParams.jsid;
-      listJxjsjbxx(this.queryParams_Jss).then((response) => {
+      listJxjsjbxx(this.queryParams_Jss).then(response => {
         this.JssOptions = response.rows;
+        //console.log(this.JssOptions);
       });
     },
-    
+
     jsFormat(row, column) {
       // return this.selectDictLabel(this.classOptions, row.classid);
       var actions = [];
       var datas = this.JssOptions;
-      Object.keys(datas).map((key) => {
+      Object.keys(datas).map(key => {
         if (datas[key].id == "" + row.jsid) {
           actions.push(datas[key].name);
           return false;
@@ -341,9 +355,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() {
@@ -355,7 +369,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id || this.ids;
       getJzxzkhsh(id).then(response => {
         this.form = response.data;
         this.open = true;
@@ -389,17 +403,24 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除考核审核过程编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm(
+        '是否确认删除考核审核过程编号为"' + ids + '"的数据项?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function() {
+        }
+      )
+        .then(function() {
           return delJzxzkhsh(ids);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
-    },
+        })
+        .catch(function() {});
+    }
     /** 导出按钮操作 */
     // handleExport() {
     //   const queryParams = this.queryParams;