From 686ac406fd004f3f40046e1f596cac242e2213bd Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 31 Jan 2023 11:47:26 +0800
Subject: [PATCH] =?UTF-8?q?--fix=20=E6=9D=83=E9=99=90=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue      | 198 ++++++++----------
 .../student/OwnerTableModelStudent.vue        |  32 +++
 src/components/student/TableModelStudent.vue  |   5 +
 src/views/learningpath/LearningPath.vue       |   4 +-
 4 files changed, 131 insertions(+), 108 deletions(-)
 create mode 100644 src/components/student/OwnerTableModelStudent.vue

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 35fbf5c7..a908f3d8 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -11,7 +11,7 @@
       <div class="drawerMain" id="ProjCheckship" style="">
         <div class="header">
           <div class="headerTitle">
-            {{ {1: "添加学员", 2: "添加学员", 3: "添加学员",4: "查看权",5: "管理权"}[type] || "" }}
+            {{ {1: "添加学员", 2: "添加学员", 3: "添加学员",4: "查看权",5: "管理权"}[type] || title }}
           </div>
           <img
               style="width: 29px; height: 29px; cursor: pointer"
@@ -99,7 +99,7 @@
                   </div>
                 </div>
               </a-tab-pane>
-              <a-tab-pane :key="2" tab="添加组织">
+              <a-tab-pane v-if="!selectStu" :key="2" tab="添加组织">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div class="tab2">
                     <a-form-item label="组织：">
@@ -146,7 +146,7 @@
                   </div>
                 </div>
               </a-tab-pane>
-              <a-tab-pane :key="3" tab="受众关联">
+              <a-tab-pane v-if="!selectStu" :key="3" tab="受众关联">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div>
                     <a-form-item label="受众名称：">
@@ -174,7 +174,7 @@
                   </div>
                   <div class="tableBox tabb">
                     <a-table
-                        style="border: 1px solid #f2f6fe"
+                        style="border: 1px solid #f2f6fe;width:800px"
                         row-key="id"
                         :columns="audiColums"
                         :data-source="audiData"
@@ -193,126 +193,94 @@
                 <div class="already">已选</div>
               </div>
             </div>
-            <div
-                class="selecteds"
-                :style="{ 'max-height': screenHeight - 235 + 'px' }"
-                style="overflow-y: auto"
-            >
-              <div class="person">快速选人</div>
-              <div v-for="(item, i) in selectsData.studentList">
-                <div v-if="i < 11">
-                  <div class="chose">
-                    {{ item.realName }}
-                    <div class="ch" @click="stuDel(i)"></div>
-                  </div>
-                </div>
-                <div v-else>
-                  <div v-if="person">
+            <div :style="{ 'max-height': screenHeight - 235 + 'px' }" style="overflow-y: auto">
+              <div class="selecteds">
+                <div class="person">快速选人</div>
+                <div v-for="(item, i) in selectsData.studentList">
+                  <div v-if="i < 11">
                     <div class="chose">
                       {{ item.realName }}
                       <div class="ch" @click="stuDel(i)"></div>
                     </div>
                   </div>
-                </div>
-              </div>
-              <div
-                  v-if="!person && selectsData.studentList.length > 10"
-                  class="ifsw"
-              >
-                <div @click="person = !person" class="“sw”">查看更多></div>
-              </div>
-              <div
-                  v-if="person && selectsData.studentList.length > 10"
-                  class="ifsw"
-              >
-                <div @click="person = !person" class="sw">收起&lt;</div>
-              </div>
-              <div class="dept">添加组织</div>
-              <div v-for="(item,i) in selectsData.deptList">
-                <div v-if="i<11">
-                  <div class="chose1">
-                    <div class="span"> {{ item.name }}</div>
-                    <div class="ch1" @click="orgDel(i)"></div>
+                  <div v-else>
+                    <div v-if="person">
+                      <div class="chose">
+                        {{ item.realName }}
+                        <div class="ch" @click="stuDel(i)"></div>
+                      </div>
+                    </div>
                   </div>
                 </div>
