From 8b7c4aabafc94bc5c2b2e309a1ad9bdf5fcb2564 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 26 Dec 2022 19:15:57 +0800
Subject: [PATCH] =?UTF-8?q?--=20=E7=BB=84=E7=BB=87=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjectAudit.vue      |   2 +-
 src/components/project/OrgClass.vue          |   4 +-
 src/components/project/ProjectManagerNew.vue |   2 +-
 src/views/projectcenter/LibraryAdd.vue       |   2 +-
 src/views/projectcenter/ProjectAdd.vue       | 196 ++++++++++---------
 src/views/projectcenter/ProjectManage.vue    |   4 +-
 src/views/projectcenter/SonProject.vue       |   5 +-
 src/views/projectcenter/TaskPage.vue         |   4 +-
 src/views/projectcenter/templateAdd.vue      |   4 +-
 9 files changed, 116 insertions(+), 107 deletions(-)

diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
index 67115e24..04fd474a 100644
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -39,7 +39,7 @@
                 <div class="set_content">
                   <div class="setc_name"><span>资源归属：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ projectInfo.sourceBelongName }}</span>
+                    <span style="color: #999999">{{ (projectInfo.sourceBelongFullName || '')+projectInfo.sourceBelongName }}</span>
                   </div>
                 </div>
                 <div class="set_content">
diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index 4cf15db6..73f44421 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -43,9 +43,9 @@ const id = computed(() => {
   return props.value
 })
 
-function change(key, obj) {
-  console.log(obj[0], key, props.value);
+function change(key, obj, {triggerNode: {props: {namePath}}}) {
   emit('update:name', obj[0])
+  emit('update:fullName', namePath)
   emit('update:value', key)
 }
 
diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue
index bbb0270e..bf68e918 100644
--- a/src/components/project/ProjectManagerNew.vue
+++ b/src/components/project/ProjectManagerNew.vue
@@ -107,7 +107,7 @@ function change(e, l) {
   memberParam.value.page = 1
   isOpen.value = false
   Array.isArray(l) && (selectOptions.value = l)
-  Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName)
+  Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName, selectOptions.value.find(e => e.departId)?.orgName)
   if (Array.isArray(l)) {
     emit('update:name', l.map(t => t.label).join(','))
     emit('update:value', l.map(t => t.value).join(','))
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 8746c2f0..2fbc8308 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -536,7 +536,7 @@
                     <div class="setc_name"><span>资源归属：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">{{
-                        projectInfo.sourceBelongName
+                          (projectInfo.sourceBelongFullName || '') + projectInfo.sourceBelongName
                       }}</span>
                     </div>
                   </div>
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 998b0d39..b4160ad0 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -3,14 +3,15 @@
   <div class="projectAdd">
     <div class="header">
       <span class="title"
