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

# Conflicts:
#	jero-web/src/mixins/header.js
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/customizeList.vue

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

@@ -829,6 +829,7 @@
 
   .selectWid {
     min-width: 150px;
+    width: 100%;
   }
 
   .inputWid {

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

@@ -760,6 +760,7 @@
 
   .selectWid {
     min-width: 150px;
+    width: 100%;
   }
 
   .inputWid {

jero-web/src/components/OcrTable/DocTable.vue

@@ -1,12 +1,13 @@
 <template>
   <div style="height: 100%">
-    <div class="box">
+    <div class="box" v-if="isTrue">
       <a-table
         class="table"
         rowKey="id"
+        :components="drag(columns,'columns')"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%'}"
         :data-source="dataSource"
         :loading="loading"
         :columns="columns"
@@ -63,6 +64,7 @@
 <script>
   import eventBUs from '../../common/event'
   import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'docTable',
@@ -91,6 +93,7 @@
         default: ''
       }
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         jsonBody: [],
@@ -102,6 +105,7 @@
         dataSource: [],
         pageNo: 1,
         pageSize: 10,
+        isTrue: false,
         total: 0,
         searchParmes: {},
         loading: false,
@@ -164,7 +168,8 @@
                 dataIndex: res.db_field_name,
                 align: 'left',
                 ellipsis: true,
-                sorter: res.sort
+                sorter: res.sort,
+                width:170,
               })
               if (res.click) {
                 this.columns[index].scopedSlots = {
@@ -196,6 +201,10 @@
                 scopedSlots: { customRender: 'operation' }
               })
             }
+            this.isTrue = false
+            setTimeout(()=>{
+              this.isTrue = true
+            },500)
           }
         })
       },
@@ -254,6 +263,8 @@
   }
 </style>
 <style scoped>
+  @import '~@assets/less/common.less';
+
   .box {
     width: 100%;
     height: calc(100% - 100px);

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

@@ -1,9 +1,10 @@
 <template>
   <div style="height: 100%">
-    <div class="box">
+    <div class="box" v-if='isTrue'>
       <a-table
         class="table"
         rowKey="id"
+        :components="drag(columns,'columns')"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
         :scroll="{x: '100%'}"
@@ -65,9 +66,11 @@
   import eventBUs from '../../common/event'
   import { getAction, postAction } from '@/api/manage'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'ocrTable',
+    mixins:[ResizeHeader, ResizeColumnProvide],
     props: {
       //接口
       url: {
@@ -92,6 +95,7 @@
     data() {
       return {
         jsonBody: [],
+        isTrue:false,
         checkboxList: [],
         userData: {},
         tableAll: false,
@@ -201,9 +205,19 @@
                 scopedSlots: { customRender: 'operation' }
               })
             }
+            this.isTrue = false
+            setTimeout(()=>{
+               this.isTrue = true
+            },100)
           }
         })
       },
+      getDataAdmin(){
+        this.isTrue = false
+        setTimeout(()=>{
+          this.isTrue = true
+        },100)
+      },
       tableOnChange(pagination, filters, sorter) {
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'
         this.orderByField = sorter.columnKey
@@ -263,6 +277,8 @@
 
 </style>
 <style scoped>
+  @import '~@assets/less/common.less';
+
   .box {
     width: 100%;
     height: calc(100% - 100px);

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

@@ -1,9 +1,10 @@
 <template>
   <div style="height: 100%">
-    <div class="box">
+    <div class="box" v-if="isTrue">
       <a-table
         class="table"
         rowKey="id"
+        :components="drag(columns,'columns')"
         :row-selection="{ fixed: true, selectedRowKeys: selectedRowKeys, onChange: onSelectChange  }"
         :pagination="false"
         :scroll="{x: true}"
@@ -62,6 +63,7 @@
 <script>
   import eventBUs from '../../common/event'
   import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'SplitDetailTable',
@@ -94,6 +96,7 @@
         default:''
       }
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         jsonBody: [],
@@ -105,6 +108,7 @@
         dataSource: [],
         pageNo: 1,
         pageSize: 10,
+        isTrue: false,
         total: 0,
         searchParmes: {},
         loading: false,
@@ -173,7 +177,8 @@
                 dataIndex: res.db_field_name,
                 align: 'left',
                 ellipsis: true,
-                sorter: res.sort
+                sorter: res.sort,
+                width: 100
               })
 
               if (res.urlClick) {
@@ -208,6 +213,10 @@
               })
             }
             // console.log('columns',this.columns)
