待办,已办条件查询

src/views/flowable/task/HistoryList.vue

@@ -19,6 +19,12 @@
 					end-placeholder="结束日期"
 				/>
 			</el-form-item>
+			<el-form-item label="实例标题" prop="title">
+				<el-input  v-model="searchForm.title" placeholder="实例标题" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="流程发起人" prop="assigneeId">
+				<UserSelect2  :modelValue="searchForm.assigneeId" :limit='1' @update:modelValue='(value) => {searchForm.assigneeId = value}'></UserSelect2>
+			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" @click="refreshList()" icon="search"
 					>查询</el-button
@@ -147,12 +153,15 @@
 // import FlowChart from '../modeler/FlowChart'
 import pick from "lodash.pick";
 import taskService from "@/api/flowable/taskService";
+import UserSelect2 from '@/components/userSelect'
 export default {
 	data() {
 		return {
 			searchForm: {
 				beginDate: "",
 				endDate: "",
+				title: "",
+				assigneeId: "",
 			},
 			searchVisible: true,
 			searchDates: "",
@@ -170,6 +179,9 @@ export default {
 	created () {
 		this.refreshList()
 	},
+	components: {
+		UserSelect2
+	},
 	mounted() {
 		this.$nextTick(() => {
 			// 将表格和工具栏进行关联

src/views/flowable/task/TodoList.vue

@@ -7,8 +7,8 @@
 			class="query-form m-b-10"
 			ref="searchForm"
 			:model="searchForm"
-			@keyup.enter="refreshList()"
-			@submit.prevent
+			@keyup.enter.native="refreshList()"
+			@submit.native.prevent
 		>
 			<el-form-item label="创建时间：" prop="searchDates">
 				<el-date-picker
@@ -20,6 +20,12 @@
 					end-placeholder="结束日期"
 				/>
 			</el-form-item>
+			<el-form-item label="实例标题" prop="title">
+				<el-input  v-model="searchForm.title" placeholder="实例标题" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="流程发起人" prop="assigneeId">
+				<UserSelect2  :modelValue="searchForm.assigneeId" :limit='1' @update:modelValue='(value) => {searchForm.assigneeId = value}'></UserSelect2>
+			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" @click="refreshList()" icon="search"
 					>查询</el-button
@@ -169,12 +175,15 @@
 import pick from "lodash.pick";
 import UserSelect from "@/components/userSelect/UserSelectDialog";
 import taskService from "@/api/flowable/taskService";
+import UserSelect2 from '@/components/userSelect'
 export default {
 	data() {
 		return {
 			searchForm: {
 				beginDate: "",
 				endDate: "",
+				title: "",
+				assigneeId: "",
 			},
 			searchVisible: true,
 			searchDates: "",
@@ -202,6 +211,7 @@ export default {
 	},
 	components: {
 		UserSelect,
+		UserSelect2
 		// FlowChart
 	},
 	watch: {
@@ -236,6 +246,7 @@ export default {
 					this.tablePage.total = data.total;
 					this.loading = false;
 				});
+			console.log(this.searchForm.assigneeId)
 		},
 		// 当前页
 		currentChangeHandle({ currentPage, pageSize }) {
@@ -244,6 +255,12 @@ export default {
 			this.refreshList();
 		},
 		todo(row) {
+			let approvalStatus
+			if (this.$store.state.user.id==='1602912511302615042'){
+				approvalStatus === 'audit'
+			}else {
+
+			}
 			taskService
 				.getTaskDef({
 					taskId: row.task.id,