From 15d1c54ca4b18b2440776040e5d949e3e813ca55 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Fri, 17 Sep 2021 15:08:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=BC=80=E7=A5=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=80=89=E6=8B=A9=E9=82=AE=E5=AF=84=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArriveAndInvoivingList.vue                | 16 +++++++++++--
 .../modules/BatchInvoicingModule.vue          | 23 +++++++++++++++++--
 .../modules/WorkGroupDistributeModule.vue     |  2 +-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 3175cc6..bc6838a 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -99,6 +99,7 @@
       @ok="modalFormOk"
       :project-id="selectProjectId"
       :visible.sync="arriveVisible"></arrive-stage-module>
+
     <!--    开票阶段-->
     <invoicing-stage-module
       ref="invoicingStage"
@@ -108,12 +109,17 @@
       :project-name="selectProjectName"
       :visible.sync="invoicingVisible"
       :charge-company-name="selectProjectChargeCompanyName"></invoicing-stage-module>
-    <project-detail-modal ref="projectDetail"></project-detail-modal>
+
     <!--    批量开票-->
     <batch-invoicing-module
       :selected-data="selectedProject"
+      :selected-company="selectedCompany"
+      is-financial
       :visible.sync="batchInvoicingVisible">
     </batch-invoicing-module>
+
+    <project-detail-modal ref="projectDetail"></project-detail-modal>
+
   </div>
 </template>
 
@@ -248,7 +254,8 @@ export default {
       invoicingVisible: false,
       arriveVisible: false,
       selectedProject: [],
-      batchInvoicingVisible: false
+      batchInvoicingVisible: false,
+      selectedCompany: {} // 选中项目的企业信息
     }
   },
   methods: {
@@ -316,6 +323,11 @@ export default {
           if (!isAllEqual(companyArr)) {
             reject('请选择来款单位为同一企业的项目合并开票')
           }
+          this.selectedCompany = {
+            id: arr[0].chargeCompanyId,
+            companyName: arr[0].chargeCompanyTemporaryName
+          }
+          console.log(this.selectedCompany)
         }
         // 来款
         if (operateType === 'incomePayment') {
diff --git a/src/views/packManagement/modules/BatchInvoicingModule.vue b/src/views/packManagement/modules/BatchInvoicingModule.vue
index ab5c392..cd0b377 100644
--- a/src/views/packManagement/modules/BatchInvoicingModule.vue
+++ b/src/views/packManagement/modules/BatchInvoicingModule.vue
@@ -40,6 +40,15 @@
                       date-format="YYYY-MM-DD"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="12" :sm="24" v-if="isFinancial">
+            <a-form-item label="邮寄联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <select-contacts
+                placeholder="请选择邮寄联系人"
+                v-decorator="['postContactId',validatorRules.postContactId]"
+                v-bind="$attrs"
+                :maxLength='50'></select-contacts>
+            </a-form-item>
+          </a-col>
         </a-row>
       </a-form>
 
@@ -78,21 +87,30 @@ import JDate from '../../../components/tools/JDate'
 import { money } from '../../../utils/validate'
 import { addZero } from '../../../utils/util'
 import { addPayBill } from '../../../api/incomePaymentsApi'
+import SelectContacts from '../../../components/company/SelectContacts'
 
 export default {
   name: 'BatchInvoicingModule',
-  components: { JDate },
+  components: { JDate, SelectContacts },
   props: {
     // 选中的项目信息
     selectedData: {
       type: Array,
       required: false,
-      default: []
+      default: () => {
+        return []
+      }
     },
     visible: {
       type: Boolean,
       required: false,
       default: false
+    },
+    // 是否为财务管理到账开票
+    isFinancial: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   watch: {
@@ -180,6 +198,7 @@ export default {
       },
       inputInvoicingAmount: null, // 输入的开票金额
       sumAmountOwed: 0 // 总未开票金额
+      // selectedCompany: {} // 企业信息
     }
   },
   methods: {
diff --git a/src/views/projectManagement/modules/WorkGroupDistributeModule.vue b/src/views/projectManagement/modules/WorkGroupDistributeModule.vue
index 1af78d1..ded2513 100644
--- a/src/views/projectManagement/modules/WorkGroupDistributeModule.vue
+++ b/src/views/projectManagement/modules/WorkGroupDistributeModule.vue
@@ -154,7 +154,7 @@ export default {
       let str = this.checkedKeys.join(',').toString()
       console.log(str)
       this.form.setFieldsValue({memberName: str})
-      this.form.validateFields((err, values) => {
+      this.form.validateFields((err) => {
         if (!err) {
           this.confirmLoading = true
           if (this.isBatch) {