From e83e0afed3f380eb9ca4ea4c96f88b7094ccd154 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 6 Dec 2022 23:51:55 +0800
Subject: [PATCH] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ProjectManagerNew.vue |  31 ++--
 src/views/projectcenter/ProjectAdd.vue       | 173 ++++++++++---------
 src/views/projectcenter/ProjectManage.vue    |  10 +-
 3 files changed, 112 insertions(+), 102 deletions(-)

diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue
index f3076888..9b802ec8 100644
--- a/src/components/project/ProjectManagerNew.vue
+++ b/src/components/project/ProjectManagerNew.vue
@@ -9,7 +9,7 @@
       :placeholder="placeholder"
       :filterOption="false"
       style="width: 100%"
-      :options="options"
+      :options="isOpen?options:selectOptions"
       allowClear
       showSearch
       :mode="mode"
@@ -39,13 +39,17 @@ const props = defineProps({
     default: ''
   },
   disabled: Boolean,
-  placeholder: String,
+  placeholder: {
+    type: String,
+    default: "请输入搜索关键字",
+  },
   mode: String
 })
 
-
 const options = ref([])
 
+const selectOptions = ref([])
+
 const managerArray = computed(() => props.mode === 'select' ? props.value : (props.value ? props.value.split(',') : []))
 
 const emit = defineEmits({})
@@ -61,10 +65,10 @@ watch(() => memberParam.value.pageNo, throttle(getPageMember, 500))
 watch(props, init)
 
 function init() {
-  props.value && (options.value = props.value.split(',').map((e, i) => ({
-    value: e,
-    label: props.name.split(',')[i]
-  })))
+  //第一次进来 编辑赋值
+  if (props.value && (props.value + '') !== selectOptions.value.map(e => e.value).join(',')) {
+    selectOptions.value = (props.value + '').split(',').map((e, i) => ({label: props.name.split(',')[i], value: e}))
+  }
 }
 
 onMounted(() => {
@@ -94,7 +98,8 @@ function getMemberData() {
     }
     const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({
       label: e.realName,
-      value: e.id
+      value: e.id,
+      deptId: e.departId
     }));
     memberParam.value.pageNo === 1 && props.value ? (options.value = list) : options.value.push(...list)
     loading.value = false
@@ -117,16 +122,10 @@ const searchMember = (keyWord) => {
 };
 
 function change(e, l) {
-  console.log('change', l)
+  selectOptions.value = l
   isOpen.value = false
+  emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId)
   if (Array.isArray(l)) {
-    // const selectIds = l.filter(t => t.value).map(t => t.value).join(',')
-    // const arr = props.value ? props.value.split(',').filter(e => !selectIds.includes(e)).map((e, i) => ({
-    //   value: e,
-    //   name: props.name.split(',')[i]
-    // })) : []
-    // l.push(...arr)
-    // l=l.filter(t => t.label)
     emit('update:name', l.map(t => t.label).join(','))
     emit('update:value', l.map(t => t.value).join(','))
   } else {
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index e788de34..664d9909 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -3,13 +3,13 @@
   <div class="projectAdd">
     <div class="header">
       <span class="title"
-        >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
+      >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
       >
       <div
-        @click="backPage"
-        style="cursor: pointer"
-        to="/projectmanage"
-        class="goback"
+          @click="backPage"
+          style="cursor: pointer"
+          to="/projectmanage"
+          class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -19,8 +19,8 @@
         <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目归属</div>
           </div>
@@ -33,26 +33,26 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目名称</div>
           </div>
           <div class="in">
             <a-input
-              v-model:value="projectInfo.name"
-              placeholder="请输入项目名称"
-              show-count
-              :maxlength="30"
-              :disabled="viewDetail ? true : false"
+                v-model:value="projectInfo.name"
+                placeholder="请输入项目名称"
+                show-count
+                :maxlength="30"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">分类</div>
           </div>
@@ -63,8 +63,8 @@
         <div class="name flex-top">
           <div class="namebox" style="margin-top:10px">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
@@ -98,53 +98,54 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-              separator="至"
-              :placeholder="['      开始时间', '        结束时间']"
-              v-model:value="projectInfo.rangeTime"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              valueFormat="YYYY-MM-DD HH:mm:ss"
-              @change="timeChange"
-              :disabled="viewDetail ? true : false"
+                separator="至"
+                :placeholder="['      开始时间', '        结束时间']"
+                v-model:value="projectInfo.rangeTime"
+                style="width: 100%; height: 40px; border-radius: 5px"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
+                @change="timeChange"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager
-              v-model:value="projectInfo.managerId"
-              v-model:name="projectInfo.manager"
-              mode="multiple"
+                v-model:value="projectInfo.managerId"
+                v-model:name="projectInfo.manager"
+                @change="managerChange"
+                mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass
-              v-model:value="projectInfo.sourceBelongId"
-              v-model:name="projectInfo.sourceBelongName"
+                v-model:value="projectInfo.sourceBelongId"
+                v-model:name="projectInfo.sourceBelongName"
             ></OrgClass>
           </div>
         </div>
@@ -154,12 +155,12 @@
           </div>
           <div class="in">
             <a-textarea
-              v-model:value="projectInfo.remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-              :disabled="viewDetail ? true : false"
+                v-model:value="projectInfo.remark"
+                style="height: 80px"
+                placeholder="请输入说明"
+                show-count
+                :maxlength="200"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -169,16 +170,16 @@
           </div>
           <div class="in">
             <a-checkbox
-              v-model:checked="courseSyncFlag"
-              :disabled="viewDetail ? true : false"
-              ><span
+                v-model:checked="courseSyncFlag"
+                :disabled="viewDetail ? true : false"
+            ><span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
                 "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-checkbox
+            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+            ></a-checkbox
             >
             <!-- <a-switch
               v-model:checked="projectInfo.courseSyncFlag"
@@ -199,8 +200,8 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
@@ -211,8 +212,8 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训分类</div>
           </div>
@@ -227,8 +228,8 @@
             <!--                src="../../assets/images/basicinfo/asterisk.png"-->
             <!--            />-->
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">是否BOEU实施</div>
           </div>
@@ -240,8 +241,8 @@
                 :disabled="viewDetail ? true : false"
             ></a-switch> -->
             <a-radio-group
-              v-model:value="projectInfo.boeFlag"
-              :disabled="viewDetail ? true : false"
+                v-model:value="projectInfo.boeFlag"
+                :disabled="viewDetail ? true : false"
             >
               <a-radio :style="radioStyle" :value="1">是</a-radio>
               <a-radio :style="radioStyle" :value="0">否</a-radio>
@@ -254,19 +255,19 @@
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
             <a-select
-              :getPopupContainer="
+                :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="classifySelect5"
-              placeholder="请选择模版"
-              :size="size"
-              style="width: 100%"
-              :options="classifyList5"
-              @change="classificationChange5"
-              @popupScroll="templateScroll"
-              :fieldNames="{
+                v-model:value="classifySelect5"
+                placeholder="请选择模版"
+                :size="size"
+                style="width: 100%"
+                :options="classifyList5"
+                @change="classificationChange5"
+                @popupScroll="templateScroll"
+                :fieldNames="{
                 label: 'name',
                 value: 'projectTemplateId',
               }"
@@ -279,7 +280,7 @@
     <div class="footer">
       <div class="btn">
         <a-button v-on:click="createProject" type="primary" class="btn1"
-          >确定
+        >确定
         </a-button>
         <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
@@ -287,11 +288,11 @@
   </div>
 </template>
 <script>
-import { onMounted, reactive, toRefs, watch } from "vue";
-import { message } from "ant-design-vue";
-import { useRoute, useRouter } from "vue-router";
+import {onMounted, reactive, toRefs, watch} from "vue";
+import {message} from "ant-design-vue";
+import {useRoute, useRouter} from "vue-router";
 import * as api from "../../api/index";
-import { useStore } from "vuex";
+import {useStore} from "vuex";
 import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
@@ -330,7 +331,7 @@ export default {
     });
 
     onMounted(() => {
-      state.projectPic = store.state.projectPic.map((e) => ({value:e.dictValue,label:e.dictName}));
+      state.projectPic = store.state.projectPic.map((e) => ({value: e.dictValue, label: e.dictName}));
       state.viewDetail = routers.query.viewDetail;
       getProjectInfo();
       getTemplate();
@@ -351,18 +352,18 @@ export default {
         return;
       }
       api
-        .getProjectDetail({ projectId: routers.query.projectId })
-        .then((res) => {
-          state.projectInfo = res.data.data.projectInfo;
-          state.projectInfo.rangeTime = [
-            state.projectInfo.beginTime,
-            state.projectInfo.endTime,
-          ];
-          state.projectInfo.parentName = routers.query.parentName;
-          state.courseSyncFlag = state.projectInfo.courseSyncFlag
-            ? true
-            : false;
-        });
+          .getProjectDetail({projectId: routers.query.projectId})
+          .then((res) => {
+            state.projectInfo = res.data.data.projectInfo;
+            state.projectInfo.rangeTime = [
+              state.projectInfo.beginTime,
+              state.projectInfo.endTime,
+            ];
+            state.projectInfo.parentName = routers.query.parentName;
+            state.courseSyncFlag = state.projectInfo.courseSyncFlag
+                ? true
+                : false;
+          });
     }
 
     const backPage = () => {
@@ -458,8 +459,13 @@ export default {
       });
     };
 
