diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 713d73d98..e49269dd1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1841,4 +1841,10 @@ module.exports = { submissionProcess:'Submission Process', localapproval1:'Local Approval1', localapproval2:'Local Approval2', + averageapprovalperiod:'Average approval period', + day:'day', + passreturntime:'Pass/return time', + approvalcycle:'Approval cycle', + transittime:'Transit Time', + returntime:'Return time', } \ 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 38dad2ab0..b89acb047 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1942,4 +1942,10 @@ module.exports = { submissionProcess:'提交流程', localapproval1:'地方批准1', localapproval2:'地方批准2', + averageapprovalperiod:'平均审批周期', + day:'天', + passreturntime:'通过/退回时间', + approvalcycle:'审批周期', + transittime:'通过时间', + returntime:'退回时间', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue index d02319143..c3f94629e 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue @@ -30,11 +30,11 @@
- * + * {{$t('filingtime')}}
- +
+ +
+
+ * + + {{$t('transittime')}} +
+ + + +
+
+ +
+
+ * + + {{$t('returntime')}} +
+ + + +
+
@@ -77,9 +115,13 @@ export default { return { visible: false, confirmLoading: false, + transittime:false, + returntime:false, + propflag: false, formInline: { bazt:undefined, batjsj:'', + tgthsj:'', bz:'', }, rules: { @@ -99,7 +141,14 @@ export default { ], bz: [ { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' } - ] + ], + tgthsj: [ + { + required: true, + message: this.$t('cannotEmpty'), + trigger: 'change' + } + ], // listConfirmation: [ // { // required: true, @@ -161,16 +210,43 @@ export default { this.ids = row.join(',') this.formInline = { bazt:undefined, + tgthsj:'', batjsj:'', bz:'', } + this.propflag = true + this.transittime = false + this.returntime = false }else{ this.formInline.bazt = row.bazt ? row.bazt : undefined this.formInline.batjsj = row.batjsj + this.formInline.tgthsj = row.tgthsj this.formInline.bz = row.bz this.ids = row.id + if (this.formInline.bazt == 1) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if (this.formInline.bazt == 2) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if(this.formInline.bazt == 4){ + this.propflag = false + this.transittime = true + this.returntime = false + } else if(this.formInline.bazt == 5){ + this.propflag = false + this.returntime = true + this.transittime = false + }else{ + this.propflag = false + this.transittime = false + this.returntime = false + } } this.visible = true + this.$nextTick(() => { this.$refs.ruleForm.clearValidate() }) @@ -197,7 +273,29 @@ export default { } }) }, - selectchange(value){ + selectchange(value) { + console.log(value) + if (value == 1) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if (value == 2) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if(value == 4){ + this.propflag = false + this.transittime = true + this.returntime = false + } else if(value == 5){ + this.propflag = false + this.returntime = true + this.transittime = false + }else{ + this.propflag = false + this.transittime = false + this.returntime = false + } this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.validateField('bazt') diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 63af28480..b3c1a3d24 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -159,6 +159,9 @@ @click="deleteData(record)">{{$t('delete')}} +
+ {{$t('averageapprovalperiod')}} : {{number}}{{$t('day')}} +
- * + * {{$t('filingtime')}}
- + + +
+ + +
+
+ * + + {{$t('transittime')}} +
+ + + +
+
+ +
+
+ * + + {{$t('returntime')}} +
+ +
@@ -79,8 +118,12 @@ export default { formInline: { bazt:undefined, batjsj:'', + tgthsj:'', bz:'', }, + transittime:false, + returntime:false, + propflag: false, rules: { bazt: [ { @@ -98,7 +141,14 @@ export default { ], bz: [ { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' } - ] + ], + tgthsj: [ + { + required: true, + message: this.$t('cannotEmpty'), + trigger: 'change' + } + ], // designDeadline: [ // { // required: true, @@ -147,13 +197,39 @@ export default { this.formInline = { bazt:undefined, batjsj:'', + tgthsj:'', bz:'', } + this.propflag = true + this.transittime = false + this.returntime = false }else{ this.formInline.bazt = row.bazt ? row.bazt : undefined this.formInline.batjsj = row.batjsj + this.formInline.tgthsj = row.tgthsj this.formInline.bz = row.bz this.ids = row.id + if (this.formInline.bazt == 1) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if (this.formInline.bazt == 2) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if(this.formInline.bazt == 4){ + this.propflag = false + this.transittime = true + this.returntime = false + } else if(this.formInline.bazt == 5){ + this.propflag = false + this.returntime = true + this.transittime = false + }else{ + this.propflag = false + this.transittime = false + this.returntime = false + } } this.visible = true this.$nextTick(() => { @@ -183,6 +259,27 @@ export default { }) }, selectchange(value){ + if (value == 1) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if (value == 2) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if(value == 4){ + this.propflag = false + this.transittime = true + this.returntime = false + } else if(value == 5){ + this.propflag = false + this.returntime = true + this.transittime = false + }else{ + this.propflag = false + this.transittime = false + this.returntime = false + } this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.validateField('bazt') diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index 881ec68a2..9b5c13f4c 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -126,6 +126,9 @@ @click="deleteData(record)">{{ $t('delete') }} +
+ {{$t('averageapprovalperiod')}} : {{number}}{{$t('day')}} +