申请人查询修改

src/api/workflow/instance/types.ts

@@ -5,7 +5,7 @@ export interface FlowInstanceQuery extends PageQuery {
   nodeName?: string;
   flowCode?: string;
   flowName?: string;
-  nickName?: string;
+  createByIds?: string[] | number[];
   businessId?: string;
 }
 

src/api/workflow/task/types.ts

@@ -4,7 +4,7 @@ export interface TaskQuery extends PageQuery {
   nodeName?: string;
   flowCode?: string;
   flowName?: string;
-  nickName?: string;
+  createByIds?: string[] | number[];
 }
 
 export interface ParticipantVo {

src/views/workflow/processInstance/index.vue

@@ -32,8 +32,10 @@
           <div v-show="showSearch" class="mb-[10px]">
             <el-card shadow="hover">
               <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-                <el-form-item label="申请人" prop="nickName">
+                <el-form-item>
-                  <el-input v-model="queryParams.nickName" placeholder="请输入申请人" @keyup.enter="handleQuery" />
+                  <el-badge :value="userSelectCount" :max="10" class="item">
+                    <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
+                  </el-badge>
                 </el-form-item>
                 <el-form-item label="任务名称" prop="nodeName">
                   <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
@@ -74,7 +76,7 @@
               </el-table-column>
               <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
               <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
-            <el-table-column align="center" prop="nickName" label="申请人"></el-table-column>
+              <el-table-column align="center" prop="createByName" label="申请人"></el-table-column>
               <el-table-column align="center" prop="version" label="版本号" width="90">
                 <template #default="scope"> v{{ scope.row.version }}.0</template>
               </el-table-column>
@@ -166,6 +168,9 @@
       </el-card>
     </el-dialog>
     <!-- 流程变量结束 -->
+
+    <!-- 申请人 -->
+    <UserSelect ref="userSelectRef" :multiple="true" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></UserSelect>
   </div>
 </template>
 
@@ -178,12 +183,16 @@ import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 import VueJsonPretty from 'vue-json-pretty';
 import 'vue-json-pretty/lib/styles.css';
+import UserSelect from '@/components/UserSelect/index.vue';
 //审批记录组件
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
 const queryFormRef = ref<ElFormInstance>();
 const categoryTreeRef = ref<ElTreeInstance>();
+import { ref } from 'vue';
+import { UserVO } from '@/api/system/user/types';
 
+const userSelectRef = ref<InstanceType<typeof UserSelect>>();
 // 遮罩层
 const loading = ref(true);
 // 选中数组
@@ -225,6 +234,11 @@ type CategoryOption = {
 const tab = ref('running');
 // 作废原因
 const deleteReason = ref('');
+
+//申请人id
+const selectUserIds = ref<Array<number | string>>([]);
+//申请人选择数量
+const userSelectCount = ref(0);
 // 查询参数
 const queryParams = ref<FlowInstanceQuery>({
   pageNum: 1,
@@ -232,7 +246,7 @@ const queryParams = ref<FlowInstanceQuery>({
   nodeName: undefined,
   flowName: undefined,
   flowCode: undefined,
-  nickName: undefined,
+  createByIds: [],
   categoryCode: undefined
 });
 
@@ -282,6 +296,8 @@ const resetQuery = () => {
   queryParams.value.categoryCode = '';
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
+  queryParams.value.createByIds = [];
+  userSelectCount.value = 0;
   handleQuery();
 };
 // 多选框选中数据
@@ -384,6 +400,19 @@ function formatToJsonObject(data: string) {
   }
 }
 
+//打开申请人选择
+const openUserSelect = () => {
+  userSelectRef.value.open();
+};
+//确认选择申请人
+const userSelectCallBack = (data: UserVO[]) => {
+  userSelectCount.value = 0;
+  if (data && data.length > 0) {
+    userSelectCount.value = data.length;
+    selectUserIds.value = data.map((item) => item.userId);
+    queryParams.value.createByIds = selectUserIds.value;
+  }
+};
 onMounted(() => {
   getProcessInstanceRunningList();
   getTreeselect();

src/views/workflow/task/allTaskWaiting.vue

@@ -12,8 +12,10 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="申请人" prop="nickName">
+            <el-form-item>
-              <el-input v-model="queryParams.nickName" placeholder="请输入申请人" @keyup.enter="handleQuery" />
+              <el-badge :value="userSelectCount" :max="10" class="item">
+                <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
+              </el-badge>
             </el-form-item>
             <el-form-item label="任务名称" prop="nodeName">
               <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
@@ -53,7 +55,7 @@
             <template #default="scope"> v{{ scope.row.version }}.0</template>
           </el-table-column>
           <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
-          <el-table-column align="center" prop="nickName" label="申请人"></el-table-column>
+          <el-table-column align="center" prop="createByName" label="申请人"></el-table-column>
           <el-table-column align="center" label="办理人">
             <template #default="scope">
               <template v-if="tab === 'waiting'">
@@ -108,6 +110,8 @@
     <UserSelect ref="userSelectRef" :multiple="false" @confirm-call-back="submitCallback"></UserSelect>
     <!-- 选人组件 -->
     <processMeddle ref="processMeddleRef" @submitCallback="getWaitingList"></processMeddle>
+    <!-- 申请人 -->
+    <UserSelect ref="applyUserSelectRef" :multiple="true" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></UserSelect>
   </div>
 </template>
 
@@ -118,11 +122,13 @@ import { TaskQuery } from '@/api/workflow/task/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 import processMeddle from '@/components/Process/processMeddle';
+import { UserVO } from '@/api/system/user/types';
 //选人组件
 const userSelectRef = ref<InstanceType<typeof UserSelect>>();
 //流程干预组件
 const processMeddleRef = ref<InstanceType<typeof processMeddle>>();
-
+//选人组件
+const applyUserSelectRef = ref<InstanceType<typeof UserSelect>>();
 const queryFormRef = ref<ElFormInstance>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
@@ -142,6 +148,10 @@ const total = ref(0);
 // 模型定义表格数据
 const taskList = ref([]);
 const title = ref('');
+//申请人id
+const selectUserIds = ref<Array<number | string>>([]);
+//申请人选择数量
+const userSelectCount = ref(0);
 // 查询参数
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
@@ -149,7 +159,7 @@ const queryParams = ref<TaskQuery>({
   nodeName: undefined,
   flowName: undefined,
   flowCode: undefined,
-  nickName: undefined
+  createByIds: []
 });
 const tab = ref('waiting');
 
@@ -166,6 +176,8 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields();
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
+  queryParams.value.createByIds = [];
+  userSelectCount.value = 0;
   handleQuery();
 };
 // 多选框选中数据
@@ -230,6 +242,19 @@ const handleView = (row) => {
 const handleMeddle = (row) => {
   processMeddleRef.value.open(row.id);
 };
+//打开申请人选择
+const openUserSelect = () => {
+  applyUserSelectRef.value.open();
+};
+//确认选择申请人
+const userSelectCallBack = (data: UserVO[]) => {
+  userSelectCount.value = 0;
+  if (data && data.length > 0) {
+    userSelectCount.value = data.length;
+    selectUserIds.value = data.map((item) => item.userId);
+    queryParams.value.createByIds = selectUserIds.value;
+  }
+};
 onMounted(() => {
   getWaitingList();
 });

src/views/workflow/task/taskCopyList.vue

@@ -4,9 +4,6 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="申请人" prop="nickName">
-              <el-input v-model="queryParams.nickName" placeholder="请输入申请人" @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="任务名称" prop="nodeName">
               <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
             </el-form-item>
@@ -92,7 +89,6 @@ const queryParams = ref<TaskQuery>({
   nodeName: undefined,
   flowName: undefined,
   flowCode: undefined,
-  nickName: undefined
 });
 /** 搜索按钮操作 */
 const handleQuery = () => {

src/views/workflow/task/taskFinish.vue

@@ -4,8 +4,10 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="申请人" prop="nickName">
+            <el-form-item>
-              <el-input v-model="queryParams.nickName" placeholder="请输入申请人" @keyup.enter="handleQuery" />
+              <el-badge :value="userSelectCount" :max="10" class="item">
+                <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
+              </el-badge>
             </el-form-item>
             <el-form-item label="任务名称" prop="nodeName">
               <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
@@ -40,7 +42,7 @@
           <template #default="scope"> v{{ scope.row.version }}.0</template>
         </el-table-column>
         <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
-        <el-table-column align="center" prop="nickName" label="申请人"></el-table-column>
+        <el-table-column align="center" prop="createByName" label="申请人"></el-table-column>
         <el-table-column align="center" prop="approverName" label="办理人">
           <template #default="scope">
             <el-tag type="success">
@@ -73,6 +75,8 @@
         @pagination="handleQuery"
       />
     </el-card>
+    <!-- 申请人 -->
+    <UserSelect ref="userSelectRef" :multiple="true" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></UserSelect>
   </div>
 </template>
 
@@ -86,6 +90,11 @@ const queryFormRef = ref<ElFormInstance>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
 const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
+import UserSelect from '@/components/UserSelect';
+import { ref } from 'vue';
+import { UserVO } from '@/api/system/user/types';
+
+const userSelectRef = ref<InstanceType<typeof UserSelect>>();
 // 遮罩层
 const loading = ref(true);
 // 选中数组
@@ -107,8 +116,12 @@ const queryParams = ref<TaskQuery>({
   nodeName: undefined,
   flowName: undefined,
   flowCode: undefined,
-  nickName: undefined
+  createByIds: []
 });
+//申请人id
+const selectUserIds = ref<Array<number | string>>([]);
+//申请人选择数量
+const userSelectCount = ref(0);
 /** 搜索按钮操作 */
 const handleQuery = () => {
   getFinishList();
@@ -118,6 +131,8 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields();
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
+  queryParams.value.createByIds = [];
+  userSelectCount.value = 0;
   handleQuery();
 };
 // 多选框选中数据
@@ -145,7 +160,19 @@ const handleView = (row: FlowTaskVO) => {
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };
-
+//打开申请人选择
+const openUserSelect = () => {
+  userSelectRef.value.open();
+};
+//确认选择申请人
+const userSelectCallBack = (data: UserVO[]) => {
+  userSelectCount.value = 0;
+  if (data && data.length > 0) {
+    userSelectCount.value = data.length;
+    selectUserIds.value = data.map((item) => item.userId);
+    queryParams.value.createByIds = selectUserIds.value;
+  }
+};
 onMounted(() => {
   getFinishList();
 });

src/views/workflow/task/taskWaiting.vue

@@ -4,8 +4,10 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="申请人" prop="nickName">
+            <el-form-item>
-              <el-input v-model="queryParams.nickName" placeholder="请输入申请人" @keyup.enter="handleQuery" />
+              <el-badge :value="userSelectCount" :max="10" class="item">
+                <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
+              </el-badge>
             </el-form-item>
             <el-form-item label="任务名称" prop="nodeName">
               <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
@@ -37,7 +39,7 @@
         <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column>
         <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
         <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
-        <el-table-column align="center" prop="nickName" label="申请人"></el-table-column>
+        <el-table-column align="center" prop="createByName" label="申请人"></el-table-column>
         <el-table-column align="center" label="办理人">
           <template #default="scope">
             <template v-if="scope.row.transactorNames">
@@ -70,6 +72,8 @@
         @pagination="handleQuery"
       />
     </el-card>
+    <!-- 申请人 -->
+    <UserSelect ref="userSelectRef" :multiple="true" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></UserSelect>
   </div>
 </template>
 
@@ -78,8 +82,14 @@ import { pageByTaskWait } from '@/api/workflow/task';
 import { TaskQuery, FlowTaskVO } from '@/api/workflow/task/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+import UserSelect from '@/components/UserSelect';
+import { ref } from 'vue';
+import { UserVO } from '@/api/system/user/types';
+
+const userSelectRef = ref<InstanceType<typeof UserSelect>>();
 //提交组件
 const queryFormRef = ref<ElFormInstance>();
 // 遮罩层
@@ -96,6 +106,11 @@ const showSearch = ref(true);
 const total = ref(0);
 // 模型定义表格数据
 const taskList = ref([]);
+
+//申请人id
+const selectUserIds = ref<Array<number | string>>([]);
+//申请人选择数量
+const userSelectCount = ref(0);
 // 查询参数
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
@@ -103,7 +118,7 @@ const queryParams = ref<TaskQuery>({
   nodeName: undefined,
   flowName: undefined,
   flowCode: undefined,
-  nickName: undefined
+  createByIds: []
 });
 onMounted(() => {
   getWaitingList();
@@ -117,6 +132,8 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields();
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
+  queryParams.value.createByIds = [];
+  userSelectCount.value = 0;
   handleQuery();
 };
 // 多选框选中数据
@@ -145,4 +162,17 @@ const handleOpen = async (row: FlowTaskVO) => {
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };
+//打开申请人选择
+const openUserSelect = () => {
+  userSelectRef.value.open();
+};
+//确认选择申请人
+const userSelectCallBack = (data: UserVO[]) => {
+  userSelectCount.value = 0;
+  if (data && data.length > 0) {
+    userSelectCount.value = data.length;
+    selectUserIds.value = data.map((item) => item.userId);
+    queryParams.value.createByIds = selectUserIds.value;
+  }
+};
 </script>