From ba642d2510ca51edf0b5e64a78b0088fe2ee3b4f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 18:03:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 6af8cef..48db372 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -16,7 +16,7 @@
<div style="display: flex; margin-top: 10px">
<el-button plain size="small" type="primary" @click="Enable">鍚敤</el-button>
<el-button plain size="small" type="primary" @click="Deactivate">鍋滅敤</el-button>
- <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</el-button>
+ <el-button plain size="small" type="primary" @click.native="ImportExcel">瀵煎叆</el-button>
<el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>
</div>
</div>
@@ -312,8 +312,7 @@
</div>
</div>
</el-dialog>
-<!-- <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible" >-->
-<!-- </BatchImport>-->
+ <ThemeImport :visible.sync="ThemeImportVisible" :codeClassifyOid="this.codeClassifyOid"></ThemeImport>
</basic-container>
</el-main>
</el-container>
@@ -350,6 +349,8 @@
inject: ["crudTreeData"],
data() {
return {
+ //瀵煎叆鐘舵�佹
+ ThemeImportVisible:false,
selectRow:'',
//鏍戣妭鐐规樉绀洪殣钘�
TreeFlagCode:false,
@@ -681,7 +682,7 @@
label: '',
prop: 'radio',
width: 60,
- hide: false,
+ display: false
},
{
label: "妯℃澘缂栧彿",
@@ -730,9 +731,7 @@
methods: {
/** 瀵煎叆 */
ImportExcel(){
- // debugger
- // this.batchImportData.visible = true
- // this.batchImportData.codeClassifyOid = this.codeClassifyOid
+ this.ThemeImportVisible=true;
},
/** 瀵煎嚭 */
ExportExcel(){
--
Gitblit v1.9.3