From 5d9d66da3b1633cbaa8b9d5c7e02c267fa3fadb1 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 2 Aug 2022 17:06:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98=E7=9F=A5?=
 =?UTF-8?q?=E8=AF=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/modules/defaultTemplate.vue    | 12 ++--
 .../components/modules/releaseStandard.vue    | 58 +++++++++++--------
 .../components/modules/solicitOpinions.vue    | 52 ++++++++++-------
 3 files changed, 69 insertions(+), 53 deletions(-)

diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
index f8b17a2ce..23ffd3f15 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
@@ -10,7 +10,7 @@
           <a-form-model-item class="itemModel" prop="titleCn">
             <a-input class="box-input"
                      :disabled="disabled"
-                     v-model="formInline.titleCn"
+                     v-model.trim="formInline.titleCn"
                      :placeholder="$t('PleaseEnter')+$t('title')"/>
           </a-form-model-item>
         </div>
@@ -24,7 +24,7 @@
           <a-form-model-item class="itemModel" prop="titleEn">
             <a-input class="box-input"
                      :disabled="disabled"
-                     v-model="formInline.titleEn"
+                     v-model.trim="formInline.titleEn"
                      :placeholder="$t('PleaseEnter')+$t('englishTitle')"/>
           </a-form-model-item>
         </div>
@@ -128,7 +128,7 @@
           <a-form-model-item class="itemModel" prop="implementCar">
             <a-input class="box-input"
                      :disabled="disabled"
-                     v-model="formInline.implementCar"
+                     v-model.trim="formInline.implementCar"
                      :placeholder="$t('PleaseEnter')+$t('implementationModel')"/>
           </a-form-model-item>
         </div>
@@ -158,7 +158,7 @@
           <a-form-model-item class="itemModel" prop="newCarImplementTime">
             <a-input class="box-input"
                      :disabled="disabled"
-                     v-model="formInline.newCarImplementTime"
+                     v-model.trim="formInline.newCarImplementTime"
                      :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"/>
           </a-form-model-item>
         </div>
@@ -172,7 +172,7 @@
           <a-form-model-item class="itemModel" prop="productionCarImplementTime">
             <a-input class="box-input"
                      :disabled="disabled"
-                     v-model="formInline.productionCarImplementTime"
+                     v-model.trim="formInline.productionCarImplementTime"
                      :placeholder="$t('PleaseEnter')+$t('vehicleInProductionDate')"/>
           </a-form-model-item>
         </div>
@@ -267,7 +267,7 @@
           <a-form-model-item class="itemModel" prop="link">
             <a-input class="box-input"
                      :disabled="disabled"
-                     v-model="formInline.link"
+                     v-model.trim="formInline.link"
                      :placeholder="$t('PleaseEnter')+$t('link')"/>
           </a-form-model-item>
         </div>
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue
index afea487f4..8fe91d578 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue
@@ -1,15 +1,15 @@
 <template>
   <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-    <div v-for="(item,index) in dataList" :key="index">
+    <div v-for="(item,index) in formInline.dataList" :key="index">
       <div class="feedbackPoint">
         {{'NO.'+(index+1)}}
         <a-icon class="icon-size"
                 @click="addData"
-                v-if="(dataList.length-1) == index && !disabled"
+                v-if="(formInline.dataList.length-1) == index && !disabled"
                 type="plus-circle"/>
         <a-icon class="icon-size"
                 @click="deleteData"
-                v-if="dataList.length > 1 && (dataList.length - 1) == index && !disabled"
+                v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
                 type="minus-circle"/>
       </div>
       <a-row :gutter="24">
@@ -18,10 +18,13 @@
             <div class="title-text">
               <span class="title-text-text" :title="$t('standardNo')">{{$t('standardNo')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="standardNo">
+            <a-form-model-item class="itemModel"
+                               :prop="'dataList.'+index+'.standardNumber'"
+                               :rules="[{max: 100,message: $t('standardNo') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
+                               }]">
               <a-input class="box-input"
                        :disabled="disabled"
-                       v-model="item.standardNumber"
+                       v-model.trim="item.standardNumber"
                        :placeholder="$t('PleaseEnter')+$t('standardNo')"/>
             </a-form-model-item>
           </div>
