饲喂

src/utils/request.js

@@ -11,7 +11,7 @@ const service = axios.create({
   //baseURL: process.env.VUE_APP_BASE_API, // 根目录路径
  // baseURL: 'http://192.168.1.77:8092',
  
-   baseURL: 'http://192.168.1.70:8087',
+  baseURL: 'http://192.168.1.70:8087',
   
   //baseURL: 'http://192.168.1.96.8090',
   withCredentials: true, // send cookies when cross-domain requests
@@ -36,7 +36,7 @@ service.interceptors.request.use(
     //     config.headers['token'] = getToken()
     //   }
     // }
-     console.log(sessionStorage.getItem("g_token"))
+    //  console.log(sessionStorage.getItem("g_token"))
      
      config.headers['Authorization'] = 'Bearer '+ window.sessionStorage.getItem("g_token")
     return config
@@ -62,10 +62,10 @@ service.interceptors.response.use(
    */
   response => {
 
-    console.log("response-------------",response)
+   // console.log("response-------------",response)
      const res = response.data
  
-    console.log(res)
+    //console.log(res)
 
     // if the custom code is not 20000, it is judged as an error.
     if (res.code !== 200) {

src/views/dataStatistics/FeedProcess.vue

@@ -1,11 +1,107 @@
 <template>
  
   <div>
-   待开发页面
 
-   
+
+    <el-card class="box-card">
+      <!-- 搜索区域 -->
+      <div class="search-bx1">
+
+        <el-row :gutter="20">
+            <el-col :span="24">
+
+              <el-select v-model="searchData.calf_category_id" filterable placeholder="饲喂计划" class="g-mr20  g-mb20" style="width: 180px;" clearable>
+                <el-option v-for="item in calfTypeList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <el-select v-model="searchData.status" filterable placeholder="班次" class="g-mr20" style="width: 180px;" clearable>
+                <el-option v-for="item in statusList" :key="item.id" :label="item.value" :value="item.id" />
+              </el-select>
+              <el-select v-model="searchData.status" filterable placeholder="饲喂车" class="g-mr20" style="width: 180px;" clearable>
+                <el-option v-for="item in statusList" :key="item.id" :label="item.value" :value="item.id" />
+              </el-select>
+              <el-input v-model="searchData.name" placeholder="饲喂车编号"  style="width: 180px;" disabled />
+            </el-col>
+        </el-row>
+        <el-row :gutter="20">
+            <el-col :span="24">
+ 
+                <el-input v-model="searchData.name" placeholder="栏舍名称"  style="width: 220px;" class="g-mr20  g-mb20" clearable />
+                <el-input v-model="searchData.name" placeholder="栏舍组名称"  style="width: 220px;" class="g-mr20 " clearable />
+
+                <el-input-number v-model="searchData.min_daily_age" style="width:120px;" :controls="false" placeholder="准确率" />
+                <span style="margin:0px 8px;">至</span>
+                <el-input-number v-model="searchData.max_daily_age" style="width:120px;" class="g-mr20" :controls="false" placeholder="准确率" />
+
+                <el-input-number v-model="searchData.min_daily_age" style="width:120px;" :controls="false" placeholder="温差" />
+                <span style="margin:0px 8px;">至</span>
+                <el-input-number v-model="searchData.max_daily_age" style="width:120px;" class="g-mr20" :controls="false" placeholder="温差" />
+
+                <el-button type="primary"   @click="form_search">搜索</el-button>
+                <el-button type="primary"   @click="form_clear">重置</el-button>
+            </el-col>
+        </el-row>
+
+ 
+      </div>
 
  
+      <!-- 表格 -->
+      <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
+        <el-table-column label="序号"  width="50px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="类型名称" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="犊牛数量" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+         
+ 
+        <!-- <el-table-column  label="状态"  min-width="100px" align="center">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.mg_state" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0"   />
+          </template>
+        </el-table-column> -->
+
+        <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="scope">
+             <!-- 修改按钮 -->
+             <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
+             <!-- 删除按钮 -->
+             <el-button type="danger" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页区域 -->
+      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.total"/>
+    </el-card>
+
+
+    <!-- 弹窗 新增or修改 -->
+    <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
+      <div class="">
+        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="100px"  style="width:50%;margin:0 auto 50px">
+            <el-form-item label="类型名称：" prop="name">
+                <el-input   v-model="addForm.name"  ></el-input>  
+            </el-form-item>
+           
+            
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="addFormStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
+          <el-button @click="addFormShow = false">关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
  
     
   </div>
@@ -28,19 +124,16 @@ export default {
  
 
       //接口 - 获取 - 表格
-      url_get_table:'/api/v1/ops/barn/list',
+      url_get_table:'/api/v1/ops/base_setting/calf_type/list',
       //接口 - 新增 - 表格
-      url_add_table:'/api/v1/ops/barn/add',  
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
       //接口 - 修改 - 表格
-      url_edit_table:'/api/v1/ops/barn/update', 
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
       //接口 - 删除 - 表格
-      url_delete_table:'/api/v1/ops/barn/delete', 
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
       
       //接口 - 下拉框 列表 
-      url_get_select1:'/api/v1/ops/calf_feed/enum/list',
-
-      //接口 - 下拉框 列表 栏舍组
-      url_get_select2:'/api/v1/ops/barn_group/list?page=1&page_size=1000',
+      url_get_select1:'/role/getAll',
 
       //按钮权限
       isButtonEdit:false,
@@ -71,19 +164,14 @@ export default {
       ],
 
 
-      //栏舍状态
-      statusList:[
-        {id: 1, value: '正常'},
-        {id: 2, value: '空栏'},
-        {id: 3, value: '损坏'},
+      
+      pastureList:[
+    
       ],
 
     
 
-      //栏舍组下拉
-      barnGroupList:[
-         
-      ],
+ 
 
 
       addFormShow:false,
@@ -94,9 +182,9 @@ export default {
       },
 
       addFormRules:{
-        // name: [
-        //   { required: true, message: '类型必填', trigger: 'blur' },
-        // ],
+        name: [
+          { required: true, message: '类型必填', trigger: 'blur' },
+        ],
    
 
       },
@@ -111,10 +199,10 @@ export default {
      
 
      //获取下拉框
-       //this.get_select_list1()
+     // this.get_select_list1()
 
       //表格 - 初始化 
-        //this.get_table_data()
+      this.get_table_data()
 
      
 
@@ -132,13 +220,14 @@ export default {
     //获取 下拉框
     get_select_list1(){
         var me = this
-        ajaxDataPost(me.url_get_select2, { name: ""}).then(e => {
-          console.log("栏舍组下拉框：",e)
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
 
-          if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
-            me.barnGroupList = []
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
           } else {
-            me.barnGroupList = e.data.list
+            me.roleList = e.data
           }
 
          
@@ -146,17 +235,17 @@ export default {
         })
 
 
-        // ajaxDataGet('/authdata/pasture', {  "page": 1,   "page_size": 1000}).then(e => {
-        //   console.log("牧场下拉框1：",e)
+        ajaxDataGet('/authdata/pasture', {  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("牧场下拉框1：",e)
 
-        //   //打印请求成功结果
-        //   if(e.data == null || e.data == undefined ||e.data.length == 0   ){
-        //     me.pastureList = []
-        //   } else {
-        //     me.pastureList = e.data
-        //   }
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.pastureList = []
+          } else {
+            me.pastureList = e.data
+          }
   
-        // })
+        })
 
     
     },
@@ -225,116 +314,12 @@ export default {
     //清空弹窗表单信息
     reset_form(){
       this.addForm.name = ''
-      this.addForm.id = undefined
-      this.addForm.barn_group_id = undefined
-      this.addForm.number = ''
-       
-    },
-
-    //新增
-    form_add() {
-      this.reset_form()
-      this.addFormStatus = 'create'
-      this.addFormShow = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-    //编辑
-    form_edit(row) {
-      this.reset_form()
-      console.log('行内容row=========', row)
-      //编辑行内容赋值
-      this.addForm = Object.assign({}, row)  
-      this.addFormStatus = 'edit'
-      this.addFormShow = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
     },
+ 
 
-
-    //新增关闭
-    add_dialog_close(){
-       //内容重置
-       this.$refs['addFormRef'].resetFields()
-    },
-
-    //新增 保存
-    add_dialog_save() {
-      var me = this
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-          var send_data = {
-              "name": me.addForm.name,
-              "barn_group_id": me.addForm.barn_group_id,
-              "number": me.addForm.number,
-
-          }
-          console.log("弹窗参数：", send_data)
-
-          //关闭弹窗
-          // me.addFormShow = false
-         //加载 - 发送新增保存
-           ajaxDataPost(me.url_add_table, send_data).then(e => {
-                console.log("新增结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
-                  //关闭弹窗
-                  me.addFormShow = false
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
-                }
-            })
-         
-        }
-      })
-    },
-    //编辑 保存
-    edit_dialog_save(){
-      var me = this
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-          var send_data = {
     
-              "id": me.addForm.id,
-              "name": me.addForm.name,
-              "barn_group_id": me.addForm.barn_group_id,
-              "number": me.addForm.number,
-          }
-
-          // var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
-          // console.log(name)
-
-           // 编辑保存
-          console.log("弹窗参数：", send_data)
-
-          //关闭弹窗
-          // me.addFormShow = false
-         //加载 - 发送新增保存
-         ajaxDataPut(me.url_edit_table, send_data).then(e => {
-                console.log("编辑结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
-                  //关闭弹窗
-                  me.addFormShow = false
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
-                }
-            })
-         
-        }
-      })
-    },
+   
+ 
 
 
     
@@ -342,41 +327,7 @@ export default {
 
 
 
-    form_delete(row) {
-      var me = this
-
-       me.$confirm('是否删除此条内容?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-            console.log("删除的ID参数：", row.id)
-            //加载 - 发送新增保存
-            ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
-                console.log("编辑结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success',  message: '删除成功!'  });
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
-                }
-            })
-
-        
- 
-          
-        }).catch(() => {
-          me.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-
-
-       
-    },
-
+  
  
     form_export() {
     //获取请求表格数据的参数

src/views/formulaPlan/FeedPlan.vue

@@ -15,7 +15,7 @@
         <el-input v-model="searchData.barn_name" placeholder="饲喂栏舍"  style="width: 180px;" class="g-mr20" clearable />
         <el-button type="primary"   @click="form_search">搜索</el-button>
         <el-button type="primary"   @click="form_clear">重置</el-button>
-        <el-button type="primary"   @click="form_add">添加</el-button>
+        <el-button type="primary"   @click="form_add">添加车次</el-button>
          <!-- <el-button type="primary"   @click="form_export">导出</el-button> -->
       </div>
       <!-- 表格 -->
@@ -53,8 +53,9 @@
 
         <el-table-column label="配方模板" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.formula_name }}</span>
+             <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_record_see(scope.row)">{{ scope.row.formula_name }}</el-button>
           </template>
+           
         </el-table-column>
         <el-table-column label="饲喂时间" min-width="150px" align="center">
           <template slot-scope="scope">
@@ -142,10 +143,16 @@
                     <el-time-picker v-model="addForm.feed_time" format='HH:mm:ss' type="time" placeholder="选择日期"   style="width: 80%;" :clearable="false"   />
                   </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                  <el-form-item label="车次状态：" prop="status">
+                    <el-switch v-model="addForm.status" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="2"   />
+                  </el-form-item>
+                </el-col>
+                
             </el-row>
             <el-row :gutter="20">
               <el-col :span="12">
-                <el-table ref="multipleTable1"  key="0"  :data="selectBarnGroupList"  element-loading-text="给我一点时间"  @selection-change="change_barn_group_selection"   border fit >
+                <el-table ref="multipleTable1"  key="0"  :data="barnGroupTableList"  element-loading-text="给我一点时间"  highlight-current-row  @selection-change="change_barn_group_selection" @current-change="change_barn_group_now"  border fit >
                   <el-table-column   type="selection"   width="55">  </el-table-column>
                   <el-table-column label="栏舍组名称" min-width="150px" align="center">
                     <template slot-scope="scope">
@@ -160,8 +167,9 @@
                 </el-table>
               </el-col>
               <el-col :span="12">
-                <el-table  ref="multipleTable2"  key="0"  :data="selectBarnList"  element-loading-text="给我一点时间"  @selection-change="change_barn_selection"   border fit >
-                  <el-table-column   type="selection"   width="55">  </el-table-column>
+                <el-table  ref="multipleTable2"  row-key="id"  :data="barnTableList"  element-loading-text="给我一点时间"  @selection-change="change_barn_selection"   
+                 border fit >
+                  <el-table-column   type="selection" :reserve-selection=true  width="55">  </el-table-column>
                   <el-table-column label="栏舍名称" min-width="150px" align="center">
                     <template slot-scope="scope">
                       <span>{{ scope.row.name }}</span>
@@ -183,6 +191,88 @@
         </div>
       </div>
     </el-dialog>
+
+
+    <el-dialog   title="配方模板" :visible.sync="seeFormShow" @close="see_dialog_close" width="80%">
+      <div class="">
+        <div class="search-bx1">
+          
+        </div>
+
+
+        <el-table   key="0"  :data="tableList2"  v-loading="tableLoading2" element-loading-text="给我一点时间"    border fit>
+              <el-table-column label="阶段"  width="50px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.id }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开始日龄" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.start_daily_age }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="结束日龄" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.end_daily_age }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="饲料类型" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.forage_name }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="日饲喂量(kg)" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.daily_feed_number }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="第一班占比(%)" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.first_class_ratio }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="第二班占比(%)" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.second_class_ratio }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="第三班占比(%)" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.third_class_ratio }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="第四班占比(%)" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.fourth_class_ratio }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="班次允许误差(kg)" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.allow_class_error }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="饲喂温度℃" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.feed_temp }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="允许温差℃" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.allow_temp_error }}</span>
+                </template>
+              </el-table-column>
+
+
+
+        </el-table>
+
+
+
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="seeFormShow = false">关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -276,11 +366,28 @@ export default {
         // ],
       },
       barnIds:[],
