From 73313a1532419f820a7b74725be15d43dee70fe8 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 14 Jun 2024 23:26:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=AD=E6=8A=84=E9=80=81=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/requirement/add.vue   |  2 +-
 .../components/ToolToShowUserPicker.vue        | 18 +++++++-----------
 .../implementation/phase.vue                   |  4 ++--
 .../workflow/process/common/UserPicker.vue     |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index db1b430..7d3d887 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -35,7 +35,7 @@
         <el-col :span="24">
           <el-form-item label="所属公司" prop="companyIds" class="tree-select">
             <div>{{ getName(companyList) }}</div>
-            <el-button @click="showCompany">{{companyList.length===0?'请选择':'更改'}}</el-button>
+            <el-button  color="#DED0B2" @click="showCompany">{{companyList.length===0?'请选择所属公司':'更改'}}</el-button>
 <!--                        <el-tree-select v-model="formData.companyIds" :data="companyOption"-->
 <!--                                        filterable clearable :check-strictly="true" multiple/>-->
           </el-form-item>
diff --git a/src/views/project-management/implementation/components/ToolToShowUserPicker.vue b/src/views/project-management/implementation/components/ToolToShowUserPicker.vue
index 4818c8b..3dde1c2 100644
--- a/src/views/project-management/implementation/components/ToolToShowUserPicker.vue
+++ b/src/views/project-management/implementation/components/ToolToShowUserPicker.vue
@@ -1,6 +1,7 @@
 <template>
-  <el-button color="#DED0B2"  >
-    {{ modelValue || '请选择抄送人员' }}
+  <div>{{modelValue}}</div>
+  <el-button color="#DED0B2" style="margin-left: 10px" @click="click">
+    {{ modelValue?'更改':'请选择抄送人员' }}
   </el-button>
 </template>
 
@@ -11,13 +12,8 @@ const props = defineProps({
     default: ''
   }
 })
-
-// const emit = defineEmits('update: modelValue')
-
-const localText = ref('')
-
+const emit = defineEmits('clickCopyUser')
+const click=()=>{
+  emit("clickCopyUser")
+}
 </script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index edbeadc..58b7614 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -4,7 +4,7 @@
     <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
     <el-form :model="formData" label-width="auto">
       <el-form-item label="抄送人员">
-        <Ttsup :modelValue="chooseUserInfo()" @click="chooseUser"/>
+        <Ttsup :modelValue="chooseUserInfo()" @clickCopyUser="chooseUser"/>
       </el-form-item>
     </el-form>
     <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList" @ok="selected"/>
@@ -130,7 +130,7 @@ const chooseUserInfo = () => {
       return item.name
     }).join('，')
   } else {
-    return "请选择抄送人员"
+    return null
   }
 }
 const selected = (select) => {
diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue
index d9acfee..523e2d7 100644
--- a/src/views/workflow/process/common/UserPicker.vue
+++ b/src/views/workflow/process/common/UserPicker.vue
@@ -187,7 +187,7 @@ const showUserPicker = () => {
     value: "0"
   };
   dataList.value = [];
-  selectList.value = []
+  // selectList.value = []
   chooseId.value = 0;
   radio.value = 0;
   visible.value = true;