From 4f7438aa836f2f52238248b064b57cdb63df8948 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Fri, 23 Dec 2022 21:50:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=97=E4=BB=8E=E7=9A=84=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=BA=E6=9E=84=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E7=94=A8=EF=BC=8C=E4=B8=8D=E5=86=8D=E6=98=AF?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=B0=83=E7=94=A8=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Forward.vue                 |  2 +-
 src/views/exam/ExamList.vue           |  7 ++--
 src/views/manage/AddAudiences.vue     | 46 ++++++++++++++++++++-------
 src/views/manage/AutoAddAudiences.vue | 46 ++++++---------------------
 4 files changed, 47 insertions(+), 54 deletions(-)

diff --git a/src/views/Forward.vue b/src/views/Forward.vue
index 1b47c650..4e596d08 100644
--- a/src/views/Forward.vue
+++ b/src/views/Forward.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <portal-header style="background: #387DF7;" :hideSearch="true" textColor="#ffffff"></portal-header>
-        <iframe :src="url" style="width: 100%;height: 100%;margin-top: 30px;" frameborder="0"></iframe>
+        <iframe :src="url" style="width: 100%;height: 100%;" frameborder="0"></iframe>
     <portal-footer></portal-footer>
   </div>
 </template>
diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue
index 7a38af7d..c6ff5ed4 100644
--- a/src/views/exam/ExamList.vue
+++ b/src/views/exam/ExamList.vue
@@ -63,17 +63,14 @@
               <template slot-scope="scope">
                 <!-- v-if="scope.row.collectNumber === 0" -->
                 <el-button type="text" v-if="!scope.row.published" @click="releaseData(scope.row,true)">发布</el-button>
-                
-                
-
-
+           
                   <!-- // 成绩控制需要结束状态 -->
                 <el-button type="text" v-if="scope.row.published" @click="viewResults(scope.row)">成绩</el-button>
                 <el-button type="text" v-if="scope.row.published" @click="pushResults(scope.row)">推送</el-button>
                 <!-- <el-button type="text" v-if="scope.row.published" @click="creatQrCode(scope.row)">二维码</el-button> -->
                 <el-button type="text" v-if="scope.row.published" @click="releaseData(scope.row,false)">取消发布</el-button>
                 <el-dropdown type="text"  style="margin-left:10px">
-                  <el-button type="text" > 考试 <i class="el-icon-arrow-down el-icon--right"></i> </el-button>
+                  <el-button type="text" > 更多 <i class="el-icon-arrow-down el-icon--right"></i> </el-button>
                   <el-dropdown-menu slot="dropdown">
                     <!-- <el-dropdown-item command="a">查看</el-dropdown-item> -->
                     <el-dropdown-item command="b" @click.native="editData(scope.row)">编辑</el-dropdown-item>
diff --git a/src/views/manage/AddAudiences.vue b/src/views/manage/AddAudiences.vue
index aaad9774..102e7520 100644
--- a/src/views/manage/AddAudiences.vue
+++ b/src/views/manage/AddAudiences.vue
@@ -121,6 +121,7 @@
   import usergroupApi from "@/api/modules/usergroup";
   import userApi from "@/api/system/user";
   import orgApi from "@/api/system/organiza";
+  import apiUserBasic from "@/api/boe/userbasic";
   export default{
     data(){
       return{
@@ -181,22 +182,45 @@
         if (node.level === 0) {
           resolve([{name:'组织机构树',id:'-1'}]);
         }else{
+          let $this=this;
           if(node.level === 1){
               parentId = '-1';
+              apiUserBasic.findOrgsByKeyword('').then(rs=>{
+                  let treeList=[];
+                  rs.result.forEach(item=>{
+                    let node={
+                      id:item.id,
+                      name:item.name,
+                      hrbpId:item.hrbpId,
+                      children:[]
+                    }
+                    treeList.push(node);
+                  });
+                  resolve(treeList);
+              });
           }else{
               parentId = node.data.id;
+              
+              apiUserBasic.getOrgInfo(parentId).then(rs=>{
+                if(rs.status==200){
+                  let treeList=[];
+                  if(rs.result.directChildList){
+                      rs.result.directChildList.forEach(item=>{
+                        let node={
+                          id:item.id,
+                          name:item.name,
+                          hrbpId:item.hrbpId,
+                          children:[]
+                        }
+                        treeList.push(node);
+                      });
+                    }
+                    resolve(treeList);
+                 }else{
+                   resolve([]);
+                 }
+              });
           }
-          usergroupApi.userOrgs(parentId).then(res =>{
-              if (res.status == 200) {
-                if(res.result != null && res.result.length > 0){
-                  resolve(res.result);
-                }else{
-                  resolve([]);
-                }
-              }else{
-                this.$message.error('查询用户的机构失败');
-              }
-          });
         }
       },
       handleSelectionChange(val) {
diff --git a/src/views/manage/AutoAddAudiences.vue b/src/views/manage/AutoAddAudiences.vue
index 24ec0a5c..be1d09df 100644
--- a/src/views/manage/AutoAddAudiences.vue
+++ b/src/views/manage/AutoAddAudiences.vue
@@ -22,40 +22,15 @@
       <el-button type="success" size="medium">导入</el-button>
       <el-button type="success" size="medium">批量删除</el-button>
     </div>
-    <el-table
-        ref="multipleTable"
-        :data="tableData"
-        tooltip-effect="dark"
-        style="width: 100%"
-        @selection-change="handleSelectionChange">
-        <el-table-column
-          type="selection"
-          width="55">
-        </el-table-column>
-        <el-table-column
-          label="姓名"
-          prop="name"
-          >
+    <el-table   ref="multipleTable"  :data="tableData"  tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
+        <el-table-column  type="selection"  width="55"> </el-table-column>
+        <el-table-column label="姓名" prop="name" >
           <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
-        <el-table-column
-          prop="name"
-          label="工号"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="部门"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="add"
-          label="岗位"
-        >
-        </el-table-column>
-        <el-table-column
-          label="操作"
-        >
+        <el-table-column prop="name" label="工号" > </el-table-column>
+        <el-table-column prop="address"  label="部门" > </el-table-column>
+        <el-table-column prop="add" label="岗位" > </el-table-column>
+        <el-table-column label="操作" >
           <template slot-scope="scope">
             <el-button>操作</el-button>
           </template>
@@ -65,11 +40,8 @@
         <el-button type="success" size="large">暂存</el-button>
         <el-button type="success" size="large">发布</el-button>
       </div>
-      <el-dialog
-        title="组织"
-        custom-class="g-dialog"
-        :visible.sync="dialogVisible">
-        <span>这是一段信息</span>
+      <el-dialog  title="组织"  custom-class="g-dialog"  :visible.sync="dialogVisible">
+        <span></span>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">关闭</el-button>
           <el-button type="primary" @click="dialogVisible = false">完成</el-button>