|
|
@@ -1201,13 +1201,13 @@
|
|
|
<div class="flex mg-b-10">
|
|
|
<el-input
|
|
|
v-model="formulaInput"
|
|
|
- placeholder="请输入内容"
|
|
|
- size="samll"
|
|
|
+ placeholder="请输入名称"
|
|
|
+ size="samll" clearable @clear="searchFormulaName"
|
|
|
></el-input>
|
|
|
- <el-button type="info">保存</el-button>
|
|
|
+ <el-button type="info" class="mg-l-10" @click="searchFormulaName">搜索</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
- :data="editEleList"
|
|
|
+ :data="editEleListFilter"
|
|
|
border
|
|
|
style="width: 100%"
|
|
|
height="400px"
|
|
|
@@ -1231,7 +1231,7 @@
|
|
|
<!-- <el-link
|
|
|
class="mg-l-10"
|
|
|
type="danger"
|
|
|
- @click="delEleRowHandle(scope.$index,editEleList)"
|
|
|
+ @click="delEleRowHandle(scope.$index,editEleListFilter)"
|
|
|
>删除</el-link> -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -1659,6 +1659,8 @@ export default {
|
|
|
|
|
|
editEleFormulaVisible: false,
|
|
|
formulaInput: '',
|
|
|
+ editEleListFilter:[],
|
|
|
+ editEleListAll:[],
|
|
|
|
|
|
importTemplateVisible: false,
|
|
|
fileUrl: '',
|
|
|
@@ -1993,11 +1995,19 @@ export default {
|
|
|
this.curEleTable = row;
|
|
|
selectFormElements(this.curEleTable.id).then((res) => {
|
|
|
|
|
|
- this.editEleList = res.data.data;
|
|
|
+ this.editEleListFilter = res.data.data;
|
|
|
+ this.editEleListAll = [].concat(this.editEleListFilter);
|
|
|
})
|
|
|
this.editEleFormulaVisible = true;
|
|
|
},
|
|
|
|
|
|
+ //搜索 筛选
|
|
|
+ searchFormulaName(){
|
|
|
+ this.editEleListFilter = this.editEleListAll.filter((ele)=>{
|
|
|
+ return ele.eName.indexOf(this.formulaInput) > -1;
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
saveNewEle (row) {
|
|
|
row.eAllowDeviation = (row.allow ? row.allow : '') + (row.deviation ? row.deviation : '');
|
|
|
row.fId = this.curEleTable.id;
|
|
|
@@ -2790,7 +2800,7 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
this.setLeftType(4,this.curTreeData,this.curTreeNode);
|
|
|
- //this.showType = 2;
|
|
|
+ // this.showType = 2;
|
|
|
},
|
|
|
|
|
|
editNodeHandle(){
|
gangyj