修改虚拟清单的高级检索；

2.我的流程页面细节处理

jero-web/src/common/lang/en-us.js

@@ -693,4 +693,6 @@ module.exports = {
   finalizationTime:'Finalization time',
   setting:'setting',
   incorrectsubmitted:'The data status is incorrect; Only data with status to be confirmed can be submitted',
+  date:'date',
+  time:'time',
 }

jero-web/src/common/lang/zh-cn.js

@@ -697,4 +697,6 @@ module.exports = {
   versionName:'版本名称',
   finalizationTime:'定版时间',
   setting:'设定',
+  date:'日期',
+  time:'时间'
 }

jero-web/src/components/globalAdvancedQuery/index.vue

@@ -32,17 +32,17 @@
     style="top:5%;max-height: 95%;"
   >
     <template slot="footer">
-<!--      <div style="float: left">-->
+      <div style="float: left">
-<!--        <a-button :loading="loading" @click="handleReset">{{$t('reset')}}</a-button>-->
+        <a-button :loading="loading" @click="handleReset">{{$t('reset')}}</a-button>
-<!--        <a-button :loading="loading" @click="handleSave">{{$t('SaveQueryCriteria')}}</a-button>-->
+        <a-button :loading="loading" @click="handleSave">{{$t('SaveQueryCriteria')}}</a-button>
-<!--      </div>-->
+      </div>
       <a-button :loading="loading" @click="handleCancel">{{$t('close')}}</a-button>
       <a-button :loading="loading" type="primary" @click="handleOk">{{$t('query')}}</a-button>
     </template>
 
     <a-spin :spinning="loading">
       <a-row>
-        <a-col :sm="24" :md="24">
+        <a-col :sm="24" :md="24-5">
 
           <a-empty v-if="queryParamsModel.length === 0" style="margin-bottom: 12px;">
             <div slot="description">
@@ -186,6 +186,28 @@
 
           </a-form>
         </a-col>
+        <a-col :sm="24" :md="5">
+          <!-- 查询记录 -->
+
+          <a-card class="j-super-query-history-card" :bordered="true">
+            <div slot="title">
+              {{$t('SavedQuery')}}
+            </div>
+
+            <a-empty v-if="saveTreeData.length === 0" class="j-super-query-history-empty" :description="$t('NoQueriesSaved')"/>
+            <a-tree
+              v-else
+              class="j-super-query-history-tree"
+              showIcon
+              :treeData="saveTreeData"
+              :selectedKeys="[]"
+              @select="handleTreeSelect"
+            >
+            </a-tree>
+          </a-card>
+
+
+        </a-col>
       </a-row>
     </a-spin>
 

jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue

@@ -125,8 +125,8 @@
         parmes.size = this.pageSize
         parmes.userId = this.userInfo().userId
         postAction('task/doneProcess', parmes).then((res) => {
-          this.dataSource = res.orders || []
+          this.dataSource = res.list || []
-          this.total = res.total
+          this.total = res.count
           this.loading = false
         })
       },

jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue

@@ -135,8 +135,8 @@
         parmes.size = this.pageSize
         parmes.userId = this.userInfo().userId
         postAction('task/IssuedProcess', parmes).then((res) => {
-          this.dataSource = res.orders || []
+          this.dataSource = res.list || []
-          this.total = res.total
+          this.total = res.count
           this.loading = false
         })
       },

jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue

@@ -134,8 +134,8 @@
         parmes.size = this.pageSize
         parmes.userId = this.userInfo().userId
         postAction('task/allProcess', parmes).then((res) => {
-          this.dataSource = res.orders || []
+          this.dataSource = res.list || []
-          this.total = res.total
+          this.total = res.count
           this.loading = false
         })
       },

jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue

@@ -116,14 +116,12 @@
         parmes.size = this.pageSize
         parmes.userId = this.userInfo().userId
         postAction('task/todoTaskList',parmes).then((res)=>{
-          this.dataSource = res.orders || []
+          this.dataSource = res.list || []
-          this.total = res.total
+          this.total = res.count
           this.loading = false
         })
       },
       dealWith(row) {
-        console.log(row, 'rowrow')
-        // this.currentProcessNumber = row.processNumber
         let index = row.taskIds.lastIndexOf(',')
         row.taskIds = row.taskIds.slice(0, index)
         if (row.prcType == '2') {

jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue

@@ -149,8 +149,8 @@
         parmes.size = this.pageSize
         parmes.userId = this.userInfo().userId
         postAction('task/queryTaskDraft', parmes).then((res) => {
-          this.dataSource = res.orders || []
+          this.dataSource = res.list || []
-          this.total = res.total
+          this.total = res.count
           this.loading = false
         })
       },