From 96febb9d80f5462dbe38ccf7923792468074dc5a Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 17:34:15 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86-=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E9=A1=B9=E7=9B=AE-=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BC=B9=E6=A1=86=E3=80=81=E5=88=B0=E8=B4=A6?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=88=97=E8=A1=A8=E5=8A=A0=E4=B8=8A=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E8=81=94=E7=B3=BB=E4=BA=BA=E8=BF=99=E4=B8=80=E5=88=97?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E6=9D=A5=E6=AC=BE=EF=BC=9A=E6=9C=AA=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=9A=84=E4=BC=9A=E8=AE=AE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E5=9C=A8=E8=BF=99=E9=87=8C=E6=9D=A5?=
 =?UTF-8?q?=E6=AC=BE=EF=BC=8C=E6=9D=A5=E6=AC=BE=E6=8C=89=E9=92=AE=E7=BD=AE?=
 =?UTF-8?q?=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arriveAndInvoicing/ArriveAndInvoivingList.vue     | 11 ++++++++++-
 src/views/mailManagement/BillMail.vue                 |  7 +++++++
 .../modules/PackProjectSelectProjectModule.vue        | 10 ++++++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index d335414..a082d26 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -103,7 +103,10 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-            <a @click="incomePayment(record)" v-has="'incomePaymentAndInvoiving:incomePayment'">来款</a>
+<!--            未审核通过的会议项目不允许在这里来款-->
+            <a @click="incomePayment(record)"
+               v-has="'incomePaymentAndInvoiving:incomePayment'"
+               :disabled="record.projectType === 3 && record.registerCheckResult === '0'">来款</a>
             <a @click="invoicing(record)" :disabled="record.needInvoice === 0"
                v-has="'incomePaymentAndInvoiving:invoicing'">开票</a>
           </span>
@@ -214,6 +217,12 @@ export default {
           width: 280,
           dataIndex: 'chargeCompanyTemporaryName',
           scopedSlots: { customRender: 'text' }
+        }, {
+          title: '企业联系人',
+          align: 'center',
+          width: 280,
+          dataIndex: 'contactsTemporaryName',
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '应收金额',
           align: 'center',
diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue
index fb036c0..1be7d5f 100644
--- a/src/views/mailManagement/BillMail.vue
+++ b/src/views/mailManagement/BillMail.vue
@@ -179,6 +179,13 @@ export default {
           dataIndex: 'chargeCompanyName',
           scopedSlots: { customRender: 'text' }
         },
+        // {
+        //   title: '企业联系人',
+        //   align: 'center',
+        //   width: 300,
+        //   dataIndex: 'principalName',
+        //   scopedSlots: { customRender: 'text' }
+        // },
         {
           title: '邮寄联系人',
           align: 'center',
diff --git a/src/views/packManagement/modules/PackProjectSelectProjectModule.vue b/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
index 372eb63..75071c9 100644
--- a/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
+++ b/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
@@ -145,10 +145,16 @@ export default {
         }, {
           title: '项目负责人',
           align: 'center',
-          width: 140,
+          width: 280,
           dataIndex: 'principalName',
           scopedSlots: { customRender: 'text' }
-        }, {
+        },{
+          title: '企业联系人',
+          align: 'center',
+          width: 280,
+          dataIndex: 'contactsTemporaryName',
+          scopedSlots: { customRender: 'text' }
+        },  {
           title: '应收金额',
           align: 'center',
           width: 120,