From 631d3131cd61546f1803f8e7ce5efcbf344a58c3 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 13 Sep 2021 18:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue         | 161 +++++++++++-------
 .../incomePayments/meetManage/Attendance.vue  |   3 +-
 2 files changed, 105 insertions(+), 59 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index 163beb9..31d8d93 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -1,28 +1,39 @@
 <template>
   <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      switchFullscreen
-      @cancel="handleCancel"
-      cancelText="关闭">
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @cancel="handleCancel"
+    cancelText="关闭">
     <!-- 基本信息begin-->
     <section class="base-info">
       <h3 class="title">基本信息</h3>
       <a-row :gutter="24">
         <a-col :span="12">
-          <label>项目负责人:</label>
-          <span></span>
+          <label>项目负责人：</label>
+          <span>{{basicInfo.principalName}}</span>
         </a-col>
         <a-col :span="12">
-          <label>应收金额:</label>
-          <span></span>
+          <label>应收金额：</label>
+          <span>{{basicInfo.receivableAmount}}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
-          <label>备注:</label>
-          <span></span>
+          <label>备注：</label>
+          <span>{{basicInfo.remarks}}</span>
+        </a-col>
+      </a-row>
+<!--      来款方式为合同的显示-->
+      <a-row :gutter="24" v-if="basicInfo.chargeWay === 2">
+        <a-col :span="12">
+          <label>来款方式：</label>
+          <span>合同</span>
+        </a-col>
+        <a-col :span="12">
+          <label>合同编号：</label>
+          <span class="contract-num">{{basicInfo.contractNum}}</span>
         </a-col>
       </a-row>
     </section>
@@ -32,62 +43,62 @@
       <h3 class="title">企业信息</h3>
       <a-row :gutter="24">
         <a-col :span="12">
-          <label>来款企业:</label>
-          <span></span>
+          <label>来款企业：</label>
+          <span>{{enterpriseInfo.companyName}}</span>
         </a-col>
         <a-col :span="12">
-          <label>企业联系人:</label>
-          <span></span>
+          <label>企业联系人：</label>
+          <span>{{contactsInfo.name}}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
-          <label>企业联系人性别:</label>
-          <span></span>
+          <label>企业联系人性别：</label>
+          <span>{{initGender(contactsInfo.gender)}}</span>
         </a-col>
         <a-col :span="12">
-          <label>企业联系人职务:</label>
-          <span></span>
+          <label>企业联系人职务：</label>
+          <span>{{contactsInfo.post}}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
-          <label>企业联系人电话:</label>
-          <span></span>
+          <label>企业联系人电话：</label>
+          <span>{{contactsInfo.phone}}</span>
         </a-col>
         <a-col :span="12">
-          <label>企业联系人邮箱:</label>
-          <span></span>
+          <label>企业联系人邮箱：</label>
+          <span>{{contactsInfo.email}}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
-          <label>企业联系人邮编:</label>
-          <span></span>
+          <label>企业联系人邮编：</label>
+          <span>{{contactsInfo.postalCode}}</span>
         </a-col>
         <a-col :span="12">
-          <label>企业联系人地址:</label>
-          <span></span>
+          <label>企业联系人地址：</label>
+          <span>{{contactsInfo.contactAddress}}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
-          <label>是否需要发票:</label>
-          <span></span>
+          <label>是否需要发票：</label>
+          <span>{{basicInfo.needInvoice}}</span>
         </a-col>
         <a-col :span="12">
-          <label>是否打包:</label>
-          <span></span>
+          <label>是否打包：</label>
+          <span>{{basicInfo.pack}}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
-          <label>企业邮编:</label>
-          <span></span>
+          <label>企业邮编：</label>
+          <span>{{enterpriseInfo.postalCode}}</span>
         </a-col>
         <a-col :span="12">
-          <label>企业地址:</label>
-          <span></span>
+          <label>企业地址：</label>
+          <span>{{enterpriseInfo.companyAddress}}</span>
         </a-col>
       </a-row>
     </section>
@@ -96,7 +107,7 @@
     <section class="payment-info">
       <h3 class="title">到账信息</h3>
       <section class="payment-info-title">到账信息</section>
-      <div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">2021年到账200元</div>
+      <div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">{{item.paymentDate}}到账{{item.amountReceived}}元</div>
     </section>
     <!--到账信息end-->
     <!--开票邮寄信息begin-->
@@ -104,15 +115,15 @@
       <h3 class="title">开票邮寄信息</h3>
       <div class="wrap-table">
         <a-table
