From 17dde52ed88a1ee8bb1046157b3fe3f54d0c0ba7 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 20 Apr 2022 18:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=9A=84=E7=BC=96=E8=BE=91=202.=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BC=96=E8=BE=91=E5=86=85=E5=AE=B9=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProjectDetails.vue             | 31 ++++++++++++++++---
 .../components/listEditModel.vue              |  7 ++++-
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index c888b1039..d390b8a38 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -162,28 +162,46 @@
       </a-tab-pane>
     </a-tabs>
     <listOfRelevantPersonnel ref="listOfRelevantPersonnelRef"/>
+    <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
   </div>
 </template>
 
 <script>
   import * as echarts from 'echarts'
   import listOfRelevantPersonnel from './listOfRelevantPersonnel'
+  import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+  import addModel from './addModel'
 
   export default {
     name: 'ProjectDetails',
     components: {
-      listOfRelevantPersonnel
+      listOfRelevantPersonnel,
+      addModel
     },
     data() {
       return {
-        queryForm: {}
+        queryForm: {},
+        url: {
+          queryById: 'project/projectLibraryBase/queryById',
+          add: 'project/projectLibraryBase/add',
+          edit: 'project/projectLibraryBase/edit'
+        }
       }
     },
     mounted() {
-      this.queryForm = this.$route.query
+      this.getForm()
       this.mainEcharts()
     },
     methods: {
+      getForm() {
+        getAction(this.url.queryById, { id: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            this.queryForm = res.result[0] || {}
+          } else {
+            this.queryForm = {}
+          }
+        })
+      },
       mainEcharts() {
         var myChart = echarts.init(document.getElementById('main'))
         myChart.setOption({
@@ -212,9 +230,12 @@
           window.open(val)
         }
       },
-      edit(){
-
+      edit() {
+        this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(this.queryForm)))
       },
+      addModelList() {
+        this.getForm()
+      }
     }
   }
 </script>
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 4f983c1d1..dfa8213da 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -760,7 +760,12 @@
       },
       editModel(item) {
         this.visible = true
-        this.queryPersonByProject(item)
+        if (item.dutyTerritory) {
+          this.queryPersonByProject(item)
+        } else {
+          this.formInline = item
+          this.formInline = { ...this.formInline }
+        }
         this.$nextTick(() => {
           this.rules = {}
           switch (item.roleCode) {