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/views/system/DictItemList.vue

@@ -53,6 +53,7 @@
             ref="table"
             rowKey="id"
             size="middle"
+            :components="drag(columns,'columns')"
             :scroll="{x: '100%'}"
             :columns="columns"
             :dataSource="dataSource"
@@ -83,10 +84,11 @@
   import {filterObj} from '@/utils/util';
   import DictItemModal from './modules/DictItemModal'
   import {JeroListMixin} from '@/mixins/JeroListMixin'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: "DictItemList",
-    mixins: [JeroListMixin],
+    mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
     components: {DictItemModal},
     data() {
       return {

jero-web/src/views/system/DictList.vue

@@ -63,6 +63,7 @@
         ref="table"
         rowKey="id"
         size="middle"
+        :components="drag(columns,'columns')"
         :scroll="{x: '100%'}"
         :columns="columns"
         :dataSource="dataSource"
@@ -98,10 +99,11 @@
   import { getAction } from '@/api/manage'
   import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
   import Vue from 'vue'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'DictList',
-    mixins: [JeroListMixin],
+    mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
     components: { DictModal, DictItemList, DictDeleteList },
     data() {
       return {
@@ -128,7 +130,7 @@
             title: this.$t('DictionaryName'),
             align: 'left',
             dataIndex: 'dictName',
-            width: '25%',
+            width: 160,
             ellipsis: true
           },
           // {
@@ -148,14 +150,14 @@
             title: this.$t('DictionaryNumber'),
             align: 'left',
             dataIndex: 'dictCode',
-            width: '25%',
+            width: 160,
             ellipsis: true
           },
           {
             title: this.$t('describe'),
             align: 'left',
             dataIndex: 'description',
-            width: '25%',
+            width: 160,
             ellipsis: true
           },
           {

jero-web/src/views/system/LogList.vue

@@ -53,6 +53,7 @@
       ref="table"
       size="middle"
       rowKey="id"
+      :components="drag(columns,'columns')"
       :columns="columns"
       :dataSource="dataSource"
       :pagination="ipagination"
@@ -76,10 +77,11 @@
   import { filterObj } from '@/utils/util';
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import JEllipsis from '@/components/jero/JEllipsis'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: "LogList",
-    mixins:[JeroListMixin],
+    mixins:[JeroListMixin, ResizeHeader, ResizeColumnProvide],
     components: {
       JEllipsis
     },
@@ -103,38 +105,44 @@
             align:"left",
             customRender:function (t,r,index) {
               return parseInt(index)+1;
-            }
+            },
+            width: 40
           },
           {
             title: this.$t('LogContent'),
             align:"left",
             dataIndex: 'logContent',
             scopedSlots: { customRender: 'logContent' },
-            sorter: true
+            sorter: true,
+            width: 270
           },
           {
             title: this.$t('OperatorID'),
             dataIndex: 'userid',
             align:"left",
-            sorter: true
+            sorter: true,
+            width: 121
           },
           {
             title: this.$t('OperatorName'),
             dataIndex: 'username',
             align:"left",
-            sorter: true
+            sorter: true,
+            width: 141
           },
           {
             title: 'IP',
             dataIndex: 'ip',
             align:"left",
-            sorter: true
+            sorter: true,
+            width: 93
           },
           {
             title: this.$t('ElapsedTime'),
             dataIndex: 'costTime',
             align:"left",
-            sorter: true
+            sorter: true,
+            width: 136
           },
           {
             title: this.$t('LogType'),
@@ -149,12 +157,14 @@
               }
             },*/
             align:"left",
+            width: 95
           },
           {
             title: this.$t('createTime'),
             dataIndex: 'createTime',
             align:"left",
-            sorter: true
+            sorter: true,
+            width: 199
           }
         ],
         operateColumn:
@@ -162,6 +172,7 @@
           title: this.$t('OperationType'),
           dataIndex: 'operateType_dictText',
           align:"left",
+          width: 95
         },
         labelCol: {
           xs: { span: 1 },

jero-web/src/views/system/PermissionDataRuleList.vue

@@ -43,6 +43,7 @@
           ref="table"
           rowKey="id"
           size="middle"
+          :components="drag(columns,'columns')"
           :columns="columns"
           :dataSource="dataSource"
           :loading="loading"
@@ -67,10 +68,11 @@
   import {getPermissionRuleList, queryPermissionRule} from '@/api/api'
   import {JeroListMixin} from '@/mixins/JeroListMixin'
   import PermissionDataRuleModal from './modules/PermissionDataRuleModal'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'PermissionDataRuleList',
-    mixins: [JeroListMixin],
+    mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
     components: {
       PermissionDataRuleModal
     },
@@ -82,23 +84,27 @@
           {
             title: this.$t('RuleName'),
             dataIndex: 'ruleName',
-            key: 'ruleName'
+            key: 'ruleName',
+            width: 170
           },
           {
             title: this.$t('RuleField'),
             dataIndex: 'ruleColumn',
-            key: 'ruleColumn'
+            key: 'ruleColumn',
+            width: 170
           },
           {
             title: this.$t('RuleValue'),
             dataIndex: 'ruleValue',
-            key: 'ruleValue'
+            key: 'ruleValue',
+            width: 137
           },
           {
             title: this.$t('operation'),
             dataIndex: 'action',
             scopedSlots: {customRender: 'action'},
-            align: 'center'
+            align: 'left',
+            width: 130
           }
         ],
         permId: '',

jero-web/src/views/system/PermissionList.vue

@@ -30,6 +30,7 @@
         :columns="columns"
         :scroll="{x: '100%'}"
         size="middle"
+        :components="drag(columns,'columns')"
         :pagination="false"
         :dataSource="dataSource"
         :loading="loading"
