From 72fa5d26cbaff01a4e2866ae7484f61daefc5dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Wed, 21 Dec 2022 09:24:35 +0800 Subject: [PATCH] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/globalAdvancedQuery/index.vue | 8 +- .../ProjectDetails/index.vue | 8 +- .../components/listOfRegulations.vue | 147 +++++++++++------- 3 files changed, 100 insertions(+), 63 deletions(-) diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index ed1fba712..82a1b8faf 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -11,7 +11,7 @@ {{$t('empty')}} - + {{$t('advancedQuery')}} @@ -19,7 +19,7 @@ - {{$t('advancedQuery')}} + {{$t('advancedQuery')}}
- + @@ -340,8 +340,8 @@ .Virtual-detail-header { width: 100%; - height: 68px; - line-height: 68px; + height: 56px; + line-height: 56px; padding: 0 32px 0 32px; box-sizing: border-box; display: flex; @@ -357,7 +357,7 @@ font-size: 20px; font-weight: 400; color: #040B29; - line-height: 68px; + line-height: 55px; } .doc-detail-right { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index eebaee1d0..ee2075ccf 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -35,6 +35,7 @@ :triggerChange="false" :dictCode="'duty_territory'"/>
+ + + :fieldList="fieldList" MarginRight='2px'/> {{ $t('query') }} - {{ $t('reset') }} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + @@ -100,18 +106,11 @@ {{ $t('initiateTaskConfirmation') }}
-
- - {{ $t('alteration') }} -
-
- - {{ $t('fixedPlate') }} -
...{{ $t('more') }} @@ -157,10 +169,6 @@ {{ $t('Transfer') }}
-
- - {{ $t('copy') }} -
{{ $t('add') }} @@ -486,12 +494,13 @@ mixins: [ResizeColumnProvide,ResizeHeader], data() { return { + toggleSearchStatus: false, roleSwitchingList: [], listTitle: '', columnsAll: [ { title: this.$t('standard'), - align: 'center', + align: 'left', dataIndex: 'serialNumber', width: 180, fixed: 'left', @@ -499,7 +508,7 @@ }, { title: this.$t('title'), - align: 'center', + align: 'left', dataIndex: 'title', width: 180, fixed: 'left', @@ -507,21 +516,21 @@ }, { title: this.$t('subtitle'), - align: 'center', + align: 'left', dataIndex: 'subtitle', ellipsis: true, width: 180 }, { title: this.$t('listConfirmationStatus'), - align: 'center', + align: 'left', dataIndex: 'inventoryAffirmStatusName', width: 240, ellipsis: true }, { title: this.$t('taskAffirmStatus'), - align: 'center', + align: 'left', dataIndex: 'taskAffirmStatusName', width: 240, ellipsis: true @@ -533,98 +542,98 @@ // }, { title: this.$t('zoneOfApplication'), - align: 'center', + align: 'left', dataIndex: 'region_dictText', width: 180, ellipsis: true }, { title: this.$t('correspondingStandard'), - align: 'center', + align: 'left', dataIndex: 'correspondingStandard', width: 180, ellipsis: true }, { title: this.$t('implementationCategory'), - align: 'center', + align: 'left', dataIndex: 'implementType_dictText', width: 180, ellipsis: true }, { title: this.$t('ImplementationDate'), - align: 'center', + align: 'left', width: 200, dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', ellipsis: true }, { title: this.$t('vehicleInProductionDate'), - align: 'center', + align: 'left', width: 220, dataIndex: 'implementTime', ellipsis: true }, { title: this.$t('certificationType'), - align: 'center', + align: 'left', dataIndex: 'attestationType_dictText', width: 180, ellipsis: true }, { title: this.$t('certificationLevel'), - align: 'center', + align: 'left', dataIndex: 'attestationRank_dictText', width: 180, ellipsis: true }, { title: this.$t('applicableSupplement'), - align: 'center', + align: 'left', width: 220, dataIndex: 'applicableSupplement', ellipsis: true }, { title: 'WVTA ID', - align: 'center', + align: 'left', dataIndex: 'wvtaId', width: 180, ellipsis: true }, { title: this.$t('areaOfResponsibility'), - align: 'center', + align: 'left', ellipsis: true, dataIndex: 'dutyTerritory_dictText', width: 180 }, { title: this.$t('regulatoryEngineer'), - align: 'center', + align: 'left', ellipsis: true, dataIndex: 'regulationOwnerName', width: 180 }, { title: this.$t('certifiedEngineer'), - align: 'center', + align: 'left', ellipsis: true, dataIndex: 'homologationEngineerName', width: 180 }, { title: this.$t('engineeringInterfacePerson'), - align: 'center', + align: 'left', ellipsis: true, dataIndex: 'engineeringInterfacePersonName', width: 180 }, { title: this.$t('remarks'), - align: 'center', + align: 'left', dataIndex: 'remark', width: 180, ellipsis: true @@ -635,7 +644,7 @@ { title: this.$t('Deliverables'), dataIndex: 'designDeliverableTemplateName', - align: 'center', + align: 'left', width: 180, ellipsis: true, scopedSlots: { customRender: 'designDeliverableTemplateName' } @@ -643,28 +652,28 @@ { title: this.$t('Sponsor'), dataIndex: 'designInitiatorName', - align: 'center', + align: 'left', width: 180, ellipsis: true }, { title: this.$t('personLiable'), dataIndex: 'designDutyName', - align: 'center', + align: 'left', width: 180, ellipsis: true }, { title: this.$t('TaskCutOffTime'), dataIndex: 'designDueDate', - align: 'center', + align: 'left', ellipsis: true, width: 140 }, { title: this.$t('descriptionDeliverables'), dataIndex: 'designRemark', - align: 'center', + align: 'left', width: 220, ellipsis: true } @@ -676,7 +685,7 @@ { title: this.$t('Deliverables'), dataIndex: 'prehomoDeliverableTemplateName', - align: 'center', + align: 'left', width: 180, ellipsis: true, scopedSlots: { customRender: 'prehomoDeliverableTemplateName' } @@ -684,28 +693,28 @@ { title: this.$t('Sponsor'), dataIndex: 'prehomoInitiatorName', - align: 'center', + align: 'left', width: 180, ellipsis: true }, { title: this.$t('personLiable'), dataIndex: 'prehomoDutyName', - align: 'center', + align: 'left', width: 180, ellipsis: true }, { title: this.$t('TaskCutOffTime'), dataIndex: 'prehomoDueDate', - align: 'center', + align: 'lefft', width: 140, ellipsis: true }, { title: this.$t('descriptionDeliverables'), dataIndex: 'prehomoRemark', - align: 'center', + align: 'left', width: 220, ellipsis: true } @@ -717,7 +726,7 @@ { title: this.$t('Deliverables'), dataIndex: 'verifyDeliverableTemplateName', - align: 'center', + align: 'left', width: 180, ellipsis: true, scopedSlots: { customRender: 'verifyDeliverableTemplateName' } @@ -725,28 +734,28 @@ { title: this.$t('Sponsor'), dataIndex: 'verifyInitiatorName', - align: 'center', + align: 'left', width: 180, ellipsis: true }, { title: this.$t('personLiable'), dataIndex: 'verifyDutyName', - align: 'center', + align: 'left', width: 180, ellipsis: true }, { title: this.$t('TaskCutOffTime'), dataIndex: 'verifyDueDate', - align: 'center', + align: 'left', ellipsis: true, width: 140 }, { title: this.$t('descriptionDeliverables'), dataIndex: 'verifyRemark', - align: 'center', + align: 'left', width: 220, ellipsis: true } @@ -754,14 +763,14 @@ }, { title: this.$t('operation'), - align: 'center', + align: 'left', fixed: 'right', width: 240, scopedSlots: { customRender: 'operation' } }, { title: this.$t('operation'), - align: 'center', + align: 'left', fixed: 'right', width: 140, scopedSlots: { customRender: 'operationOne' } @@ -771,20 +780,20 @@ { title: this.$t('deliverableTemplate'), dataIndex: 'fileName', - align: 'center', + align: 'left', width: 260, ellipsis: true }, { title: this.$t('resultReported'), dataIndex: 'fileName', - align: 'center', + align: 'left', width: 260, ellipsis: true }, { title: this.$t('operation'), - align: 'center', + align: 'left', width: 130, scopedSlots: { customRender: 'fileOperation' } } @@ -1054,6 +1063,9 @@ }, methods: { ...mapGetters(['userInfo']), + handleToggleSearch() { + this.toggleSearchStatus = !this.toggleSearchStatus + }, viewClick(row) { let roleCodeIndex if (this.isDisplay) { @@ -2526,6 +2538,14 @@ display: none !important; } + //.popconfirm .ant-popover-inner-content{ + // padding: 0px 16px; + //} + // + //.popconfirm .ant-popover-message{ + // padding: 23px 0 1px; + //} + .ant-table-placeholder { padding: 0; border-top: none; @@ -2536,8 +2556,21 @@ } .tableList .ant-table-thead > tr > th { - padding: 7px 16px !important; + padding: 0px 16px !important; + font-weight: bolder; } + + .tableList .ant-table-tbody > tr > td{ + color: #040B29 ; + } + + //.tableList .ant-table-thead > tr{ + // padding: 2px 16px !important; + //} + + //.tableList .ant-table-thead >tr{ + // height: 56px !important; + //}