From ecb25c4825e94eebb50ab3147c328256f94b8687 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 10 Aug 2022 14:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/exporthistory/index.vue    |  2 +-
 .../components/modules/fillTableAdd.vue       |  1 +
 .../documentTranslation/index.vue             | 11 +++++--
 jero-web/src/views/externalReports/index.vue  | 22 +++++++------
 .../parameterlist/components/addModel.vue     |  2 ++
 .../components/listOfRelevantPersonnel.vue    | 31 ++++++++++++++++---
 .../views/regulatoryEarlyWarning/index.vue    |  2 +-
 7 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue
index ecd48eb3d..6bec68ea0 100644
--- a/jero-web/src/components/exporthistory/index.vue
+++ b/jero-web/src/components/exporthistory/index.vue
@@ -40,7 +40,7 @@
       :dataSource='areaTable'
       :pagination='false'
       :loading='loading'
-      :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
+      :scroll="{x: '100%',y:600}"
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       @change='handleTableChange'>
 
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
index 51b79e4d2..a2d27bb6f 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
@@ -52,6 +52,7 @@
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
                           :disabled="isParentId"
+                          style='z-index: 99'
                           v-model="formInline.parentId">
                   <a-select-option v-for="(item, key) in ParentList"
                                    :key="item.id"
diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue
index f1882ee91..e0521ba0c 100644
--- a/jero-web/src/views/documentTools/documentTranslation/index.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/index.vue
@@ -78,7 +78,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -100,6 +100,9 @@
              v-if="record.createBy == userInfoQuery.username && record.releaseCondition == 'draft'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
+        <span slot="title" slot-scope="text,record" :title="text">
+            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
+        </span>
         <span slot="translationLanguage" slot-scope="text,record"
               :title="record.sourceLanguage_dictText +' -- '+record.targetLanguage_dictText">
             <span class="translationLanguageText" style="margin-top: -2px">{{record.sourceLanguage_dictText}}</span>
@@ -160,13 +163,15 @@
             title: this.$t('standard'),
             align: 'center',
             dataIndex: 'serialNumber',
-            width: 170
+            width: 170,
+            scopedSlots: { customRender: 'title' }
           },
           {
             title: this.$t('title'),
             align: 'center',
             dataIndex: 'title',
-            width: 170
+            width: 170,
+            scopedSlots: { customRender: 'title' }
           },
           {
             title: this.$t('TextStatus'),
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 7701193c0..8886cdf38 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -40,13 +40,12 @@
                     <span v-else :title="title">
                       {{title && title.length > 18?title.slice(0,17)+'...':title}}
                     </span>
-                    <template #overlay>
-                      <a-menu v-has="'externalReports:folder'"
-                              @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
-                        <a-menu-item key="1" @click="orgAdd" >{{$t('Addingfolder')}}</a-menu-item>
-                        <a-menu-item key="4" @click="orgAdds" v-if="deleteNode">{{$t('Addingsubfolders')}}</a-menu-item>
-                        <a-menu-item key="2" @click="orgEdit">{{$t('Editfolder')}}</a-menu-item>
-                        <a-menu-item key="3" @click="orgDelete" >{{$t('Deletefolders')}}</a-menu-item>
+                    <template #overlay >
+                      <a-menu  @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
+                        <a-menu-item key="1" @click="orgAdd" v-has="'externalReports:folder'">{{$t('Addingfolder')}}</a-menu-item>
+                        <a-menu-item key="4" @click="orgAdds" v-has="'externalReports:folder'" v-if="deleteNode">{{$t('Addingsubfolders')}}</a-menu-item>
+                        <a-menu-item key="2" @click="orgEdit" v-has="'externalReports:folder'">{{$t('Editfolder')}}</a-menu-item>
+                        <a-menu-item key="3" @click="orgDelete" v-has="'externalReports:folder'">{{$t('Deletefolders')}}</a-menu-item>
 
                       </a-menu>
                     </template>
@@ -127,7 +126,7 @@
                   :loading="loading"
                   :pagination="false"
                   rowKey="id"
-                  :scroll="{x: 10,y:'calc(100vh - 130px)'}"
+                  :scroll="{x: '100%',y:'calc(100vh - 180px)'}"
                   :data-source="dataSource"
                   :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
                   :columns="columns"
@@ -135,6 +134,10 @@
         <span slot="projectName" slot-scope="text,record" :title="text">
             {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
         </span>
+                  <span slot="fileName" slot-scope="text,record" :title="text">
+            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
+        </span>
+
                   <span slot="operation" slot-scope="text,record">
 <!--            <a class="text-operation" @click="handlelist(record)">{{$t('view')}}</a>-->
             <a class="text-operation" @click="download(record)">{{$t('download')}}</a>
@@ -353,6 +356,7 @@ export default {
           title: this.$t('fileName'),
           align: 'center',
           dataIndex: 'fileName',
+          scopedSlots: { customRender: 'fileName' },
           width: 200
         },
         {
@@ -733,7 +737,7 @@ export default {
       }
     },
     pageOnChange(page, pageSize) {
-      this.pageNo = page
+      this.queryParams.pageNo = page
       this.loadData()
     },
     addModelList() {
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index b0af1ec96..b64ae61a5 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -739,6 +739,8 @@ export default {
             if(this.formInline.controlType == 11){
               query.certCategoryParamsInfoEOList = []
               query.certCategory = ''
+            }else{
+              query.titleDefaultValue = ''
             }
             this.confirmLoading = true
             Action(url, query).then((res) => {
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index a77144c4f..755c66c3a 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -1,12 +1,11 @@
 <template>
   <div>
-    <a-modal
+    <a-drawer
       :title="$t('ListOfRelevantPersonnel')"
       :width="1000"
       :visible="visible"
       :maskClosable="false"
-      @ok="visible = false"
-      @cancel="visible = false"
+      @close="handleCancel"
     >
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
@@ -104,7 +103,7 @@
         rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
-        :scroll="{x:800,y: 400}"
+        :scroll="{x:800,y: 500}"
         :data-source="dataSource"
         :loading="loading"
       >
@@ -136,7 +135,11 @@
       <!--          @showSizeChange="SizeChange"-->
       <!--        />-->
       <!--      </div>-->
-    </a-modal>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+      </div>
+    </a-drawer>
     <a-modal
       :title="$t('ListOfRelevantPersonnel')"
       :width="600"
@@ -414,6 +417,12 @@
         this.selectedRowKeys = []
         this.getList()
       },
+      handleCancel(){
+        this.visible = false
+      },
+      handleSubmit(){
+        this.visible = false
+      },
       batSettingClick() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
@@ -633,4 +642,16 @@
     height: 38px;
     /*margin-top: 2px;*/
   }
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index:100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue
index 4156aceda..034ad00dc 100644
--- a/jero-web/src/views/regulatoryEarlyWarning/index.vue
+++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue
@@ -29,7 +29,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%',y:'calc(100vh - 180px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"