-                <div v-else>
-                  <div v-if="dept">
+                <div
+                    v-if="!person && selectsData.studentList.length > 10"
+                    class="ifsw"
+                >
+                  <div @click="person = !person" class="“sw”">查看更多></div>
+                </div>
+                <div
+                    v-if="person && selectsData.studentList.length > 10"
+                    class="ifsw"
+                >
+                  <div @click="person = !person" class="sw">收起&lt;</div>
+                </div>
+              </div>
+              <div v-if="!selectStu" class="selecteds">
+                <div class="dept">添加组织</div>
+                <div v-for="(item,i) in selectsData.deptList">
+                  <div v-if="i<11">
                     <div class="chose1">
                       <div class="span"> {{ item.name }}</div>
                       <div class="ch1" @click="orgDel(i)"></div>
                     </div>
                   </div>
-
-                </div>
-
-              </div>
-              <div v-if="!dept && selectsData.deptList.length >10" class="ifsw">
-                <div @click="dept = !dept" class=“sw”>查看更多></div>
-              </div>
-              <div v-if="dept && selectsData.deptList.length >10" class="ifsw">
-                <div @click="dept = !dept" class="sw"> 收起&lt;</div>
-              </div>
-              <!--受众-->
-              <div class="group">受众关联</div>
-              <div v-for="(item, i) in selectsData.groupList">
-                <div v-if="i < 11">
-                  <div class="chose2">
-                    <div class="span">{{ item.audienceName }}</div>
-                    <div class="ch2" @click="AuditDel(i)"></div>
-                  </div>
-                </div>
-                <div v-else>
-                  <div v-if="group">
-                    <div class="chose2">
-                      <div class="span">{{ item.audienceName }}</div>
-                      <div class="ch2" @click="AuditDel(i)"></div>
+                  <div v-else>
+                    <div v-if="dept">
+                      <div class="chose1">
+                        <div class="span"> {{ item.name }}</div>
+                        <div class="ch1" @click="orgDel(i)"></div>
+                      </div>
                     </div>
                   </div>
                 </div>
+                <div v-if="!dept && selectsData.deptList.length >10" class="ifsw">
+                  <div @click="dept = !dept" class=“sw”>查看更多></div>
+                </div>
+                <div v-if="dept && selectsData.deptList.length >10" class="ifsw">
+                  <div @click="dept = !dept" class="sw"> 收起&lt;</div>
+                </div>
               </div>
-              <div
-                  v-if="!group && selectsData.groupList.length > 10"
-                  class="ifsw"
-              >
-                <div @click="group = !group" class="“sw”">查看更多></div>
-              </div>
-              <div v-if="group && selectsData.groupList > 10" class="ifsw">
-                <div @click="group = !group" class="sw">收起&lt;</div>
-              </div>
+              <!--受众-->
+             <div v-if="!selectStu" class="selecteds">
+               <div class="group">受众关联</div>
+               <div v-for="(item, i) in selectsData.groupList">
+                 <div v-if="i < 11">
+                   <div class="chose2">
+                     <div class="span">{{ item.audienceName }}</div>
+                     <div class="ch2" @click="AuditDel(i)"></div>
+                   </div>
+                 </div>
+                 <div v-else>
+                   <div v-if="group">
+                     <div class="chose2">
+                       <div class="span">{{ item.audienceName }}</div>
+                       <div class="ch2" @click="AuditDel(i)"></div>
+                     </div>
+                   </div>
+                 </div>
+               </div>
+               <div
+                   v-if="!group && selectsData.groupList.length > 10"
+                   class="ifsw"
+               >
+                 <div @click="group = !group" class="“sw”">查看更多></div>
+               </div>
+               <div v-if="group && selectsData.groupList > 10" class="ifsw">
+                 <div @click="group = !group" class="sw">收起&lt;</div>
+               </div>
+             </div>
             </div>
           </div>
-          <!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
-             <div>
-               <div style="margin-top: 20px">快速选人</div>
-               // eslint-disable-next-line vue/require-v-for-key
-               <div v-for="(item,i) in selectsData.studentList" >
-               <a-tag v-if="i < 10" :closable="true" color="#4ea6ff" @close="stuDel(i)"
-                      :key="i" style="margin-top:20px">
-                 {{ item.realName }}
-               </a-tag>
-               <a-tag v-else :closable="true" color="#4ea6ff" @close="stuDel(i)"
-                       style="margin-top:20px">
-                 {{ item.realName }}
-               </a-tag>
-               <div></div>
-             </div>
-             </div>
-             <div>
-               <div style="margin-top: 20px">组织添加</div>
-               <a-tag :closable="true" color="#4ea6ff" @close="orgDel(i)" v-for="(item,i) in selectsData.deptList"
-                      :key="i"
-                      style="margin-top:20px">
-                 {{ item.name }}
-               </a-tag>
-             </div>
-             <div>
-               <div style="margin-top: 20px">受众添加</div>
-               <a-tag :closable="true" color="#4ea6ff" @close="AuditDel(i)" v-for="(item,i) in selectsData.groupList"
-                      :key="i" style="margin-top:20px">
-                 {{ item.audienceName }}
-               </a-tag>
-             </div>
-           </div>-->
         </div>
         <div class="btnn">
           <button class="btn1" @click="closeDrawer">取消</button>
