From f8f25ebe9352751b7dddc46a96d8b43791453bce Mon Sep 17 00:00:00 2001
From: fengchenchen <syxysoft.com>
Date: Thu, 9 Jun 2022 15:37:56 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20-=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=20=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=9E=AB=E4=BB=98=E4=BF=A1=E6=81=AF=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue         | 84 ++++++++++++++++++-
 src/enums/commonEnums.js                      | 10 +++
 .../ArriveAndInvoivingList.vue                |  2 +-
 vue.config.js                                 |  5 +-
 4 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 src/enums/commonEnums.js

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index 2f23c56..2b85b4a 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -65,6 +65,7 @@
       </a-row>
     </section>
     <!-- 基本信息end-->
+
     <!-- 企业信息begin-->
     <section class="enterprise-info">
       <h3 class="title">企业信息</h3>
@@ -110,6 +111,46 @@
       </a-row>
     </section>
     <!--企业信息end-->
+
+    <!-- 代付企业--第三方垫付 信息 只有会员缴费 和证书缴费的时候存在 begin-->
+    <section class="enterprise-info" v-if="(basicInfo.projectType === ProjectTypeEnums.STANDARD_MEMBER_PRO.value || basicInfo.projectType === ProjectTypeEnums.STANDARD_CERTIFICATE_PRO.value) && hasOtherCompany">
+      <h3 class="title">第三方垫付信息</h3>
+      <a-row :gutter="24">
+        <a-col :span="12" class="detail-item">
+          <label>关联付款发票名称：</label>
+          <span><j-ellipsis :value="otherCompanyInfo.headerName" :length="20"></j-ellipsis></span>
+        </a-col>
+        <a-col :span="12" class="detail-item">
+          <label>社会统一代码/税号：</label>
+          <span><j-ellipsis :value="otherCompanyInfo.taxNumber" :length="20"></j-ellipsis></span>
+        </a-col>
+      </a-row>
+      <!--      增值税发票存在的信息较多-->
+      <template v-if="Number(otherCompanyInfo.invoiceRequirements) === 2">
+        <a-row :gutter="24">
+          <a-col :span="12" class="detail-item">
+            <label>单位地址：</label>
+            <span><j-ellipsis :value="otherCompanyInfo.invoiceAddress" :length="20"></j-ellipsis></span>
+          </a-col>
+          <a-col :span="12" class="detail-item">
+            <label>电话号码：</label>
+            <span><j-ellipsis :value="otherCompanyInfo.invoicePhone" :length="20"></j-ellipsis></span>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12" class="detail-item">
+            <label>开户银行：</label>
+            <span>{{ otherCompanyInfo.depositBank }}</span>
+          </a-col>
+          <a-col :span="12" class="detail-item">
+            <label>银行账户：</label>
+            <span>{{ otherCompanyInfo.bankAccount }}</span>
+          </a-col>
+        </a-row>
+      </template>
+    </section>
+    <!--代付企业--第三方垫付 信息end-->
+
     <!--    企业联系人信息start-->
     <section>
       <h3 class="title">企业联系人信息</h3>
@@ -244,9 +285,11 @@
 </template>
 
 <script>
-import { queryCommonProjectById } from '@api/incomePaymentsApi'
+import { queryCommonProjectById, getStanderMemberLastProofInfo, getCertificateLastProofInfo } from '@api/incomePaymentsApi'
 import JEllipsis from '@comp/jero/JEllipsis'
 import PreviewFile from './jero/PreviewFile'
+import { ProjectTypeEnums } from '@/enums/commonEnums'
+import pick from 'lodash.pick'
 // import {getAction} from "@api/manage";
 const columns = [
   {
@@ -304,6 +347,12 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    // 是否是到账开票模块
+    isInvoicing: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data() {
@@ -324,10 +373,18 @@ export default {
       // 到账信息
       paymentInfoList: [],
       // 开票邮寄信息
-      logisticsInfoList: []
+      logisticsInfoList: [],
+      // 垫付企业的信息
+      otherCompanyInfo: {},
+      ProjectTypeEnums
+    }
+  },
+  computed: {
+    // 是否是第三方代付
+    hasOtherCompany() {
+      return this.isInvoicing && this.otherCompanyInfo.headerName && (this.otherCompanyInfo.headerName !== this.basicInfo.companyName)
     }
   },
-  computed: {},
   components: {
     JEllipsis,
     PreviewFile
@@ -355,12 +412,33 @@ export default {
           console.log('未查到相应的信息')
         }
       })
+      // 到账开票模块显示请求发票信息，查看是否是第三方代付
+      if(this.isInvoicing) {
+        /* 如果当前项目是会员项目、会员证书项目 需要请求响应的 第三方付款信息*/
+        let projectType = Number(record.projectType)
+        if(projectType === ProjectTypeEnums.STANDARD_MEMBER_PRO.value) {
+          this.getMemberLastProofInfo(record, getStanderMemberLastProofInfo)
+        } else if(projectType === ProjectTypeEnums.STANDARD_CERTIFICATE_PRO.value){
+          this.getMemberLastProofInfo(record, getCertificateLastProofInfo)
+        }
+      }
+    },
+    getMemberLastProofInfo(record, requestFunc) {
+      let param = {
+        projectId: record.id
+      }
+      requestFunc && requestFunc(param).then(res => {
+        if (res.success) {
+          this.otherCompanyInfo = res.result || {}
+        }
+      })
     },
     handleCancel() {
       // 清除之前的信息
       this.basicInfo = {}
       this.enterpriseInfo = {}
       this.contactsInfo = {}
+      this.otherCompanyInfo = {}
       this.paymentInfoList = []
       this.logisticsInfoLis = []
       this.visible = false
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
new file mode 100644
index 0000000..8a4b704
--- /dev/null
+++ b/src/enums/commonEnums.js
@@ -0,0 +1,10 @@
+
+// 项目类型 数据字典 的定义 和数据库的保持一致
+export const ProjectTypeEnums = {
+  GENERAL_PRO: {name: '普通项目', value: 1},
+  GROUP_PRO: {name: '工作组项目', value: 2},
+  MEETING_PRO: {name: '会议项目', value: 3},
+  MEMBER_PRO: {name: '会员项目', value: 4},
+  STANDARD_MEMBER_PRO: {name: '标协会员项目', value: 5},
+  STANDARD_CERTIFICATE_PRO: {name: '标协证书项目', value: 6},
+}
\ No newline at end of file
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index ecd004c..d9ea4a8 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -175,7 +175,7 @@
       :visible.sync="batchInvoicingVisible">
     </batch-invoicing-module>
 
-    <project-detail-modal ref="projectDetail"></project-detail-modal>
+    <project-detail-modal :is-invoicing="true" ref="projectDetail"></project-detail-modal>
 
     <!--    审核缴费凭证-->
     <audit-proof-module ref="auditProof" @ok="modalFormOk"></audit-proof-module>
diff --git a/vue.config.js b/vue.config.js
index 939bd47..77c321a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -76,7 +76,7 @@ module.exports = {
   },
 
   devServer: {
-    port: 3000,
+    port: 21825,
     proxy: {
       /* '/api': {
         target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统
@@ -88,7 +88,8 @@ module.exports = {
       },*/
       '/jero-boot': {
         // ''
-        target: 'http://localhost:8080', //请求本地 jero-boot后台项目
+        // target: 'http://10.0.10.78:21824', //请求本地 jero-boot后台项目
+        target: 'http://10.0.1.9:21824', //
         ws: false,
         changeOrigin: true,
       },