-            ref="table"
-            size="middle"
-            rowKey="id"
-            :pagination="false"
-            :columns="columns"
-            :dataSource="logisticsInfoList"
-            class="j-table-force-nowrap"
+          ref="table"
+          size="middle"
+          rowKey="id"
+          :pagination="false"
+          :columns="columns"
+          :dataSource="logisticsInfoList"
+          class="j-table-force-nowrap"
         >
-        <span slot="action" slot-scope="text, record" class="action-span-cell">
+        <span slot="action" class="action-span-cell">
           <a @click="lookLogistics()">查看物流</a>
         </span>
         </a-table>
@@ -126,6 +137,7 @@
 </template>
 
 <script>
+import {queryCommonProjectById} from '@api/incomePaymentsApi'
 // import {getAction} from "@api/manage";
 const paymentInfoList = [
   {
@@ -162,42 +174,42 @@ const columns = [
   {
     title: '开票人',
     align: 'center',
-    dataIndex: '',
+    dataIndex: 'createBy',
   },
   {
     title: '日期',
     align: 'center',
-    dataIndex: '',
+    dataIndex: 'billDate',
   },
   {
     title: '金额(元)',
     align: 'center',
-    dataIndex: '',
+    dataIndex: 'invoiceAmount',
   },
   {
     title: '票号',
     align: 'center',
-    dataIndex: '',
+    dataIndex: 'billNo',
   },
   {
     title: '项目',
     align: 'center',
-    dataIndex: '',
+    dataIndex: 'chargeCompanyName',
   },
   {
     title: '邮寄人',
     align: 'center',
-    dataIndex: '',
+    dataIndex: 'liaisonMan',
   },
   {
     title: '快递',
     align: 'center',
-    dataIndex: '',
+    dataIndex: 'sendMethod',
   },
   {
     title: '快递单号',
     align: 'center',
-    dataIndex: 'piaoNo',
+    dataIndex: 'postNo',
   },
   {
     title: '操作',
@@ -220,6 +232,8 @@ export default {
       basicInfo: {},
       // 企业信息
       enterpriseInfo: {},
+      // 联系人信息
+      contactsInfo:{},
       columns,
       // 到账信息
       paymentInfoList,
@@ -231,6 +245,24 @@ export default {
     open(record) {
       // 记录当前项目id
       this.currentProjectId = record.id
+      // 通过id查询项目详情
+      queryCommonProjectById({id:this.currentProjectId}).then(res => {
+        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.paymentInfoList = res.result.paymentRecord
+          // 开票邮寄信息
+          this.logisticsInfoList = res.result.mailBill
+        }else {
+          console.log('未查到相应的信息')
+        }
+      })
       this.visible = true
     },
     handleCancel() {
@@ -256,7 +288,17 @@ export default {
     *  查看物流
     * */
     lookLogistics() {
-      window.open('http://www.api.kuaidi100.com', '_blank')
+      window.open('https://www.ems.com.cn/', '_blank')
+    },
+    /*
+    * 性别格式话
+    * */
+    initGender(val){
+      if(val === 1){
+        return '男'
+      }else if(val === 2){
+        return '女'
+      }
     }
   }
 }
@@ -274,7 +316,10 @@ h3 {
 label {
   color: #666;
 }
-
+.contract-num {
+  color: #42b983;
+  cursor: pointer;
+}
 h3.title::before {
   position: absolute;
   top: 4px;
@@ -296,12 +341,12 @@ h3.title::before {
     line-height: 35px;
     letter-spacing: 1px;
     color: #fff;
-    background: #069f99;
+    background: #a2e6e4;
   }
 
   &-content {
     color: #424242;
-    background: #efefef;
+    //background: #efefef;
     padding: 5px;
     padding-left: 10px;
     border: 1px solid #ccc;
@@ -320,7 +365,7 @@ h3.title::before {
 /deep/ .ant-table-thead {
   tr > th {
     color: #fff;
-    background: #069f99;
+    background: #a2e6e4;
     border: none;
   }
 }
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index e525e8c..2a21a59 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -162,7 +162,8 @@
         <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
         <!--当会议费用为0不需要合并开票-->
         <a-button type="primary" @click="batchInvoice" v-show="currentMeetingInfo.meetingCosts !== 0">合并开票</a-button>
-        <a-button type="primary" @click="batchSetDocker">设置对接人</a-button>
+        <!--只有国际研讨会才会有设置对接人-->
+        <a-button type="primary" @click="batchSetDocker" v-if="currentMeetingInfo.meetingType === '3' ">设置对接人</a-button>
       </div>
 
       <!-- table区域-begin -->