Merge remote-tracking branch 'origin/master'

src/views/dashboard/ProcessPortal/components/MyWork.vue

@@ -51,8 +51,8 @@
     </div>
 
     <task-handle-modal @register="registerHandleModal" @success="reloadTodo" />
-    <select-entruster-modal @register="registerEntrusterModal" @selected="selectedEntruster" />
-    <select-entruster-modal @register="registerComplaintModal" @selected="selectedComplaint" />
+    <SingleDeptUserModal title="选择委托人" @register="registerEntrusterModal" @selected="selectedEntruster" />
+    <SingleDeptUserModal title="选择转办人" @register="registerComplaintModal" @selected="selectedComplaint" />
   </div>
 </template>
 
@@ -66,7 +66,7 @@
   import { RightOutlined, QuestionCircleOutlined, ReloadOutlined } from '@ant-design/icons-vue';
   import { Tooltip } from 'ant-design-vue';
   import TaskHandleModal from '/@/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue';
-  import SelectEntrusterModal from '/@/views/super/bpm/process/personalOffice/myHandleTask/modal/SelectEntrusterModal.vue';
+  import SingleDeptUserModal from '/@/components/semri/singleDeptUserComponent/SingleDeptUserModal.vue';
   import { getTaskInfoForHistory } from '/@/views/super/bpm/process/personalOffice/myHandleTask/useTaskList';
   import { todoColumns } from '../data/todo.data';
   import { ccColumns } from '../data/cc.data';

src/views/super/bpm/process/personalOffice/myHandleTask/task.handle.data.ts

@@ -233,12 +233,11 @@ export const searchFormSchema: FormSchema[] = [
   {
     label: '发起人',
     field: 'userName',
-    component: 'JSelectUserByDept',
+    component: 'SzDeptUserSelect',
     componentProps: {
-      labelKey: 'realname',
-      rowKey: 'username',
-      showButton: false,
-      isRadioSelection: true,
+      valueKey: 'username',
+      multi: true,
+      triggerMode: 'input',
     },
     buss: 'run',
   },