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

jero-web/src/views/projectManagement/projectLibrary/index.vue

@@ -127,6 +127,7 @@
       <a-table
         ref="table"
         size="middle"
+        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%'}"
@@ -180,6 +181,7 @@
   import changeExtensionModel from './components/changeExtensionModel'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'index',
@@ -188,6 +190,7 @@
       PersonnelSelection,
       changeExtensionModel
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         loading: false,
@@ -214,7 +217,7 @@
             title: this.$t('entryName'),
             align: 'left',
             dataIndex: 'projectName',
-            width: 180,
+            width: 260,
             sorter:true,
             ellipsis: true,
             scopedSlots: { customRender: 'projectName' }
@@ -244,7 +247,7 @@
           {
             title: this.$t('brand'),
             align: 'left',
-            width: 180,
+            width: 140,
             ellipsis: true,
             dataIndex: 'brandText'
           },
@@ -282,7 +285,7 @@
             title: this.$t('operation'),
             align: 'left',
             fixed: 'right',
-            width: 302,
+            width: 260,
             scopedSlots: { customRender: 'operation' }
           }
         ],

jero-web/src/views/projectManagement/projectNonConformance/index.vue

@@ -152,6 +152,7 @@
         ref="table"
         size="middle"
         rowKey="uuid"
+        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%'}"
@@ -186,12 +187,14 @@
   import { getAction, postAction, downloadFile, deleteAction ,downloadFilePost} from '@/api/manage'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import store from '@/store/'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'projectNonConformance',
     components: {
       PersonnelSelection
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         queryParam: {},
@@ -228,7 +231,7 @@
             title: this.$t('areaOfResponsibility'),
             align: 'left',
             dataIndex: 'dutyTerritory',
-            width: 180,
+            width: 120,
             sorter:true,
             ellipsis: true
           },