Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period

# Conflicts: # jero-web/src/components/tableCollection/index1.vue # jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue # jero-web/src/views/documentManage/collection/index.vue # jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue # jero-web/src/views/projectManagement/components/listOfRegulations.vue # jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue # jero-web/src/views/projectManagement/projectStatusBoard/index.vue
2022-12-30 15:53:39 +08:00
parent 07c02abef6 2154e4edfe
commit b0b8f36e92
129 changed files with 1418 additions and 765 deletions
@@ -214,14 +214,14 @@
            key: 'rowIndex',
            width: 50,
            ellipsis: true,
-            align: 'center',
+            align: 'left',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            }
          },
          {
            title: this.$t('userAccount'),
-            align: 'center',
+            align: 'left',
            dataIndex: 'username',
            ellipsis: true,
            width: 120,
@@ -229,28 +229,28 @@
          },
          {
            title: this.$t('userName'),
-            align: 'center',
+            align: 'left',
            width: 100,
            ellipsis: true,
            dataIndex: 'realname'
          },
          {
            title: this.$t('EmployeeNumber'),
-            align: 'center',
+            align: 'left',
            width: 100,
            ellipsis: true,
            dataIndex: 'workNo'
          },
          {
            title: this.$t('EmployeeType'),
-            align: 'center',
+            align: 'left',
            width: 100,
            ellipsis: true,
            dataIndex: 'workerType_dictText'
          },
          {
            title: this.$t('department'),
-            align: 'center',
+            align: 'left',
            width: 180,
            ellipsis: true,
            dataIndex: 'orgCodeTxt'
@@ -269,7 +269,7 @@
          // },
          {
            title: this.$t('status'),
-            align: 'center',
+            align: 'left',
            width: 80,
            ellipsis: true,
            dataIndex: 'status_dictText'
@@ -278,7 +278,7 @@
            title: this.$t('operation'),
            dataIndex: 'action',
            scopedSlots: {customRender: 'action'},
-            align: "center",
+            align: "left",
            width: 80
          }
        ],