This commit is contained in:
linfso 2024-10-08 18:19:43 +08:00
parent a28ba6936c
commit 8374ecd067

View File

@ -848,8 +848,11 @@ export default {
settleEndDate:parseTime(endDate),
subBillList:this.selectBillList,
}
this.loading = true;
// 生成合账单号
addEmisSettleBill(postData).then(response => {
this.loading=false;
this.$modal.msgSuccess("合账成功");
this.$emit("on-changed");
this.handleQuery();
@ -883,7 +886,7 @@ export default {
let startDate = new Date(this.billMonth+"-01 00:00:00");
let endDate= this.getMonthLast(startDate);
endDate.setHours(23,59,59,0)
this.loading = true;
for(let i=0;i<this.selectBillList.length;i++){
let settleBillName=this.selectBillList[i].billCode;
@ -901,56 +904,13 @@ export default {
// 生成合账单号
let res=await addEmisSettleBill(postData);
}
this.loading=false;
this.$modal.msgSuccess("操作成功");
this.handleQuery();
}).catch(() => {});
},
// handleAutoMergeBill(){
// if(!this.billMonth){
// this.$modal.msgError("账单月不能为空!");
// return;
// }
// this.$confirm("确定自动合账吗?", "提示", {
// cancelButtonText: "否",
// confirmButtonText: "确定",
// type: "warning",
// distinguishCancelAndClose: true,
// closeOnClickModal: false
// }).then(() => {
// this.currentSettleBillNo=genJsSeqNo();
// let startDate = new Date(this.billMonth+"-01 00:00:00");
// let endDate= this.getMonthLast(startDate);
// endDate.setHours(23,59,59,0)
// let settleBillForm={
// settleBillNo: this.currentSettleBillNo,
// settleBillName: this.billName,
// billMonth: this.billMonth,
// settleStartDate:parseTime(startDate),
// settleEndDate:parseTime(endDate),
// subBillList:this.selectBillList,
// }
// // 生成合账单号
// addEmisSettleBill(settleBillForm).then(response => {
// this.$modal.msgSuccess("合并成功");
// this.$emit("on-changed");
// this.titleMergeForm="账单-"+this.currentSettleBillNo;
// this.openMergeForm=true;
// this.handleQuery();
// });
// }).catch(() => {});
// },
// 获取当前月的最后一天
getMonthLast(date) {
var currentMonth = date.getMonth()