diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index 3202450..f7581a4 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -35,7 +35,8 @@ - 查询 + 查询 重置 @@ -46,8 +47,12 @@
- 导出 - 合并开票 + 导出 + + 合并开票 +
@@ -98,7 +103,8 @@ 来款 - 开票 + 开票 @@ -271,7 +277,7 @@ export default { selectedProject: [], batchInvoicingVisible: false, selectedCompany: {}, // 选中项目的企业信息 - mailContactsId: null, // 项目邮寄联系人id + mailContactsId: null // 项目邮寄联系人id } }, methods: { @@ -329,7 +335,7 @@ export default { // 开票 if (operateType === 'invoic') { // 是否存在不需要发票的项目 - if (arr.some(item => item.needInvoice === 0 || Number(item.receivableAmount) === 0)){ + if (arr.some(item => item.needInvoice === 0 || Number(item.receivableAmount) === 0)) { reject('存在不需要发票的项目！') } // 是否存在企业不同的项目 @@ -341,7 +347,7 @@ export default { if (!isAllEqual(companyArr)) { reject('请选择来款单位为同一企业的项目合并开票！') } - if (arr.some(item => item.invoiceAmount && Number(item.invoiceAmount) === Number(item.receivableAmount))) { + if (arr.some(item => item.makeInvoice === 1)) { reject('存在已完成开票的项目！') } this.selectedCompany = { diff --git a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue index 331bfec..4484d11 100644 --- a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue +++ b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue @@ -29,7 +29,7 @@ - + - + 是 否 @@ -74,12 +75,15 @@ - + 是 否 + + @@ -95,7 +99,8 @@ - @@ -115,7 +120,8 @@ - + + - - + 是 否 + + @@ -191,8 +199,8 @@ - - + + { - // 是否回民回显 - this.form.setFieldsValue(pick(record, - 'huiPeople', - )) - }) - }else if(record.haveMeals === 0){ - this.haveMealBool = false - } - // 是否住酒店 - if(record.checkInHotel === 1){ + if (record.haveMeals === 1) { + this.haveMealBool = true + this.$nextTick(() => { + // 是否回民回显 + this.form.setFieldsValue(pick(record, + 'huiPeople' + )) + }) + } else if (record.haveMeals === 0) { + this.haveMealBool = false + } + // 是否住酒店 + if (record.checkInHotel === 1) { this.inHotelBool = true // 入住酒店回显 离店时间回显 房型回显 this.$nextTick(() => { @@ -391,14 +403,14 @@ export default { this.form.setFieldsValue(pick(record, 'inHotelTime', 'outHotelTime', - 'roomLayout', + 'roomLayout' )) }) - }else if(record.checkInHotel === 0){ + } else if (record.checkInHotel === 0) { this.inHotelBool = false } // 是否接站 - if(record.pickUp === 1){ + if (record.pickUp === 1) { this.pickUpBool = true // 抵达时间 到达站 到达班次 this.$nextTick(() => { @@ -406,27 +418,27 @@ export default { this.form.setFieldsValue(pick(record, 'arrivalTime', 'destination', - 'arrivalShift', + 'arrivalShift' )) }) - }else if(record.pickUp === 0){ + } else if (record.pickUp === 0) { this.pickUpBool = false } // 是否送站 - if(record.deliveryStation === 1){ + if (record.deliveryStation === 1) { this.sendBool = true this.$nextTick(() => { // 离开时间 离开站 离开班次 this.form.setFieldsValue(pick(record, 'departureTime', 'departureStation', - 'departureShift', + 'departureShift' )) }) - }else if(record.pickUp === 0){ + } else if (record.pickUp === 0) { this.sendBool = false } - console.log(record,'record') + console.log(record, 'record') this.$nextTick(() => { // 身份类型是嘉宾 内部企业只渲染 住店 抵达时间 离开时间 this.form.setFieldsValue(pick(record, @@ -444,7 +456,7 @@ export default { }) - }, + } } } diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue index 9ae84c1..8102e14 100644 --- a/src/views/packManagement/PackProjectMaintenance.vue +++ b/src/views/packManagement/PackProjectMaintenance.vue @@ -527,6 +527,9 @@ export default { if (arr.some(item => item.needInvoice === 0 || Number(item.receivableAmount) === 0)) { reject('存在不需要发票的项目！') } + if (arr.some(item => item.makeInvoice === 1)) { + reject('存在已完成开票的项目！') + } } // 来款 if (operateType === 'incomePayment') { @@ -534,6 +537,9 @@ export default { if (arr.some(item => Number(item.receivableAmount) === 0)) { reject('存在应收金额为0的项目！') } + if (arr.some(item => item.inAccount === 1)) { + reject('不可选择已付全款的项目！') + } } resolve(arr) }) diff --git a/src/views/packManagement/modules/BatchIncomePaymentModule.vue b/src/views/packManagement/modules/BatchIncomePaymentModule.vue index 799a91c..3894591 100644 --- a/src/views/packManagement/modules/BatchIncomePaymentModule.vue +++ b/src/views/packManagement/modules/BatchIncomePaymentModule.vue @@ -258,10 +258,6 @@ export default { this.addZero(e) e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim() this.inputIncomingAmount = Number(e.target.value) - if (this.inputIncomingAmount > this.sumAmountOwed) { - this.$message.warn('来款金额大于当前欠款金额，输入有误！') - return - } this.clearThisTimeAmount() this.calculateThisTimeAmount() }, @@ -282,6 +278,10 @@ export default { this.$message.warn('请输入大于0的来款金额') return } + if (this.inputIncomingAmount > this.sumAmountOwed) { + this.$message.warn('来款金额大于当前欠款金额，输入有误！') + return + } this.dataSource.forEach((item, index) => { // 当前项目欠款是否 >0 if (Number(item.amountOwed) > 0) { diff --git a/src/views/packManagement/modules/BatchInvoicingModule.vue b/src/views/packManagement/modules/BatchInvoicingModule.vue index 587d08e..9a9b750 100644 --- a/src/views/packManagement/modules/BatchInvoicingModule.vue +++ b/src/views/packManagement/modules/BatchInvoicingModule.vue @@ -274,10 +274,6 @@ export default { this.addZero(e) e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim() this.inputInvoicingAmount = Number(e.target.value) - if (this.inputInvoicingAmount > this.sumAmountOwed) { - this.$message.warn('开票金额大于当前未开票金额，输入有误！') - return - } this.clearThisTimeAmount() this.calculateThisTimeAmount() }, @@ -317,6 +313,10 @@ export default { this.$message.warn('请输入大于0的开票金额') return } + if (this.inputInvoicingAmount > this.sumAmountOwed) { + this.$message.warn('开票金额大于当前未开票金额，输入有误！') + return + } this.dataSource.forEach((item, index) => { // 当前项目欠款是否 >0 if (Number(item.amountOwed) > 0) { diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index a86b048..e5eba1d 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -196,23 +196,29 @@ export default { return parseInt(index) + 1 } }, { - title: '项目名称', + title: '来款项目', align: 'center', - // width: 200, + width: 200, dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } }, { - title: '负责人', + title: '项目负责人', align: 'center', - width: 140, + width: 200, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '所属科室', align: 'center', - width: 140, + width: 200, dataIndex: 'depart', scopedSlots: { customRender: 'text' } + }, { + title: '来款单位', + align: 'center', + width: 200, + dataIndex: 'chargeCompanyTemporaryName', + scopedSlots: { customRender: 'text' } }, { title: '应收金额', align: 'center', @@ -236,27 +242,32 @@ export default { { title: '序号', dataIndex: 'title', - key: 'rowIndex', - width: 120, - align: 'center' - }, { - title: '项目名称', align: 'center', - // width: 200, + width: 60, + }, { + title: '来款项目', + align: 'center', + width: 200, dataIndex: 'projectName', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'projectName' } }, { - title: '负责人', + title: '项目负责人', align: 'center', - width: 140, + width: 200, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '所属科室', align: 'center', - width: 140, + width: 200, dataIndex: 'depart', scopedSlots: { customRender: 'text' } + }, { + title: '来款单位', + align: 'center', + width: 200, + dataIndex: 'chargeCompanyTemporaryName', + scopedSlots: { customRender: 'text' } }, { title: '应收金额', align: 'center',