duy пре 5 месеци
родитељ
комит
1b41197614
1 измењених фајлова са 18 додато и 11 уклоњено
  1. 18 11
      src/views/manager/wbsinfo/paramDetail.vue

+ 18 - 11
src/views/manager/wbsinfo/paramDetail.vue

@@ -15,12 +15,12 @@
                           v-for="item in projectList"
                           :key="item.id"
                           :label="item.projectName"
-                          :value="item.id">
+                          :value="item.projectId">
                           </el-option>
                       </el-select>
                     </el-form-item>
                     <el-form-item label="" prop="contractSection">
-                      <el-select v-model="searchForm.contractSection" placeholder="合同段" clearable >
+                      <el-select v-model="searchForm.contractId" placeholder="合同段" clearable >
                           <el-option
                           v-for="item in contractList"
                           :key="item.id"
@@ -33,7 +33,7 @@
                         <el-input v-model="searchForm.textSearch"  placeholder="元素名称"></el-input>
                       </el-form-item>
                       <el-form-item>
-                          <el-button type="primary" >搜索</el-button>
+                          <el-button type="primary" @click="searchElement">搜索</el-button>
                       </el-form-item>
               </el-form>
           </div>
@@ -48,7 +48,7 @@
         </div>
 
         <!-- 表格 -->
-        <el-table :data="tableData" style="width: 100%" border>
+        <el-table :data="tableData" style="width: 100%" border v-loading="tableLoading">
           <el-table-column type="index" label="序号" width="50"></el-table-column>
           <el-table-column prop="elementName" label="元素名称"></el-table-column>
           <el-table-column prop="type" label="是否全局参数">
@@ -169,10 +169,11 @@ export default {
       ],
       searchForm: {
         projectName: '',
-        contractSection: '',
-        textSearch: '',
+        contractId: '',
+        elementName: '',
       },
       tableData: [],
+      tableLoading:false,
       addDialogVisible:false,
       isEdit:false,
       form: {
@@ -304,7 +305,7 @@ export default {
         getProjectContractByParam({
           parameterId: id
         }).then((res) => {
-          this.projectList = res.data.data.records;
+          this.projectList = res.data.data;
         });
       }
         
@@ -323,15 +324,21 @@ export default {
     
           });
     },
+    searchElement(){
+      this.getTableData()
+    },
     //获取元素列表
     getTableData(id){
+      this.tableLoading=true
       getParameterElementList({
         parameterId:  this.paramId,
-        contractId:'',
-        projectId:'',
-        elementName:''
+        contractId:this.searchForm.contractId,
+        projectId:this.searchForm.projectName,
+        elementName:this.searchForm.elementName
       }).then((res)=>{
-        this.tableData = res.data.data;
+        this.tableLoading=false
+        this.tableData = res.data.data||[];
+        this.tableLoading=false
       })
     },
     confirmAdd(){