From a118492b539f00f5bdd60fb68acc2c3c9db7313c Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Mon, 18 Oct 2021 10:24:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E3=80=81?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=A6=E6=83=85=E4=BA=92=E7=9B=B8=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MessagePage/ProjectDetailModal.vue |  8 +-------
 src/views/mineContract/MineContract.vue      |  9 ++++++++-
 src/views/mineProject/MineProject.vue        |  2 +-
 src/views/workTeam/WorkTeam.vue              | 13 ++++++++++++-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/views/MessagePage/ProjectDetailModal.vue b/src/views/MessagePage/ProjectDetailModal.vue
index 91f26f2..1334202 100644
--- a/src/views/MessagePage/ProjectDetailModal.vue
+++ b/src/views/MessagePage/ProjectDetailModal.vue
@@ -15,7 +15,7 @@
           <span><j-ellipsis :value="basicInfo.chargeProject" :length="20"></j-ellipsis></span>
         </a-col>
         <!--        我的项目--款项用途-->
-        <a-col :span="12" v-if="projectType === 1" class="detail-item">
+        <a-col :span="12" v-if="basicInfo.projectType === 1" class="detail-item">
           <label>款项用途：</label>
           <span><j-ellipsis :value="basicInfo.chargeUse_dictText" :length="20"></j-ellipsis></span>
         </a-col>
@@ -204,12 +204,6 @@ export default {
       type: Boolean,
       required: false,
       default: false
-    },
-    // 项目类型，我的项目--1；
-    projectType: {
-      type: Number,
-      required: false,
-      default: null
     }
   },
   data() {
diff --git a/src/views/mineContract/MineContract.vue b/src/views/mineContract/MineContract.vue
index d951a51..57d61ba 100644
--- a/src/views/mineContract/MineContract.vue
+++ b/src/views/mineContract/MineContract.vue
@@ -124,7 +124,14 @@ export default {
     openDetail(id) {
       this.contractId = id
       this.detailVisible = true
-    }
+    },
+    /*
+    * 打开项目详情模态框
+    * */
+    openDetailModal(record) {
+      this.projectType = record.projectType
+      this.$refs.projectDetail.open(record)
+    },
   }
 }
 </script>
diff --git a/src/views/mineProject/MineProject.vue b/src/views/mineProject/MineProject.vue
index 5239f00..b1681fd 100644
--- a/src/views/mineProject/MineProject.vue
+++ b/src/views/mineProject/MineProject.vue
@@ -89,7 +89,7 @@
       <!--    表格区域end-->
     </a-card>
 
-    <project-detail-modal ref="projectDetail" :project-type="1" @openContractModule="handleOpenContractModule"></project-detail-modal>
+    <project-detail-modal ref="projectDetail" @openContractModule="handleOpenContractModule"></project-detail-modal>
     <mine-contract-module :contract-id="contractId" :visible.sync="contractModuleVisible" @openProjectDetail="openDetailModal"></mine-contract-module>
   </div>
 </template>
diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue
index 8c11e0c..f8130a2 100644
--- a/src/views/workTeam/WorkTeam.vue
+++ b/src/views/workTeam/WorkTeam.vue
@@ -90,7 +90,8 @@
 
     </a-card>
 
-    <project-detail-modal ref="projectDetail"></project-detail-modal>
+    <project-detail-modal ref="projectDetail" @openContractModule="handleOpenContractModule"></project-detail-modal>
+    <mine-contract-module :contract-id="contractId" :visible.sync="contractModuleVisible" @openProjectDetail="openDetailModal"></mine-contract-module>
   </div>
 </template>
 <script>
@@ -154,6 +155,8 @@ export default {
           col: 2
         }
       ],
+      contractId: null,
+      contractModuleVisible: false,
       url: {
         list: '/project/payWorkingGroupSubitem/queryCompanyPageList'
       }
@@ -176,6 +179,14 @@ export default {
           meetingType:'1'
         }
       })
+    },
+    /**
+     * 打开合同详情
+     * @param contractId
+     */
+    handleOpenContractModule(contractId) {
+      this.contractId = contractId
+      this.contractModuleVisible = true
     }
   }
 }