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">
+
-
+
+
+
+
@@ -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"/>
+
+
+
+
+
@@ -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) {