From 95605ca3f4a48f5af03017bd541c249dc32a7303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?= <153298343@qq.com> Date: Tue, 13 Sep 2022 10:48:22 +0800 Subject: [PATCH] up --- package.json | 1 + src/components/XyTable/index.vue | 10 +- src/main.js | 4 + src/views/budget/budgetList.vue | 4 + src/views/budget/seeBudget.vue | 4 + .../contract/components/contractSign.vue | 20 +- .../contract/components/detailContract.vue | 10 + .../contract/components/editorContract.vue | 20 +- src/views/contract/contractList.vue | 2626 +++++++++-------- src/views/contract/seeContract.vue | 2301 +++++++++------ src/views/dashboard/index.vue | 15 +- src/views/finance/paymentRegistrationList.vue | 13 +- .../statisticalReport/budgetProgress.vue | 4 + 13 files changed, 2952 insertions(+), 2080 deletions(-) diff --git a/package.json b/package.json index c6ec39a..4d0d5f4 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "html2canvas": "^1.4.1", "js-cookie": "2.2.0", "less": "^3.13.1", + "moment": "^2.29.4", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index 312bedf..a346aed 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -63,7 +63,7 @@ export default { return { width: '100%', marginBottom: "20px"} } }, - + btnWidth:{ type:Number, default:190 @@ -93,6 +93,9 @@ export default { selectClick(selection, row){ this.$emit('select',selection, row) }, + rowClick(selection, row){ + this.$emit('rowClick',selection, row) + }, cellClick(row, column, cell){ this.$emit('cellClick',row, column, cell) }, @@ -117,7 +120,7 @@ export default { mounted() { }, render(h) { - 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 + let {summaryMethod,cellClick,btnWidth,selectClick,height,createIndexRow,tableStyle,treeProps,showSummary,showHeader,$scopedSlots,showIndex,defaultExpandAll,headerCellStyle,headerRowStyle,rowStyle,cellStyle,indent,tableHeight,tableItem,list,deleteClick,editorClick,rowClick} = this return (
{ tableItem && tableItem.length>0 ? @@ -140,7 +143,7 @@ export default { default-expand-all={defaultExpandAll} tree-props={treeProps} fit={true} - on={{['select']:selectClick,['cell-click']:cellClick}}> + on={{['select']:selectClick,['cell-click']:cellClick,['row-click']:rowClick}}> { //序号 showIndex ? createIndexRow() : '' @@ -285,4 +288,3 @@ export default { - diff --git a/src/main.js b/src/main.js index c571d9f..c2ed041 100644 --- a/src/main.js +++ b/src/main.js @@ -43,6 +43,10 @@ Vue.component('xy-dialog',xyDialog) Vue.config.productionTip = false +import moment from 'moment' + +Vue.prototype.$moment = moment; + new Vue({ el: '#app', router, diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue index 235b0cc..91763e4 100644 --- a/src/views/budget/budgetList.vue +++ b/src/views/budget/budgetList.vue @@ -520,6 +520,10 @@ export default { }) }, }, + created() { + + this.select.year=this.$moment().format('YYYY'); + }, mounted() { this.getTypes() this.getDepartment() diff --git a/src/views/budget/seeBudget.vue b/src/views/budget/seeBudget.vue index c5bf9eb..ea208c4 100644 --- a/src/views/budget/seeBudget.vue +++ b/src/views/budget/seeBudget.vue @@ -232,6 +232,10 @@ export default { }) }, }, + created() { + + this.select.year=this.$moment().format('YYYY'); + }, mounted() { this.getTypes() this.getDepartment() diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue index 9b43390..62d6fa9 100644 --- a/src/views/contract/components/contractSign.vue +++ b/src/views/contract/components/contractSign.vue @@ -77,6 +77,19 @@
+ + +