From 0e829b33040d11044d99909c553c9c23949b1d28 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 27 Mar 2023 16:05:27 +0800
Subject: [PATCH] bug 67300 bug 67307 bug 67303

---
 .../components/maintenance.vue                | 17 +++++++++---
 .../otamanagement/upgradeactivity/index.vue   |  4 +--
 .../auxiliaryupgradehavechanged.vue           |  2 +-
 .../thetargetvehicleofthisupgrade.vue         |  2 +-
 .../components/upgradehavechanged.vue         |  2 +-
 .../components/upgradeimpactassessment.vue    |  2 +-
 .../components/upgradetargetmodel.vue         |  2 +-
 .../components/usernotification.vue           |  2 +-
 .../components/maintenance.vue                | 26 +++++++++++++++----
 .../vehicleregistration/index.vue             |  6 ++---
 10 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue
index 75237d8fc..0993686b4 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue
@@ -41,7 +41,7 @@
                              :getCalendarContainer="(trigger) => trigger.parentNode"
                              v-model="formInline.batjsj"
                              :disabled="false"
-                             style="width: 100%"/>
+                             style="width: 90%"/>
             </a-form-model-item>
           </div>
         </a-col>
@@ -52,9 +52,10 @@
               <span class="title-text-text" :title="$t('remarks')">
                 {{$t('remarks')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="remarks">
+            <a-form-model-item class="itemModel" prop="bz">
               <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
                           v-model="formInline.bz"
+                          style="width: 90%"
                           :rows="4"/>
             </a-form-model-item>
           </div>
@@ -95,6 +96,9 @@ export default {
             trigger: 'change'
           }
         ],
+        bz: [
+          { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' }
+        ]
         // listConfirmation: [
         //   {
         //     required: true,
@@ -154,6 +158,11 @@ export default {
     edit(row) {
       if(row instanceof Array){
         this.ids = row.join(',')
+        this.formInline = {
+          bazt:undefined,
+          batjsj:'',
+          bz:'',
+        }
       }else{
         this.formInline.bazt = row.bazt ? row.bazt : undefined
         this.formInline.batjsj = row.batjsj
@@ -189,7 +198,7 @@ export default {
     },
     handleCancel() {
       this.formInline = {
-        bazt:'',
+        bazt:undefined,
         batjsj:'',
         bz:'',}
       this.ids = ''
@@ -274,7 +283,7 @@ export default {
 .box-input {
   display: inline-block;
   height: 38px;
-  width: 100%;
+  width: 90%;
 }
 
 .itemModel {
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
index 7ac514e96..42ea1fcf1 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
@@ -111,7 +111,7 @@
       <div v-has="'regulatoryAndTechnicalAssessment:batchDelete'"
            class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true"
-                    :accept="'.zip'"/>
+                    :accept="'.zip'" @getList="getList"/>
       </div>
       <div @click="handleModule"
            v-has="'regulatoryAndTechnicalAssessment:batchDelete'"
@@ -235,7 +235,7 @@ export default {
       ],
       columns: [
         {
-          title: this.$t('registrationnumber'),
+          title: this.$t('upgraderegistrationnumber'),
           align: 'left',
           dataIndex: 'cpdjbh',
           ellipsis: true,
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
index 22bcac59c..fdd3d3a7a 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
@@ -3,7 +3,7 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
       </div>
       <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
index 161896a0e..23fd852bf 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
@@ -3,7 +3,7 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"  @getList="getData"/>
       </div>
       <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
index 4193f643a..d9357c17f 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
@@ -3,7 +3,7 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"  @getList="getData"/>
       </div>
       <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index 14424544b..2f91e3e28 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -3,7 +3,7 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"  @getList="getData"/>
       </div>
       <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index c77924cae..bee003e7b 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -3,7 +3,7 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"  @getList="getData"/>
       </div>
       <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
index 5a5717e53..a226d99b5 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
@@ -3,7 +3,7 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"  @getList="getData"/>
       </div>
       <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
index 98267cd05..ddba93e87 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
@@ -20,6 +20,7 @@
             </div>
             <a-form-model-item class="itemModel" prop="bazt">
               <j-dict-select-tag class="box-input" v-model="formInline.bazt"
+                                 @input="selectchange"
                                  :placeholder="$t('PleaseSelect')+$t('recordstatus')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'recordstatus'"/>
@@ -40,7 +41,7 @@
                              format="YYYY-MM-DD"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
                              v-model="formInline.batjsj"
-                             style="width: 100%"/>
+                             style="width: 90%"/>
             </a-form-model-item>
           </div>
         </a-col>
@@ -51,9 +52,10 @@
               <span class="title-text-text" :title="$t('remarks')">
                 {{$t('remarks')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="remarks">
+            <a-form-model-item class="itemModel" prop="bz">
               <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
                           v-model="formInline.bz"
+                          style="width: 90%"
                           :rows="4"/>
             </a-form-model-item>
           </div>
@@ -75,7 +77,7 @@ export default {
       visible: false,
       confirmLoading: false,
       formInline: {
-        bazt:'',
+        bazt:undefined,
         batjsj:'',
         bz:'',
       },
@@ -94,6 +96,9 @@ export default {
             trigger: 'change'
           }
         ],
+        bz: [
+          { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' }
+        ]
         // designDeadline: [
         //   {
         //     required: true,
@@ -139,6 +144,11 @@ export default {
     edit(row) {
       if(row instanceof Array){
         this.ids = row.join(',')
+        this.formInline = {
+            bazt:undefined,
+            batjsj:'',
+            bz:'',
+        }
       }else{
         this.formInline.bazt = row.bazt ? row.bazt : undefined
         this.formInline.batjsj = row.batjsj
@@ -172,9 +182,15 @@ export default {
         }
       })
     },
+    selectchange(value){
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField('bazt')
+      })
+    },
     handleCancel() {
       this.formInline = {
-        bazt:'',
+        bazt:undefined,
         batjsj:'',
         bz:'',}
       this.ids = ''
@@ -259,7 +275,7 @@ export default {
 .box-input {
   display: inline-block;
   height: 38px;
-  width: 100%;
+  width: 90%;
 }
 
 .itemModel {
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
index 84613bcec..9ddc8ef68 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
@@ -6,10 +6,10 @@
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
-              <div class="title-text" :title="$t('upgraderegistrationnumber')">
-                <span>{{ $t('upgraderegistrationnumber') }}</span>
+              <div class="title-text" :title="$t('registrationnumber')">
+                <span>{{ $t('registrationnumber') }}</span>
               </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter') + $t('upgraderegistrationnumber')"
+              <a-input class="box-input" :placeholder="$t('PleaseEnter') + $t('registrationnumber')"
                 v-model="queryParam.cpdjbh"></a-input>
             </div>
           </a-col>