diff --git a/src/api/propertyPlan/index.js b/src/api/propertyPlan/index.js new file mode 100644 index 0000000..0838a9f --- /dev/null +++ b/src/api/propertyPlan/index.js @@ -0,0 +1,41 @@ +import request from "@/utils/request"; + +export function index (params) { + return request({ + url: '/api/admin/property-plan/index', + method: 'get', + params + }) +} + +export function show (params) { + return request({ + url: '/api/admin/property-plan/show', + method: 'get', + params + }) +} + +export function store (data) { + return request({ + url: '/api/admin/property-plan/store', + method: 'post', + data + }) +} + +export function save (data) { + return request({ + url: '/api/admin/property-plan/save', + method: 'post', + data + }) +} + +export function destroy (params) { + return request({ + url: '/api/admin/property-plan/destroy', + method: 'get', + params + }) +} diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 1478809..e67f3e1 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,54 +2,6 @@
当前登录人:{{ user.name }}
- -
- 预算总体进展情况 - -
- -
-
-
- {{ moneyFormat(statistic.progress.money_total_1) }} -
-
年初预算数
-
-
-
- {{ moneyFormat(statistic.progress.money_total_2) }} -
-
调整后预算数
-
-
-
- {{ moneyFormat(statistic.progress.use_money_total) }} -
-
已支付金额
-
-
-
- {{ - toper( - statistic.progress.money_total_1, - statistic.progress.money_total_2, - statistic.progress.use_money_total - ) - }}% -
-
进展率
-
-
-
-
-
@@ -119,7 +71,7 @@ style="margin-left: 10px" ghost @click="toContract(row)" - >查看查看 @@ -129,6 +81,55 @@
+ + +
+ 预算总体进展情况 + +
+ +
+
+
+ {{ moneyFormat(statistic.progress.money_total_1) }} +
+
年初预算数
+
+
+
+ {{ moneyFormat(statistic.progress.money_total_2) }} +
+
调整后预算数
+
+
+
+ {{ moneyFormat(statistic.progress.use_money_total) }} +
+
已支付金额
+
+
+
+ {{ + toper( + statistic.progress.money_total_1, + statistic.progress.money_total_2, + statistic.progress.use_money_total + ) + }}% +
+
进展率
+
+
+
+
+
diff --git a/src/views/finance/components/addPropertyPlan.vue b/src/views/finance/components/addPropertyPlan.vue new file mode 100644 index 0000000..e77d245 --- /dev/null +++ b/src/views/finance/components/addPropertyPlan.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/src/views/finance/financialEvaluation.vue b/src/views/finance/financialEvaluation.vue new file mode 100644 index 0000000..93705f7 --- /dev/null +++ b/src/views/finance/financialEvaluation.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue index 4a06bf7..1f619f5 100644 --- a/src/views/finance/paymentRegistrationList.vue +++ b/src/views/finance/paymentRegistrationList.vue @@ -1,451 +1,531 @@ - - - - - + + + + + diff --git a/src/views/statisticalReport/quarterlyStatistics.vue b/src/views/statisticalReport/quarterlyStatistics.vue index dc4ba55..e40cfbf 100644 --- a/src/views/statisticalReport/quarterlyStatistics.vue +++ b/src/views/statisticalReport/quarterlyStatistics.vue @@ -6,11 +6,11 @@ style="margin-bottom: 10px; border: 0px; margin-top: 15px" >
- - 年份 - - + + 年份 + + 关键字 @@ -76,10 +76,10 @@ export default {

{row.department.name}

{ - row.plan?.map(i => { + row.plan?.map((i,index) => { return ( -

{i.name}

+

{i.name}

) }) @@ -106,9 +106,9 @@ export default { },0) }

{ - row.plan?.map(i => { + row.plan?.map((i,index) => { return ( -

{ i.money }

+

{ i.money }

) }) } @@ -146,9 +146,9 @@ export default { },0) }

{ - row.plan?.map(i => { + row.plan?.map((i,index) => { return ( -

{ i.detail[z].plan_total }

+

{ i.detail[z].plan_total }

) }) } @@ -169,9 +169,9 @@ export default { },0) }

{ - row.plan?.map(i => { + row.plan?.map((i,index) => { return ( -

{ i.detail[z].act_total }

+

{ i.detail[z].act_total }

) }) } @@ -194,9 +194,9 @@ export default { },0)) }%

{ - row.plan?.map(i => { + row.plan?.map((i,index) => { return ( -

{ this.percent(i.detail[z].act_total,i.detail[z].plan_total) }%

+

{ this.percent(i.detail[z].act_total,i.detail[z].plan_total) }%

) }) } @@ -219,9 +219,9 @@ export default { '/' }

{ - row.plan?.map(i => { + row.plan?.map((i,index) => { return ( -

{ +

{ i.detail?.reduce((a,b) => { return a + parseInt(b.plan_total) },0) @@ -250,7 +250,7 @@ export default { }, }, computed: {}, - created() { + created() { this.select.year = this.$moment().format('YYYY'); this.getList(); }, @@ -258,6 +258,9 @@ export default {