From c18c6566d32ba3dfd715bcd6fe4457aa324dfdf0 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 8 Dec 2022 18:07:21 +0800
Subject: [PATCH] -- bug

---
 src/components/drawers/ProjPowerList.vue     |  2 +-
 src/components/project/ProjectManagerNew.vue | 31 ++++++-------
 src/views/courselibrary/CoursewareManage.vue | 46 ++------------------
 3 files changed, 20 insertions(+), 59 deletions(-)

diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue
index 84b6402e..0730c4da 100644
--- a/src/components/drawers/ProjPowerList.vue
+++ b/src/components/drawers/ProjPowerList.vue
@@ -323,7 +323,7 @@ export default {
                   name: value.memberName ? value.memberName : "-",
 
                   com: value.orgName ? value.orgName : "-",
-                  gang: "-",
+                  gang: value.positionMgrLevel ? value.positionMgrLevel : "-",
                   number: value.memberNo ? value.memberNo : "-",
                   state: value.tagName ? value.tagName : "-",
                 };
diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue
index dcbd6c48..6b41b554 100644
--- a/src/components/project/ProjectManagerNew.vue
+++ b/src/components/project/ProjectManagerNew.vue
@@ -18,6 +18,7 @@
       @search="searchMember"
       :open="isOpen"
       @change="change"
+      @blur="blur"
   >
     <template v-if="loading" #notFoundContent>
       <a-spin size="small"/>
@@ -60,8 +61,7 @@ const memberParam = ref({keyWord: '', pageNo: 1, pageSize: 10})
 const loading = ref(false)
 
 
-watch(() => memberParam.value.keyWord, throttle(getSearchMember, 500))
-watch(() => memberParam.value.pageNo, throttle(getPageMember, 500))
+watch(() => memberParam.value, throttle(getMemberData, 1000))
 watch(props, init)
 
 function init() {
@@ -76,19 +76,15 @@ onMounted(() => {
   init()
 })
 
-function getSearchMember() {
-  console.log('getSearchMember')
-  options.value && options.value.length && (options.value = [])
-  getMemberData()
-}
-
-function getPageMember() {
-  console.log('getPageMember')
-  getMemberData()
-}
-
 
 function getMemberData() {
+  console.log(memberParam)
+  if (!memberParam.value.keyWord) {
+    return
+  }
+  if (memberParam.value.pageNo !== 1) {
+    options.value && options.value.length && (options.value = [])
+  }
   isOpen.value = true
   loading.value = true
   api1.getMemberInfo(memberParam.value).then((res) => {
@@ -116,11 +112,16 @@ const memberScroll = (e) => {
 //搜索学员
 const searchMember = (keyWord) => {
   console.log('searchMember', keyWord)
+  loading.value = true
   options.value = []
   isOpen.value = true
   keyWord && (memberParam.value = {keyWord, pageNo: 1, pageSize: 10});
 };
 
+function blur() {
+  isOpen.value = false
+}
+
 function change(e, l) {
   isOpen.value = false
   Array.isArray(l) && (selectOptions.value = l)
@@ -129,8 +130,8 @@ function change(e, l) {
     emit('update:name', l.map(t => t.label).join(','))
     emit('update:value', l.map(t => t.value).join(','))
   } else {
-    emit('update:name', l.label)
-    emit('update:value', l.value)
+    emit('update:name', l?.label)
+    emit('update:value', l?.value)
   }
 }
 
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 52cb527f..3854110a 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4707,7 +4707,7 @@ export default defineComponent({
           });
           const postData = {
             offcourseId: null, //不传代表新增
-            name: item.name,
+            name: '复制'+item.name,
             picUrl: item.picUrl,
             targetUser: item.targetUser,
             meaning: item.meaning,
@@ -4787,47 +4787,7 @@ export default defineComponent({
     };
     //获取教师
     const getTea = async () => {
-      options4CurName.value = state.teacher;
-      options4CurId.value = state.teacherId;
-      const item1 = await getMemberInfoApi({
-        pageNo: state.currentPageTea1,
-        pageSize: state.pageSizeTea1,
-        keyWord: options4CurName.value,
-        id: options4CurId.value ? options4CurId.value : null,
-      })
-          .then((res) => {
-            console.log("获取授课教师", res);
-            if (res.data.code === 200) return res.data.data;
-          })
-          .catch((err) => {
-            console.log("获取授课教师失败", err);
-          });
-      const { rows, total } = item1;
-      state.tableDataTotalTea1 = total;
-      state.tableDataTotalTea2 = total;
-      let newArr = [];
-      for (let item of rows) {
-        if (options4CurId.value === item.id) {
-          if (state.offcoursePlanId && state.offcourseId) {
-            options4CurName.value = item.realName;
-            state.xjkkinputV4 = item.realName;
-            state.teacherId = item.id;
-          } else if (state.offcourseId) {
-            options4CurName.value = item.realName;
-            state.qdms_inputV5 = item.realName;
-            state.teacher = item.realName;
-            state.teacherId = item.id;
-            console.log("那个老师", item);
-          }
-        }
-        newArr.push({
-          value: item.id,
-          label: item.realName,
-        });
-      }
-      options4.value = newArr;
-      console.log("options4.value");
-      console.log(options4.value);
+
     };
     //编辑面授课
     const handleEdit = async (itm, type) => {
@@ -4839,7 +4799,7 @@ export default defineComponent({
         type: 2,
       };
       api2.auditList(obj).then((res) => {
-        state.auditDescription = res.data.data.rows[0].description;
+        state.auditDescription = res.data.data.rows[0]?.description;
       });
 
       console.log(45555);