Merge remote-tracking branch 'origin/feature_dev_20230109_BTTZ' into feature_dev_20230109_BTTZ

jero-web/src/components/viewFileModel/index.vue

@@ -5,10 +5,10 @@
     style="z-index: 1007"
     :visible="visibleFile"
     :maskClosable="false"
-    @cancel="visibleFile = false"
+    @cancel="visibleFile = false;$emit('visible')"
   >
     <template slot="footer">
-      <a-button key="back" @click="visibleFile = false">
+      <a-button key="back" @click="visibleFile = false;$emit('visible')">
         {{$t('cancel')}}
       </a-button>
     </template>

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue

@@ -26,8 +26,10 @@
             </div>
           </div>
           <a-table
+            v-if="isTrue"
             ref="table"
             size="middle"
+            :components="drag(columns,'columns')"
             :loading="loading"
             :pagination="false"
             :scroll="{x: '100%',y:'calc(100vh - 320px)'}"
@@ -71,7 +73,7 @@
       </div>
     </div>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
-    <viewFileModel ref="viewFileModelRef"/>
+    <viewFileModel ref="viewFileModelRef" @visible="sVisible"/>
   </div>
 </template>
 
@@ -81,6 +83,7 @@
   import { getAction, putAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
   import { postAction } from '../../../../api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'evaluationResultsList',
@@ -88,12 +91,14 @@
       uploadFile,
       viewFileModel
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         loading: false,
         total: 0,
         pageSize: 10,
         pageNo: 1,
+        isTrue: true,
         flag:false,
         dataSource: [],
         formInline: {},
@@ -170,6 +175,9 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      sVisible(){
+        this.getDataAdmin()
+      },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
@@ -257,6 +265,12 @@
       seeFileClick(item) {
         this.$refs.viewFileModelRef.clickButtonToUpload(item)
       },
+      getDataAdmin(){
+        this.isTrue = false
+        setTimeout(()=>{
+          this.isTrue = true
+        },100)
+      },
       endProcessClick() {
         let query = {
           ids: this.$route.query.id
@@ -276,7 +290,7 @@
 </script>
 
 <style scoped lang="less">
-  @import '~@assets/less/common.less';
+  @import'~@assets/less/common.less';
 
   .doc-detail {
     background: #fff;
@@ -381,4 +395,8 @@
     overflow: hidden;
     text-align: right;
   }
+
+  ::v-deep .ant-table-placeholder{
+    margin-top: 8px !important;
+  }
 </style>

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue

@@ -465,4 +465,8 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+
+  ::v-deep .ant-table-placeholder {
+    margin-top: 8px !important;
+  }
 </style>

jero-web/src/views/documentTools/virtualList/components/transferList.vue

@@ -31,6 +31,7 @@
         </a-form>
       </div>
       <a-table
+        :components="drag(columns,'columns')"
         :columns="columns"
         rowKey="id"
         :scroll="{x: 800}"
@@ -63,11 +64,13 @@
 
 <script>
   import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'transferList',
     components: {},
     props: ['url'],
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         visible: false,
@@ -79,25 +82,29 @@
             title: this.$t('VirtualListName'),
             dataIndex: 'name',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 223
           },
           {
             title: this.$t('instructionForUse'),
             dataIndex: 'useExplain',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 223
           },
           {
             title: this.$t('updateTime'),
             dataIndex: 'updateTime',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 223
           },
           {
             title: this.$t('creater'),
             dataIndex: 'createBy',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 223
           }
         ],
         dataList: [],
@@ -161,6 +168,7 @@
       },
       handleCancel() {
         this.visible = false
+        this.$emit('visible')
       },
       handleSubmit(flag) {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {

jero-web/src/views/parameter/escalationlibrary/index.vue

@@ -44,9 +44,9 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
-        <span slot="projectName" slot-scope="text,record" :title="text">
+<!--        <span slot="projectName" slot-scope="text,record" :title="text">-->
-            {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }}
+<!--            {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }}-->
-        </span>
+<!--        </span>-->
         <span slot="operation" slot-scope="text,record">
             <a class="text-operation" @click="handlecody(record)" v-has="'params:report:history'">{{$t('Exporthistory')}}</a>
             <a class="text-operation" @click="deleteLib(record)" v-has="'report:detail:list'">{{$t('See')}}</a>
@@ -488,4 +488,14 @@
   ::v-deep .ant-table-body {
     background: transparent!important;
   }
+
+  ::v-deep .ant-table-row-cell-break-word{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  ::v-deep .ant-table-placeholder{
+    margin-top: 8px !important
+  }
 </style>