-        >{{ projectInfo.projectId ? "编辑" : "创建"
+      >{{
+          projectInfo.projectId ? "编辑" : "创建"
         }}{{ ptojectType == "3" ? "班级" : "项目" }}</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>
@@ -20,8 +21,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>
@@ -34,8 +35,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">
               {{ ptojectType == 3 ? "班级名称" : "项目名称" }}
@@ -43,27 +44,27 @@
           </div>
           <div class="in">
             <NameInput
-              placeholder="请输入项目名称"
-              v-model:value="projectInfo.name"
-              v-model:validate="projectInfo.validate"
-              :maxlength="30"
-              show-count
-              :id="projectInfo.projectId"
+                placeholder="请输入项目名称"
+                v-model:value="projectInfo.name"
+                v-model:validate="projectInfo.validate"
+                :maxlength="30"
+                show-count
+                :id="projectInfo.projectId"
             ></NameInput>
           </div>
         </div>
         <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>
           <div class="in select" style="flex: 1; display: flex">
             <div
-              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-              style="
+                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+                style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
@@ -71,19 +72,19 @@
                 position: relative;
                 overflow: hidden;
               "
-              v-for="(src, index) in projectPic"
-              :key="index"
-              @click="() => (projectInfo.picUrl = src.value)"
+                v-for="(src, index) in projectPic"
+                :key="index"
+                @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                style="
+                  style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                :src="src.value"
-                alt="avatar"
+                  :src="src.value"
+                  alt="avatar"
               />
             </div>
           </div>
@@ -91,64 +92,65 @@
         <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="至"
-              :show-time="{ format: 'HH:mm' }"
-              :placeholder="['      开始时间', '        结束时间']"
-              :disabled-date="disabledDate"
-              v-model:value="projectInfo.rangeTime"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              valueFormat="YYYY-MM-DD HH:mm"
-              @change="timeChange"
-              :disabled="viewDetail ? true : false"
+                separator="至"
+                :show-time="{ format: 'HH:mm' }"
+                :placeholder="['      开始时间', '        结束时间']"
+                :disabled-date="disabledDate"
+                v-model:value="projectInfo.rangeTime"
+                style="width: 100%; height: 40px; border-radius: 5px"
+                valueFormat="YYYY-MM-DD HH:mm"
+                @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"
-              @onChange="managerChange"
-              mode="multiple"
+                v-model:value="projectInfo.managerId"
+                v-model:name="projectInfo.manager"
+                @onChange="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"
+                v-model:fullName="projectInfo.sourceBelongFullName"
             ></OrgClass>
           </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>
@@ -159,8 +161,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>
@@ -171,15 +173,15 @@
         <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">是否BOEU实施</div>
           </div>
           <div class="in">
             <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>
@@ -192,16 +194,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
             >
           </div>
         </div>
@@ -211,12 +213,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>
@@ -235,18 +237,18 @@
           <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;
                 }
               "
-              placeholder="请选择模版"
-              :size="size"
-              style="width: 100%"
-              :options="classifyList5"
-              @change="classificationChange5"
-              @popupScroll="templateScroll"
-              :fieldNames="{
+                placeholder="请选择模版"
+                :size="size"
+                style="width: 100%"
+                :options="classifyList5"
+                @change="classificationChange5"
+                @popupScroll="templateScroll"
+                :fieldNames="{
                 label: 'name',
                 value: 'projectTemplateId',
               }"
@@ -260,33 +262,33 @@
       <div class="btn">
         <a-button @click="backPage" class="btn2">取消</a-button>
         <a-button
-          :loading="loading"
-          v-on:click="createProject"
-          type="primary"
-          class="btn1"
-          style="margin-left: 20px"
-          >确定
+            :loading="loading"
+            v-on:click="createProject"
+            type="primary"
+            class="btn1"
+            style="margin-left: 20px"
+        >确定
         </a-button>
       </div>
     </div>
   </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";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
-import { changeOwnership, scrollLoad } from "@/api/method";
-import { storage } from "../../api/storage";
+import {changeOwnership, scrollLoad} from "@/api/method";
+import {storage} from "../../api/storage";
 import * as api2 from "../../api/indexAudit";
