From e622bd5e3b2638b9ab9a712ed1160a66018d6fd7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 22 二月 2024 09:21:15 +0800
Subject: [PATCH] mrshi
---
company/src/components/business/OperaTaxesWindow.vue | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/company/src/components/business/OperaTaxesWindow.vue b/company/src/components/business/OperaTaxesWindow.vue
index e3d58e5..e4c8953 100644
--- a/company/src/components/business/OperaTaxesWindow.vue
+++ b/company/src/components/business/OperaTaxesWindow.vue
@@ -51,7 +51,11 @@
<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
:data="tableData"
border
show-summary
@@ -84,6 +88,7 @@
</template>
</el-table-column>
</el-table>
+<<<<<<< HEAD
<el-table
v-if="model.applyType == 1"
:data="tableData1"
@@ -91,6 +96,14 @@
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"
--
Gitblit v1.9.3