From d31362a5723fa654bb1b23c9bb55a3f28460d628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 16 Apr 2023 14:37:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=92=8C=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/transferListvirtal.vue | 8 +- .../components/virtualListDetails.vue | 102 +++++++++--------- .../views/documentTools/virtualList/index.vue | 18 ++-- .../components/referenceDeliverablesList.vue | 11 +- .../components/transferListvirtal.vue | 2 +- .../components/certificationList/index.vue | 6 +- .../components/listOfRegulations.vue | 2 +- .../components/transferListvirtal.vue | 8 +- .../components/SentList.vue | 6 +- .../components/dealtWith.vue | 6 +- .../components/designCompliance.vue | 8 +- .../components/doneList.vue | 6 +- .../components/referenceDeliverablesList.vue | 14 ++- .../reviewedByThePersonInCharge.vue | 3 +- .../projectRegulationTasks/index.vue | 12 +-- .../views/virtualAuthenticationList/index.vue | 18 ++-- 18 files changed, 125 insertions(+), 107 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d5e94d464..040338da3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1787,4 +1787,5 @@ module.exports = { pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login', cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas', lidar:'lidar', + history:'History', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 4b1e269d1..325de7d36 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1889,4 +1889,5 @@ module.exports = { pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据', cannotSetResponsibilityAreas:'所属不同责任领域，不能设置接口人', lidar:'激光雷达', + history:'历史', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue index 31bb656b7..466be2b80 100644 --- a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue +++ b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue @@ -2,7 +2,7 @@
-
- {{$t('VirtualListName')}} +
+ {{$t('marketRegulationList')}}
-
@@ -54,7 +54,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 300px)'}" :rowKey="(record)=>JSON.stringify(record)" :data-source="dataSource" @change="tableOnChange" @@ -119,12 +119,12 @@
* - {{$t('VirtualListName')}} + {{$t('marketRegulationList')}}
+ :placeholder="$t('PleaseEnter')+$t('marketRegulationList')"/>
@@ -180,12 +180,12 @@ name: [ { required: true, - message: this.$t('VirtualListName') + this.$t('cannotEmpty'), + message: this.$t('marketRegulationList') + this.$t('cannotEmpty'), trigger: 'blur' }, { max: 100, - message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + message: this.$t('marketRegulationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'), trigger: 'blur' } ], @@ -218,7 +218,7 @@ title: this.$t('newlyAdded'), columns: [ { - title: this.$t('VirtualListName'), + title: this.$t('marketRegulationList'), align: 'left', dataIndex: 'name', width: '40', diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue index f9fa721ef..2a67fb149 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue @@ -33,10 +33,10 @@ @@ -87,6 +87,13 @@ dataIndex: 'studioEngineerName', align: 'left', ellipsis: true, + width: 140 + }, + { + title: this.$t('explain'), + dataIndex: 'explanation', + align: 'left', + ellipsis: true, width: 223 } ], diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue index e9c82a9db..2e7c52030 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue @@ -45,7 +45,7 @@ - {{ $t('modifyHistory') }} + {{ $t('history') }} {{textLoading}} - {{$t('referenceDeliverables')}} -
+ {{$t('referenceDeliverables')}} + @@ -87,6 +87,13 @@ dataIndex: 'studioEngineerName', align: 'left', ellipsis: true, + width: 140 + }, + { + title: this.$t('explain'), + dataIndex: 'explanation', + align: 'left', + ellipsis: true, width: 223 } ], @@ -151,6 +158,9 @@ }, onSelectChange(value) { this.selectedRowKeys = value + if (this.selectedRowKeys.length > 1) { + this.selectedRowKeys.shift() + } }, handleCancel() { this.visible = false diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index c2563a666..81e29ade2 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -2,8 +2,7 @@
- {{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || $route.query.TaskKey - == 'dezrrtjjfw' + {{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'dezrrtjjfw' ? $t('personLiableConfirm'):$t('sponsorReview')}}
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index b08a13f0c..beb513a27 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -23,10 +23,10 @@
-
- {{$t('taskType')}} +
+ {{$t('ProcessType')}}
-
-
- {{$t('taskStatus')}} +
+ {{$t('ProcessStatus')}}
-
-
- {{$t('CertificationListName')}} +
+ {{$t('marketCertificationList')}}
-
@@ -114,12 +114,12 @@
* {{$t('CertificationListName')}} + :title="$t('marketCertificationList')">{{$t('marketCertificationList')}}
+ :placeholder="$t('PleaseEnter')+$t('marketCertificationList')"/>
@@ -167,12 +167,12 @@ name: [ { required: true, - message: this.$t('CertificationListName') + this.$t('cannotEmpty'), + message: this.$t('marketCertificationList') + this.$t('cannotEmpty'), trigger: 'blur' }, { max: 100, - message: this.$t('CertificationListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + message: this.$t('marketCertificationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'), trigger: 'blur' } ], @@ -212,10 +212,10 @@ dataSource: [], columns: [ { - title: this.$t('CertificationListName'), + title: this.$t('marketCertificationList'), align: 'left', dataIndex: 'name', - width: '40%', + width: '40', ellipsis: true, scopedSlots: { customRender: 'CertificationListName' } },