diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index 242b53c10..801cf50a5 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -90,10 +90,15 @@ .jee-hidden { display: none } + .box-input .ant-select-selection { height: 38px !important; } .box-input .ant-select-selection__rendered { line-height: 38px; +} + +.ant-table-fixed-left table, .ant-table-fixed-right table .ant-table-fixed{ + width: min-content; } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index c119a66e5..6df7ce08a 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -2,43 +2,43 @@
- - -
-
- {{$t('standard')}} + + +
+
+ {{$t('standard')}} +
+
- -
- - -
-
- {{$t('title')}} + + +
+
+ {{$t('title')}} +
+
- -
- - -
-
- {{$t('areaOfResponsibility')}} + + +
+
+ {{$t('areaOfResponsibility')}} +
+
- -
- - + + {{$t('query')}} {{$t('reset')}} - +
@@ -54,7 +54,7 @@ :loading="loading" rowKey="uuid" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :data-source="dataSource" :columns="columns" @@ -94,38 +94,52 @@ title: this.$t('standard'), align: 'center', dataIndex: 'serialNumber', - scopedSlots: { customRender: 'standard' } + scopedSlots: { customRender: 'standard' }, + ellipsis: true, + width: 180 }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + ellipsis: true, + width: 180, scopedSlots: { customRender: 'standard' } }, { title: this.$t('ProcessType'), align: 'center', - dataIndex: 'flowType' + dataIndex: 'flowType', + ellipsis: true, + width: 180 }, { title: this.$t('areaOfResponsibility'), align: 'center', - dataIndex: 'dutyTerritory_dictText' + dataIndex: 'dutyTerritory_dictText', + ellipsis: true, + width: 180 }, { title: this.$t('problemType'), align: 'center', - dataIndex: 'problemType' + dataIndex: 'problemType', + ellipsis: true, + width: 180 }, { title: this.$t('Sponsor'), align: 'center', - dataIndex: 'initiator' + dataIndex: 'initiator', + ellipsis: true, + width: 140 }, { title: this.$t('personLiable'), align: 'center', - dataIndex: 'duty' + dataIndex: 'duty', + ellipsis: true, + width: 140 } ], total: 0, @@ -213,7 +227,7 @@ serialNumber: val.serialNumber, actiProcInstId: val.prcId, primaryKeyId: val.projectTaskInventoryDetailId, - TaskKey: val.taskDefinitionKey, + TaskKey: val.taskDefinitionKey, isDisplay: val.status == 'NotDone' ? true : false } switch (num) { diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index a16435549..4195c6126 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -154,13 +154,13 @@ rowKey="uuid" :loading="loading" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :data-source="dataSource" :columns="columns" > - {{text}} + {{text}}
@@ -201,48 +201,56 @@ align: 'center', dataIndex: 'serialNumber', ellipsis: true, - scopedSlots: { customRender: 'standard' } + width:180, + scopedSlots: { customRender: 'standard' }, }, { title: this.$t('title'), align: 'center', dataIndex: 'title', ellipsis: true, + width:180, scopedSlots: { customRender: 'standard' } }, { title: this.$t('ProcessType'), align: 'center', dataIndex: 'flowType', + width:180, ellipsis: true }, { title: this.$t('areaOfResponsibility'), align: 'center', dataIndex: 'dutyTerritory_dictText', + width:180, ellipsis: true }, { title: this.$t('RelatedItems'), align: 'center', dataIndex: 'projectName', + width:180, ellipsis: true }, { title: this.$t('problemType'), align: 'center', dataIndex: 'problemType', - ellipsis: true + width:140, + ellipsis: true, }, { title: this.$t('Sponsor'), align: 'center', - dataIndex: 'initiator' + dataIndex: 'initiator', + width:140, }, { title: this.$t('personLiable'), align: 'center', - dataIndex: 'duty' + dataIndex: 'duty', + width:140, } ], total: 0,