+            this.isTrue = false
+            this.$nextTick(()=>{
+              this.isTrue = true
+            })
           }
         })
       },
@@ -308,6 +317,8 @@
   }
 </style>
 <style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
   .ant-table td {
     white-space: nowrap;
   }

jero-web/src/components/SplitTable/DocTable.vue

@@ -1,9 +1,10 @@
 <template>
   <div style="height: 100%">
-    <div class="box">
+    <div class="box" v-if="isTrue">
       <a-table
         class="table"
         rowKey="id"
+        :components="drag(columns,'columns')"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
         :scroll="{x: '100%'}"
@@ -59,6 +60,7 @@
 <script>
   import eventBUs from '../../common/event'
   import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'SplitDocTable',
@@ -87,6 +89,7 @@
         default: ''
       }
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         jsonBody: [],
@@ -98,6 +101,7 @@
         dataSource: [],
         pageNo: 1,
         pageSize: 10,
+        isTrue: false,
         total: 0,
         searchParmes: {},
         loading: false,
@@ -193,6 +197,10 @@
                 scopedSlots: { customRender: 'operation' }
               })
             }
+            this.isTrue = false
+            this.$nextTick(()=>{
+              this.isTrue = true
+            })
           }
         })
       },

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

@@ -1,9 +1,10 @@
 <template>
   <div style="height: 100%">
-    <div class="box">
+    <div class="box" v-if="isTrue">
       <a-table
         class="table"
         rowKey="id"
+        :components="drag(columns,'columns')"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
         :scroll="{x: '100%'}"
@@ -65,6 +66,7 @@
   import eventBUs from '../../common/event'
   import { getAction, postAction } from '@/api/manage'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'SplitTable',
@@ -93,6 +95,7 @@
         default: ''
       }
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         jsonBody: [],
@@ -104,6 +107,7 @@
         dataSource: [],
         pageNo: 1,
         pageSize: 10,
+        isTrue: false,
         total: 0,
         searchParmes: {},
         loading: false,
@@ -224,9 +228,19 @@
                 scopedSlots: { customRender: 'operation' }
               })
             }
+            this.isTrue = false
+            this.$nextTick(()=>{
+              this.isTrue = true
+            })
           }
         })
       },
+      getDataAdmin(){
+        this.isTrue = false
+        setTimeout(()=>{
+          this.isTrue = true
+        },100)
+      },
       tableOnChange(pagination, filters, sorter) {
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'
         this.orderByField = sorter.columnKey
@@ -291,6 +305,9 @@
   }
 </style>
 <style scoped>
+  @import '~@assets/less/common.less';
+
+
   .box {
     width: 100%;
     height: calc(100% - 100px);

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

@@ -26,6 +26,7 @@
           @searchReset="searchReset"
         />
         <a-table
+          :components="drag(columns,'cloumns')"
           :columns="columns"
           rowKey="serial_number"
           :scroll="{x: 1500}"
@@ -60,6 +61,7 @@
 <script>
   import { getAction, postAction } from '@/api/manage'
   import currencySearch from '@/components/currencySearch/index'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'index',
@@ -75,6 +77,7 @@
         return false
       }
     },
+    mixins: [ResizeColumnProvide,ResizeHeader],
     data() {
       return {
         visible: false,
@@ -88,18 +91,21 @@
             title: this.$t('standard'),
             dataIndex: 'serial_number',
             ellipsis: true,
-            align: 'left'
+            align: 'left',
+            width: 480
           },
           {
             title: this.$t('title'),
             dataIndex: 'title',
             ellipsis: true,
-            align: 'left'
+            align: 'left',
+            width: 480
           },
           {
             title: this.$t('TextStatus'),
             dataIndex: 'state',
-            align: 'left'
+            align: 'left',
+            width: 480
           }
         ],
         dataList: [],

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

