From a5fb6df44d3edd4f76c4c0a736a81e62183f2e91 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Wed, 7 Sep 2022 18:52:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Course/courseForm.vue |  2 +-
 src/components/System/chooseOrg.vue  |  2 ++
 src/views/course/WaitAudited.vue     | 21 +++++++--------------
 src/views/examine/Reviewed.vue       | 14 ++++++++------
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index fa921f5f..bc9c0af5 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -1188,7 +1188,7 @@ export default {
           });
         }else{
           $this.btnLoading = false;
-          this.$message.error('获取审核HRBP失败');
+          this.$message.error('获取审核HRBP失败:'+rs.message);
         }
       })
 
diff --git a/src/components/System/chooseOrg.vue b/src/components/System/chooseOrg.vue
index e9487290..ccf3220d 100644
--- a/src/components/System/chooseOrg.vue
+++ b/src/components/System/chooseOrg.vue
@@ -3,9 +3,11 @@
   <div>
      <el-dialog title="先择组织机构" :append-to-body="true" :visible.sync="dlgShow" :before-close="handleClose" :close-on-click-modal="false" width="500px" custom-class="g-dialog">
      <div>
+       <!--
         <el-input placeholder="" v-model="orgName">
           <i slot="prefix" class="el-input__icon el-icon-search"></i>
         </el-input>
+        -->
      </div>
       <div style="overflow-y: auto;height: 400px;">
         <el-tree
diff --git a/src/views/course/WaitAudited.vue b/src/views/course/WaitAudited.vue
index 841e0825..4bda90ac 100644
--- a/src/views/course/WaitAudited.vue
+++ b/src/views/course/WaitAudited.vue
@@ -7,17 +7,10 @@
             <el-cascader placeholder="内容分类" clearable v-model="sysTypeList" :props="defaultTypeProps" :options="sysTypeListMap"></el-cascader>
           </el-col>
           <el-col :span="4">
-              <el-input placeholder="创建人" v-model="params.createUser" clearable></el-input>
+              <el-input placeholder="创建人" v-model="params.courseUser" clearable></el-input>
           </el-col>
           <el-col :span="4">
-             <el-input placeholder="课程名称" style="width:100%" v-model="params.keyword" clearable></el-input>
-          </el-col>
-          <el-col :span="4">
-              <el-select v-model="params.status" placeholder="审核结果" clearable>
-                <el-option label="全部" :value="null"></el-option>
-                <el-option label="通过" :value="9"></el-option>
-                <el-option label="未通过" :value="2"></el-option>
-              </el-select>
+             <el-input placeholder="课程名称" style="width:100%" v-model="params.courseName" clearable></el-input>
           </el-col>
            <el-col :span="8">
               <el-button type="primary"  @click="getsearch()" icon="el-icon-search">搜索</el-button>
@@ -51,7 +44,7 @@
 
      <el-table-column label="操作" width="100px" fixed="right">
         <template slot-scope="scope">
-          <el-button @click="toExamine(scope.row)" type="text" >审核记录</el-button>
+          <el-button @click="toExamine(scope.row)" type="text" >审核日志</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -135,7 +128,7 @@ export default {
       },
       detailType: 1,
       dialogVisible: false,
-      params: {status:''},
+      params: {status:'',courseUser:'',courseName:''},
       pageData:[],
       courseChooseShow: false,
       courseChooseId: '',
@@ -145,7 +138,7 @@ export default {
   mounted() {
     this.loadResOwners();
     this.searchData();
-     this.getResOwnerTree().then(rs=>{
+    this.getResOwnerTree().then(rs=>{
       this.resOwnerListMap=rs;
     });
     this.getSysTypeTree().then(rs=>{
@@ -161,8 +154,8 @@ export default {
     reset(){
       this.resOwner = ''
       this.params.sysType = ''
-      this.params.createUser = ''
-      this.params.keyword = ''
+      this.params.courseName = ''
+      this.params.courseUser = ''
       this.params.type = ''
       this.params.publish = ''
       this.sysTypeList = [];
diff --git a/src/views/examine/Reviewed.vue b/src/views/examine/Reviewed.vue
index d34ef916..d576c1d4 100644
--- a/src/views/examine/Reviewed.vue
+++ b/src/views/examine/Reviewed.vue
@@ -7,11 +7,12 @@
             <el-cascader placeholder="内容分类" clearable v-model="sysTypeList" :props="defaultTypeProps" :options="sysTypeListMap"></el-cascader>
           </el-col>
           <el-col :span="4">
-              <el-input placeholder="创建人" v-model="params.createUser" clearable></el-input>
+              <el-input placeholder="创建人" v-model="params.courseUser" clearable></el-input>
           </el-col>
           <el-col :span="4">
-             <el-input placeholder="课程名称" style="width:100%" v-model="params.keyword" clearable></el-input>
+             <el-input placeholder="课程名称" style="width:100%" v-model="params.courseName" clearable></el-input>
           </el-col>
+          <!--
           <el-col :span="4">
               <el-select v-model="params.status" placeholder="审核结果" clearable>
                 <el-option label="全部" :value="null"></el-option>
@@ -19,6 +20,7 @@
                 <el-option label="未通过" :value="2"></el-option>
               </el-select>
           </el-col>
+          -->
            <el-col :span="8">
               <el-button type="primary"  @click="getsearch()" icon="el-icon-search">搜索</el-button>
               <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
@@ -51,7 +53,7 @@
 
      <el-table-column label="操作" width="100px" fixed="right">
         <template slot-scope="scope">
-          <el-button @click="toExamine(scope.row)" type="text" >审核记录</el-button>
+          <el-button @click="toExamine(scope.row)" type="text" >审核日志</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -135,7 +137,7 @@ export default {
       },
       detailType: 1,
       dialogVisible: false,
-      params: {status:''},
+      params: {status:'',courseUser:'',courseName:''},
       pageData:[],
       courseChooseShow: false,
       courseChooseId: '',
@@ -161,8 +163,8 @@ export default {
     reset(){
       this.resOwner = ''
       this.params.sysType = ''
-      this.params.createUser = ''
-      this.params.keyword = ''
+      this.params.courseUser = ''
+      this.params.courseName = ''
       this.params.type = ''
       this.params.publish = ''
       this.sysTypeList = [];