From 42c9f87c6991437750220a01d535ff50e341544e Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 21 Apr 2022 14:15:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=99=9A=E6=8B=9F=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=EF=BC=9B?= =?UTF-8?q?=202.=E6=88=91=E7=9A=84=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../components/globalAdvancedQuery/index.vue | 32 ++++++++++++++++--- .../tabComponents/alreadyProcess/index.vue | 4 +-- .../tabComponents/alreadySend/index.vue | 4 +-- .../tabComponents/monitorProcess/index.vue | 4 +-- .../tabComponents/processCenter/index.vue | 6 ++-- .../tabComponents/taskDraft/index.vue | 4 +-- 8 files changed, 41 insertions(+), 17 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4c551430a..a84c34585 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/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', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index abf157ea4..a31106cf5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -697,4 +697,6 @@ module.exports = { versionName:'版本名称', finalizationTime:'定版时间', setting:'设定', + date:'日期', + time:'时间' } \ No newline at end of file diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index 00991ce9a..157f2f9b1 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -32,17 +32,17 @@ style="top:5%;max-height: 95%;" > - +
@@ -186,6 +186,28 @@ + + + + +
+ {{$t('SavedQuery')}} +
+ + + + + + + + diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue index 67ce02f25..d126543fb 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue +++ b/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.total = res.total + this.dataSource = res.list || [] + this.total = res.count this.loading = false }) }, diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue index 413e90940..4fd010c96 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue +++ b/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.total = res.total + this.dataSource = res.list || [] + this.total = res.count this.loading = false }) }, diff --git a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue index 2479cb676..04c65876e 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue +++ b/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.total = res.total + this.dataSource = res.list || [] + this.total = res.count this.loading = false }) }, diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index 99953660a..e1b9aefb7 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/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.total = res.total + this.dataSource = res.list || [] + 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') { diff --git a/jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue index cc862e4a4..ecbd4152c 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue +++ b/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.total = res.total + this.dataSource = res.list || [] + this.total = res.count this.loading = false }) },