From c7411a988595f4493260bbc8a414097a92354ae9 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 29 Apr 2025 17:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/company-manage/performance-manage/index.vue    | 1 -
 src/views/data-create/epc-template/index.vue             | 1 -
 .../gw-template/components/addAndEditForm.vue            | 9 +++++++--
 src/views/data-create/gw-template/index.vue              | 5 ++---
 src/views/data-create/nw-template/index.vue              | 1 -
 src/views/sub-manage/sub-manage/index.vue                | 1 -
 src/views/sub-manage/sub-performance-manage/index.vue    | 1 -
 src/views/sub-manage/sub-person-manage/index.vue         | 1 -
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/views/company-manage/performance-manage/index.vue b/src/views/company-manage/performance-manage/index.vue
index 4f5695e..9d1a23f 100644
--- a/src/views/company-manage/performance-manage/index.vue
+++ b/src/views/company-manage/performance-manage/index.vue
@@ -259,4 +259,3 @@ export default {
     },
 }
 </script>
-<style scoped lang="scss"></style>
diff --git a/src/views/data-create/epc-template/index.vue b/src/views/data-create/epc-template/index.vue
index c7071a0..8d5ef83 100644
--- a/src/views/data-create/epc-template/index.vue
+++ b/src/views/data-create/epc-template/index.vue
@@ -204,4 +204,3 @@ export default {
     },
 }
 </script>
-<style scoped lang="scss"></style>
diff --git a/src/views/data-create/gw-template/components/addAndEditForm.vue b/src/views/data-create/gw-template/components/addAndEditForm.vue
index 0b78599..d7255cc 100644
--- a/src/views/data-create/gw-template/components/addAndEditForm.vue
+++ b/src/views/data-create/gw-template/components/addAndEditForm.vue
@@ -989,6 +989,7 @@ export default {
                                 proPerf: item.proPerf,
                                 einDate: item.einDate,
                                 exitDate: item.exitDate,
+                                perfId: item.perfId,
                             })
                         })
                     }
@@ -1086,6 +1087,9 @@ export default {
                     this.companyKeyPersonList[this.keyTableCurrentIndex].proPerf = keyPersonPerformanceInnerSelectList
                         .map((item) => item.proName)
                         .join(',')
+                    this.companyKeyPersonList[this.keyTableCurrentIndex].perfId = keyPersonPerformanceInnerSelectList
+                        .map((item) => item.id)
+                        .join(',')
                 } else {
                     this.$modal.msgError('请选择人员')
                     return false
@@ -1234,6 +1238,7 @@ export default {
         async addCompanyKeyPerson() {
             this.companyKeyPersonList.push({
                 userId: '', // 人员id
+                perfId: '', // 人员业绩id
                 userName: '', // 人员名称
                 title: '', // 人员职称
                 diploma: '', // 执业资格证书
@@ -1652,16 +1657,16 @@ export default {
                             JSON.parse(
                                 JSON.stringify({
                                     ...item,
-                                    subcontractorPersonList: item.subPersonList,
                                     companyPerformanceList: item.subPerfList,
+                                    subcontractorPersonList: item.subPersonList,
                                 }),
                             ),
                         )
                     })
                 }
             } else {
-                this.$modal.msgError('详情获取失败' + res.message)
                 this.$modal.closeDialogOuter()
+                this.$modal.msgError('详情获取失败' + res.message)
             }
         },
     },
diff --git a/src/views/data-create/gw-template/index.vue b/src/views/data-create/gw-template/index.vue
index 75cd395..bf33b23 100644
--- a/src/views/data-create/gw-template/index.vue
+++ b/src/views/data-create/gw-template/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <!-- 公司业绩管理 -->
+    <!-- 国网模板 -->
     <div class="app-container">
         <el-form :model="queryParams" ref="login" label-width="0px" class="ms-content">
             <el-row :gutter="20">
@@ -185,7 +185,7 @@ export default {
                 {
                     id: row.id,
                 },
-                `国网模板_${row.name}.docx`,
+                `国网模板_${row.name}.doc`,
             )
         },
 
@@ -216,4 +216,3 @@ export default {
     },
 }
 </script>
-<style scoped lang="scss"></style>
diff --git a/src/views/data-create/nw-template/index.vue b/src/views/data-create/nw-template/index.vue
index b7c5983..bf4f4cb 100644
--- a/src/views/data-create/nw-template/index.vue
+++ b/src/views/data-create/nw-template/index.vue
@@ -204,4 +204,3 @@ export default {
     },
 }
 </script>
-<style scoped lang="scss"></style>
diff --git a/src/views/sub-manage/sub-manage/index.vue b/src/views/sub-manage/sub-manage/index.vue
index 8219bc6..1185d21 100644
--- a/src/views/sub-manage/sub-manage/index.vue
+++ b/src/views/sub-manage/sub-manage/index.vue
@@ -198,4 +198,3 @@ export default {
     },
 }
 </script>
-<style scoped lang="scss"></style>
diff --git a/src/views/sub-manage/sub-performance-manage/index.vue b/src/views/sub-manage/sub-performance-manage/index.vue
index cb89354..99427cf 100644
--- a/src/views/sub-manage/sub-performance-manage/index.vue
+++ b/src/views/sub-manage/sub-performance-manage/index.vue
@@ -253,4 +253,3 @@ export default {
     },
 }
 </script>
-<style scoped lang="scss"></style>
diff --git a/src/views/sub-manage/sub-person-manage/index.vue b/src/views/sub-manage/sub-person-manage/index.vue
index d51b49b..13ad4b4 100644
--- a/src/views/sub-manage/sub-person-manage/index.vue
+++ b/src/views/sub-manage/sub-person-manage/index.vue
@@ -232,4 +232,3 @@ export default {
     },
 }
 </script>
-<style scoped lang="scss"></style>