From f3ef847baff641dc73bc3aff18ac0919fa9dd1fa Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 29 Dec 2023 11:01:03 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug79799=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2=E4=B8=BB=E8=B5=B7=E8=8D=89?=
 =?UTF-8?q?=E4=BA=BA=E5=8F=91=E5=B8=83=E8=8A=82=E7=82=B9=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterpriseStandardAnnul/modules/BaseInfoForm.vue      | 2 +-
 .../modules/MainDrafterPublishBaseInfo.vue                | 8 ++++++++
 .../enterpriseStandardSealSave/modules/BaseInfoForm.vue   | 2 +-
 .../enterpriseStandardStartUse/modules/BaseInfoForm.vue   | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardAnnul/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardAnnul/modules/BaseInfoForm.vue
index a4b5f7f5..6d7419b8 100644
--- a/src/views/workCenter/enterpriseStandardAnnul/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/enterpriseStandardAnnul/modules/BaseInfoForm.vue
@@ -231,7 +231,7 @@ export default {
         if (res.success) {
           const result = res.result
           // 标准英文名称
-          this.formInline.standardEnglishName = result.standard_english_name
+          this.formInline.englishName = result.standard_english_name
           // 代替企标编号
           this.formInline.substituteStandardNumber = result.substitute_standard_number
           // 被代替企标编号
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue
index 789cf072..dc2cf4eb 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue
@@ -99,6 +99,14 @@ export default {
     initData (data) {
       // 给表单赋值,在线编辑不知道要怎么赋值？
       this.formInline = Object.assign({}, data)
+      if (!data.releaseDate) {
+        // 没有需要回显的发布日期，带出基础信息的发布日期
+        this.formInline.releaseDate = JSON.parse(data.businessJson).release_date
+      }
+      if (!data.implementDate) {
+        // 没有需要回显的实施日期，带出基础信息的实施日期
+        this.formInline.implementDate = JSON.parse(data.businessJson).implementation_date
+      }
       // 给表单赋值
       this.$nextTick(() => {
         this.$refs.baseInfoForm.initData(data)
diff --git a/src/views/workCenter/enterpriseStandardSealSave/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardSealSave/modules/BaseInfoForm.vue
index 36e4fc37..59ad96b4 100644
--- a/src/views/workCenter/enterpriseStandardSealSave/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/enterpriseStandardSealSave/modules/BaseInfoForm.vue
@@ -231,7 +231,7 @@ export default {
         if (res.success) {
           const result = res.result
           // 标准英文名称
-          this.formInline.standardEnglishName = result.standard_english_name
+          this.formInline.englishName = result.standard_english_name
           // 代替企标编号
           this.formInline.substituteStandardNumber = result.substitute_standard_number
           // 被代替企标编号
diff --git a/src/views/workCenter/enterpriseStandardStartUse/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardStartUse/modules/BaseInfoForm.vue
index 2152f6d5..649439f4 100644
--- a/src/views/workCenter/enterpriseStandardStartUse/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/enterpriseStandardStartUse/modules/BaseInfoForm.vue
@@ -231,7 +231,7 @@ export default {
         if (res.success) {
           const result = res.result
           // 标准英文名称
-          this.formInline.standardEnglishName = result.standard_english_name
+          this.formInline.englishName = result.standard_english_name
           // 标准类型？？
           // this.formInline.standardEnglishName = result.standard_english_name
           // 代替企标编号