@@ -419,6 +387,22 @@ const emit = defineEmits({});
 const props = defineProps({
   type: Number,
   id: String,
+  title: {
+    type: String,
+    default: '',
+  },
+  clear: {
+    type: Boolean,
+    default: false,
+  },
+  selectStu: {
+    type: Boolean,
+    default: false,
+  },
+  selectOne: {
+    type: Boolean,
+    default: false,
+  },
   stage: {
     type: Array,
     default: () => [],
@@ -577,6 +561,7 @@ const auditSelectKeys = ref([]);
 const screenHeight = ref(document.body.clientHeight);
 //const screenWidth = ref(document.body.clientWidth);
 const stuRowSelection = computed(() => ({
+  type:props.selectOne?'radio':'checkbox',
   columnWidth: 20,
   selectedRowKeys: stuSelectKeys.value,
   onChange: onStuSelectChange,
@@ -764,6 +749,7 @@ function handleStageOk() {
   saveStu({
     targetId: props.id,
     type: props.type,
+    clear:props.clear,
     deptIds: selectsData.value.deptList?.map((e) => e.id),
     stageId: selectsData.value.stageId,
     groupIds: selectsData.value.groupList?.map((e) => e.id),
diff --git a/src/components/student/OwnerTableModelStudent.vue b/src/components/student/OwnerTableModelStudent.vue
new file mode 100644
index 00000000..24e7d901
--- /dev/null
+++ b/src/components/student/OwnerTableModelStudent.vue
@@ -0,0 +1,32 @@
+<template>
+  <TableModelStudent :types="types" :id="id" ref="tableModelRef">
+    <template #extension="{ data: { record } }">
+        <CommonStudent v-if="record.type===type" :type="type" :id="id" @finash="submitCall" :clear="true" :select-stu="true" :select-one="true">
+          <a-button type="link">转移归属权</a-button>
+        </CommonStudent>
+    </template>
+    <slot></slot>
+  </TableModelStudent>
+</template>
+<script setup>
+import {defineProps, ref} from "vue";
+import TableModelStudent from "@/components/student/TableModelStudent";
+import CommonStudent from "@/components/student/CommonStudent";
+
+const props = defineProps({
+  id: String,
+  type: Number,
+  types: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const tableModelRef = ref()
+
+function submitCall(flag) {
+  tableModelRef.value.loading = true
+  flag && tableModelRef.value.searchStu();
+}
+
+</script>
diff --git a/src/components/student/TableModelStudent.vue b/src/components/student/TableModelStudent.vue
index 5749e8f7..fb7aaa1d 100644
--- a/src/components/student/TableModelStudent.vue
+++ b/src/components/student/TableModelStudent.vue
@@ -201,6 +201,11 @@ watch(visiable, () => {
   visiable.value && searchStu()
   searchParams.value = initParams
 });
+
+defineExpose({
+  searchStu,
+  loading
+})
 </script>
 <style lang="scss">
 .cus-btn {
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 9a9ac6b6..508e6758 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -691,7 +691,7 @@
 import { reactive, toRefs, onMounted, watch, computed } from "vue";
 import { useRouter } from "vue-router";
 import CommonStudent from "@/components/student/CommonStudent";
-import TableModelStudent from "@/components/student/TableModelStudent";
+import OwnerTableModelStudent from "@/components/student/OwnerTableModelStudent";
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
@@ -1254,7 +1254,7 @@ export default {
                         dropdownClassName="tabledropdown"
                     >
                       <a-select-option value="权限名单" label="权限名单">
-                        <TableModelStudent types={[7,8,9]} id={text.record.id}>权限名单</TableModelStudent>
+                        <OwnerTableModelStudent types={[7,8,9]} id={text.record.id} type={9}>权限名单</OwnerTableModelStudent>
                       </a-select-option>
                       <a-select-option value="查看权" label="查看权">
                         <CommonStudent type={7} id={text.record.id}>查看权</CommonStudent>