From 6a38495b8f31c1f2f00aa315a3118a7b51db24ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Wed, 29 Mar 2023 10:05:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/globalAdvancedQuery/index.vue | 6 +++--- .../components/listAddModel.vue | 12 ++++++------ .../components/modules/addModel.vue | 16 ++++++++-------- .../components/virtualListDetails.vue | 14 +++++++------- .../ParameterItemCollectionList.vue | 17 ++++++++--------- .../components/certificationList/index.vue | 11 +++++------ .../components/listAddModel.vue | 12 ++++++------ .../components/listOfRegulations.vue | 11 +++++------ .../src/views/regulationsKanban/index.vue | 19 +++++++++---------- 9 files changed, 57 insertions(+), 61 deletions(-) diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index b8e71934d..82c5b4f2b 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -11,15 +11,15 @@ {{$t('empty')}} - + {{$t('advancedQuery')}} - + - {{$t('advancedQuery')}} + {{$t('advancedQuery')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue index 83303ced2..891996117 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue @@ -45,15 +45,15 @@ - - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 41ef684b2..e2577d9e7 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -94,15 +94,15 @@ - - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 9fe341730..968fc7dff 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -110,16 +110,15 @@ class="table-page-search-submitButtons"> - - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 48626c18f..0c407627d 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -48,12 +48,11 @@ - - {{ $t('query') }} - {{ $t('reset') }} + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/projectManagement/components/listAddModel.vue b/jero-web/src/views/projectManagement/components/listAddModel.vue index 357bafbd2..e639112d9 100644 --- a/jero-web/src/views/projectManagement/components/listAddModel.vue +++ b/jero-web/src/views/projectManagement/components/listAddModel.vue @@ -45,15 +45,15 @@ + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 34ba87b53..e3c918e25 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -79,12 +79,11 @@ - - {{ $t('query') }} - {{ $t('reset') }} + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 7bce34131..2f6e21cb8 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -54,16 +54,15 @@ - - {{ $t('query') }} - {{ $t('reset') }} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} + From d317ece1d23eb3c228ce56ce44ddb6e004ea7019 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 10:15:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeactivity/components/upgradecompletion.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index 8b1479d10..3fa22b2c4 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -152,6 +152,7 @@ {{ (formInline.ssjlfj === 'null' || formInline.ssjlfj === '' || formInline.ssjlfj == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -243,10 +244,17 @@ export default { this.showButton=true } this.record=record - this.visible = true this.confirmLoading = false - console.log('555',record); + console.log('555',record); + getAction('/ota/otaBaSjJssj/queryByOtaId',{otaId:this.record.id}).then(res=>{ + if(res.code==200){ + this.formInline=res.result ==null? {list:[{}]} :res.result + if(res.result.list==null ||res.result.list.length==0){ + this.formInline.list=[{}] + } + } + }) this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate()