diff --git a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue index 38e9daa..1458f98 100644 --- a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue +++ b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue @@ -737,6 +737,7 @@ export default { // 生成成套附属设备 getCtFileList(ctData) { + console.log("hhhhhhhhhhh",ctData) for (const key in ctData) { const ctList = { wholeTypeName: key, @@ -751,9 +752,9 @@ export default { taskName: this.queryParams.taskName, } }) - if(this.wholeTypeNameList.length == 0){ + // if(this.wholeTypeNameList.length == 0){ this.wholeTypeNameList.push(ctList) - } + // } // this.wholeTypeNameList.push(ctList) } diff --git a/src/views/cost/csotSettlement/component/exportDialogMonth.vue b/src/views/cost/csotSettlement/component/exportDialogMonth.vue new file mode 100644 index 0000000..0f46fb8 --- /dev/null +++ b/src/views/cost/csotSettlement/component/exportDialogMonth.vue @@ -0,0 +1,92 @@ + + + diff --git a/src/views/cost/csotSettlement/component/monthRecord.vue b/src/views/cost/csotSettlement/component/monthRecord.vue index ebc75df..516c2f3 100644 --- a/src/views/cost/csotSettlement/component/monthRecord.vue +++ b/src/views/cost/csotSettlement/component/monthRecord.vue @@ -320,15 +320,20 @@ export default { exportList[0].codeNum += e.codeNum + ',' }) exportList[0].codeNum = exportList[0].codeNum.slice(0, -1) + this.downloadZip( + 'material/sltAgreementInfo/exportLeaseMonthZip', + JSON.stringify(exportList), + `月结明细${new Date().getTime()}.zip`, + ) } else { exportList[0].codeNum = row.codeNum + this.downloadJson( + 'material/sltAgreementInfo/exportSltInfoMonth', + JSON.stringify(exportList), + `月结明细${new Date().getTime()}.xlsx`, + ) } - this.downloadJson( - 'material/sltAgreementInfo/exportSltInfoMonth', - JSON.stringify(exportList), - `月结明细${new Date().getTime()}.xlsx`, - ) }, /** 列表勾选 */ handleSelectionChange(list) { diff --git a/src/views/cost/csotSettlement/costApplyList.vue b/src/views/cost/csotSettlement/costApplyList.vue index b668773..cd298db 100644 --- a/src/views/cost/csotSettlement/costApplyList.vue +++ b/src/views/cost/csotSettlement/costApplyList.vue @@ -55,7 +55,7 @@ 批量导出结算表 - 批量导出月结明细表 - + + + { + this.exportParamsMonth.push({ + agreementId: e.agreementId, + agreementCode: e.agreementCode, + costBearingParty: '', + codeNum: '', + projectName: e.projectName, + unitName: e.unitName, + }) + }) + + this.exportDialogVisibleMonth = true + }, /** 关闭弹框 */ handleCloseDialog() { this.exportDialogVisible = false @@ -413,12 +447,48 @@ export default { this.downloadZip( 'material/sltAgreementInfo/exportLeaseAll', JSON.stringify(this.exportParams), - `月结明细${new Date().getTime()}.zip`, + `结算_${new Date().getTime()}.zip`, ) this.exportDialogVisible = false this.$refs.tableRef.clearSelection() }, + + /** 关闭月结明细弹框 */ + handleCloseDialogMonth() { + this.exportDialogVisibleMonth = false + }, + /** 确定月结明细按钮 */ + handleSubmitMonth(form) { + console.log("xxxxxxxxxxxxxxxxxx",form) + if (form.length === 1) { + if(form[0]=='01'){ + this.exportParamsMonth.forEach((e) => { + e.codeNum = '0' + }) + }else{ + this.exportParamsMonth.forEach((e) => { + e.codeNum = '1' + }) + } + }else{ + this.exportParamsMonth.forEach((e) => { + e.codeNum = '0,1' + }) + } + // exportLeaseAll(this.exportParams).then(res => { + // downloadFile({ fileName: `月结明细_${new Date().getTime()}.zip`, fileData: res, fileType: 'application/zip;charset=utf-8' }) + // }) + this.downloadZip( + 'material/sltAgreementInfo/exportLeaseMonthZip', + JSON.stringify(this.exportParamsMonth), + `结算_${new Date().getTime()}.zip`, + ) + + this.exportDialogVisibleMonth = false + this.$refs.tableRef.clearSelection() + }, + /** 月结记录 */ handleMonthRecord(row) { this.agreementId = row.agreementId