From a075ef6b7cbd09d727068ef3d7e08691775dbb16 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 17:58:58 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b2-standard-template.vue | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/components/view/b2-standard-template.vue b/src/components/view/b2-standard-template.vue
index d6ca274..bf60cf6 100644
--- a/src/components/view/b2-standard-template.vue
+++ b/src/components/view/b2-standard-template.vue
@@ -63,7 +63,7 @@
</div>
<el-dialog title="妯℃澘缂栧埗" :visible.sync="isShow" width="80%" :before-close="isClose">
<div style="width: 100%;height: 80vh;overflow: auto;" v-if="isShow">
- <Excel :data="row.thing" :title="row.name" v-loading="loading"></Excel>
+ <Excel :data="row.thing" :execlTitle="row.name" v-loading="loading"></Excel>
</div>
</el-dialog>
</div>
@@ -95,7 +95,7 @@
font: '缂栬緫',
type: 'text',
method: 'doDiy',
- field: ['createUserName', 'updateUserName','thing']
+ field: ['createUserName', 'updateUserName']
}, {
id: 'delete',
font: '鍒犻櫎',
@@ -172,7 +172,6 @@
closed(){
this.loading = true
let data = luckysheet.toJson()
- console.log(data);
this.$axios.post(this.$api.StandardTemplate.upStandardTemplate,{
id: this.row.id,
thing: JSON.stringify(data),
--
Gitblit v1.9.3