批量开票、批量来款

src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue

@@ -87,7 +87,7 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-            <a @click="incomePayment(record.id)">来款</a>
+            <a @click="incomePayment(record)">来款</a>
             <a @click="invoicing(record)" :disabled="record.needInvoice === 0">开票</a>
           </span>
         </a-table>
@@ -98,6 +98,7 @@
       ref="arriveStage"
       @ok="modalFormOk"
       :project-id="selectProjectId"
+      :project-type="selectProjectType"
       :visible.sync="arriveVisible"></arrive-stage-module>
 
     <!--    开票阶段-->
@@ -115,6 +116,7 @@
       :selected-data="selectedProject"
       :selected-company="selectedCompany"
       is-financial
+      @ok="modalFormOk"
       :visible.sync="batchInvoicingVisible">
     </batch-invoicing-module>
 
@@ -263,10 +265,11 @@ export default {
   methods: {
     /**
      * 来款
-     * @param id
+     * @param record
      */
-    incomePayment(id) {
-      this.selectProjectId = id
+    incomePayment(record) {
+      this.selectProjectType = record.projectType
+      this.selectProjectId = record.id
       this.arriveVisible = true
     },
     /**
@@ -329,7 +332,6 @@ export default {
             id: arr[0].chargeCompanyId,
             companyName: arr[0].chargeCompanyTemporaryName
           }
-          console.log(this.selectedCompany)
         }
         // 来款
         if (operateType === 'incomePayment') {