From c6ddba870219ba509e5540427af8817bbb751651 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 25 Jul 2024 22:10:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=8A=84=E9=80=81?=
 =?UTF-8?q?=E4=BA=BA=E5=9B=9E=E6=98=BE=E5=8F=8A=E5=8F=96=E6=B6=88=E7=AE=AD?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectApply.vue          |  2 +-
 src/views/project-demand/summary/add.vue      |  2 +-
 .../process/common/AvatarEllipsis.vue         |  7 +++-
 .../workflow/process/config/CcNodeConfig.vue  | 36 ++++++++++---------
 src/views/workflow/process/nodes/CcNode.vue   |  2 +-
 src/views/workflow/process/nodes/Node.vue     |  9 +++--
 6 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 504f414..366b649 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -58,7 +58,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="title==='apply'||title==='check'">
-          <el-form-item label="分管领导" :required="true" prop=""
+          <el-form-item label="分管领导"
                         label-width="125">
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
               {{ optionalChargeLeadershipList.length !== 0 ? '更改' : getOptionalChargeLeadershipList(optionalChargeLeadershipList) ? '更改' : '请选择' }}
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 4ba6d35..65d2972 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -246,7 +246,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="分管领导" :required="true" prop=""
+          <el-form-item label="分管领导"
                         label-width="125">
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
               {{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }}
diff --git a/src/views/workflow/process/common/AvatarEllipsis.vue b/src/views/workflow/process/common/AvatarEllipsis.vue
index 142549d..3c010ed 100644
--- a/src/views/workflow/process/common/AvatarEllipsis.vue
+++ b/src/views/workflow/process/common/AvatarEllipsis.vue
@@ -19,7 +19,7 @@
             </el-icon>
           </div>
         </div>
-        <div class="arrow" v-if="(index+1)%3!==0&&userInfo.length!==1&&(index+1)!==userInfo.length">
+        <div class="arrow" v-if="(index+1)%3!==0&&userInfo.length!==1&&(index+1)!==userInfo.length&&showArrow">
           <el-icon size="20">
             <Right/>
           </el-icon>
@@ -49,6 +49,11 @@ const props = defineProps({
   mode: {
     type: String,
     default: 'design'
+  },
+  //是否显示箭头
+  showArrow: {
+    type: Boolean,
+    default: true
   }
 })
 
diff --git a/src/views/workflow/process/config/CcNodeConfig.vue b/src/views/workflow/process/config/CcNodeConfig.vue
index 29d0bef..80f47e5 100644
--- a/src/views/workflow/process/config/CcNodeConfig.vue
+++ b/src/views/workflow/process/config/CcNodeConfig.vue
@@ -1,18 +1,20 @@
 <template>
-  <el-button size="mini" icon="Plus" type="primary" @click="selectUser" round>选择抄送人</el-button>
-<!--  <div class="option">-->
-<!--    <el-checkbox label="允许发起人添加抄送人" v-model="shouldAdd"></el-checkbox>-->
-<!--  </div>-->
+  <el-button size="mini" icon="Plus" type="primary" @click="selectUser" round style="margin-bottom: 10px">选择抄送人
+  </el-button>
+  <!--  <div class="option">-->
+  <!--    <el-checkbox label="允许发起人添加抄送人" v-model="shouldAdd"></el-checkbox>-->
+  <!--  </div>-->
   <!--    <org-items v-model="select"/>-->
-      <avatar-ellipsis :row="3" :user-info="assignedUser"/>
-    <user-picker title="请选择抄送人" multiple ref="userPicker" :v-model="assignedUser" @ok="selectedUser"/>
+  <avatar-ellipsis :row="3" :user-info="assignedUser" :showArrow="false" />
+  <user-picker title="请选择抄送人" multiple ref="userPicker" v-model:value="assignedUser" @ok="selectedUser"/>
 </template>
 
 <script setup>
 import {computed, defineProps} from 'vue'
 import UserPicker from "../common/UserPicker.vue";
 import AvatarEllipsis from "../common/AvatarEllipsis.vue";
-const userPicker=ref()
+
+const userPicker = ref()
 const props = defineProps({
   config: {
     type: Object,
@@ -41,16 +43,16 @@ const selectUser = () => {
   userPicker.value.showUserPicker()
 }
 const selectedUser = (select) => {
-  let userInfoList = []
-  for (let val of select) {
-    let userInfo = {
-      id: val.id,
-      name: val.name,
-      avatar: val.avatar,
-    }
-    userInfoList.push(userInfo)
-  }
-  assignedUser.value = userInfoList
+  // let userInfoList = []
+  // for (let val of select) {
+  //   let userInfo = {
+  //     id: val.id,
+  //     name: val.name,
+  //     avatar: val.avatar,
+  //   }
+  //   userInfoList.push(userInfo)
+  // }
+  assignedUser.value = select
 }
 
 </script>
diff --git a/src/views/workflow/process/nodes/CcNode.vue b/src/views/workflow/process/nodes/CcNode.vue
index 082ccfb..cf9b74e 100644
--- a/src/views/workflow/process/nodes/CcNode.vue
+++ b/src/views/workflow/process/nodes/CcNode.vue
@@ -1,6 +1,6 @@
 <template>
   <node :title="config.name" :show-error="showError" :select-user="selectUser" :mode="mode" :content="content" :node-id="config.id"
-        :error-info="errorInfo" :show-avatar="true" :user-info="config.props.assignedUser"
+        :error-info="errorInfo" :show-avatar="true" :user-info="config.props.assignedUser" nodeType="carbonCopyRecipient"
         @selected="emit('selected')" @delNode="emit('delNode')" @insertNode="type => emit('insertNode', type)"
         placeholder="请设置抄送人" :header-bgc="headerBgc" :header-icon="Promotion"/>
 </template>
diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue
index d0d4920..2b4188c 100644
--- a/src/views/workflow/process/nodes/Node.vue
+++ b/src/views/workflow/process/nodes/Node.vue
@@ -18,12 +18,12 @@
         <template v-if="selectUser.show && mode === 'view'">
           <div class="avatar_button">
             <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :mode="mode" :user-info="userInfo"/>
-            <el-button type="primary" :icon="Plus" circle/>
+<!--            <el-button type="primary" :icon="Plus" circle/>-->
           </div>
         </template>
         <template v-else-if="showAvatar">
           <span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
-          <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo" :mode="mode"/>
+          <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo" :mode="mode" :show-arrow="nodeType!=='carbonCopyRecipient'"/>
         </template>
         <template v-else>
           <span class="placeholder" v-if="(content || '').trim() === ''">{{ placeholder }}</span>
@@ -146,6 +146,11 @@ const props = defineProps({
   mode: {
     type: String,
     default: 'design'
+  },
+  //节点类型,例如抄送人(区别该节点,去掉抄送人之间的箭头)
+  nodeType: {
+    type: String,
+    default: ''
   }
 })