From ecbfc3c0c11cb33ec80c0ed3e64a4012a3a71897 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Fri, 15 Oct 2021 18:06:53 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MessagePage/ProjectDetailModal.vue   | 18 +++++++-----------
 .../modules/MineContractModule.vue             | 12 ++++++++----
 src/views/mineProject/MineProject.vue          | 14 +++++++++++---
 src/views/system/UserAnnouncementList.vue      |  2 +-
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/views/MessagePage/ProjectDetailModal.vue b/src/views/MessagePage/ProjectDetailModal.vue
index 68cc2ba..91f26f2 100644
--- a/src/views/MessagePage/ProjectDetailModal.vue
+++ b/src/views/MessagePage/ProjectDetailModal.vue
@@ -109,8 +109,6 @@
     <template slot="footer">
       <a-button @click="handleCancel">关闭</a-button>
     </template>
-
-    <mine-contract-module :visible.sync="contractDetailVisible" :contract-id="contractId"></mine-contract-module>
   </j-modal>
 </template>
 
@@ -118,7 +116,6 @@
 import { queryCommonProjectById } from '@api/incomePaymentsApi'
 import JEllipsis from '@comp/jero/JEllipsis'
 import PreviewFile from '@comp/jero/PreviewFile'
-import MineContractModule from '@views/mineContract/modules/MineContractModule'
 // import {getAction} from "@api/manage";
 const paymentInfoList = [
   {
@@ -233,17 +230,16 @@ export default {
       // 到账信息
       paymentInfoList,
       // 开票邮寄信息
-      logisticsInfoList,
-      // 合同详情
-      contractDetailVisible: false,
-      contractId: ''
+      logisticsInfoList
     }
   },
   computed: {},
   components: {
     JEllipsis,
-    PreviewFile,
-    MineContractModule
+    PreviewFile
+  },
+  created() {
+    console.log('xiangmuxiangqing')
   },
   methods: {
     open(record) {
@@ -300,8 +296,8 @@ export default {
     * */
     toContractDetail() {
       if (this.basicInfo.contractId) {
-        this.contractId = this.basicInfo.contractId
-        this.contractDetailVisible = true
+        this.$emit('openContractModule', this.basicInfo.contractId)
+
         this.handleCancel()
       } else {
         this.$message.warn('该项目未与合同关联')
diff --git a/src/views/mineContract/modules/MineContractModule.vue b/src/views/mineContract/modules/MineContractModule.vue
index 1a88015..2326407 100644
--- a/src/views/mineContract/modules/MineContractModule.vue
+++ b/src/views/mineContract/modules/MineContractModule.vue
@@ -78,17 +78,18 @@
       </div>
     </a-spin>
 
-    <project-detail-modal ref="projectDetail"></project-detail-modal>
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+    </template>
+
   </j-modal>
 </template>
 
 <script>
 import { getContractDetailById } from '@api/incomePaymentsApi'
-import ProjectDetailModal from '@views/MessagePage/ProjectDetailModal'
 
 export default {
   name: 'MineContractModule',
-  components: { ProjectDetailModal },
   props: {
     visible: {
       type: Boolean,
@@ -141,6 +142,9 @@ export default {
       associatedProjectList: [] // 关联项目信息
     }
   },
+  created() {
+    console.log(11111111)
+  },
   methods: {
     /**
      * 获取详情信息
@@ -167,7 +171,7 @@ export default {
       // 用projectId替换id
       let param = JSON.parse(JSON.stringify(record))
       param.id = param.projectId
-      this.$refs.projectDetail.open(param)
+      this.$emit('openProjectDetail', param)
       this.close()
     },
     lookLogistics() {
diff --git a/src/views/mineProject/MineProject.vue b/src/views/mineProject/MineProject.vue
index 6a644df..5239f00 100644
--- a/src/views/mineProject/MineProject.vue
+++ b/src/views/mineProject/MineProject.vue
@@ -89,7 +89,8 @@
       <!--    表格区域end-->
     </a-card>
 
-    <project-detail-modal ref="projectDetail" :project-type="1"></project-detail-modal>
+    <project-detail-modal ref="projectDetail" :project-type="1" @openContractModule="handleOpenContractModule"></project-detail-modal>
+    <mine-contract-module :contract-id="contractId" :visible.sync="contractModuleVisible" @openProjectDetail="openDetailModal"></mine-contract-module>
   </div>
 </template>
 <script>
@@ -97,10 +98,11 @@ import { JeroListMixin } from '@/mixins/JeroListMixin'
 import ProjectTable from '@comp/table/ProjectTable'
 import ProjectDetailModal from '@views/MessagePage/ProjectDetailModal'
 import StatusSlot from '@comp/tools/StatusSlot'
+import MineContractModule from '@views/mineContract/modules/MineContractModule'
 
 export default {
   name: 'MineProject',
-  components: { ProjectTable, ProjectDetailModal, StatusSlot },
+  components: { ProjectTable, ProjectDetailModal, StatusSlot, MineContractModule },
   mixins: [JeroListMixin],
   data() {
     return {
@@ -160,7 +162,9 @@ export default {
       ],
       url: {
         list: '/project/payCommonProject/queryCompanyPageList'
-      }
+      },
+      contractId: null,
+      contractModuleVisible: false
     }
   },
   methods: {
@@ -172,6 +176,10 @@ export default {
       this.ipagination.current = pagination.current
       this.ipagination.pageSize = pagination.pageSize
       this.loadData()
+    },
+    handleOpenContractModule(contractId) {
+      this.contractId = contractId
+      this.contractModuleVisible = true
     }
   }
 }
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 4aeb919..bebc446 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -55,7 +55,7 @@
             <template slot="title">
               <span v-html="text" class="ellipsis-span"></span>
             </template>
-            <span v-html="myEllipsis(text,20)" class="ellipsis-span"></span>
+            <span v-html="myEllipsis(text,50)" class="ellipsis-span"></span>
           </a-tooltip>
         </span>