@@ -32,10 +35,13 @@
               <span class="title-text-text"
                     :title="$t('standardNameCn')">{{$t('standardNameCn')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="standardNameCn">
+            <a-form-model-item class="itemModel"
+                               :prop="'dataList.'+index+'.standardNameCn'"
+                               :rules="[{max: 100,message: $t('standardNameCn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
+                               }]">
               <a-input class="box-input"
                        :disabled="disabled"
-                       v-model="item.standardNameCn"
+                       v-model.trim="item.standardNameCn"
                        :placeholder="$t('PleaseEnter')+$t('standardNameCn')"/>
             </a-form-model-item>
           </div>
@@ -47,10 +53,13 @@
             <div class="title-text">
               <span class="title-text-text" :title="$t('standardNameEn')">{{$t('standardNameEn')}}</span>
             </div>
-            <a-form-model-item class="itemModel">
+            <a-form-model-item class="itemModel"
+                               :prop="'dataList.'+index+'.standardNameEn'"
+                               :rules="[{max: 100,message: $t('standardNameEn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
+                               }]">
               <a-input class="box-input"
                        :disabled="disabled"
-                       v-model="item.standardNameEn"
+                       v-model.trim="item.standardNameEn"
                        :placeholder="$t('PleaseEnter')+$t('standardNameEn')"/>
             </a-form-model-item>
           </div>
@@ -101,13 +110,12 @@
 
   export default {
     name: 'releaseStandard',
-    props:['formInlineQuery','disabled'],
+    props: ['formInlineQuery', 'disabled'],
     data() {
       return {
         rules: {},
         formInline: {},
-        CategoryTreeList: [],
-        dataList: []
+        CategoryTreeList: []
       }
     },
     mounted() {
@@ -115,19 +123,19 @@
         if (this.formInlineQuery.id) {
           this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery))
           this.formInline = { ...this.formInline }
-          this.dataList = this.formInline.newStandardTemplateEOList
-          this.dataList = [...this.dataList]
+          this.formInline.dataList = this.formInline.newStandardTemplateEOList
+          this.formInline = { ...this.formInline }
         } else {
-          this.dataList = [
+          this.formInline.dataList = [
             {
               standardNumber: '',
               standardNameCn: '',
               standardNameEn: '',
               issueTime: '',
-              implementTime:'',
+              implementTime: ''
             }
           ]
-          this.dataList = [...this.dataList]
+          this.formInline = { ...this.formInline }
         }
       })
     },