-      selectBarnGroupList:[],
-      selectBarnList:[],
+      barnGroupTableList:[],
+      barnTableList:[],
 
       barnGroupIdsArr:[],
       barnIdsArr:[],
+
+      //选中的栏舍树包含所有栏舍
+      barnGroupTree:[],
+      //选中的栏舍树只包含选中栏舍
+      barnGroupTreeSelect:[],
+
+
+      tableLoading2: false,
+      //表格内容
+      tableList2:[],
+      seeFormShow:false,
+      seeFormStatus: '',
+      seeFormTxt: {  edit: '修改',  create: '新增' },
+      seeForm:{
+        name:'',id:''
+      },
+
     }
   },
   created(){
@@ -345,7 +452,7 @@ export default {
       //栏舍组表格
       ajaxDataPost('/api/v1/ops/barn_group/list?page=1&page_size=1000', {name:""}).then(e => {
         if(e.code === 200 ){
-          me.selectBarnGroupList = e.data.list
+          me.barnGroupTableList = e.data.list
         }
       })
     },
@@ -385,7 +492,7 @@ export default {
       me.searchData.formula_name = ""
       me.searchData.barn_name = ""
       me.searchData.barn_group_name = ""
-      me.searchData.status = undefined
+      me.searchData.status = 
       me.get_table_data()
     },
 
@@ -413,6 +520,37 @@ export default {
       
     },
 
+    form_record_see(row) {
+      var me = this
+      console.log('行内容row=========', row)
+      //编辑行内容赋值
+      this.seeForm = Object.assign({}, row)
+
+      this.seeFormShow = true
+
+
+      
+
+      ajaxDataGet('/api/v1/ops/formula_plan/formula/'+row.formula_id, {  }).then(e => {
+          console.log("配方模板：",e)
+
+          //打印请求成功结果
+          if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+            me.tableList2 = []
+          } else {
+            me.tableList2 = e.data.list
+          }
+  
+        })
+
+    },
+
+    //新增关闭
+    see_dialog_close(){
+       //内容重置
+       this.seeFormShow = false
+     },
+
     //新增
     form_add() {
       this.reset_form()
@@ -466,26 +604,28 @@ export default {
             "feed_vehicle_id": parseFloat(me.addForm.feed_vehicle_id) ,
             "feed_vehicle_name": me.addForm.feed_vehicle_name,
             "status": parseFloat(me.addForm.status) ,
-            "feed_time": me.addForm.feed_time,
+            "feed_time": parseTime(me.addForm.feed_time, '{h}:{i}:{s}'), 
             "barn_group_ids":me.barnGroupIdsArr,
             "barn_ids":me.barnIdsArr,
           }
+
+          console.log('新增保存',send_data)
      
           //关闭弹窗
-          me.addFormShow = false
+         // me.addFormShow = false
          //加载 - 发送新增保存
-           ajaxDataPost(me.url_add_table, send_data).then(e => {
-                console.log("新增结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
-                  //关闭弹窗
-                  me.addFormShow = false
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
-                }
-            })
+          //  ajaxDataPost(me.url_add_table, send_data).then(e => {
+          //       console.log("新增结果：",e)
+          //       //打印请求成功结果
+          //       if(e.code == 200  ){
+          //         me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
+          //         //关闭弹窗
+          //         me.addFormShow = false
+          //         me.get_table_data()
+          //       } else {
+          //         me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
+          //       }
+          //   })
 
         }
       })
