From 3c456949b70671cc2ad95ad5395dfaceda519f17 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 10:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/business/OperaTaxesWindow.vue | 71 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 20 deletions(-)
diff --git a/company/src/components/business/OperaTaxesWindow.vue b/company/src/components/business/OperaTaxesWindow.vue
index 35b2a23..0fd9b66 100644
--- a/company/src/components/business/OperaTaxesWindow.vue
+++ b/company/src/components/business/OperaTaxesWindow.vue
@@ -51,11 +51,12 @@
<div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{ model.price }}</div>
</div>
</div>
- <el-table v-if="model.applyType ==0"
+ <el-table
+ v-if="model.applyType ==0"
:data="tableData"
border
show-summary
- :summary-method="getSummaries"
+ :summary-method="getSummaries1"
style="width: 100%; margin-bottom: 20px;">
<el-table-column
label="搴忓彿"
@@ -77,11 +78,6 @@
</el-table-column>
<el-table-column
align="center"
- prop="createDate"
- label="鐢宠寮�绁ㄦ椂闂�">
- </el-table-column>
- <el-table-column
- align="center"
prop="fee"
label="閲戦">
<template slot-scope="{row}">
@@ -89,12 +85,13 @@
</template>
</el-table-column>
</el-table>
- <el-table v-if="model.applyType ==1"
- :data="tableData1"
- border
- show-summary
- :summary-method="getSummaries"
- style="width: 100%; margin-bottom: 20px;">
+ <el-table
+ v-if="model.applyType ==1"
+ :data="tableData1"
+ border
+ show-summary
+ :summary-method="getSummaries"
+ style="width: 100%; margin-bottom: 20px;">
<el-table-column
label="淇濆崟"
align="center"
@@ -109,14 +106,17 @@
label="淇濋櫓鏂规">
</el-table-column>
<el-table-column
+ v-if="model.applyType == 1"
align="center"
prop="applyCode"
label="淇濆崟鍙�">
</el-table-column>
<el-table-column
align="center"
- prop="changApplyCode"
label="鎵瑰崟鍙�">
+ <template slot-scope="{row}">
+ <span>{{row.changApplyCode ? row.changApplyCode : '-'}}</span>
+ </template>
</el-table-column>
<el-table-column
align="center"
@@ -127,7 +127,8 @@
</template>
</el-table-column>
</el-table>
- <el-table v-if="model.applyType == 1"
+ <el-table
+ v-if="model.applyType == 1"
:data="tableData2"
border
show-summary
@@ -166,6 +167,7 @@
</el-table-column>
</el-table>
</div>
+ <span style="font-size: 14px;" v-if="model.status === 2">閫�鍥炲師鍥狅細{{model.cancelInfo}} 寮�绁ㄥ憳-{{model.cancelUserId}} {{model.cancelUserName}}</span>
<el-dialog
title="涓婁紶鍙戠エ"
:visible.sync="visible1"
@@ -192,8 +194,8 @@
</span>
</el-dialog>
<template v-slot:footer>
- <el-button v-if="model.status ==0 && !visible1" type="danger" @click="visible1=true">閫�鍥炵敵璇�</el-button>
- <el-button @click="visible=false">鍙栨秷</el-button>
+ <el-button v-if="userInfo.type !== 1 && model.status ==0 && !visible1" type="danger" @click="visible1 = true">閫�鍥炵敵璇�</el-button>
+ <el-button @click="visible = false">鍙栨秷</el-button>
</template>
</GlobalWindow>
</template>
@@ -202,6 +204,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { getDetail,backApply } from '@/api/business/taxes'
+import { mapState } from 'vuex'
export default {
name: 'OperaCompanyWindow',
extends: BaseOpera,
@@ -225,6 +228,9 @@
tableData2: []
}
},
+ computed: {
+ ...mapState(['userInfo'])
+ },
created () {
this.config({
api: '/business/taxes',
@@ -266,15 +272,40 @@
getDetails () {
getDetail(this.model.id).then(res => {
this.model = res
- if (res.type == 0) {
+ if (res.applyType == 0) {
this.tableData=(res.applyList)
} else {
+ console.log(res.applyList)
+ console.log(res.delTaxList)
this.tableData1=(res.applyList)
this.tableData2=(res.delTaxList)
}
- console.log(this.tableData)
}).catch(err => {
})
+ },
+ getSummaries1 (param) {
+ const { columns, data } = param
+ const sums = []
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '鍚堣'
+ } else {
+ if (index == 3) {
+ const values = data.map(item => Number(item[column.property]))
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ }
+ }
+ }
+ })
+ return sums
},
getSummaries (param) {
const { columns, data } = param
@@ -351,7 +382,7 @@
font-size: 14px;
margin-bottom: 20px;
.info_list_item_label {
- width: 150px;
+ width: 100px;
flex-shrink: 0;
}
.info_list_item_val {
--
Gitblit v1.9.3