From 5c3f70931ee26e9d31c48e4b09e69b47969638a7 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 16 Nov 2023 10:58:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98-=E8=AF=BE?=
 =?UTF-8?q?=E9=A2=98=E7=BB=84=E8=B5=84=E6=96=99-=E5=85=B6=E4=BB=96-?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/policyTopicsDetail/index.vue    |  4 ++--
 .../policyTopics/components/editDrawer.vue        | 15 ++++++++++++---
 .../components/ResearchGroupMaterials.vue         |  6 +++---
 .../creatProcess/policyTopicEnrollment/index.vue  |  4 ++--
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/pages/details/policyTopicsDetail/index.vue b/src/pages/details/policyTopicsDetail/index.vue
index 75b317094..a16af192f 100644
--- a/src/pages/details/policyTopicsDetail/index.vue
+++ b/src/pages/details/policyTopicsDetail/index.vue
@@ -98,8 +98,8 @@
               <div class="whole" style="display: flex;border-bottom: 1px solid #E5E5E5">
                 <label style=" margin-right: 164px;line-height: 44px">其他</label>
                 <div style="min-height: 44px;padding: 8px 0;">
-                  <template v-if="form.otherList && form.otherList.length > 0">
-                    <p class="file-item" v-for="file in form.otherList">
+                  <template v-if="form.researchGroupOtherList && form.researchGroupOtherList.length > 0">
+                    <p class="file-item" v-for="file in form.researchGroupOtherList">
                       <a class="file-title" target="_blank" :title="file.oldFileName" @click="openFileInPdf(file.id, file.oldFileName)">{{ file.oldFileName }}</a>
                       <i title="下载" class="icon-download" @click="downloadFile(file.id)"></i>
                       <i title="下载带水印" class="icon-download2" @click="downloadFileByWater(file.id, file.fileSuffix)"></i>
diff --git a/src/pages/policyRegulation/policyTopics/components/editDrawer.vue b/src/pages/policyRegulation/policyTopics/components/editDrawer.vue
index 2a1cce572..d9fc20f35 100644
--- a/src/pages/policyRegulation/policyTopics/components/editDrawer.vue
+++ b/src/pages/policyRegulation/policyTopics/components/editDrawer.vue
@@ -165,9 +165,9 @@
             <customFile
                 :config="{
                   attrName: '其他',
-                  attrField: 'other'
+                  attrField: 'researchGroupOther'
                 }"
-                v-model="form.other"
+                v-model="form.researchGroupOther"
             ></customFile>
           </el-col>
           <el-col :span="12">
@@ -442,7 +442,7 @@ export default {
       // 课题组资料
       researchPlan: '',
       researchFindings: '',
-      other: '',
+      researchGroupOther: '',
       conferenceMaterials: '',
       // 课题组联系方式
       topicContactInformationList: [
@@ -498,6 +498,15 @@ export default {
     showDrawer (val) {
       if (this.title === '编辑') {
         this.form = { ...this.editForm }
+        if (this.editForm.meetingList.length < 1) {
+          this.form.meetingList = JSON.parse(JSON.stringify(this.initForm.meetingList))
+        }
+        if (this.editForm.topicContactInformationList.length < 1) {
+          this.form.topicContactInformationList = JSON.parse(JSON.stringify(this.initForm.topicContactInformationList))
+        }
+        if (this.editForm.insideContactInformationList.length < 1) {
+          this.form.insideContactInformationList = JSON.parse(JSON.stringify(this.initForm.insideContactInformationList))
+        }
       } else {
         this.resetForm()
       }
diff --git a/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/components/ResearchGroupMaterials.vue b/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/components/ResearchGroupMaterials.vue
index 3843ced4f..f66b260fe 100644
--- a/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/components/ResearchGroupMaterials.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/components/ResearchGroupMaterials.vue
@@ -20,9 +20,9 @@
       <el-col :span="12">
         <UploadFormItem
             label="其他"
-            prop="other"
-            :ids.sync="form.other"
-            :names.sync="form.otherName"
+            prop="researchGroupOther"
+            :ids.sync="form.researchGroupOther"
+            :names.sync="form.researchGroupOtherName"
             :disabled="disabled">
         </UploadFormItem>
         <UploadFormItem
diff --git a/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/index.vue b/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/index.vue
index 3c99fa3ea..711da01b1 100644
--- a/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/index.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/index.vue
@@ -159,8 +159,8 @@ export default {
       researchPlanName: '',
       researchFindings: '',
       researchFindingsName: '',
-      other: '',
-      otherName: '',
+      researchGroupOther: '',
+      researchGroupOtherName: '',
       conferenceMaterials: '',
       conferenceMaterialsName: '',
       // 课题组联系方式