From 46fa579da71a4e1fec27f2896d011cfe5f2bdcfc Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 2 Jun 2022 15:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                 |  1 +
 jero-web/src/common/lang/zh-cn.js                 |  1 +
 .../searchCenter/components/DocumentLibrary.vue   | 15 ++++++++++++++-
 .../components/TaskListModel.vue                  |  4 ++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index a8866045f..cd16bc37d 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -626,6 +626,7 @@ module.exports = {
   ListOfRelevantPersonnel: 'List of relevant personnel',
   DeliverableStatus: 'Deliverable status',
   CurrentStatusOfTheProject: 'Current status of the project',
+  CurrentStatus:'Current status',
   NonConformance: 'Non conformance',
   listSubclauses: 'List Subclauses',
   fileType: 'File Type',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 503ded6cc..679015a72 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -635,6 +635,7 @@ module.exports = {
   ListOfRelevantPersonnel: '相关人员名单',
   DeliverableStatus: '交付物状态',
   CurrentStatusOfTheProject: '项目当前状态',
+  CurrentStatus:'当前状态',
   NonConformance: '未符合项',
   listSubclauses: '清单条目',
   fileType: '文件类型',
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 8661c251c..aa584e9c8 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -87,6 +87,7 @@
             v-if="isTrue"
             ref="table"
             size="middle"
+            @change="tableOnChange"
             :loading="loading"
             :pagination="false"
             :scroll="{x: '100%'}"
@@ -302,6 +303,7 @@
             align: 'center',
             ellipsis: true,
             width: 170,
+            sorter: true,
             dataIndex: 'issue_time'
           },
           {
@@ -309,12 +311,14 @@
             align: 'center',
             ellipsis: true,
             width: 210,
+            sorter: true,
             dataIndex: 'implement_time'
           },
           {
             title: this.$t('ImplementationDate'),
             align: 'center',
             ellipsis: true,
+            sorter: true,
             width: 210,
             dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
           },
@@ -342,7 +346,9 @@
         mapTwo: {},
         selectModelName: '',
         queryParamOne: {},
-        searchQueryOne: {}
+        searchQueryOne: {},
+        orderBy: '1',
+        orderByField: ''
       }
     },
     watch: {
@@ -575,6 +581,11 @@
       changeQuery(val, name) {
         this.queryParamOne[name + '_name'] = val
       },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        this.orderByField = sorter.columnKey
+        this.getInfoList()
+      },
       getInfoList(num) {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
@@ -596,6 +607,8 @@
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           mapOne: this.mapOne,
           mapTwo: this.mapTwo
         }
diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue
index eade65182..37c718a23 100644
--- a/jero-web/src/views/projectManagement/components/TaskListModel.vue
+++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue
@@ -114,13 +114,13 @@
             <div class="box-title-text">
               <div class="title-text">
               <span class="title-text-text"
-                    :title="$t('CurrentProjectStatusEvaluation')">{{$t('CurrentProjectStatusEvaluation')}}</span>
+                    :title="$t('CurrentStatus')">{{$t('CurrentStatus')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="conditionAssessment">
                 <a-select
                   :disabled="disabled"
                   v-model="item.conditionAssessment"
-                  :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
+                  :placeholder="$t('PleaseSelect')+$t('CurrentStatus')">
                   <a-select-option :value="'1'">
                      <span style="display: inline-block;width: 100%">
                             {{ $t('red') }}