@@ -89,11 +90,12 @@
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import PermissionDataRuleList from './PermissionDataRuleList'
   import JEllipsis from '@/components/jero/JEllipsis'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
 
   export default {
     name: 'PermissionList',
-    mixins: [JeroListMixin],
+    mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
     components: {
       PermissionDataRuleList,
       PermissionModal,

jero-web/src/views/system/QuartzJobList.vue

@@ -59,6 +59,7 @@
         size="middle"
         bordered
         rowKey="id"
+        :components="drag(columns,'columns')"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
@@ -113,10 +114,11 @@
   import { getAction } from '@/api/manage'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import JEllipsis from "@/components/jero/JEllipsis";
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: "QuartzJobList",
-    mixins:[JeroListMixin],
+    mixins:[JeroListMixin, ResizeHeader, ResizeColumnProvide],
     components: {
       QuartzJobModal,
       JEllipsis
@@ -153,11 +155,13 @@
 /*            customRender:function (text) {
               return "*"+text.substring(9,text.length);
             }*/
+            width: 612
           },
           {
             title: 'cron表达式',
             align:"left",
-            dataIndex: 'cronExpression'
+            dataIndex: 'cronExpression',
+            width: 47
           },
           {
             title: '参数',
@@ -182,7 +186,8 @@
             filters: [
               { text: '已启动', value: '0' },
               { text: '已暂停', value: '-1' },
-            ]
+            ],
+            width: 76
           },
           {
             title: '操作',

jero-web/src/views/system/RoleUserList.vue

@@ -46,10 +46,12 @@
       <a-table
         ref="table"
         rowKey="id"
+        :components="drag(columns,'columns')"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
+        :scroll="{x: '100%'}"
         @change="handleTableChange">
          <span slot="action" slot-scope="text, record">
              <a @click="handlePerssion(record.id)"
@@ -80,10 +82,11 @@
   import { filterObj } from '@/utils/util'
   import UserRoleModal from './modules/UserRoleModal'
   import moment from 'moment'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'RoleUserList',
-    mixins: [JeroListMixin],
+    mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
     components: {
       UserRoleModal,
       SelectUserModal,

jero-web/src/views/system/SysCheckRuleList.vue

@@ -71,11 +71,13 @@
       size="middle"
       bordered
       rowKey="id"
+      :components="drag(columns,columns)"
       :columns="columns"
       :dataSource="dataSource"
       :pagination="ipagination"
       :loading="loading"
       :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      :sroll="{x: '100%'}"
       @change="handleTableChange">
 
       <template slot="action" slot-scope="text, record">
@@ -112,10 +114,11 @@
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import SysCheckRuleModal from './modules/SysCheckRuleModal'
   import SysCheckRuleTestModal from './modules/SysCheckRuleTestModal'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'SysCheckRuleList',
-    mixins: [JeroListMixin],
+    mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
     components: { SysCheckRuleModal, SysCheckRuleTestModal, JEllipsis },
     data() {
       return {
@@ -132,24 +135,28 @@
           {
             title: '规则名称',
             align: 'left',
-            dataIndex: 'ruleName'
+            dataIndex: 'ruleName',
+            width: 301
           },
           {
             title: '规则Code',
             align: 'left',
-            dataIndex: 'ruleCode'
+            dataIndex: 'ruleCode',
+            width: 332
           },
           {
             title: '规则描述',
             align: 'left',
             dataIndex: 'ruleDescription',
-            customRender: (t) => (<j-ellipsis value={t} length={48}/>)
+            customRender: (t) => (<j-ellipsis value={t} length={48}/>),
+            width: 300
           },
           {
             title: '操作',
             dataIndex: 'action',
             align: 'left',
             scopedSlots: { customRender: 'action' },
+            width: 187
           }
         ],
         url: {

jero-web/src/views/system/UserAnnouncementList.vue

@@ -57,6 +57,7 @@
     </div>
 
     <a-table
+      :components="drag(columns,'columns')"
       ref="table"
       rowKey="id"
       :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -102,10 +103,11 @@ import { JeroListMixin } from '@/mixins/JeroListMixin'
 import DynamicNotice from '../../components/tools/DynamicNotice'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'UserAnnouncementList',
-    mixins: [JeroListMixin],
+    mixins: [JeroListMixin,ResizeHeader, ResizeColumnProvide],
     components: {
       DynamicNotice,
       ShowAnnouncement
@@ -143,6 +145,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
             align: 'left',
             dataIndex: 'msgContent',
             ellipsis: true,
+            width: 450,
             scopedSlots: { customRender: 'msgTitile' }
           },
           // {

jero-web/src/views/system/UserList.vue

@@ -118,6 +118,7 @@
       <a-table
         ref="table"
         rowKey="id"
+        :components="drag(columns,'columns')"
         :scroll="{x: '100%'}"
         :columns="columns"
         :dataSource="dataSource"
@@ -171,10 +172,11 @@
   import axios from 'axios'
   import Vue from 'vue'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'UserList',
-    mixins: [JeroListMixin],
+    mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
     components: {
       DepartmentAllocation,
       RoleAssignment,

jero-web/src/views/system/modules/DeptUserInfo.vue

@@ -50,6 +50,7 @@
       <a-table
         ref="table"
         size="middle"
+        :components="drag(columns,'columns')"
         :scroll="{x: '100%'}"
         :columns="columns"
         :pagination="false"
@@ -111,10 +112,11 @@
   import SelectUserModal from './SelectUserModal'
   import UserModal from './UserModal'
   import DeptRoleUserModal from './DeptRoleUserModal'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'DeptUserInfo',
-    mixins: [JeroListMixin],
+    mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
     components: {
       DeptRoleUserModal,
       SelectUserModal,