Browse Source

Merge branch 'master' into test-dev

duy 1 month ago
parent
commit
0196f22792
1 changed files with 23 additions and 3 deletions
  1. 23 3
      src/views/manager/wbsinfo/element.vue

+ 23 - 3
src/views/manager/wbsinfo/element.vue

@@ -286,10 +286,29 @@
       :close-on-click-modal="false"
     >
       <p class="font-c-warning">编辑元素信息(请谨慎操作)</p>
-        <div style="display:flex;margin-bottom:10px">
-                      <el-input placeholder="请输入你想编辑的元素名称" v-model="searchinput" :size="size"  clearable  @clear="clearsearchinput" >  </el-input>
+        <div style="display:flex;margin-bottom:10px;">
+          <el-input placeholder="请输入你想编辑的元素名称" v-model="searchinput"  clearable  @clear="clearsearchinput"  style="width:300px;margin-right:10px">  </el-input>
+                        
+          <el-select
+              v-model="eTypeVal"
+            style="width:200px;margin-right:10px;"
+            clearable
+
+
+             
+              placeholder="请选择数据类型"
+            >
+              <el-option
+                v-for="item in dataTypeList"
+                :key="item.id"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              ></el-option>
+            </el-select>
+        
                       <el-button type="primary" icon="el-icon-search"  size="small"  @click="searchinputChange">搜索</el-button>
         </div>
+
       <el-table
         :data="editEleList"
         border
@@ -743,6 +762,7 @@ export default {
       sortTag2: false,
       sort:[],
       searchinput:'',
+      eTypeVal:''
 
     }
   },
@@ -1099,7 +1119,7 @@ export default {
     //获取编辑元素信息
     getselectPrivateFormElements(){
        this.editEleloading=true
-            selectPrivateFormElements(this.curEleTable.id,{eName:this.searchinput}).then((res) => {
+            selectPrivateFormElements(this.curEleTable.id,{eName:this.searchinput,eType:this.eTypeVal}).then((res) => {
                 this.editEleloading=false
                 res.data.data.forEach((element) => {
                 this.eleReg.exec(element.eAllowDeviation);