@@ -5,18 +5,19 @@
     :visible="visible"
     :confirm-loading="confirmLoading"
     :maskClosable="false"
-    @cancel="visible = false"
+    @cancel="visible = false;$emit('visible')"
   >
     <template slot="footer">
-      <a-button key="back" @click="visible = false">
+      <a-button key="back" @click="visible = false;$emit('visible')">
         {{$t('cancel')}}
       </a-button>
     </template>
     <a-table
       class="table"
+      :components="drag(columns,'columns')"
       :columns="columns"
       :pagination="false"
-      :scroll="{y: 420}"
+      :scroll="{x:'100%',y: 420}"
       :data-source="dataSource"
       :loading="loading"
     >
@@ -46,9 +47,12 @@
 
 <script>
   import { getAction, postAction,  } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
   export default {
     name: 'index',
     props:['url'],
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data(){
         return{
           visible:false,
@@ -65,7 +69,8 @@
               dataIndex: 'logContent',
               align: 'left',
               ellipsis: true,
-              scopedSlots: { customRender: 'content' }
+              scopedSlots: { customRender: 'content' },
+              width: 664
             },
             {
               title: this.$t('OperationTime'),

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

@@ -36,6 +36,7 @@
       ref='table'
       size='middle'
       rowKey='id'
+      :components="drag(columns,'columns')"
       :columns='columns'
       :dataSource='areaTable'
       :pagination='false'
@@ -72,10 +73,12 @@ import { putAction, postAction, getAction, deleteAction ,downloadFile } from '@/
 import axios from 'axios'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
 export default {
   name: 'diolagArea',
   components: {},
+  mixins:[ResizeHeader, ResizeColumnProvide],
   data() {
     return {
       token:Vue.ls.get(ACCESS_TOKEN),
@@ -102,20 +105,23 @@ export default {
           title: this.$t('Exporttype'),
           align: 'left',
           dataIndex: 'exportType',
-          ellipsis: true
+          ellipsis: true,
+          width: 260
         },
         {
           title: this.$t('Exporttime'),
           align: 'left',
           dataIndex: 'exportTime',
-          ellipsis: true
+          ellipsis: true,
+          width: 260
         },
         {
           title: this.$t('file'),
           align: 'left',
           dataIndex: 'exportFileName',
           scopedSlots: { customRender: 'file' },
-          ellipsis: true
+          ellipsis: true,
+          width: 260
         }
       ],
       newVisible: false,

jero-web/src/components/tableCollection/historyTable.vue

@@ -0,0 +1,39 @@
+<template>
+  <a-table
+  :components="drag(columnshistory,'columnshistory')"
+  class="table"
+  :columns="columnshistory"
+  :pagination="false"
+  :scroll="{x: '100%',y: 400}"
+  :data-source="dataSourcehistory"
+  :loading="loading"
+  >
+  <span slot="content" slot-scope="text,record">
+          <a-tooltip placement="topLeft">
+        <template slot="title">
+          <span v-html="text"></span>
+        </template>
+            <span v-html="text"></span>
+      </a-tooltip>
+       </span>
+  <span slot="detailText" slot-scope="text,record">
+              <span class="text" :title="text">
+               {{text && text.length > 10?text.slice(0,9)+'...':text}}
+              </span>
+        </span>
+  </a-table>
+</template>
+
+<script>
+
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+export default {
+  name: 'historyTable.vue',
+  props:['columnshistory','dataSourcehistory'],
+  mixins:[ResizeHeader, ResizeColumnProvide],
+}
+</script>
+
+<style scoped>
+
+</style>

jero-web/src/components/tableCollection/historyTable1.vue

@@ -0,0 +1,39 @@
+<template>
+  <a-table
+    class="table"
+    :components="drag(columnshistory,'columnshistory')"
+    :columns="columnshistory"
+    :pagination="false"
+    :scroll="{x: '100%', y: 400}"
+    :data-source="dataSourcehistory"
+    :loading="loading"
+  >
+       <span slot="content" slot-scope="text,record">
+          <a-tooltip placement="topLeft">
+        <template slot="title">
+          <span v-html="text"></span>
+        </template>
+            <span v-html="text"></span>
+      </a-tooltip>
+       </span>
+    <span slot="detailText" slot-scope="text,record">
+              <span class="text" :title="text">
+               {{text && text.length > 10?text.slice(0,9)+'...':text}}
+              </span>
+        </span>
+  </a-table>
+</template>
+
+<script>
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+export default {
+  name: 'historyTable1',
+  props:['columnshistory','dataSourcehistory'],
+  mixins:[ResizeHeader, ResizeColumnProvide],
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -3,6 +3,7 @@
     <div class="box">
       <!--      -->
       <a-table
+        :components="drag(columns,'columns',JSON.parse(JSON.stringify(minWidthColumns)))"
         class="table"
         rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -179,28 +180,29 @@
       @ok="handleOk"
       @cancel="handleCancel"
     >
-      <a-table
-        class="table"
-        :columns="columnshistory"
-        :pagination="false"
-        :scroll="{y: 400}"
-        :data-source="dataSourcehistory"
-        :loading="loading"
-      >
-       <span slot="content" slot-scope="text,record">
-          <a-tooltip placement="topLeft">
-        <template slot="title">
-          <span v-html="text"></span>
-        </template>
-            <span v-html="text"></span>
-      </a-tooltip>
-       </span>
-        <span slot="detailText" slot-scope="text,record">
-              <span class="text" :title="text">
-               {{text && text.length > 10?text.slice(0,9)+'...':text}}
-              </span>
-        </span>
-      </a-table>
+      <historyTable :columnshistory='columnshistory' :dataSourcehistory='dataSourcehistory'></historyTable>
+<!--      <a-table-->
+<!--        class="table"-->
+<!--        :columns="columnshistory"-->
+<!--        :pagination="false"-->
+<!--        :scroll="{y: 400}"-->
+<!--        :data-source="dataSourcehistory"-->
+<!--        :loading="loading"-->
+<!--      >-->
+<!--       <span slot="content" slot-scope="text,record">-->
+<!--          <a-tooltip placement="topLeft">-->
+<!--        <template slot="title">-->
+<!--          <span v-html="text"></span>-->
+<!--        </template>-->
+<!--            <span v-html="text"></span>-->
+<!--      </a-tooltip>-->
+<!--       </span>-->
+<!--        <span slot="detailText" slot-scope="text,record">-->
+<!--              <span class="text" :title="text">-->
+<!--               {{text && text.length > 10?text.slice(0,9)+'...':text}}-->
+<!--              </span>-->
+<!--        </span>-->
+<!--      </a-table>-->
       <div class="page" v-if="dataSourcehistory.length > 0">
         <a-pagination
           :show-total="total => $t('total')+` ${total} `+$t('strip')"
@@ -271,11 +273,14 @@
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import axios from 'axios'
   import Vue from 'vue'
-  import VueDraggableResizable from 'vue-draggable-resizable'
+  // import VueDraggableResizable from 'vue-draggable-resizable'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import historyTable from './historyTable.vue'
 
   export default {
     name: 'index',
+    mixins:[ResizeHeader, ResizeColumnProvide],
     props: {
       //接口
       url: {
@@ -304,48 +309,51 @@
     },
     components: {
       CollectionType,
-      VueDraggableResizable
+      // VueDraggableResizable
+      historyTable
     },
     data() {
-      this.components = {
-        header: {
-          cell: (h, props, children) => {
-            const { key, ...restProps } = props
-
-            // 此处的this.columns 是定义的table的表头属性变量
-
-            const col = this.columns.find((col) => {
-              const k = col.dataIndex || col.key
-              return k === key
-            })
-
-            if (!col || !col.width) {
-              return h('th', { ...restProps }, [...children])
-            }
-
-            const dragProps = {
-              key: col.dataIndex || col.key,
-              class: 'table-draggable-handle',
-              attrs: {
-                w: 10,
-                x: col.width,
-                z: 1,
-                axis: 'x',
-                draggable: false,
-                resizable: false
-              },
-              on: {
-                dragging: (x, y) => {
-                  col.width = Math.max(x, 1)
-                }
-              }
-            }
-            const drag = h('vue-draggable-resizable', { ...dragProps })
-            return h('th', { ...restProps, class: 'resize-table-th' }, [...children, drag])
-          }
-        }
-      }
+      // this.components = {
+      //   header: {
+      //     cell: (h, props, children) => {
+      //       const { key, ...restProps } = props
+      //
+      //       // 此处的this.columns 是定义的table的表头属性变量
+      //
+      //       const col = this.columns.find((col) => {
+      //         const k = col.dataIndex || col.key
+      //         return k === key
+      //       })
+      //
+      //       if (!col || !col.width) {
+      //         return h('th', { ...restProps }, [...children])
+      //       }
+      //
+      //       const dragProps = {
+      //         key: col.dataIndex || col.key,
+      //         class: 'table-draggable-handle',
+      //         attrs: {
+      //           w: 10,
+      //           x: col.width,
+      //           z: 1,
+      //           axis: 'x',
+      //           draggable: false,
+      //           resizable: false
+      //         },
+      //         on: {
+      //           dragging: (x, y) => {
+      //             col.width = Math.max(x, 1)
+      //           }
+      //         }
+      //       }
+      //       const drag = h('vue-draggable-resizable', { ...dragProps })
+      //       return h('th', { ...restProps, class: 'resize-table-th' }, [...children, drag])
+      //     }
+      //   }
+      // }
       return {
+        colIndexs:[],
+        minWidthColumns:[],
         token: Vue.ls.get(ACCESS_TOKEN),
         jsonBody: [],
         checkboxList: [],
@@ -411,14 +419,15 @@
           {
             title: this.$t('OperationDetails'),
             dataIndex: 'logContent',
-            align: 'center',
+            align: 'left',
+            width: 320,
             ellipsis: true,
             scopedSlots: { customRender: 'content' }
           },
           {
             title: this.$t('OperationTime'),
             dataIndex: 'createTime',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 180
           }
@@ -767,10 +776,10 @@
             let num = 0
             this.content = []
             jsonHead.forEach((res, index) => {
-              console.log(res)
+              // console.log(res)
               // 配置列
               if (res.type) {
-                console.log('配置')
+                // console.log('配置')
                 this.columns.push({
                   dataIndex: res.db_field_name,
                   align: 'left',
@@ -834,8 +843,15 @@
                   }
                 }
               }
+
+              if(res.isLock && res.isLock === '0'){
+                this.colIndexs.push(index)
+              }
             })
             this.columns = [...this.columns]
+            this.colIndexs.forEach((item)=>{
+              this.minWidthColumns.push([this.columns[item],500])
+            })
             this.$forceUpdate()
           }
         })
@@ -976,7 +992,7 @@
                 Object.keys(Obj).forEach((item) => {
                   if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
                     Obj[item].list.forEach((itemLi) => {
-                      console.log(item)
+                      // console.log(item)
                       if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){
                         itemLi.isLock = 0
                       }else{
@@ -1163,6 +1179,10 @@
     text-justify: inter-ideograph;
     word-break: break-all
   }
+
+  ::v-deep .ant-table-placeholder{
+    margin-top: 8px !important;
+  }
 </style>
 <style>
   .resize-table-th {

jero-web/src/components/tableCollection/index1.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%">
-    <div class="box">
+    <div class="box"  v-if='isTrue'>
       <!--      -->
       <a-table
         class="table"
@@ -11,7 +11,7 @@
         :data-source="dataSource"
         :loading="loading"
         sticky
-        :components="components"
+        :components="drag(columns,'columns',JSON.parse(JSON.stringify(minWidthColumns)))"
         :columns="columns"
         :rowClassName="rowClassName"
         @change="tableOnChange"
@@ -168,28 +168,30 @@
       @ok="handleOk"
       @cancel="handleCancel"
     >
-      <a-table
-        class="table"
-        :columns="columnshistory"
-        :pagination="false"
-        :scroll="{y: 400}"
-        :data-source="dataSourcehistory"
-        :loading="loading"
-      >
-       <span slot="content" slot-scope="text,record">
-          <a-tooltip placement="topLeft">
-        <template slot="title">
-          <span v-html="text"></span>
-        </template>
-            <span v-html="text"></span>
-      </a-tooltip>
-       </span>
-        <span slot="detailText" slot-scope="text,record">
-              <span class="text" :title="text">
-               {{text && text.length > 10?text.slice(0,9)+'...':text}}
-              </span>
-        </span>
-      </a-table>
+      <history-table1 :columnshistory='columnshistory' :dataSourcehistory='dataSourcehistory'></history-table1>
+<!--      :components="drag(columnshistory,'columnshistory')"-->
+<!--      <a-table-->
+<!--        class="table"-->
+<!--        :columns="columnshistory"-->
+<!--        :pagination="false"-->
+<!--        :scroll="{x: '100%', y: 400}"-->
+<!--        :data-source="dataSourcehistory"-->
+<!--        :loading="loading"-->
+<!--      >-->
+<!--       <span slot="content" slot-scope="text,record">-->
+<!--          <a-tooltip placement="topLeft">-->
+<!--        <template slot="title">-->
+<!--          <span v-html="text"></span>-->
+<!--        </template>-->
+<!--            <span v-html="text"></span>-->
+<!--      </a-tooltip>-->
+<!--       </span>-->
+<!--        <span slot="detailText" slot-scope="text,record">-->
+<!--              <span class="text" :title="text">-->
+<!--               {{text && text.length > 10?text.slice(0,9)+'...':text}}-->
+<!--              </span>-->
+<!--        </span>-->
+<!--      </a-table>-->
       <div class="page" v-if="dataSourcehistory.length > 0">
         <a-pagination
           :show-total="total => $t('total')+` ${total} `+$t('strip')"
@@ -213,8 +215,10 @@
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import axios from 'axios'
   import Vue from 'vue'
-  import VueDraggableResizable from 'vue-draggable-resizable'
+  // import VueDraggableResizable from 'vue-draggable-resizable'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import historyTable1 from './historyTable1.vue'
 
   export default {
     name: 'index',
@@ -241,48 +245,52 @@
     },
     components: {
       CollectionType,
-      VueDraggableResizable
+      // VueDraggableResizable
+      historyTable1
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
-      this.components = {
-        header: {
-          cell: (h, props, children) => {
-            const { key, ...restProps } = props
-
-            // 此处的this.columns 是定义的table的表头属性变量
-
-            const col = this.columns.find((col) => {
-              const k = col.dataIndex || col.key
-              return k === key
-            })
-
-            if (!col || !col.width) {
-              return h('th', { ...restProps }, [...children])
-            }
-
-            const dragProps = {
-              key: col.dataIndex || col.key,
-              class: 'table-draggable-handle',
-              attrs: {
-                w: 10,
-                x: col.width,
-                z: 1,
-                axis: 'x',
-                draggable: false,
-                resizable: false
-              },
-              on: {
-                dragging: (x, y) => {
-                  col.width = Math.max(x, 1)
-                }
-              }
-            }
-            const drag = h('vue-draggable-resizable', { ...dragProps })
-            return h('th', { ...restProps, class: 'resize-table-th' }, [...children, drag])
-          }
-        }
-      }
+      // this.components = {
+      //   header: {
+      //     cell: (h, props, children) => {
+      //       const { key, ...restProps } = props
+      //
+      //       // 此处的this.columns 是定义的table的表头属性变量
+      //
+      //       const col = this.columns.find((col) => {
+      //         const k = col.dataIndex || col.key
+      //         return k === key
+      //       })
+      //
+      //       if (!col || !col.width) {
+      //         return h('th', { ...restProps }, [...children])
+      //       }
+      //
+      //       const dragProps = {
+      //         key: col.dataIndex || col.key,
+      //         class: 'table-draggable-handle',
+      //         attrs: {
+      //           w: 10,
+      //           x: col.width,
+      //           z: 1,
+      //           axis: 'x',
+      //           draggable: false,
+      //           resizable: false
+      //         },
+      //         on: {
+      //           dragging: (x, y) => {
+      //             col.width = Math.max(x, 1)
+      //           }
+      //         }
+      //       }
+      //       const drag = h('vue-draggable-resizable', { ...dragProps })
+      //       return h('th', { ...restProps, class: 'resize-table-th' }, [...children, drag])
+      //     }
+      //   }
+      // }
       return {
+        colIndexs:[],
+        minWidthColumns:[],
         token: Vue.ls.get(ACCESS_TOKEN),
         jsonBody: [],
         checkboxList: [],
@@ -297,6 +305,8 @@
         pageNo: 1,
         pageSize: 100,
         pageNohistory: 1,
+        description:'',
+        isTrue:false,
         pageSizehistory: 10,
         pageSizeOptions: ['100', '200'],
         total: 0,
@@ -340,14 +350,15 @@
           {
             title: this.$t('OperationDetails'),
             dataIndex: 'logContent',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
-            scopedSlots: { customRender: 'content' }
+            scopedSlots: { customRender: 'content' },
+            width: 484
           },
           {
             title: this.$t('remarks'),
             dataIndex: 'remarks',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 180,
             scopedSlots: { customRender: 'detailText' }
@@ -355,7 +366,7 @@
           {
             title: this.$t('OperationTime'),
             dataIndex: 'createTime',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 180
           }
@@ -629,8 +640,20 @@
                   }
                 }
               }
+
+              if(res.type){
+                this.colIndexs.push(index)
+              }
             })
-            this.columns = [...this.columns]
+
+            this.isTrue = false
+            setTimeout(()=>{
+              this.isTrue = true
+              this.columns = [...this.columns]
+              this.colIndexs.forEach((item)=>{
+                this.minWidthColumns.push([this.columns[item],500])
+              })
+            },300)
             console.log(this.columns)
           }
         })
@@ -861,6 +884,7 @@
   }
 </style>
 <style scoped lang="less">
+@import'~@assets/less/common.less';
 .inputWid {
   min-width: 100px;
   height: 38px;
@@ -971,6 +995,10 @@
     text-justify: inter-ideograph;
     word-break: break-all
   }
+
+  ::v-deep .ant-table-placeholder{
+    margin-top: 8px !important;
+  }
 </style>
 <style>
   .resize-table-th {

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

@@ -1,12 +1,13 @@
 <template>
   <div style="height: 100%">
-    <div class="box">
+    <div class="box" v-if="isTrue">
       <a-table
         class="table"
         rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
         :scroll="{x: '100%'}"
+        :components="drag(columns,'columns')"
         :data-source="dataSource"
         :loading="loading"
         :rowClassName="rowClassName"
@@ -62,9 +63,11 @@
 <script>
   import eventBUs from '../../common/event'
   import { getAction, postAction } from '@/api/manage'
+  import {ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'index',
+    mixins: [ResizeColumnProvide,ResizeHeader],
     props: {
       //接口
       url: {
@@ -97,6 +100,7 @@
         dataSource: [],
         pageNo: 1,
         pageSize: 10,
+        isTrue:false,
         total: 0,
         searchParmes: {},
         loading: false,
@@ -193,6 +197,10 @@
                 scopedSlots: { customRender: 'operation' }
               })
             }
+            this.isTrue = false
+            this.$nextTick(()=>{
+              this.isTrue = true
+            })
           }
         })
       },

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

@@ -5,15 +5,16 @@
     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>
     <a-table
       class="table"
+      :components="drag(columnsFile,'columnsFile')"
       :columns="columnsFile"
       :pagination="false"
       :scroll="{x:500,y: 400}"
@@ -39,10 +40,11 @@
   import { Base64 } from 'js-base64'
   import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'viewFileModel',
-
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         dataSourceFile: [],