-import { validateName } from "@/api/index1";
+import {validateName} from "@/api/index1";
 import dayjs from "dayjs";
 
 export default {
@@ -304,7 +306,7 @@ export default {
     const routers = useRoute();
     const router = useRouter();
     const state = reactive({
-      loading:false,
+      loading: false,
       currentPage: 1, //当前页
       tableDataTotal: -1, //模版列表总数
       pageSize: 10, //每页10条数据
@@ -351,10 +353,10 @@ export default {
       state.projectInfo.parentId = routers.query.parentId;
       state.projectInfo.projectId = routers.query.projectId;
       (state.projectInfo.projectId || state.projectInfo.parentId) &&
-        api
+      api
           .getProjectDetail({
             projectId:
-              state.projectInfo.projectId || state.projectInfo.parentId,
+                state.projectInfo.projectId || state.projectInfo.parentId,
           })
           .then((res) => {
             state.projectInfo = {
@@ -380,8 +382,8 @@ export default {
                   if (res.rows && res.rows.length > 0) {
                     let i = res.rows.length;
                     state.auditDescription = res.rows[i - 1].description
-                      ? res.rows[i - 1].description
-                      : "-";
+                        ? res.rows[i - 1].description
+                        : "-";
                   }
                 }
               });
@@ -490,24 +492,26 @@ export default {
       api.createProject(state.projectInfo).then((res) => {
         state.loading = false
         state.projectInfo.projectId ||
-          changeOwnership("project", res.data.data.projectId, [
-            { id: res.data.data.createId, name: res.data.data.createName },
-          ]);
+        changeOwnership("project", res.data.data.projectId, [
+          {id: res.data.data.createId, name: res.data.data.createName},
+        ]);
         message.destroy();
         message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
         // router.back();
         router.push({
           path: "/taskpage",
-          query: { projectId: res.data.data.projectId },
+          query: {projectId: res.data.data.projectId},
         });
         storage.set("projectId", res.data.data.projectId);
       });
     };
 
-    function managerChange(e, l, d, t) {
+    function managerChange(e, l, d, t, orgName) {
       state.projectInfo.sourceBelongId = d
       state.projectInfo.sourceBelongName = t
+      state.projectInfo.sourceBelongFullName = orgName
     }
+
     const disabledDate = (current) => {
       return current && current < dayjs().startOf('day');
     };
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index a0d160ff..6a1d0225 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -231,6 +231,7 @@
               <OrgClass
                   v-model:value="projectInfo.sourceBelongId"
                   v-model:name="projectInfo.sourceBelongName"
+                  v-model:fullName="projectInfo.sourceBelongFullName"
               ></OrgClass>
             </div>
           </div>
@@ -1803,9 +1804,10 @@ export default {
         }
     );
 
-    function managerChange(e, l, d, t) {
+    function managerChange(e, l, d, t,orgName) {
       state.projectInfo.sourceBelongId = d
       state.projectInfo.sourceBelongName = t
+      state.projectInfo.sourceBelongFullName = orgName
     }
 
     return {
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index c0f044cd..e27d6ab1 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -83,7 +83,7 @@
 					</div>
 
 					<div class="in select">
-						<OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName"></OrgClass>
+						<OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName" v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
 					</div>
 				</div>
 				<div class="name">
@@ -313,9 +313,10 @@ export default {
 			});
 		};
 
-		function managerChange(e, l, d, t) {
+		function managerChange(e, l, d, t,orgName) {
 			state.projectInfo.sourceBelongId = d
 			state.projectInfo.sourceBelongName = t
+      state.projectInfo.sourceBelongFullName = orgName
 		}
 		const disabledDate = (current) => {
 			return current && current < dayjs().startOf('day');
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 564de010..cace7ae2 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3380,7 +3380,7 @@ export default {
           let end = info.endTime;
           state.tstartTime = info.beginTime;
           state.tendTime = info.endTime;
-          state.tsourceBelong = info.sourceBelongName;
+          state.tsourceBelong = (info.sourceBelongFullName || '')+info.sourceBelongName;
           state.parentId = info.parentId;
           state.name = info.name;
           state.startTime = start;
@@ -3407,7 +3407,7 @@ export default {
 
           // state.attach = info.attach;
           // state.templateId = info.templateId;
-          state.sourceBelong = info.sourceBelongName;
+          state.sourceBelong = (info.sourceBelongFullName || '')+info.sourceBelongName;
           // state.fileList=info.attach.split(",")
           let d = info.attach.indexOf(",");
           // console.log(info.attach, "xgo", info.attach.length);
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 2472f944..2895c488 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -119,6 +119,7 @@
             <OrgClass
                 v-model:value="projectInfo.sourceBelongId"
                 v-model:name="projectInfo.sourceBelongName"
+                v-model:fullName="projectInfo.sourceBelongFullName"
             ></OrgClass>
           </div>
         </div>
@@ -296,9 +297,10 @@ const createProject = () => {
       });
 };
 
-function managerChange(e, l, d, t) {
+function managerChange(e, l, d, t,orgName) {
   projectInfo.value.valuesourceBelongId = d;
   projectInfo.value.sourceBelongName = t;
+  projectInfo.value.sourceBelongFullName = orgName
 }
 </script>
 <style lang="scss">