From b5b214099f009fe7f4878d779e1c246aab742b56 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Fri, 13 Jan 2023 14:09:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/evaluationResultsList.vue      | 31 ++++++++++++-------
 .../views/documentManage/collection/index.vue | 25 +++++++++------
 .../regulationsKanban/components/addModel.vue | 12 +++++--
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index 674fb5c81..18c98e03a 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -56,14 +56,14 @@
           <div style="margin-top: 20px">
             <span class="text">{{$t('filingExternalOpinions')}}:</span>
             <div @click="clickButtonToUpload('opinionArchiveId')" style="color: #21c9cc"
-                 v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text">
-              <a-button type="primary"style="margin-right: 8px;height: 32px">
-              {{$t('clickUpload')}}
+                 v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text-index">
+              <a-button type="primary" style="margin-right: 8px;height: 32px">
+                {{$t('clickUpload')}}
               </a-button>
             </div>
-            <div @click="seeFileClick(formInline.opinionArchiveId)" style="color: #21c9cc" class="operator-text">
-              <a-button type="primary"style="margin-right: 8px;height: 32px">
-              {{$t('viewFile')}}
+            <div @click="seeFileClick(formInline.opinionArchiveId)" style="color: #21c9cc" class="operator-text-index">
+              <a-button type="primary" style="margin-right: 8px;height: 32px">
+                {{$t('viewFile')}}
               </a-button>
             </div>
           </div>
@@ -94,10 +94,10 @@
         total: 0,
         pageSize: 10,
         pageNo: 1,
-        flag:false,
+        flag: false,
         dataSource: [],
         formInline: {},
-        administrators:false,
+        administrators: false,
         userInfoQuery: {},
         columns: [
           {
@@ -164,8 +164,11 @@
           }
         })
       }
-      getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsOpinionGather',id : this.$route.query.id}).then((res) => {
-          this.flag = res
+      getAction('/project/projectUserPermission/hasProcessControlButton', {
+        type: 'LawsOpinionGather',
+        id: this.$route.query.id
+      }).then((res) => {
+        this.flag = res
       })
     },
     methods: {
@@ -215,7 +218,7 @@
           actiProcInstId: this.actiProcInstId
         }
         downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls',
-          this.$route.query.serialNumber+ ' ' +this.$t('evaluationResults') + '.zip', query)
+          this.$route.query.serialNumber + ' ' + this.$t('evaluationResults') + '.zip', query)
       },
       getData() {
         this.formInline = JSON.parse(JSON.stringify(this.$route.query))
@@ -381,4 +384,10 @@
     overflow: hidden;
     text-align: right;
   }
+
+  .operator-text-index {
+    display: inline-block;
+    /*margin-right: 16px;*/
+    margin-left: 16px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue
index 5d9532bcd..ead524a18 100644
--- a/jero-web/src/views/documentManage/collection/index.vue
+++ b/jero-web/src/views/documentManage/collection/index.vue
@@ -102,15 +102,16 @@
 <script>
   import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
   import problemKnowledgeBaseList from './components/problemKnowledgeBaseList'
+
   export default {
     name: 'collection',
-    components:{
+    components: {
       problemKnowledgeBaseList
     },
     data() {
       return {
         selectedRowKeys: [],
-        activeTab:this.$t('DocumentLibrary'),
+        activeTab: this.$t('DocumentLibrary'),
         queryParams: {
           pageNo: 1,
           pageSize: 10
@@ -126,7 +127,7 @@
             key: 'serialNumber',
             scopedSlots: { customRender: 'serialNumber' },
             align: 'left',
-            sorter:true,
+            sorter: true,
             ellipsis: true,
             width: 180
           },
@@ -143,7 +144,7 @@
             align: 'left',
             width: 180,
             ellipsis: true,
-            sorter:true,
+            sorter: true,
             dataIndex: 'state'
           },
           {
@@ -151,7 +152,7 @@
             align: 'left',
             width: 180,
             ellipsis: true,
-            sorter:true,
+            sorter: true,
             dataIndex: 'createTime'
           },
           {
@@ -175,11 +176,11 @@
     methods: {
       tableOnChange(pagination, filters, sorter) {
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'
-        if(sorter.columnKey == 'serialNumber'){
+        if (sorter.columnKey == 'serialNumber') {
           this.orderByField = 'serial_number'
-        } else if(sorter.columnKey == 'createTime') {
+        } else if (sorter.columnKey == 'createTime') {
           this.orderByField = 'create_time'
-        } else{
+        } else {
           this.orderByField = sorter.columnKey
         }
         this.loadData()
@@ -205,7 +206,7 @@
           }
         })
       },//搜索
-      callback(event){
+      callback(event) {
 
       },
       searchQuery() {
@@ -326,7 +327,7 @@
 
   .collection {
     .collection-search-wrapper {
-      margin-bottom: 20px;
+      /*margin-bottom: 20px;*/
     }
 
     .colloction-table {
@@ -367,6 +368,10 @@
   .box-button {
     height: 38px;
   }
+
+  ::v-deep .ant-card-body {
+    padding: 0 24px!important;
+  }
 </style>
 <style lang="less">
   /*.collection{*/
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index ed5a9a2ef..585528cb1 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -10,7 +10,7 @@
         :wrapper-col='wrapperCol'
       >
         <a-row :gutter='24'>
-          <a-col :span='9'>
+          <a-col :span='8'>
             <div class="box-title-text">
               <div class="title-text" :title="$t('areaOfResponsibility')">
                 <span>{{$t('areaOfResponsibility')}}</span>
@@ -32,7 +32,7 @@
             </div>
 
           </a-col>
-          <a-col :span='9'>
+          <a-col :span='8'>
             <div class="box-title-text">
               <div class="title-text" :title="$t('RelatedItems')">
                 <span>{{$t('RelatedItems')}}</span>
@@ -50,9 +50,11 @@
             </div>
 
           </a-col>
-          <a-col :span='6' style='margin-top: 4px;'>
+          <a-col :span='8' style='margin-top: 2px;'>
+            <span style="float: right;margin-right: 8px">
             <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>
+            </span>
           </a-col>
         </a-row>
       </a-form-model>
@@ -524,6 +526,10 @@
     color: red;
     margin-right: 4px;
   }
+
+  .box-button{
+    height:38px;
+  }
 </style>
 <style lang='less'>
   .area-module {