@@ -139,28 +147,28 @@
         })
       },
       addData() {
-        this.dataList.push({
+        this.formInline.dataList.push({
           standardNumber: '',
           standardNameCn: '',
           standardNameEn: '',
           issueTime: '',
-          implementTime:'',
+          implementTime: ''
         })
-        this.dataList = [...this.dataList]
+        this.formInline = { ...this.formInline }
       },
       deleteData() {
-        this.dataList.pop()
-        this.dataList = [...this.dataList]
+        this.formInline.dataList.pop()
+        this.formInline = { ...this.formInline }
       },
-      dateChange(item,index) {
-        this.dataList[index][item] = this.dataList[index][item] ? moment(this.dataList[index][item]).format('YYYY-MM-DD') : ''
+      dateChange(item, index) {
+        this.formInline.dataList[index][item] = this.formInline.dataList[index][item] ? moment(this.formInline.dataList[index][item]).format('YYYY-MM-DD') : ''
       },
       getData(callback) {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             let query = {
               id: this.formInline.id,
-              newStandardTemplateEOList: this.dataList
+              newStandardTemplateEOList: this.formInline.dataList
             }
             callback && callback(query)
           }
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue
index 271a1c8d7..905c0be26 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue
@@ -1,15 +1,15 @@
 <template>
   <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-    <div v-for="(item,index) in dataList" :key="index">
+    <div v-for="(item,index) in formInline.dataList" :key="index">
       <div class="feedbackPoint">
         {{'NO.'+(index+1)}}
         <a-icon class="icon-size"
                 @click="addData"
-                v-if="(dataList.length-1) == index && !disabled"
+                v-if="(formInline.dataList.length-1) == index && !disabled"
                 type="plus-circle"/>
         <a-icon class="icon-size"
                 @click="deleteData"
-                v-if="dataList.length > 1 && (dataList.length - 1) == index && !disabled"
+                v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
                 type="minus-circle"/>
       </div>
       <a-row :gutter="24">
@@ -18,10 +18,13 @@
             <div class="title-text">
               <span class="title-text-text" :title="$t('planNoChinese')">{{$t('planNoChinese')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="planNoChinese">
+            <a-form-model-item class="itemModel"
+                               :prop="'dataList.'+index+'.planNumberCn'"
+                               :rules="[{max: 100,message: $t('planNoChinese') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
+                               }]">
               <a-input class="box-input"
                        :disabled="disabled"
-                       v-model="item.planNumberCn"
+                       v-model.trim="item.planNumberCn"
                        :placeholder="$t('PleaseEnter')+$t('planNoChinese')"/>
             </a-form-model-item>
           </div>
@@ -32,10 +35,13 @@
               <span class="title-text-text"
                     :title="$t('standardNameCn')">{{$t('standardNameCn')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="standardNameCn">
+            <a-form-model-item class="itemModel"
+                               :prop="'dataList.'+index+'.standardNameCn'"
+                               :rules="[{max: 100,message: $t('standardNameCn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
+                               }]">
               <a-input class="box-input"
                        :disabled="disabled"
-                       v-model="item.standardNameCn"
+                       v-model.trim="item.standardNameCn"
                        :placeholder="$t('PleaseEnter')+$t('standardNameCn')"/>
             </a-form-model-item>
           </div>
@@ -47,10 +53,13 @@
             <div class="title-text">
               <span class="title-text-text" :title="$t('standardNameEn')">{{$t('standardNameEn')}}</span>
             </div>
-            <a-form-model-item class="itemModel">
+            <a-form-model-item class="itemModel"
+                               :prop="'dataList.'+index+'.standardNameEn'"
+                               :rules="[{max: 100,message: $t('standardNameEn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
+                               }]">
               <a-input class="box-input"
                        :disabled="disabled"
-                       v-model="item.standardNameEn"
+                       v-model.trim="item.standardNameEn"
                        :placeholder="$t('PleaseEnter')+$t('standardNameEn')"/>
             </a-form-model-item>
           </div>
@@ -82,13 +91,12 @@
 
   export default {
     name: 'solicitOpinions',
-    props: ['formInlineQuery','disabled'],
+    props: ['formInlineQuery', 'disabled'],
     data() {
       return {
         rules: {},
         formInline: {},
-        CategoryTreeList: [],
-        dataList: []
+        CategoryTreeList: []
       }
     },
     mounted() {
@@ -96,10 +104,10 @@
         if (this.formInlineQuery.id) {
           this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery))
           this.formInline = { ...this.formInline }
-          this.dataList = this.formInline.newOpinionTemplateEOList
-          this.dataList = [...this.dataList]
+          this.formInline.dataList = this.formInline.newOpinionTemplateEOList
+          this.formInline = { ...this.formInline }
         } else {
-          this.dataList = [
+          this.formInline.dataList = [
             {
               planNumberCn: '',
               standardNameCn: '',
@@ -107,7 +115,7 @@
               expirationDate: ''
             }
           ]
-          this.dataList = [...this.dataList]
+          this.formInline = { ...this.formInline }
         }
       })
     },
@@ -119,27 +127,27 @@
         })
       },
       addData() {
-        this.dataList.push({
+        this.formInline.dataList.push({
           planNumberCn: '',
           standardNameCn: '',
           standardNameEn: '',
           expirationDate: ''
         })
-        this.dataList = [...this.dataList]
+        this.formInline = { ...this.formInline }
       },
       deleteData() {
-        this.dataList.pop()
-        this.dataList = [...this.dataList]
+        this.formInline.dataList.pop()
+        this.formInline = { ...this.formInline }
       },
       dateChange(item, index) {
-        this.dataList[index][item] = this.dataList[index][item] ? moment(this.dataList[index][item]).format('YYYY-MM-DD') : ''
+        this.formInline.dataList[index][item] = this.formInline.dataList[index][item] ? moment(this.formInline.dataList[index][item]).format('YYYY-MM-DD') : ''
       },
       getData(callback) {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             let query = {
               id: this.formInline.id,
-              newOpinionTemplateEOList: this.dataList
+              newOpinionTemplateEOList: this.formInline.dataList
             }
             callback && callback(query)
           }