+    function managerChange(e, l, d) {
+      state.projectInfo.sourceBelongId = d
+    }
+
     return {
       ...toRefs(state),
+      managerChange,
       timeChange,
       classificationChange,
       classificationChange5,
@@ -471,9 +477,10 @@ export default {
 };
 </script>
 <style lang="scss">
-.flex-top{
+.flex-top {
   align-items: flex-start !important;
 }
+
 .projectAdd {
   width: 100%;
   // height: inherit;
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 32964e4e..b703033c 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -9,7 +9,6 @@
               v-model:value="searchParam.name"
               style="width: 270px; height: 40px; border-radius: 8px"
               placeholder="请输入项目名称"
-              @change="sProjectNameChange"
               allowClear
               showSearch
           >
@@ -20,7 +19,6 @@
               v-model:value="searchParam.manager"
               style="width: 270px; height: 40px; border-radius: 8px"
               placeholder="请输入项目经理"
-              @change="sProjectOrderChange"
               allowClear
               showSearch
           >
@@ -31,7 +29,6 @@
               v-model:value="searchParam.createName"
               style="width: 270px; height: 40px; border-radius: 8px"
               placeholder="请输入项目创建人"
-              @change="sProjectCreateChange"
               allowClear
               showSearch
           >
@@ -212,6 +209,7 @@
               <ProjectManager
                   v-model:value="projectInfo.managerId"
                   v-model:name="projectInfo.manager"
+                  @onChange="managerChange"
                   mode="multiple"
               ></ProjectManager>
             </div>
@@ -1753,10 +1751,16 @@ export default {
               });
         }
     );
+
+    function managerChange(e, l, d) {
+      state.projectInfo.sourceBelongId = d
+    }
+
     return {
       ...toRefs(state),
       dayjs,
       moment,
+      managerChange,
       reFinashedProject,
       showBackFinashModal,
       timeChange,