From 71e5a697f67ec1c42f1ba6993ce48224eab53176 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 4 Aug 2022 18:01:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/modules/defaultTemplate.vue       | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 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 23ffd3f15..3ccb0896f 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
@@ -249,11 +249,11 @@
           </div>
           <a-form-model-item class="itemModel">
             <PersonnelSelection
-              :query="{db_field_name:'lawsContactName',db_field_txt:$t('regulatoryContact')}"
+              :query="{db_field_name:'lawsContact',db_field_txt:$t('regulatoryContact')}"
               :personneQuery="formInline"
               :disabled="disabled"
               @change="PersonnelSelectionChange"
-              v-model="formInline.lawsContact"/>
+              v-model="formInline.lawsContactName"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -382,6 +382,12 @@
           } else {
             this.formInline.technologyTerritory = []
           }
+          if (!this.formInline.useMethod) {
+            this.formInline.useMethod = undefined
+          }
+          if (!this.formInline.state) {
+            this.formInline.state = undefined
+          }
           this.formInline = { ...this.formInline }
         } else {
           this.formInline = {}
@@ -443,6 +449,12 @@
                 formInline[res] = formInline[res].join(',')
               }
             })
+            if (!formInline.state || formInline.state == '' || formInline.state == 'null') {
+              formInline.state = ''
+            }
+            if (!formInline.useMethod || formInline.useMethod == '' || formInline.useMethod == 'null') {
+              formInline.useMethod = ''
+            }
             callback && callback(formInline)
           }
         })