Просмотр исходного кода

已办事项和我发起的添加筛选条件

lizhenhao 2 лет назад
Родитель
Сommit
a2801b80f4

+ 14 - 2
src/views/modules/flowable/task/ApplyList.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="page">
       <el-form size="small" :inline="true"  class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="searchForm.title" placeholder="请输入标题"></el-input>
+        </el-form-item>
+        <el-form-item label="流程发起人" prop="applyUserId">
+          <UserSelect :limit='1' :userName="applyUserName" :readonly="true" @getValue='(value, label) => {searchForm.applyUserId = value,applyUserName  = label}'></UserSelect>
+        </el-form-item>
         <el-form-item label="创建时间" prop="searchDates">
           <el-date-picker
             v-model="searchDates"
@@ -107,6 +113,7 @@
   import UrgeForm from './UrgeForm'
   import TaskService from '@/api/flowable/TaskService'
   import ProcessService from '@/api/flowable/ProcessService'
+  import UserSelect from '@/components/userSelect'
   export default {
     props: {
       index: {
@@ -122,8 +129,11 @@
       return {
         searchForm: {
           beginDate: '',
-          endDate: ''
+          endDate: '',
+          title: '',
+          applyUserId: ''
         },
+        applyUserName: '',
         searchDates: '',
         dataList: [],
         tablePage: {
@@ -175,7 +185,8 @@
     //   this.refreshList()
     // },
     components: {
-      UrgeForm
+      UrgeForm,
+      UserSelect
       // FlowChart
     },
     watch: {
@@ -262,6 +273,7 @@
       resetSearch () {
         this.searchDates = ''
         this.$refs.searchForm.resetFields()
+        this.applyUserName = ''
         this.$nextTick(() => {
           this.refreshList()
         })

+ 16 - 1
src/views/modules/flowable/task/HistoryList.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="page">
       <el-form size="small" :inline="true"  class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="searchForm.title" placeholder="请输入标题"></el-input>
+        </el-form-item>
+        <el-form-item label="流程发起人" prop="applyUserId">
+          <UserSelect :limit='1' :userName="applyUserName" :readonly="true" @getValue='(value, label) => {searchForm.applyUserId = value,applyUserName  = label}'></UserSelect>
+        </el-form-item>
         <el-form-item label="完成时间" prop="searchDates">
           <el-date-picker
             v-model="searchDates"
@@ -15,6 +21,7 @@
             :picker-options="pickerOptions">
           </el-date-picker>
         </el-form-item>
+
         <el-form-item>
           <el-button  type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
           <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
@@ -83,6 +90,7 @@
   // import FlowChart from '../modeler/FlowChart'
   import pick from 'lodash.pick'
   import TaskService from '@/api/flowable/TaskService'
+  import UserSelect from '@/components/userSelect'
   export default {
     props: {
       index: {
@@ -96,9 +104,12 @@
     },
     data () {
       return {
+        applyUserName: '',
         searchForm: {
           beginDate: '',
-          endDate: ''
+          endDate: '',
+          title: '',
+          applyUserId: ''
         },
         searchDates: '',
         dataList: [],
@@ -146,6 +157,9 @@
     },
     // activated () {
     // },
+    components: {
+      UserSelect
+    },
     watch: {
       searchDates () {
         if (this.searchDates) {
@@ -219,6 +233,7 @@
       resetSearch () {
         this.searchDates = ''
         this.$refs.searchForm.resetFields()
+        this.applyUserName = ''
         this.$nextTick(() => {
           this.refreshList()
         })