From e888da9567166a3d60233932788022d884d78c55 Mon Sep 17 00:00:00 2001 From: "271556543@qq.com" <271556543@qq.com> Date: Mon, 1 Aug 2022 13:22:39 +0800 Subject: [PATCH] 2022.8.1 --- src/components/XyTable/index.vue | 6 +- src/views/budget/budgetList.vue | 25 ++-- .../contract/components/contractSign.vue | 25 +++- .../contract/components/detailContract.vue | 2 +- .../components/detailContractSign.vue | 3 +- .../components/detailPaymentRegistration.vue | 9 +- .../contract/components/editorContract.vue | 46 +------ .../components/examineRegistration.vue | 9 +- .../components/paymentRegistration.vue | 6 +- src/views/contract/contractList.vue | 116 ++++++++++++------ .../contract/paymentRegistrationList.vue | 9 +- .../components/examineRegistration.vue | 9 +- src/views/finance/paymentRegistrationList.vue | 2 +- 13 files changed, 149 insertions(+), 118 deletions(-) diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index 6077874..9a79ea4 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -48,6 +48,9 @@ export default { type:Boolean, default:false }, + summaryMethod:{ + type:Function + }, treeProps:{ type:Object, default:()=> { @@ -113,7 +116,7 @@ export default { mounted() { }, render(h) { - let {cellClick,btnWidth,selectClick,height,createIndexRow,tableStyle,treeProps,showSummary,showHeader,$scopedSlots,showIndex,defaultExpandAll,headerCellStyle,headerRowStyle,rowStyle,cellStyle,indent,tableHeight,tableItem,list,deleteClick,editorClick} = this + let {summaryMethod,cellClick,btnWidth,selectClick,height,createIndexRow,tableStyle,treeProps,showSummary,showHeader,$scopedSlots,showIndex,defaultExpandAll,headerCellStyle,headerRowStyle,rowStyle,cellStyle,indent,tableHeight,tableItem,list,deleteClick,editorClick} = this return (
{ tableItem && tableItem.length>0 ? @@ -121,6 +124,7 @@ export default { ref="table" show-summary={showSummary} show-header={showHeader} + summary-method={summaryMethod} header-row-style={headerRowStyle} header-cell-style={headerCellStyle} row-style={rowStyle} diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue index 6610279..5b827f2 100644 --- a/src/views/budget/budgetList.vue +++ b/src/views/budget/budgetList.vue @@ -118,7 +118,7 @@