diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f7b84ed7c..722f78b1a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1712,6 +1712,7 @@ module.exports = { returntofill: 'Return to fill', thereAreCurrentlyNoRegulationsToHandle: 'No regulations to be processed now', certificationSubmission: 'Application Submitted', + certificationSubmissionEndTime: 'Application Submitted End Time', upgradecompletion: 'Upgrade completion', implementedupgrade: 'Whether the implemented upgrade is consistent with the record', numberofvehicles: 'Number of vehicles that have completed upgrades', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c7d04575e..29697e07a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1812,6 +1812,7 @@ module.exports = { expeditionProcess: '催办流程', thereAreCurrentlyNoRegulationsToHandle: '当前没有可处理的法规', certificationSubmission: '认证提交', + certificationSubmissionEndTime:'认证提交截止时间', upgradecompletion: '升级完成情况', implementedupgrade: '实施的升级是否和备案一致', numberofvehicles: '完成升级的车辆数', diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 1fe20cf5e..f385f2e98 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -303,14 +303,14 @@
* - {{$t('closingDate')}} + {{$t('certificationSubmissionEndTime')}}
* - {{$t('closingDate')}} + {{$t('certificationSubmissionEndTime')}}
- - -
-
- {{$t('remarks')}} -
- - - -
-
-
@@ -690,6 +674,22 @@
+ + +
+
+ {{$t('remarks')}} +
+ + + +
+
+
@@ -1222,7 +1222,7 @@ } .title-text { - width: 114px; + width: 124px; text-align: right; display: inline-block; font-weight: 500; @@ -1242,7 +1242,7 @@ } .itemModel { - width: calc(100% - 130px); + width: calc(100% - 140px); display: inline-block; margin-top: 2px; height: 40px; diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue b/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue index 62d6ee45c..92ba9c97a 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue @@ -13,16 +13,16 @@
-
+
* - {{ $t('cutoffTime') }} + :title="titleName"> + {{ titleName }}
{ if (valid) { - this.$emit('deadlineDataForm', this.queryData,this.formInline) + this.$emit('deadlineDataForm', this.queryData, this.formInline) this.confirmLoading = true } }) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 68de076af..eaf3fcca0 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -843,10 +843,10 @@ scopedSlots: { customRender: 'DeliverablesResult' } }, { - title: this.$t('closingDate'), + title: this.$t('certificationSubmissionEndTime'), align: 'left', dataIndex: 'endTime', - width: 130, + width: 150, sorter: true, ellipsis: true }, @@ -1424,7 +1424,7 @@ dutyDueDate: 'inventoryVerifyEndTime', title: this.$t('release') } - this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query))) + this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('inventoryVerifyEndTime')) } else { this.failedMessage(data) } @@ -2070,7 +2070,7 @@ title: this.$t('initiateTask'), NAId: NAId } - this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query))) + this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('taskConfirmEndTime')) // this.submitTask(value, prompt, ids, notConditions, data, NAId) } else { this.failedMessage(data)