Signed-off-by: 段小段 <1729609802@qq.com>

src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -7,19 +7,20 @@
       <el-select v-model="table.getdataListParm.parammaps.search" placeholder="查询" class="filter-item" style="width: 120px;margin-right: 10px;">
         <el-option v-for="item in searchList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-select v-if="table.getdataListParm.parammaps.search == '0'" v-model="table.getdataListParm.parammaps.fanme" placeholder="请选择配方" class="filter-item" style="width: 120px;" clearable>
-        <el-option v-for="item in formulaList" :key="item.id" :label="item.name" :value="item.id" />
+      <el-select v-if="table.getdataListParm.parammaps.search == '0'" v-model="table.getdataListParm.parammaps.templetid" clearable filterable placeholder="请输入配方名称" style="width: 180px;" class="filter-item">
+        <el-option v-for="(item,index) in fenceHouseList" :key="index" :label="item.tname" :value="item.id" />
       </el-select>
-      <el-select v-else v-model="table.getdataListParm.parammaps.fanme" placeholder="请选择栏舍" class="filter-item" style="width: 120px;" clearable>
-        <el-option v-for="item in fenceHouseList" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select>
+      <el-select v-else v-model="table.getdataListParm.parammaps.barid" clearable filterable placeholder="请选择栏舍" style="width: 180px;" class="filter-item">
+        <el-option v-for="item in formulaList" :key="item.id" :label="item.bname" :value="item.id" />
+      </el-select>
+      <el-button class="successBorder" style="margin-left:10px;" @click="handleSearch">查询</el-button>
     </div>
     <div class="search" />
     <div class="table">
       <el-table
         :key="table.tableKey"
         v-loading="table.listLoading"
-        element-loading-text="给我q一点时间"
+        element-loading-text="给我一点时间"
         :data="table.list"
         border
         fit
@@ -531,7 +532,9 @@ export default {
             startTime: parseTime(new Date(), '{y}-{m}-{d}'),
             stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
             inputDatetime: [new Date(), new Date()],
-            search: '0'
+            search: '0',
+            templetid:'',
+            barid:''
           }
         },
         tableKey: 1,
@@ -645,10 +648,38 @@ export default {
       this.see.table.getdataListParm.parammaps.stopTime = this.table.getdataListParm.parammaps.stopTime
       this.getListSee()
     }
-    this.getList()
+    this.getList()
+    this.getformulaList()
+    this.getfenceHouseList()
   },
 
-  methods: {
+  methods: {
+    getformulaList(){
+      const url = 'authdata/GetDataByName'
+      const data = {}
+      data.name = 'getBarListEnable'
+      data.parammaps = {}
+      data.parammaps.pastureid = Cookies.get('pastureid')
+      postJson(url, data).then(response => {
+        if(response.data.list !== null){
+          this.formulaList = response.data.list
+        }else{
+          this.formulaList = []
+        }
+      })
+    },
+    getfenceHouseList(){
+      const url = 'authdata/GetDataByName'
+      const data = {}
+      data.name = 'getFeedTempletName'
+      postJson(url, data).then(response => {
+        if(response.data.list !== null){
+          this.fenceHouseList = response.data.list
+        }else{
+          this.fenceHouseList = []
+        }
+      })
+    },
     getList() {
       this.table.listLoading = true
       GetDataByName(this.table.getdataListParm).then(response => {
@@ -659,14 +690,24 @@ export default {
           this.table.pageSize = response.data.pageSize
           this.table.total = response.data.total
         } else {
-          this.table.list = []
+          this.table.list = []
+          this.table.pageNum = 0
+          this.table.pageSize = 0
+          this.table.total = 0
         }
-        console.log(this.$route.params.tname)
-        // this.see.dialogFormVisible = false
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)
       })
+    },
+    handleSearch() {
+      if(this.table.getdataListParm.parammaps.search == '0'){
+        this.table.getdataListParm.parammaps.barid = ''
+      }else{
+        this.table.getdataListParm.parammaps.templetid = ''
+        console.log(this.table.getdataListParm.parammaps.barid)
+      }
+      this.getList()
     },
     changeDate() {
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
@@ -754,7 +795,10 @@ export default {
           this.getListDetails2()
         } else {
           this.details.table1.list = []
-          this.details.table2.list = []
+          this.details.table2.list = []
+          this.details.table1.pageNum = 0
+          this.details.table1.pageSize = 0
+          this.details.table1.total = 0
         }
         setTimeout(() => {
           this.details.table1.listLoading = false
@@ -771,7 +815,10 @@ export default {
           this.details.table2.pageSize = response.data.pageSize
           this.details.table2.total = response.data.total
         } else {
-          this.details.table2.list = []
+          this.details.table2.list = []
+          this.details.table2.pageNum = 0
+          this.details.table2.pageSize = 0
+          this.details.table2.total = 0
         }
         setTimeout(() => {
           this.details.table2.listLoading = false
@@ -806,7 +853,10 @@ export default {
           this.see.table.pageSize = response.data.pageSize
           this.see.table.total = response.data.total
         } else {
-          this.see.table.list = []
+          this.see.table.list = []
+          this.see.table.pageNum = 0
+          this.see.table.pageSize = 0
+          this.see.table.total = 0
         }
         setTimeout(() => {
           this.see.table.listLoading = false