From 76ecc88c6d974b79efc97651776fad230605532b Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 27 Jul 2022 14:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=A0=B8=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArriveAndInvoivingList.vue                | 54 ++++++++++---------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 3e08e21..c9037d4 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -51,12 +51,14 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="缴费凭证状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-dict-select-tag v-model="queryParam.paymentStatus" placeholder="请选择缴费凭证状态" dictCode="payment_status"/>
+                <j-dict-select-tag v-model="queryParam.paymentStatus" placeholder="请选择缴费凭证状态"
+                                   dictCode="payment_status"/>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="来款开票状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-dict-select-tag v-model="queryParam.paidInvoicStatus" placeholder="请选择来款开票状态" dictCode="paid_invoic_status"/>
+                <j-dict-select-tag v-model="queryParam.paidInvoicStatus" placeholder="请选择来款开票状态"
+                                   dictCode="paid_invoic_status"/>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -133,9 +135,10 @@
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
             <!--            待审核状态显示审核按钮-->
+            <!--会议项目待审核状态 待上传也显示审核 -->
             <a @click="auditProof(record)"
                class="audit-btn"
-               v-if="record.checkPaymentStatus === 'toBeReviewed'"
+               v-if="record.checkPaymentStatus === 'toBeReviewed' ||  (record.projectType ===  3 && record.paymentStatus === 'toBeUploaded')  "
                v-has="'incomePaymentAndInvoiving:audit'">审核</a>
             <!--            未审核通过的会议项目不允许在这里来款-->
             <a @click="incomePayment(record)"
@@ -185,7 +188,8 @@
     <!--    审核缴费凭证-->
     <audit-proof-module ref="auditProof" @ok="modalFormOk"></audit-proof-module>
     <!-- 会议审核的弹窗 -->
-    <audit-modal ref="auditModal" :meeting-type="meetingType" :situation-id="situationId" @ok="modalFormOk"></audit-modal>
+    <audit-modal ref="auditModal" :meeting-type="meetingType" :situation-id="situationId"
+                 @ok="modalFormOk"></audit-modal>
     <!-- 确认收入 弹窗-->
     <pre-come-module ref="preComeModule" @ok="modalFormOk"></pre-come-module>
   </div>
@@ -194,7 +198,7 @@
 <script>
 import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_financial.png'
-import { JeroListMixin } from '../../../mixins/JeroListMixin'
+import {JeroListMixin} from '../../../mixins/JeroListMixin'
 import JYearDate from '../../../components/jero/JYearDate'
 import StatusSlot from '../../../components/tools/StatusSlot'
 import ArriveStageModule from './modules/ArriveStageModule'
@@ -202,7 +206,7 @@ import InvoicingStageModule from './modules/InvoicingStageModule'
 import SelectPrincipal from '../../../components/company/SelectPrincipal'
 import ProjectDetailModal from '../../../components/ProjectDetailModal'
 import BatchInvoicingModule from '../../packManagement/modules/BatchInvoicingModule'
-import { isAllEqual } from '../../../utils/util'
+import {isAllEqual} from '../../../utils/util'
 import AuditProofModule from './modules/AuditProofModule'
 // import AuditProofModule from "@views/financialManagement/arriveAndInvoicing/modules/AuditProofModule";
 import AuditModal from '@views/incomePayments/meetManage/modules/AuditModal'
@@ -240,12 +244,12 @@ export default {
       IconImg,
       ProjectTypeEnums,
       labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 }
+        xs: {span: 24},
+        sm: {span: 5}
       },
       wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 10 }
+        xs: {span: 24},
+        sm: {span: 10}
       },
       columns: [
         {
@@ -262,86 +266,86 @@ export default {
           align: 'center',
           width: 280,
           dataIndex: 'chargeProject',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: {customRender: 'projectName'}
         }, {
           title: '来款用途',
           align: 'center',
           width: 180,
           dataIndex: 'chargeUse_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: {customRender: 'text'}
         }, {
           title: '项目负责人',
           align: 'center',
           width: 140,
           dataIndex: 'principalName',
-          scopedSlots: { customRender: 'contact' }
+          scopedSlots: {customRender: 'contact'}
         }, {
           title: '来款单位',
           align: 'center',
           width: 280,
           dataIndex: 'chargeCompanyTemporaryName',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: {customRender: 'text'}
         }, {
           title: '企业联系人',
           align: 'center',
           width: 140,
           dataIndex: 'contactsTemporaryName',
-          scopedSlots: { customRender: 'contact' }
+          scopedSlots: {customRender: 'contact'}
         }, {
           title: '应收金额',
           align: 'center',
           width: 100,
           dataIndex: 'receivableAmount',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: {customRender: 'text'}
         }, {
           title: '实收金额',
           align: 'center',
           width: 100,
           dataIndex: 'paidAmount',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: {customRender: 'text'}
         }, {
           title: '缴费凭证状态',
           align: 'center',
           width: 120,
           dataIndex: 'paymentStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: {customRender: 'text'}
         }, {
           title: '打包',
           align: 'center',
           width: 70,
           dataIndex: 'pack',
-          scopedSlots: { customRender: 'status-pack' }
+          scopedSlots: {customRender: 'status-pack'}
         }, {
           title: '需要发票',
           align: 'center',
           width: 80,
           dataIndex: 'needInvoice',
-          scopedSlots: { customRender: 'status-pack' }
+          scopedSlots: {customRender: 'status-pack'}
         }, {
           title: '到账',
           align: 'center',
           width: 70,
           dataIndex: 'inAccount',
-          scopedSlots: { customRender: 'status' }
+          scopedSlots: {customRender: 'status'}
         }, {
           title: '开票',
           align: 'center',
           width: 70,
           dataIndex: 'makeInvoice',
-          scopedSlots: { customRender: 'status-bill' }
+          scopedSlots: {customRender: 'status-bill'}
         }, {
           title: '邮寄',
           align: 'center',
           width: 70,
           dataIndex: 'mail',
-          scopedSlots: { customRender: 'status-mail' }
+          scopedSlots: {customRender: 'status-mail'}
         }, {
           title: '操作',
           dataIndex: 'action',
           align: 'center',
           fixed: 'right',
           width: 250,
-          scopedSlots: { customRender: 'action' }
+          scopedSlots: {customRender: 'action'}
         }
       ],
       url: {
@@ -380,7 +384,7 @@ export default {
     invoicing(record) {
       // 标协会员项目必须先到账后开票
       if ((Number(record.projectType) === 5 || Number(record.projectType) === 6) && record.paymentStatus !== 'completed') {
-        this.$message.warn(`标协${ Number(record.projectType) === 5 ? '会员' : '证书' }项目必须先审核通过才可开票。`)
+        this.$message.warn(`标协${Number(record.projectType) === 5 ? '会员' : '证书'}项目必须先审核通过才可开票。`)
         return
       }
       this.mailContactsId = record.mailContactsId