From fa6e9bc85fb291e8a4c50fc2a0bd1b00d6e88139 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 3 Dec 2022 13:03:57 +0800
Subject: [PATCH] =?UTF-8?q?--=20bug=20=E6=8E=88=E8=AF=BE=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue   |  7 +++++--
 src/components/project/ProjectManager.vue | 23 ++++++++++++++++-------
 src/views/projectcenter/ProjectAdd.vue    |  2 +-
 src/views/projectcenter/ProjectManage.vue |  2 +-
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index f9a553eb..c1891108 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -61,8 +61,9 @@
               <span style="margin-right: 3px">授课教师：</span>
             </div>
             <div class="btnbox">
-              <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"
-                               :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>
+<!--              <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"-->
+<!--                               :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>-->
+              <ProjectManager v-model:value="memberValue.value" v-model:name="memberValue.label"></ProjectManager>
             </div>
           </div>
           <div class="main_item">
@@ -278,6 +279,7 @@ import dayjs from "dayjs";
 import AssessmentList from "../drawers/ AssessmentList.vue";
 // import { toDate } from "../../api/method";、
 import {addTempTask} from "../../api/indexTaskadd";
+import ProjectManager from "@/components/project/ProjectManager";
 
 export default {
   name: "AddFaceteach",
@@ -286,6 +288,7 @@ export default {
     AddHomework,
     AddTest,
     AssessmentList,
+    ProjectManager,
   },
   props: {
     addfaceteachVisible: {
diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue
index e3d8fee3..d86f700e 100644
--- a/src/components/project/ProjectManager.vue
+++ b/src/components/project/ProjectManager.vue
@@ -1,13 +1,13 @@
 <template>
   <a-select
       v-model:value="managerArray"
-      placeholder="请选择项目经理"
+      :placeholder="placeholder"
       :filterOption="false"
       style="width: 100%"
       :options="options"
       allowClear
       showSearch
-      mode="multiple"
+      :mode="mode"
       :disabled="disabled"
       @popupScroll="memberScroll"
       @search="searchMember"
@@ -37,6 +37,15 @@ export default {
       type: Boolean,
       default: false
     },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    // 'multiple' | 'tags'
+    mode: {
+      type: String,
+      default: 'select'
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -93,11 +102,11 @@ export default {
 
     function init() {
       console.log('init--', props)
-      if (props.value !== state.managerArray.join(',')) {
+      if (props.value !== typeof state.managerArray === 'object' ? state.managerArray.join(',') : state.managerArray) {
         if (props.value) {
           const arrManager = props.name.split(',')
           const arrManagerId = props.value.split(',')
-          state.managerArray = arrManagerId
+          state.managerArray = props.mode === 'select' ? props.value : arrManagerId;
           state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
         } else {
           state.managerArray = []
@@ -114,10 +123,10 @@ export default {
       }
     }
 
-    function change(e, l) {
+    function change(e, {label, value}) {
       console.log('change')
-      ctx.emit('update:value', e.join(','))
-      ctx.emit('update:name', l.map(t => t.label).join(','))
+      ctx.emit('update:value', typeof value === 'object' ? e.join(',') : value)
+      ctx.emit('update:name', typeof label === 'object' ? label.join(',') : label)
     }
 
     return {
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 82eb9b90..fbc8eb6a 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -124,7 +124,7 @@
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
-            <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"></ProjectManager>
+            <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager" mode="multiple"></ProjectManager>
           </div>
         </div>
         <div class="name">
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 7b470d40..52cf63ae 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -202,7 +202,7 @@
             </div>
             <div class="inname">项目经理:</div>
             <div class="in">
-              <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"></ProjectManager>
+              <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager" mode="multiple"></ProjectManager>
             </div>
           </div>
           <div class="name">