diff --git a/src/components/jeecg/modal/ProcessDelivery.vue b/src/components/jeecg/modal/ProcessDelivery.vue
index 8e809a1..9407c7e 100644
--- a/src/components/jeecg/modal/ProcessDelivery.vue
+++ b/src/components/jeecg/modal/ProcessDelivery.vue
@@ -15,13 +15,36 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="物资类型">
                 <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
                                    placeholder="请选择物资类型"  />
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-range-picker
+                  format="YYYY-MM-DD"
+                  :value="processTime"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="processDateChange"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="流程发起部门">
+                <a-select v-model="queryParam.departId" placeholder="请输入项目部"  @mouseenter="getUnit" >
+                  <a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.unit">{{item.unit_dictText}}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="流程计划">
+                <j-dict-select-tag type="list" v-model="queryParam.processPlan" dictCode="process_plan"
+                                   placeholder="请选择物资类型"  />
+              </a-form-item>
+            </a-col>
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -144,7 +167,7 @@
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
   import '@/assets/less/TableExpand.less'
 
-  const MODAL_WIDTH = 1200
+  const MODAL_WIDTH = 1600
   export default {
     name: 'ProcessDelivery',
     props: ['multi', 'code', 'groupId', 'param'],
@@ -214,6 +237,7 @@
           // }
         ],
         url: {
+          listByuntil: '/unitwaste/processUnitWasteWarehouseCode/list',
           list: '/hy/processMaterialsDelivery/listByDel',
           delete: '/hy/processMaterialsDelivery/delete',
           deleteBatch: '/hy/processMaterialsDelivery/deleteBatch',
@@ -243,7 +267,20 @@
         selectedRowKeys: [],
         modalWidth: MODAL_WIDTH,
         changeData: '',
-        getFileData: false
+        getFileData: false,
+
+        //部门查询
+        queryParamsUntil:[],
+        //时间相关查询
+        processTime:[],
+        labelCol: {
+          xs: { span: 4 },
+          sm: { span: 4 },
+        },
+        wrapperCol: {
+          xs: { span: 20 },
+          sm: { span: 20 },
+        },
       }
     },
     mounted() {
@@ -269,6 +306,23 @@
     },
     methods: {
 
+      //流程发起时间
+      processDateChange: function (value, dateString) {
+        this.processTime = value
+        this.queryParam.processTimeBegin=dateString[0];
+        this.queryParam.processTimeEnd=dateString[1];
+        console.log(this.queryParam)
+      },
+
+      //加載項目部
+      getUnit(){
+        getAction(this.url.listByuntil).then((res) => {
+          if (res.success) {
+            this.queryParamsUntil =  res.result.records||res.result;
+            console.log(this.queryParamsUntil)
+          }
+        })
+      },
       handleTableChange(pagination, filters, sorter) {
         // console.log("执行了",pagination,filters,sorter)
         //分页、排序、筛选变化时触发
diff --git a/src/components/jeecg/modal/ProcessPlan.vue b/src/components/jeecg/modal/ProcessPlan.vue
index a6a5e63..c6f8a39 100644
--- a/src/components/jeecg/modal/ProcessPlan.vue
+++ b/src/components/jeecg/modal/ProcessPlan.vue
@@ -15,13 +15,13 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="物资类型">
                 <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
                                    placeholder="请选择物资类型"  />
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-range-picker
                   format="YYYY-MM-DD"
@@ -31,14 +31,14 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="流程发起部门">
                 <a-select v-model="queryParam.departId" placeholder="请输入项目部"  @mouseenter="getUnit" >
                   <a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.unit">{{item.unit_dictText}}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="流程计划">
                 <j-dict-select-tag type="list" v-model="queryParam.processPlan" dictCode="process_plan"
                                    placeholder="请选择物资类型"  />
diff --git a/src/views/activiti/doneManage.vue b/src/views/activiti/doneManage.vue
index e40001b..419c43a 100644
--- a/src/views/activiti/doneManage.vue
+++ b/src/views/activiti/doneManage.vue
@@ -17,6 +17,16 @@
                 />
               </a-form-item>
             </a-col>
+<!--            <a-col :md="6" :sm="8">-->
+<!--              <a-form-item label="所属流程" prop="processName">-->
+<!--                <a-input-->
+<!--                  type="text"-->
+<!--                  v-model="searchForm.processName"-->
+<!--                  placeholder="请输入"-->
+<!--                  clearable-->
+<!--                />-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="12" >
                 <a-button @click="handleSearch" type="primary" icon="search">搜索</a-button>
@@ -138,6 +148,7 @@ export default {
       searchForm: {
         // 搜索框对应data对象
         name: "",
+        processName: "",
         pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
         sort: "createTime", // 默认排序字段
diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index 66b3fc0..fa599d2 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -8,7 +8,7 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="handleSearch">
           <a-row :gutter="24">
-            <a-col :md="6" :sm="8">
+            <a-col :xl="5" :md="6" :sm="8">
               <a-form-item label="任务名称" prop="name">
                 <a-input
                   type="text" allowClear
@@ -17,8 +17,38 @@
                 />
               </a-form-item>
             </a-col>
+<!--            <a-col :xl="5" :md="6" :sm="8">-->
+<!--              <a-form-item label="委托人" prop="assignee">-->
+<!--                <a-input-->
+<!--                  type="text" allowClear-->
+<!--                  v-model="searchForm.assignee"-->
+<!--                  placeholder="请输入"-->
+<!--                />-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+            <a-col :xl="5" :md="6" :sm="8">
+              <a-form-item label="流程发起人" prop="applyer">
+                <a-input
+                  type="text" allowClear
+                  v-model="searchForm.applyer"
+                  placeholder="请输入"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :md="6" :sm="10">
+              <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-range-picker
+                  style="width: 210px"
+                  v-model="searchForm.createTimeRange"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onDateChange"
+                  @ok="onDateOk"
+                />
+              </a-form-item>
+            </a-col>
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="6" :sm="12">
+            <a-col :xl="4" :md="6" :sm="12">
                 <a-button type="primary" style="left: 10px" @click="handleSearch" icon="search">查询</a-button>
                 <a-button type="primary" @click="handleReset" icon="reload"
                           style="margin-left: 8px;left: 10px">重置</a-button>
@@ -226,7 +256,11 @@
         searchForm: {
           // 搜索框对应data对象
           name: '',
-          Id: ''
+          Id: '',
+          applyer: "",
+          createTime_begin: '',
+          createTime_end: '',
+          assignee: ''
         },
         modalTaskTitle: '',
         modalTitle: '', // 添加或编辑标题
@@ -271,7 +305,16 @@
         },
         /*历史*/
         modalLsVisible: false,
-        procInstId: ''
+        procInstId: '',
+
+        labelCol: {
+          xs: { span: 1 },
+          sm: { span: 2 },
+        },
+        wrapperCol: {
+          xs: { span: 10 },
+          sm: { span: 16 },
+        },
       }
     },
     mounted() {
@@ -283,6 +326,15 @@
       this.init()
     },
     methods: {
+
+      onDateChange: function (value, dateString) {
+        console.log(dateString[0],dateString[1]);
+        this.searchForm.createTime_begin=dateString[0];
+        this.searchForm.createTime_end=dateString[1];
+      },
+      onDateOk(value) {
+        console.log(value);
+      },
       init() {
         this.getDataList()
       },