@@ -572,11 +712,13 @@ export default {
 
 
     },
-
+    //栏舍组选择
     change_barn_group_selection(val){
-      console.log(val)
+      console.log("选中的数组", val)
       var me = this
       var barnGroupIdsArr = []
+
+      
       val.forEach(function (item,index) {
         barnGroupIdsArr.push(item.id)
         
@@ -584,6 +726,9 @@ export default {
      me.barnGroupIdsArr = barnGroupIdsArr
 
 
+
+    
+     
       me.barnIds = []
       val.forEach(function (item,index) {
         item.barns.forEach(function (v,k){
@@ -591,16 +736,40 @@ export default {
         })
       })
 
-      // 栏舍数据
+      console.log("选中的栏舍组",me.barnGroupIdsArr)
+      console.log("选中的栏舍",me.barnIdsArr)
+
+      // 查询栏舍组下的所有栏舍数据
       if(me.barnIds.length > 0) {
         ajaxDataPost('/api/v1/ops/barn/list/ids',{ids:me.barnIds}).then(e => {
           if(e.code === 200) {
-            me.selectBarnList = e.data.list
+            me.barnTableList = e.data.list
+
+           
+
+            // for(let i = 0; i<me.barnTableList.length;i++){
+            //   for(let j = 0; i<me.barnIdsArr.length;i++){
+            //     if(me.barnTableList[i].id == me.barnIdsArr[i]){
+            //       me.$refs.multipleTable2.toggleRowSelection(me.barnTableList[i])
+            //     }
+            //   }
+            // }
+
+            
+
+
+
           }
         })
       }
     },
 
+
+    change_barn_group_now(val) {
+        this.currentRow = val;
+        console.log("currentRow==========",this.currentRow)
+    },
+
     change_barn_selection(val){
       var me = this
       this.selectList2 = val