From 2b0bba96bd8f68468e56e479d8ed4d8cf8942b67 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 27 Dec 2023 14:04:17 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/MainDrafterCollectUploadMinuteBaseInfo.vue | 10 +++++-----
 .../modules/OtherDrafterUploadStandardBaseInfo.vue     |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
index e3561271..95fdcacf 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
@@ -89,10 +89,10 @@
           </div>
           <a-form-model-item class="item-model" prop="inspectFlag">
             <a-radio-group v-model="formInline.inspectFlag">
-              <a-radio :value="1">
+              <a-radio value="1">
                 {{ $t('yes') }}
               </a-radio>
-              <a-radio :value="0">
+              <a-radio value="0">
                 {{ $t('not') }}
               </a-radio>
             </a-radio-group>
@@ -101,7 +101,7 @@
       </div>
     </a-form-model>
     <!--  是否需要稽查选择是，需要填写稽查内容，否则隐藏稽查内容区域  -->
-    <template v-if="formInline.inspectFlag === 1">
+    <template v-if="formInline.inspectFlag === '1'">
       <!--  稽查内容  -->
       <p class="base-info-inner-title">{{ $t('enterpriseStandardLibrary.standard.auditContent') }}</p>
 
@@ -312,7 +312,7 @@ export default {
       let data = {}
       await this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          if (this.formInline.inspectFlag === 1 && this.dataSource && this.dataSource.length > 0) {
+          if (this.formInline.inspectFlag === '1' && this.dataSource && this.dataSource.length > 0) {
             if (this.dataSource.map(item => item.rectificationDepartment).every(item => !!item)) {
               // 每一个的整改部门都填了
               // 有数据可以抛出
@@ -322,7 +322,7 @@ export default {
               this.$message.warning(this.$t('pleaseCompleteTableInfo'))
               data = false
             }
-          } else if (this.formInline.inspectFlag === 0) {
+          } else if (this.formInline.inspectFlag === '0') {
             // 有数据可以抛出
             data = Object.assign({}, this.formInline)
           } else {
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/OtherDrafterUploadStandardBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/OtherDrafterUploadStandardBaseInfo.vue
index e37792a4..1f07d9ff 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/OtherDrafterUploadStandardBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/OtherDrafterUploadStandardBaseInfo.vue
@@ -121,7 +121,8 @@ export default {
       // 把数据抛出
       const data = {}
       data.otherDraftUserVOS = this.dataSource
-      return this.dataSource
+      data.businessJson = JSON.stringify(this.$refs.baseInfoForm.getData())
+      return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
     getDataValidate () {