From 39967909b38575d2325b6f51b4d7721e4dd7a12d Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 06 七月 2023 10:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 58 +---------------------------------------------------------
1 files changed, 1 insertions(+), 57 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 428a3a8..4afd457 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -81,20 +81,6 @@
<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="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button>
- <!-- <div style="display: inline-block">
- <el-select v-model="searchTemplate.searchCondition" placeholder="璇烽�夋嫨" class="search-condition">
- <el-option
- v-for="item in searchTemplateOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- <el-input v-model="searchTemplate.findText" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
- size="small"
- @keyup.enter.native="EnterFind">
- </el-input>
- </div> -->
<!-- 鏌ヨ瀵硅瘽妗�-->
<el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ">
<div>
@@ -210,48 +196,6 @@
inject: [, "crudTreeData"],
data() {
return {
-<<<<<<< HEAD
-=======
- // //琛ㄦ牸option閰嶇疆椤�
- // crudTreeOption: {
- // index: true,
- // border: true,
- // height:180,
- // selection:true,
- // addBtn:this.addFlag,
- // column: [
- // {
- // label: "妯℃澘缂栧彿",
- // prop: "id"
- // },
- // {
- // label:"妯℃澘鍚嶇О",
- // prop:"name"
- // },
- // {
- // label: "妯℃澘鎻忚堪",
- // prop:"description"
- // },
- // {
- // label:"鐗堟湰鍙�",
- // prop:"revisionSeq"
- // },
- // {
- // label:"鐘舵��",
- // prop:"lcStatusText"
- // }
- // ]
- // },
- // searchTemplateOptions: [
- // {
- // value: 'id',
- // label: '妯℃澘缂栧彿'
- // }, {
- // value: 'name',
- // label: '妯℃澘鍚嶇О'
- // }
- // ],
->>>>>>> 7ff3f607595a30fc66924eb4b60ff00407afbbc2
addFlag:false,
// 琛ㄦ牸褰撳墠琛宨d
crudOid:"",
@@ -264,7 +208,7 @@
searchCondition: 'id',
findText: "",
},
-
+
//楂樼骇鏌ヨ瀵硅瘽妗�
FindFormVisible: false,
//鍏嬮殕妯℃澘瀵硅瘽妗�
--
Gitblit v1.9.3