From e4be5ba9eea9fe8408f3a7048a315b3767b33f49 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 23 二月 2024 09:54:38 +0800
Subject: [PATCH] mrshi
---
company/src/components/business/OperaTaxesWindow.vue | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/company/src/components/business/OperaTaxesWindow.vue b/company/src/components/business/OperaTaxesWindow.vue
index e4c8953..0fd9b66 100644
--- a/company/src/components/business/OperaTaxesWindow.vue
+++ b/company/src/components/business/OperaTaxesWindow.vue
@@ -51,11 +51,8 @@
<div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{ model.price }}</div>
</div>
</div>
-<<<<<<< HEAD
- <el-table v-if="model.applyType == 0"
-=======
- <el-table v-if="model.applyType ==0"
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
+ <el-table
+ v-if="model.applyType ==0"
:data="tableData"
border
show-summary
@@ -88,22 +85,13 @@
</template>
</el-table-column>
</el-table>
-<<<<<<< HEAD
<el-table
- v-if="model.applyType == 1"
+ 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;">
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
<el-table-column
label="淇濆崟"
align="center"
@@ -139,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
@@ -178,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"
@@ -285,10 +275,11 @@
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 => {
})
},
@@ -391,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