From b142f5cbf08bf5e1e5e0a960c92ce9e80ec15677 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 05 七月 2023 19:41:02 +0800
Subject: [PATCH] 主题库定义bug2
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 18e84bf..428a3a8 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -81,9 +81,20 @@
<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-input v-model="FindText" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
- size="small"
- @keyup.enter.native="EnterFind"></el-input></div>
+ <!-- <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>
@@ -92,7 +103,7 @@
</div>
<div style="padding-left: 80px;margin-top: 15px;">
<template v-for="(value, key) in FindSelect">
- <div style="display: flex;justify-content: space-around;width: 85%;margin-bottom: 15px">
+ <div style="display: flex; justify-content: space-around; width: 85%; margin-bottom: 15px">
<el-select v-model="FindSelect[key]" placeholder="璇烽�夋嫨" style="width: 28%"
@change="handleSelectChange(key)">
<el-option label="妯℃澘缂栧彿" value="0"></el-option>
@@ -199,6 +210,48 @@
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:"",
@@ -207,7 +260,11 @@
//妯℃澘灞炴�у睍绀哄唴瀹�
ProData: [],
//鍥炶溅閿悳绱㈢粦瀹氬��
- FindText: "",
+ searchTemplate: {
+ searchCondition: 'id',
+ findText: "",
+ },
+
//楂樼骇鏌ヨ瀵硅瘽妗�
FindFormVisible: false,
//鍏嬮殕妯℃澘瀵硅瘽妗�
@@ -799,20 +856,20 @@
});
})
},
- //妯℃澘绠＄悊琛ㄦ牸鏌ヨ
- EnterFind() {
- if (this.FindText == "") {
+ //妯℃澘绠＄悊琛ㄦ牸鏌ヨ,鍙湁涓�鏉℃暟鎹病蹇呰鍋氭悳绱�
+ /*nterFind() {
+ if (this.findText == "") {
gridCodeClassifyTemplate().then(res => {
this.Formlist = res.data.data
})
} else {
gridCodeClassifyTemplate().then(res => {
this.Formlist = res.data.data.filter(item => {
- return item.name.includes(this.FindText)
+ return item.name.includes(this.findText)
})
})
}
- },
+ },*/
//鍏嬮殕妯℃澘鏌ヨ
CloneEnterFind(){
gridCodeClassifyTemplate().then(res => {
@@ -924,4 +981,5 @@
.my-messageboxs {
width: 500px;
}
+
</style>
--
Gitblit v1.9.3