From 7e2ceec09205b997d72c78c5817829d84a3784d3 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 14 Sep 2021 17:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue | 56 +++++++++++++--------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index 31d8d93..68a7d66 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -12,28 +12,28 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <label>项目负责人：</label>
-          <span>{{basicInfo.principalName}}</span>
+          <span><j-ellipsis :value="basicInfo.principalName" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>应收金额：</label>
-          <span>{{basicInfo.receivableAmount}}</span>
+          <span><j-ellipsis :value="basicInfo.receivableAmount" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>备注：</label>
-          <span>{{basicInfo.remarks}}</span>
+          <span><j-ellipsis :value="basicInfo.remarks" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
 <!--      来款方式为合同的显示-->
-      <a-row :gutter="24" v-if="basicInfo.chargeWay === 2">
+      <a-row :gutter="24" v-if="!!basicInfo.contractNum">
         <a-col :span="12">
           <label>来款方式：</label>
           <span>合同</span>
         </a-col>
         <a-col :span="12">
           <label>合同编号：</label>
-          <span class="contract-num">{{basicInfo.contractNum}}</span>
+          <span class="contract-num" @click="toContractDetail">{{basicInfo.contractNum}}</span>
         </a-col>
       </a-row>
     </section>
@@ -44,61 +44,61 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <label>来款企业：</label>
-          <span>{{enterpriseInfo.companyName}}</span>
+          <span>{{basicInfo.companyName}}<j-ellipsis :value="basicInfo.receivableAmount" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>企业联系人：</label>
-          <span>{{contactsInfo.name}}</span>
+          <span>{{basicInfo.name}}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>企业联系人性别：</label>
-          <span>{{initGender(contactsInfo.gender)}}</span>
+          <span>{{basicInfo.gender_dictText}}</span>
         </a-col>
         <a-col :span="12">
           <label>企业联系人职务：</label>
-          <span>{{contactsInfo.post}}</span>
+          <span>{{basicInfo.post}}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>企业联系人电话：</label>
-          <span>{{contactsInfo.phone}}</span>
+          <span>{{basicInfo.phone}}</span>
         </a-col>
         <a-col :span="12">
           <label>企业联系人邮箱：</label>
-          <span>{{contactsInfo.email}}</span>
+          <span>{{basicInfo.email}}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>企业联系人邮编：</label>
-          <span>{{contactsInfo.postalCode}}</span>
+          <span>{{basicInfo.postalCodeContacts}}</span>
         </a-col>
         <a-col :span="12">
           <label>企业联系人地址：</label>
-          <span>{{contactsInfo.contactAddress}}</span>
+          <span><j-ellipsis :value="basicInfo.contactAddress" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>是否需要发票：</label>
-          <span>{{basicInfo.needInvoice}}</span>
+          <span>{{basicInfo.needInvoice_dictText}}</span>
         </a-col>
         <a-col :span="12">
           <label>是否打包：</label>
-          <span>{{basicInfo.pack}}</span>
+          <span>{{basicInfo.pack_dictText}}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>企业邮编：</label>
-          <span>{{enterpriseInfo.postalCode}}</span>
+          <span>{{basicInfo.postalCodeCompany}}</span>
         </a-col>
         <a-col :span="12">
           <label>企业地址：</label>
-          <span>{{enterpriseInfo.companyAddress}}</span>
+          <span><j-ellipsis :value="basicInfo.companyAddress" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
     </section>
@@ -138,6 +138,7 @@
 
 <script>
 import {queryCommonProjectById} from '@api/incomePaymentsApi'
+import JEllipsis from '@comp/jero/JEllipsis'
 // import {getAction} from "@api/manage";
 const paymentInfoList = [
   {
@@ -241,6 +242,9 @@ export default {
       logisticsInfoList,
     }
   },
+  components:{
+    JEllipsis
+  },
   methods: {
     open(record) {
       // 记录当前项目id
@@ -250,11 +254,7 @@ export default {
         if(res.success){
           console.log(res.result,'res.result')
           // 项目信息
-          this.basicInfo = res.result.project
-          // 企业信息
-          this.enterpriseInfo = res.result.company
-          // 联系人信息
-          this.contactsInfo = res.result.contacts
+          this.basicInfo = res.result
           // 到账信息
           this.paymentInfoList = res.result.paymentRecord
           // 开票邮寄信息
@@ -291,14 +291,12 @@ export default {
       window.open('https://www.ems.com.cn/', '_blank')
     },
     /*
-    * 性别格式话
+    * 去合同详情 传入合同id
     * */
-    initGender(val){
-      if(val === 1){
-        return '男'
-      }else if(val === 2){
-        return '女'
-      }
+    toContractDetail(){
+      this.$router.push({path:'/contractManagement/RevenueContractDetail',query:{
+          revenueId:this.basicInfo.contractId
+        }})
     }
   }
 }