[update] 流程审批信息增加查询条件

src/common/lang/workCenter/zh.js

@@ -234,6 +234,7 @@ module.exports = {
     flowChart: '流程图',
     taskNode: '任务节点',
     taskHandler: '任务受理人',
+    taskHandlerDept: '任务受理人组织机构',
     completionTime: '完成时间',
     timeConsuming: '耗时',
     approvalOpinion: '审批意见',

src/components/ProcessDetailList.vue

@@ -8,16 +8,55 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
+            <!--任务节点-->
             <a-col :md="8" :sm="8">
-              <!--状态-->
+              <a-form-item :label="$t('workCenter.processDetail.taskNode')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-form-item :label="$t('status')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input
-                <j-dict-select-tag
+                  :placeholder="$t('pleaseEnter') + $t('workCenter.processDetail.taskNode')"
-                  :placeholder="$t('pleaseEnter') + $t('status')"
+                  v-model="queryParam.taskName"></a-input>
-                  dict-code="prc_node_status"
-                  v-model="queryParam.finishFlag"></j-dict-select-tag>
               </a-form-item>
             </a-col>
+            <!--任务受理人-->
+            <a-col :md="8" :sm="8">
+              <a-form-item :label="$t('workCenter.processDetail.taskHandler')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input
+                  :placeholder="$t('pleaseEnter') + $t('workCenter.processDetail.taskHandler')"
+                  v-model="queryParam.taskAcceptor"></a-input>
+              </a-form-item>
+            </a-col>
+            <template v-if="toggleSearchStatus">
+              <!--任务受理人组织机构-->
+              <a-col :md="8" :sm="8">
+                <a-form-item :label="$t('workCenter.processDetail.taskHandlerDept')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-tree-select
+                    tree-node-filter-prop="title"
+                    v-model="queryParam.taskAcceptorDept"
+                    allowClear
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                    class="box-input"
+                    style="width: 100%"
+                    :tree-data="categoryTreeList"
+                    show-search
+                    :filterTreeNode="filterTreeOption"
+                    :placeholder="$t('pleaseSelect') + $t('workCenter.processDetail.taskHandlerDept')"
+                  />
+                </a-form-item>
+              </a-col>
+              <!--状态-->
+              <a-col :md="8" :sm="8">
+                <a-form-item :label="$t('status')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-dict-select-tag
+                    :placeholder="$t('pleaseSelect') + $t('status')"
+                    dict-code="prc_node_status"
+                    v-model="queryParam.finishFlag"></j-dict-select-tag>
+                </a-form-item>
+              </a-col>
+            </template>
             <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+              <a @click="handleToggleSearch">
+                {{ !toggleSearchStatus ? $t('open') : $t('putAway') }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
+              </a>
               <a-button class="box-button" type="primary" icon="search" @click="searchQuery">{{ $t('query') }}</a-button>
               <a-button class="box-button" icon="reload" style="margin-left: 8px" @click="searchReset">{{ $t('reset') }}</a-button>
             </div>
@@ -114,6 +153,7 @@ import { filterObj } from '../utils/util'
 import { kkFilePreview } from '../utils/kkFilePreview'
 import { urgeProcessNode } from '../api/workCenter'
 import { ProcessKey } from '../enums/commonEnums'
+import { queryDepartTreeList } from '../api/api'
 
 // 支持预览的文件后缀
 const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx']
@@ -267,10 +307,25 @@ export default {
       imageUrl: null,
       /* 排序参数 */
       // 后端需要去掉
-      isorter: null
+      isorter: null,
+      toggleSearchStatus: false,
+      categoryTreeList: [] // 组织机构下拉框数据
     }
   },
+  mounted () {
+    this.getSysCategoryTree()
+  },
   methods: {
+    // 获取组织机构树
+    getSysCategoryTree () {
+      queryDepartTreeList().then((res) => {
+        if (res.success) {
+          this.categoryTreeList = res.result
+        } else {
+          this.categoryTreeList = []
+        }
+      })
+    },
     loadData (arg) {
       if (!this.url.list) {
         this.$message.warning('请设置url.list属性!')
@@ -347,6 +402,9 @@ export default {
     fileLook (record) {
       this.$refs.uploadFile.open(record.commitFile)
     },
+    handleToggleSearch () {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
     /**
      * 催办
      */