From 6d2a59834282bda65e668721d3af70b800d28f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Thu, 29 Dec 2022 10:10:52 +0800
Subject: [PATCH] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
 =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TermInformation.vue            | 12 ++---
 .../components/evaluationResultsWhole.vue     | 14 ++++--
 .../components/initiatingProcess.vue          | 14 +++---
 .../components/standardDecompositionSheet.vue | 10 ++--
 .../technologyAssessment/index.vue            | 20 ++++----
 jero-web/src/views/externalReports/index.vue  | 48 ++++++++++++++-----
 6 files changed, 73 insertions(+), 45 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index ba8af1d8a..ba0867e02 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -150,37 +150,37 @@
           {
             title: this.$t('clauseNo'),
             dataIndex: 'itemNum',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 120
           },
           {
             title: this.$t('clauseName'),
             dataIndex: 'itemName',
-            align: 'center',
+            align: 'left',
             ellipsis: true
           },
           {
             title: this.$t('clauseContent'),
             dataIndex: 'itemContent',
-            align: 'center',
+            align: 'left',
             scopedSlots: { customRender: 'clauseContent' }
           },
           {
             title: this.$t('evaluationMethod'),
             dataIndex: 'evaluationMethods',
-            align: 'center',
+            align: 'left',
             scopedSlots: { customRender: 'evaluationMethod' }
           },
           {
             title: this.$t('Assessor'),
             dataIndex: 'Assessor',
-            align: 'center',
+            align: 'left',
             scopedSlots: { customRender: 'Assessor' }
           },
           {
             title: this.$t('operation'),
-            align: 'center',
+            align: 'left',
             width: 120,
             scopedSlots: { customRender: 'operation' }
           }
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
index a0007ad92..a2f18b9d5 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
@@ -109,7 +109,7 @@
           {
             title: this.$t('engineer'),
             dataIndex: 'createBy',
-            align: 'center',
+            align: 'left',
             width: 160,
             ellipsis: true,
             customRender: (value, row, index) => {
@@ -128,7 +128,7 @@
           {
             title: this.$t('complianceResults'),
             dataIndex: 'complianceResultName',
-            align: 'center',
+            align: 'left',
             width: 160,
             ellipsis: true,
             customRender: (value, row, index) => {
@@ -147,20 +147,20 @@
           {
             title: this.$t('relevantSections'),
             dataIndex: 'relatedSection',
-            align: 'center',
+            align: 'left',
             width: 160,
             ellipsis: true
           },
           {
             title: this.$t('problemDescription'),
             dataIndex: 'issueOrSuggest',
-            align: 'center',
+            align: 'left',
             ellipsis: true
           },
           {
             title: this.$t('enclosure'),
             dataIndex: 'accessoryFile',
-            align: 'center',
+            align: 'left',
             width: 160,
             ellipsis: true,
             scopedSlots: { customRender: 'accessoryFile' }
@@ -425,6 +425,10 @@
   .operator-text-feed {
     margin-top: 27px;
   }
+
+  /deep/.ant-table-column-title{
+    font-weight: bold!important;
+  }
 </style>
 <style>
   .box-clause .ant-card-body {
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index bf9609511..7fecb9ffe 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -303,7 +303,7 @@
         columns: [
           {
             title: this.$t('standard'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'serial_number',
             width: 170,
             ellipsis: true,
@@ -311,7 +311,7 @@
           },
           {
             title: this.$t('title'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'title',
             ellipsis: true,
             width: 170,
@@ -319,34 +319,34 @@
           },
           {
             title: this.$t('status'),
-            align: 'center',
+            align: 'left',
             width: 140,
             ellipsis: true,
             dataIndex: 'state'
           },
           {
             title: this.$t('zoneOfApplication'),
-            align: 'center',
+            align: 'left',
             width: 170,
             ellipsis: true,
             dataIndex: 'region'
           },
           {
             title: this.$t('technicalField'),
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 170,
             dataIndex: 'technology_territory'
           },
           {
             title: this.$t('correspondingStandard'),
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 170,
             dataIndex: 'corresponding_standard'
           },
           {
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 170,
             scopedSlots: {
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
index 6d7a27d65..96f5b4fc5 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
@@ -144,34 +144,34 @@
           {
             title: this.$t('clauseNo'),
             dataIndex: 'items_num',
-            align: 'center',
+            align: 'left',
             width: 180,
             ellipsis: true
           },
           {
             title: this.$t('clauseName'),
             dataIndex: 'items_name',
-            align: 'center',
+            align: 'left',
             width: 180,
             ellipsis: true
           },
           {
             title: this.$t('clauseContent'),
             dataIndex: 'iterms_conditions',
-            align: 'center',
+            align: 'left',
             scopedSlots: { customRender: 'clauseContent' }
           },
           {
             title: this.$t('technicalField'),
             dataIndex: 'technology_territory',
-            align: 'center',
+            align: 'left',
             width: 180,
             ellipsis: true
           },
           {
             title: this.$t('informationCategory'),
             dataIndex: 'information_category',
-            align: 'center',
+            align: 'left',
             width: 180,
             ellipsis: true
           }
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index b83f175c7..8cf0df2f3 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -229,70 +229,70 @@
         columns: [
           {
             title: this.$t('standard'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'serialNumber',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('title'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'title',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('technicalField'),
-            align: 'center',
+            align: 'left',
             width: 170,
             ellipsis: true,
             dataIndex: 'technologyTerritoryName'
           },
           {
             title: this.$t('evaluationMethod'),
-            align: 'center',
+            align: 'left',
             width: 170,
             ellipsis: true,
             dataIndex: 'evaluationMethodsName'
           },
           {
             title: this.$t('ProcessStatus'),
-            align: 'center',
+            align: 'left',
             width: 170,
             ellipsis: true,
             dataIndex: 'flowStatusName'
           },
           {
             title: this.$t('Sponsor'),
-            align: 'center',
+            align: 'left',
             width: 140,
             ellipsis: true,
             dataIndex: 'createBy'
           },
           {
             title: this.$t('dateOfInitiation'),
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 170,
             dataIndex: 'startTime'
           },
           {
             title: this.$t('closingDate'),
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 170,
             dataIndex: 'endTime'
           },
           {
             title: this.$t('remarks'),
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 170,
             dataIndex: 'remark'
           },
           {
             title: this.$t('operation'),
-            align: 'center',
+            align: 'left',
             fixed: 'right',
             width: 220,
             scopedSlots: { customRender: 'operation' }
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index cb3929c48..d8f1e2a8f 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -59,7 +59,7 @@
               <div class="split-detail-search-header">
                 <a-form layout="inline" @keyup.enter.native="searchQuery">
                   <a-row :gutter="24">
-                    <a-col :md="6" :sm="8">
+                    <a-col :md="8" :sm="8">
                       <div class="box-title-text">
                         <div class="title-text" :title="$t('fileName')">
                           <span>{{ $t('fileName') }}</span>
@@ -68,7 +68,7 @@
                                  v-model="queryParams.fileName"></a-input>
                       </div>
                     </a-col>
-                    <a-col :md="6" :sm="8">
+                    <a-col :md="8" :sm="8">
                       <div class="box-title-text">
                         <div class="title-text" :title="$t('uploadedBy')">
                           <span>{{$t('uploadedBy')}}</span>
@@ -77,7 +77,8 @@
                                  v-model="queryParams.createBy"></a-input>
                       </div>
                     </a-col>
-                    <a-col :md="6" :sm="8">
+                    <template v-if="toggleSearchStatus">
+                    <a-col :md="8" :sm="8">
                       <div class="box-title-text">
                         <div class="title-text" :title="$t('uploadTime')">
                           <span>{{ $t('uploadTime') }}</span>
@@ -91,6 +92,7 @@
                           :disabled="false"/>
                       </div>
                     </a-col>
+                    </template>
                     <span style="float: right;overflow: hidden;margin-right: 11px"
                           class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -100,6 +102,10 @@
                   <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
                   <a-button class="box-button" style="margin-left: 8px"
                             @click="searchReset">{{ $t('reset') }}</a-button>
+                 <a @click="handleToggleSearch" style="margin-left: 8px">
+                            <span class="icon-open">{{ !toggleSearchStatus ? $t('open') : $t('away') }}</span>
+                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
                </a-col>
             </span>
                   </a-row>
@@ -302,6 +308,7 @@
     },
     data() {
       return {
+        toggleSearchStatus: false,
         labelCol: { span: 6 },
         userData: {},
         wrapperCol: { span: 16 },
@@ -371,21 +378,21 @@
         columns: [
           {
             title: this.$t('fileName'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'fileName',
             scopedSlots: { customRender: 'fileName' },
             width: 200
           },
           {
             title: this.$t('fileDeclaration'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'fileDescription',
             scopedSlots: { customRender: 'projectName' },
             width: 300
           },
           {
             title: this.$t('uploadedBy'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'createBy',
             width: 150
           },
@@ -396,13 +403,13 @@
           // },
           {
             title: this.$t('uploadTime'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'createTime',
             width: 250
           },
           {
             title: this.$t('operation'),
-            align: 'center',
+            align: 'left',
             fixed: 'right',
             width: 250,
             scopedSlots: { customRender: 'operation' }
@@ -449,6 +456,9 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
       //显示条款内容弹框
       showContent(val) {
         this.contentVisible = true
@@ -1124,7 +1134,8 @@
   .box-title-text {
     line-height: 1.4;
     display: flex;
-    /*align-items: center;*/
+    align-items: center;
+    margin-bottom: 10px;
   }
 
   /deep/ .ant-table td {
@@ -1136,7 +1147,7 @@
   }
 
   .title-text {
-    width: 114px;
+    width: 110px;
     text-align: right;
     display: inline-block;
     font-weight: 400;
@@ -1220,7 +1231,7 @@
 
       .split-detail-left {
         /*height: 100%;*/
-        width: 300px;
+        width: 230px;
         float: left;
         padding-right: 20px;
         /*border-right: 1px solid #E6E7EC;*/
@@ -1249,7 +1260,7 @@
 
       .split-detail-right {
         padding-left: 20px;
-        width: calc(100% - 300px);
+        width: calc(100% - 230px);
         float: right;
         border-left: 1px solid #E6E7EC;
         /*flex: 1;*/
@@ -1302,6 +1313,7 @@
   ///deep/ .ant-table-body {
   //  overflow: hidden !important; ?????
   //}
+
 </style>
 
 <style lang="less">
@@ -1322,9 +1334,21 @@
 
   .split-detail-right-wraper {
     .table-page-search-submitButtons {
+      a{
+        display: flex;
+        justify-content: start;
+        line-height: 38px;
+      }
       .ant-col-md-6 {
         display: flex;
       }
+      .icon-open{
+        display: inline-block;
+        min-width: 30px;
+      }
+      i{
+        line-height: 38px;
+      }
     }
 
     .split-detail-search-header {