From 5f6f1a7912025cf8c751b5486db0e37607394e56 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sun, 4 Aug 2024 21:01:43 +0800
Subject: [PATCH] =?UTF-8?q?feat=20:=20=E7=A0=94=E5=8F=91=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/expense-management/share/add.vue        |  2 +-
 src/views/workflow/form/components/UserPicker.vue |  2 +-
 src/views/workflow/process/common/UserPicker.vue  | 15 +++++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index d686f04..1194784 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -106,7 +106,7 @@
       </el-row>
     </el-form>
     <user-picker :multiple="false" ref="userPicker" title="请选择研发人员" v-model:value="userList" @ok="selected"
-                 :setNullToSelectList="true"/>
+                 :setNullToSelectList="true" :isResearch="true"/>
 
     <div style="width:100%;text-align: center;padding: 10px">
       <el-button type="primary" @click="handleAdd" link style="font-size: 18px">添加一行</el-button>
diff --git a/src/views/workflow/form/components/UserPicker.vue b/src/views/workflow/form/components/UserPicker.vue
index a454767..d66da63 100644
--- a/src/views/workflow/form/components/UserPicker.vue
+++ b/src/views/workflow/form/components/UserPicker.vue
@@ -73,7 +73,7 @@ const props = defineProps({
   multiple: {
     type: Boolean,
     default: false
-  }
+  },
 })
 const chooseUser=()=>{
   userPicker.value.showUserPicker()
diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue
index 64b3dcc..f77b23d 100644
--- a/src/views/workflow/process/common/UserPicker.vue
+++ b/src/views/workflow/process/common/UserPicker.vue
@@ -96,7 +96,11 @@ const props = defineProps({
   checkMatrix: {
     default: false,
     type: Boolean
-  }
+  },
+  isResearch: {
+    default: false,
+    type: Boolean
+  },
 });
 const radio = ref(0);
 let selectItem = reactive({
@@ -140,7 +144,8 @@ watch(() => filterText.value, (newVal) => {
 const getList = () => {
   let params = {
     chooseId: 0,
-    chooseName: filterText.value
+    chooseName: filterText.value,
+    isResearch: props.isResearch
   }
   getMosrUser(params).then(res => {
     dataList.value = res.data;
@@ -165,11 +170,13 @@ async function loadNode(node, resolve) {
   let params = {}
   if (data.id) {
     params = {
-      chooseId: data.id
+      chooseId: data.id,
+        isResearch: props.isResearch
     }
   } else {
     params = {
-      chooseId: 0
+      chooseId: 0,
+      isResearch: props.isResearch
     }
   }
   let result = await getMosrUser(params).then(res => {