feed_plan: 饲喂计划页面

src/views/basicSettings/FeedCarManagement.vue

@@ -1,5 +1,5 @@
 <template>
- 
+
   <div>
 
 
@@ -18,7 +18,7 @@
            <!-- <el-button type="primary"   @click="form_export">导出</el-button> -->
       </div>
 
- 
+
       <!-- 表格 -->
       <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
         <el-table-column label="序号"  width="50px" align="center">
@@ -47,7 +47,7 @@
              <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_record_see(scope.row)">查看</el-button>
           </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"   />
@@ -74,16 +74,16 @@
       <div class="">
         <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="140px"  style="width:50%;margin:0 auto 50px">
             <el-form-item label="饲喂车编号：" prop="number">
-                <el-input   v-model="addForm.number"  ></el-input>  
+                <el-input   v-model="addForm.number"  ></el-input>
             </el-form-item>
             <el-form-item label="饲喂车名称：" prop="name">
-                <el-input   v-model="addForm.name"  ></el-input>  
+                <el-input   v-model="addForm.name"  ></el-input>
             </el-form-item>
             <el-form-item label="容量(kg)：" prop="capacity">
-                <el-input   v-model="addForm.capacity"  ></el-input>  
+                <el-input   v-model="addForm.capacity"  ></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>
@@ -132,8 +132,8 @@
             </template>
           </el-table-column>
 
-          
-    
+
+
         </el-table>
 
         <!-- 分页区域 -->
@@ -146,12 +146,12 @@
       </div>
     </el-dialog>
 
- 
-    
+
+
   </div>
 
 
-</template> 
+</template>
 
 <script>
 import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
@@ -161,26 +161,26 @@ export default {
   data() {
 
 
-    
- 
-  
+
+
+
     return {
 
- 
+
 
       //接口 - 获取 - 表格
       url_get_table:'/api/v1/ops/base_setting/feed_vehicle/list',
       //接口 - 新增 - 表格
-      url_add_table:'/api/v1/ops/base_setting/feed_vehicle/add',  
+      url_add_table:'/api/v1/ops/base_setting/feed_vehicle/add',
       //接口 - 修改 - 表格
-      url_edit_table:'/api/v1/ops/base_setting/feed_vehicle/update', 
+      url_edit_table:'/api/v1/ops/base_setting/feed_vehicle/update',
       //接口 - 删除 - 表格
-      url_delete_table:'/api/v1/ops/base_setting/feed_vehicle/is_show', 
+      url_delete_table:'/api/v1/ops/base_setting/feed_vehicle/is_show',
 
       //接口 - 获取 - 弹窗里表格
       url_get_table2:'/api/v1/ops/base_setting/feed_vehicle/logs',
-      
-      //接口 - 下拉框 列表 
+
+      //接口 - 下拉框 列表
       url_get_select1:'/role/getAll',
 
       //按钮权限
@@ -217,7 +217,7 @@ export default {
 
       //犊牛类型下拉框
       calfTypeList:[
-    
+
       ],
 
       searchData2:{
@@ -249,23 +249,23 @@ export default {
       ],
 
 
-    
 
- 
+
+
 
 
       addFormShow:false,
       addFormStatus: '',
       addFormTxt: {  edit: '修改',  create: '新增' },
       addForm:{
-        name:'',number:'' ,capacity:'' ,id:'' 
+        name:'',number:'' ,capacity:'' ,id:''
       },
-  
+
       addFormRules:{
         name: [
           { required: true, message: '类型必填', trigger: 'blur' },
         ],
- 
+
       },
 
 
@@ -273,27 +273,27 @@ export default {
       seeFormStatus: '',
       seeFormTxt: {  edit: '修改',  create: '新增' },
       seeForm:{
-        name:'',id:'' 
+        name:'',id:''
       },
 
-     
-       
+
+
     }
   },
   created(){
       //获取按钮权限
-      // this.get_auto_buttons 
-     
+      // this.get_auto_buttons
+
 
      //获取下拉框
      this.get_select_list1()
 
-      //表格 - 初始化 
+      //表格 - 初始化
      this.get_table_data()
 
-     
 
-    
+
+
   },
   methods:{
 
@@ -303,13 +303,13 @@ export default {
       this.isButtonEdit = isButtonEdit
       console.log('this.isButtonEdit==========',this.isButtonEdit)
     },
-    
+
     //获取 下拉框
     get_select_list1(){
         var me = this
 
 
-        var send_url = '/api/v1/ops/base_setting/calf_type/list?page=1&page_size=1000'  
+        var send_url = '/api/v1/ops/base_setting/calf_type/list?page=1&page_size=1000'
 
 
         ajaxDataPost(send_url,  {"name": "" }).then(e => {
@@ -322,8 +322,8 @@ export default {
             me.calfTypeList = e.data.list
           }
 
-         
-  
+
+
         })
 
 
@@ -336,16 +336,16 @@ export default {
         //   } else {
         //     me.pastureList = e.data
         //   }
-  
+
         // })
 
-    
+
     },
 
-    
+
     //获取 表格
     get_table_data() {
- 
+
      var me = this
 
      me.tableLoading = true
@@ -361,7 +361,7 @@ export default {
             me.searchData.total = e.data.total;	// 总数
             me.searchData.page = e.data.page;	//页码
             me.searchData.page_size = e.data.page_size;	//每页数量
-           
+
           } else {
             me.$message({ type: 'error', message: '请求表格列表失败！' + e.msg, duration: 2000 })
           }
@@ -369,10 +369,10 @@ export default {
           setTimeout(() => {
             me.tableLoading = false
           }, 100)
-  
+
         })
 
-       
+
     },
     //搜索 查询表格
     form_search(){
@@ -391,7 +391,7 @@ export default {
       me.searchData.max_capacity = undefined
       me.searchData.pastureId = ""
 
- 
+
       me.get_table_data()
     },
 
@@ -416,7 +416,7 @@ export default {
       this.addForm.capacity = ''
       this.addForm.id = ''
 
-      
+
     },
 
     //新增
@@ -433,7 +433,7 @@ export default {
     form_edit(row) {
       console.log('行内容row=========', row)
       //编辑行内容赋值
-      this.addForm = Object.assign({}, row)  
+      this.addForm = Object.assign({}, row)
       this.addFormStatus = 'edit'
       this.addFormShow = true
       this.$nextTick(() => {
@@ -455,13 +455,13 @@ export default {
         //验证成功
         if (valid) {
           //发起请求
-  
+
 
           var send_data = {
               "name": me.addForm.name,
               "number": me.addForm.number,
               "capacity": me.addForm.capacity,
-            
+
           }
           console.log("弹窗参数：", send_data)
 
@@ -480,7 +480,7 @@ export default {
                   me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
                 }
             })
-         
+
         }
       })
     },
@@ -514,13 +514,13 @@ export default {
                   me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
                 }
             })
-         
+
         }
       })
     },
 
 
-  
+
 
 
 
@@ -531,7 +531,7 @@ export default {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
-        }).then(() => {
+       }).then(() => {
             console.log("删除的ID参数：", row.id)
             //加载 - 发送新增保存
             ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
@@ -545,28 +545,28 @@ export default {
                 }
             })
 
-        
- 
-          
-        }).catch(() => {
+
+
+
+       }).catch(() => {
           me.$message({
             type: 'info',
             message: '已取消删除'
-          });          
-        });
+          });
+       });
+
 
 
-       
     },
 
-  
+
     form_record_see(row) {
       console.log('行内容row=========', row)
       //编辑行内容赋值
-      this.seeForm = Object.assign({}, row)  
- 
+      this.seeForm = Object.assign({}, row)
+
       this.seeFormShow = true
-      
+
     },
 
      //新增关闭
@@ -578,12 +578,9 @@ export default {
 
     //获取 表格
     get_table_data2() {
- 
       var me = this
-
       me.tableLoading2 = true
       console.log("searchData2======>", me.searchData2)
-
       var send_url = me.url_get_table2 + '?page=' + me.searchData2.page +  '&page_size=' + me.searchData2.page_size
 
       ajaxDataPost(send_url,  me.searchData2).then(e => {
@@ -594,7 +591,7 @@ export default {
             me.searchData2.total = e.data.total;	// 总数
             me.searchData2.page = e.data.page;	//页码
             me.searchData2.page_size = e.data.page_size;	//每页数量
-          
+
           } else {
             me.$message({ type: 'error', message: '请求表格列表失败！' + e.msg, duration: 2000 })
           }
@@ -605,7 +602,7 @@ export default {
 
         })
 
-      
+
     },
     //搜索 查询表格
     form_search2(){
@@ -625,7 +622,7 @@ export default {
           me.searchData2.start_time = ''
           me.searchData2.end_time = ''
         }
-        
+
       console.log('请求表格列表searchData2',me.searchData2)
       me.get_table_data2()
 
@@ -652,7 +649,7 @@ export default {
       this.get_table_data2()
     },
 
- 
+
     form_export() {
     //获取请求表格数据的参数
     //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
@@ -678,7 +675,7 @@ export default {
         {
             tHeader: ['表头1', '表头2', '表头3', '表头4',],
             filterVal: ['title1', 'title2', 'title3', 'title4'],
-            tableDatas: [ 
+            tableDatas: [
                 {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
                 {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
                 {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
@@ -689,7 +686,7 @@ export default {
     json2excel(excelDatas, '表格大标题', true, 'xlsx')
 }
 
-     
+
 
   }
 }

src/views/formulaPlan/FeedPlan.vue

@@ -1,29 +1,22 @@
 <template>
- 
   <div>
- 接口未对接页面！
- 
-
     <el-card class="box-card">
       <!-- 搜索区域 -->
       <div class="search-bx1">
-          <el-select v-model="searchData.class_id" filterable placeholder="班次" class="g-mr20  g-mb20" style="width: 180px;" clearable>
-            <el-option v-for="item in healthList" :key="item.id" :label="item.value" :value="item.id" />
-          </el-select>
-          <el-input v-model="searchData.feed_vehicle_name" placeholder="饲喂车名称"  style="width: 180px;" class="g-mr20" clearable />
-          <el-input v-model="searchData.formula_name" placeholder="配方模板"  style="width: 180px;" class="g-mr20" clearable />
-          <el-select v-model="searchData.status" filterable placeholder="车次状态" class="g-mr20" style="width: 180px;" clearable>
-            <el-option v-for="item in healthList" :key="item.id" :label="item.value" :value="item.id" />
-          </el-select>
-          <el-input v-model="searchData.barn_group_name" placeholder="饲喂栏舍组"  style="width: 180px;" class="g-mr20" clearable />
-
-          <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_export">导出</el-button> -->
+        <el-select v-model="searchData.class_id" filterable placeholder="班次" class="g-mr20  g-mb20" style="width: 180px;" clearable>
+          <el-option v-for="item in enumList.class_list" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+        <el-input v-model="searchData.feed_vehicle_name" placeholder="饲喂车名称"  style="width: 180px;" class="g-mr20" clearable />
+        <el-input v-model="searchData.formula_name" placeholder="配方模板"  style="width: 180px;" class="g-mr20" clearable />
+        <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.barn_group_name" placeholder="饲喂栏舍组"  style="width: 180px;" class="g-mr20" clearable />
+        <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_export">导出</el-button> -->
       </div>
       <!-- 表格 -->
       <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
@@ -32,19 +25,24 @@
             <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.calf_code }}</span>
+            <span>{{ scope.row.bus_number }}</span>
           </template>
         </el-table-column>
         <el-table-column label="班次" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.barn_name }}</span>
+            <span>{{ scope.row.class_number }}</span>
           </template>
         </el-table-column>
         <el-table-column label="饲喂车名称" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.calf_category_name }}</span>
+            <span>{{ scope.row.feed_vehicle_name }}</span>
           </template>
         </el-table-column>
         <el-table-column label="容量(kg)" min-width="150px" align="center">
@@ -52,25 +50,25 @@
             <span>{{ scope.row.birth_date_format }}</span>
           </template>
         </el-table-column>
- 
+
         <el-table-column label="配方模板" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.daily_age }}</span>
+            <span>{{ scope.row.formula_name }}</span>
           </template>
         </el-table-column>
         <el-table-column label="饲喂时间" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.birth_weight }}</span>
+            <span>{{ scope.row.feed_time }}</span>
           </template>
         </el-table-column>
         <el-table-column label="饲喂栏舍组" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.current_weight }}</span>
+            <span>{{ scope.row.barn_group_name }}</span>
           </template>
         </el-table-column>
         <el-table-column label="饲喂栏舍" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.daily_weight_gain }}</span>
+            <span>{{ scope.row.barn_name }}</span>
           </template>
         </el-table-column>
         <el-table-column label="犊牛数量" min-width="150px" align="center">
@@ -80,10 +78,15 @@
         </el-table-column>
         <el-table-column label="计划饲喂量(kg)" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.created_at_format }}</span>
+            <span>{{ scope.row.plan_feed_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.status" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="2" @change="change_status(scope.row)"  />
           </template>
         </el-table-column>
-        
 
         <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
@@ -100,84 +103,79 @@
 
 
     <!-- 弹窗 新增or修改 -->
-    <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
+    <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="80%">
       <div class="">
         <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="140px"  style="width:90%;margin:0 auto 50px">
-
-
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="饲喂计划名称：" prop="name">
+                <el-input   v-model="addForm.name"  placeholder="饲喂计划名称" style="width: 80%;" ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="配方模板：" prop="formula_id">
+                <el-select  v-model="addForm.formula_id" filterable placeholder="请选择" class="filter-item" style="width: 80%;" >
+                  <el-option v-for="item in formulaList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="班次：" prop="class_number">
+                <el-select  v-model="addForm.class_number" filterable placeholder="请选择" class="filter-item" style="width: 80%;" >
+                  <el-option v-for="item in enumList.class_list" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="饲喂车：" prop="feed_vehicle_id">
+                <el-select  v-model="addForm.feed_vehicle_id" filterable placeholder="请选择" class="filter-item" style="width: 80%;" >
+                  <el-option v-for="item in feedVehicleList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            </el-row>
             <el-row :gutter="20">
                 <el-col :span="12">
-                  <el-form-item label="配方模板：" prop="barn_id">
-                    <el-select  v-model="addForm.barn_id" filterable placeholder="请选择" class="filter-item" style="width: 100%;" >
-                      <el-option v-for="item in cowsheList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item> 
-                </el-col> 
-                <el-col :span="12">
-                  <el-form-item label="班次：" prop="barn_id">
-                    <el-select  v-model="addForm.barn_id" filterable placeholder="请选择" class="filter-item" style="width: 100%;" >
-                      <el-option v-for="item in cowsheList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item> 
-                </el-col> 
-            </el-row>  
-            <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="饲喂车：" prop="barn_id">
-                    <el-select  v-model="addForm.barn_id" filterable placeholder="请选择" class="filter-item" style="width: 100%;" >
-                      <el-option v-for="item in cowsheList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item> 
-                </el-col> 
-                <el-col :span="12">
-                  <el-form-item label="饲喂时间：" prop="birth_date_format">
-                    <el-date-picker v-model="addForm.birth_date_format" type="datetime" placeholder="选择日期"   style="width: 100%;" :clearable="false"   />
+                  <el-form-item label="饲喂时间：" prop="feed_time">
+                    <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-row>  
-
-
-
-           
-         
-
+                </el-col>
+            </el-row>
             <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-table   key="0"  :data="tableListShed1"  element-loading-text="给我一点时间"  @selection-change="change_table_selection1"   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">
-                        <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.name }}</span>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </el-col> 
-                <el-col :span="12">
-                  <el-table   key="0"  :data="tableListShed2"  element-loading-text="给我一点时间"  @selection-change="change_table_selection2"   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">
-                        <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.name }}</span>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </el-col> 
-            </el-row>  
-
-            
-
-          
-            
+              <el-col :span="12">
+                <el-table   key="0"  :data="selectBarnGroupList"  element-loading-text="给我一点时间"  @selection-change="change_barn_group_selection"   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">
+                      <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>
+              </el-col>
+              <el-col :span="12">
+                <el-table   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-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>{{ 1 }}</span>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-col>
+            </el-row>
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="addFormStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
@@ -185,58 +183,39 @@
         </div>
       </div>
     </el-dialog>
-
- 
-    
   </div>
-
-
-</template> 
+</template>
 
 <script>
 import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
 import { parseTime, json2excel } from '@/utils/index.js'
 export default {
   data() {
-
-
-    
- 
-  
     return {
-
- 
-
       //接口 - 获取 - 表格
       url_get_table:'/api/v1/ops/formula_plan/list',
       //接口 - 新增 - 表格
-      url_add_table:'/api/v1/ops/formula_plan/add',  
+      url_add_table:'/api/v1/ops/formula_plan/add',
       //接口 - 修改 - 表格
-      url_edit_table:'/api/v1/ops/formula_plan/update', 
+      url_edit_table:'/api/v1/ops/formula_plan/update',
       //接口 - 删除 - 表格
-      url_delete_table:'/api/v1/ops/formula_plan', 
-      
-      //接口 - 下拉框 列表 
+      url_delete_table:'/api/v1/ops/formula_plan',
+      //接口 - 下拉框 列表
       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_status: '/api/v1/ops/formula_plan/status/',
       //按钮权限
       isButtonEdit:false,
-
       //获取 - 表格数据 - 参数
       searchData:{
-        calf_code: "",
-        barn_name: "",
-        mother_code: "",
-        calf_category_id:undefined,
-        genders: undefined,
-        status: undefined,
-        min_daily_weight_gain: undefined,
-        max_daily_weight_gain: undefined,
-        min_daily_age: undefined,
-        max_daily_age: undefined,
+        class_id: undefined,
+        feed_vehicle_name: "",
+        formula_name: "",
+        barn_name:"",
+        barn_group_name:"",
+        status:undefined,
         page: 1,  //页码
         page_size: 10,   //每页数量
         total:0,  //总页数
@@ -259,89 +238,75 @@ export default {
         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
       ],
 
+      //配方模板
+      formulaList:[],
 
-      //栏舍状态
-      statusList:[
-        {id: 1, value: '正常'},
-        {id: 2, value: '空栏'},
-        {id: 3, value: '损坏'},
-      ],
-
-    
-
-      //犊牛类型
-      calfTypeList:[
-         
-      ],
-
-    //栏舍
-      cowsheList:[
-         
-      ],
+      // 饲喂车列表
+      feedVehicleList:[],
 
       sexList:[
         {id: 1, value: '公'},
         {id: 2, value: '母'},
       ],
 
-      healthList:[
-        {id: 1, value: '健康'},
-        {id: 2, value: '疾病'},
-        {id: 3, value: '出栏'},
-        {id: 4, value: '死亡'},
-        {id: 5, value: '淘汰'},
+      statusList:[
+        {id: 1, value: '开启'},
+        {id: 2, value: '关闭'},
       ],
-
-
- 
-
+      enumList: {
+        barn_status:[],
+        category_type:[],
+        calf_genders:[],
+        class_list:[],
+        event_type:[],
+        event_source:[],
+      },
       addFormShow:false,
       addFormStatus: '',
       addFormTxt: {  edit: '修改',  create: '新增' },
       addForm:{
-        name:'',id:'' ,addForm: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
+        name:'',
+        id:'' ,
+        addForm: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
       },
 
       addFormRules:{
         // name: [
         //   { required: true, message: '类型必填', trigger: 'blur' },
         // ],
-   
-
       },
-
-
-      selectList1:[],
-
-      tableListShed1:[
-      ],
-
-
-      selectList2:[],
-
-      tableListShed2:[
-      ]
-
-     
-       
+      barnIds:[],
+      selectBarnGroupList:[],
+      selectBarnList:[],
     }
   },
   created(){
       //获取按钮权限
-      // this.get_auto_buttons 
-     
-
-     //获取下拉框
-     this.get_select_list1()
+      // this.get_auto_buttons
 
-      //表格 - 初始化 
-      this.get_table_data()
+    //获取下拉框
+    this.get_select_list1()
 
-     
+    //表格 - 初始化
+    this.get_table_data()
 
-    
   },
   methods:{
+    //车次状态
+    change_status(row){
+      var me = this
+      //加载 - 保存
+      ajaxDataPut(me.url_status +row.id, {}).then(e => {
+        console.log("更改结果：",e)
+        //打印请求成功结果
+        if(e.code == 200  ){
+          me.$message({ type: 'success',  message: '设置成功!'  });
+          me.get_table_data1()
+        } else {
+          me.$message({ type: 'error', message: '设置失败！' + e.msg, duration: 2000 })
+        }
+      })
+    },
 
     get_auto_buttons() {
       // 编辑
@@ -349,116 +314,68 @@ export default {
       this.isButtonEdit = isButtonEdit
       console.log('this.isButtonEdit==========',this.isButtonEdit)
     },
-    
+
     //获取 下拉框
     get_select_list1(){
-        var me = this
-         
-
-
-        ajaxDataPost('/api/v1/ops/base_setting/calf_type/list?page=1&page_size=1000', {name:"" }).then(e => {
-            console.log("穿梭框1：",e)
-
-            //打印请求成功结果
-            if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
-              me.calfTypeList = []
-            } else {
-              me.calfTypeList = e.data.list
-            }
-
-        })
-
-
-
-
-        ajaxDataPost('/api/v1/ops/barn/list?page=1&page_size=1000', {name:"",barn_group_name:"",status:undefined}).then(e => {
-            console.log("穿梭框1：",e)
-
-            //打印请求成功结果
-            if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
-              me.cowsheList = []
-            } else {
-              me.cowsheList = e.data.list
-            }
-
-        })
-
-
-
-        
-
-
-        // ajaxDataGet('/authdata/pasture', {  "page": 1,   "page_size": 1000}).then(e => {
-        //   console.log("牧场下拉框1：",e)
+      var me = this
+      ajaxDataPost('/api/v1/ops/formula_plan/formula/list?page=1&page_size=1000', {name:""}).then(e => {
+        if(e.data.list === null || e.data.list === undefined ||e.data.list.length === 0   ){
+          me.formulaList = []
+        } else {
+          me.formulaList = e.data.list
+        }
+      })
 
-        //   //打印请求成功结果
-        //   if(e.data == null || e.data == undefined ||e.data.length == 0   ){
-        //     me.pastureList = []
-        //   } else {
-        //     me.pastureList = e.data
-        //   }
-  
-        // })
+      ajaxDataPost('api/v1/ops/base_setting/feed_vehicle/list?page=1&page_size=1000',{name:""}).then(e=>{
+        if(e.code === 200 && e.data.list.length > 0) {
+          me.feedVehicleList = e.data.list
+        }
+      })
 
-    
+      // 班次下拉框
+      ajaxDataGet('/api/v1/ops/calf_feed/enum/list').then(e => {
+        if(e.code === 200){
+          me.enumList = e.data
+        }
+      })
     },
 
-    
+
     //获取 表格
     get_table_data() {
- 
-     var me = this
-
-     me.tableLoading = true
-     console.log("searchData======>", me.searchData)
-
+      var me = this
+      me.tableLoading = true
       var send_url = me.url_get_table + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
-
       ajaxDataPost(send_url,  me.searchData).then(e => {
-        console.log("表格请求结果：",e)
-          //打印请求成功结果
-          if(e.code == 200 ){
-            me.tableList = e.data.list
-            me.searchData.total = e.data.total;	// 总数
-            me.searchData.page = e.data.page;	//页码
-            me.searchData.page_size = e.data.page_size;	//每页数量
-           
-          } else {
-            me.$message({ type: 'error', message: '请求表格列表失败！' + e.msg, duration: 2000 })
-          }
-
-          setTimeout(() => {
-            me.tableLoading = false
-          }, 100)
-  
-        })
-
-       
+        if(e.code === 200 ){
+          me.tableList = e.data.list
+          me.searchData.total = e.data.total;	// 总数
+          me.searchData.page = e.data.page;	//页码
+          me.searchData.page_size = e.data.page_size;	//每页数量
+        } else {
+          me.$message({ type: 'error', message: '请求表格列表失败！' + e.msg, duration: 2000 })
+        }
+        setTimeout(() => {
+          me.tableLoading = false
+        }, 100)
+      })
     },
     //搜索 查询表格
     form_search(){
       var me = this
       console.log('请求表格列表searchData',me.searchData)
       me.get_table_data()
-
     },
 
     //重置 表格
     form_clear(){
       var me = this
-      me.searchData.calf_code = ""
+      me.searchData.class_id = undefined
+      me.searchData.feed_vehicle_name = ""
+      me.searchData.formula_name = ""
       me.searchData.barn_name = ""
-      me.searchData.mother_code = ""
-      me.searchData.calf_category_id = undefined
-      me.searchData.genders = undefined
+      me.searchData.barn_group_name = ""
       me.searchData.status = undefined
-      me.searchData.min_daily_weight_gain = undefined
-      me.searchData.max_daily_weight_gain = undefined
-      me.searchData.min_daily_age = undefined
-      me.searchData.max_daily_age = undefined
- 
-
-
       me.get_table_data()
     },
 
@@ -482,7 +399,6 @@ export default {
       this.addForm.id = undefined
       this.addForm.barn_group_id = undefined
       this.addForm.number = ''
-       
     },
 
     //新增
@@ -493,16 +409,25 @@ export default {
       this.$nextTick(() => {
         this.$refs['addFormRef'].clearValidate()
       })
+      this.form_barn_group_list()
+    },
+
+    // 栏舍组
+    form_barn_group_list(){
+      var me = this
+      ajaxDataPost('/api/v1/ops/barn_group/list?page=1&page_size=10', {name:""}).then(e => {
+        if(e.code === 200 ){
+          me.selectBarnGroupList = e.data.list
+        }
+      })
     },
 
     //编辑
     form_edit(row) {
       this.reset_form()
-      console.log('行内容row=========', row)
       //编辑行内容赋值
-      this.addForm = Object.assign({}, row)  
-
-      if(row.genders == 0){
+      this.addForm = Object.assign({}, row)
+      if(row.genders === 0){
         this.addForm.genders = undefined
       }
       this.addFormStatus = 'edit'
@@ -512,7 +437,6 @@ export default {
       })
     },
 
-
     //新增关闭
     add_dialog_close(){
        //内容重置
@@ -527,27 +451,18 @@ export default {
         if (valid) {
           //发起请求
           var send_data = {
-              "barn_id": me.addForm.barn_id,
-              "calf_code": me.addForm.calf_code,
-              "calf_category_id": me.addForm.calf_category_id,
-              "birth_weight": parseFloat(me.addForm.birth_weight) ,
-              "genders": me.addForm.genders,
-              "current_weight":parseFloat(me.addForm.current_weight) ,
-              "mother_code": me.addForm.mother_code,
-              "remark": me.addForm.remark,
-              // "birth_date":parseTime(me.addForm.birth_date_format, '{y}-{m}-{d} {h}:{i}:{s}'), 
-              "birth_date_format":parseTime(me.addForm.birth_date_format, '{y}-{m}-{d} {h}:{i}:{s}'), 
-
+            "clas_number": me.addForm.barn_id,
+            "formula_id": me.addForm.calf_code,
+            "formula_name": me.addForm.calf_category_id,
+            "feed_vehicle_id": parseFloat(me.addForm.birth_weight) ,
+            "feed_vehicle_name": me.addForm.genders,
+            "status":parseFloat(me.addForm.current_weight) ,
+            "feed_time": me.addForm.mother_code,
+            "barn_group_ids":undefined,
           }
 
- 
- 
-
-
-          console.log("弹窗参数：", send_data)
-
           //关闭弹窗
-          // me.addFormShow = false
+          me.addFormShow = false
          //加载 - 发送新增保存
            ajaxDataPost(me.url_add_table, send_data).then(e => {
                 console.log("新增结果：",e)
@@ -561,7 +476,7 @@ export default {
                   me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
                 }
             })
-         
+
         }
       })
     },
@@ -573,7 +488,7 @@ export default {
         if (valid) {
           //发起请求
           var send_data = {
-    
+
               "id": me.addForm.id,
               "barn_id": me.addForm.barn_id,
               "calf_code": me.addForm.calf_code,
@@ -583,8 +498,8 @@ export default {
               "current_weight":parseFloat(me.addForm.current_weight) ,
               "mother_code": me.addForm.mother_code,
               "remark": me.addForm.remark,
-              // "birth_date":parseTime(me.addForm.birth_date_format, '{y}-{m}-{d} {h}:{i}:{s}'), 
-              "birth_date_format":parseTime(me.addForm.birth_date_format, '{y}-{m}-{d} {h}:{i}:{s}'), 
+              // "birth_date":parseTime(me.addForm.birth_date_format, '{y}-{m}-{d} {h}:{i}:{s}'),
+              "birth_date_format":parseTime(me.addForm.birth_date_format, '{y}-{m}-{d} {h}:{i}:{s}'),
           }
 
           // var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
@@ -608,17 +523,11 @@ export default {
                   me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
                 }
             })
-         
+
         }
       })
     },
 
-
-    
-    
-
-
-
     form_delete(row) {
       var me = this
 
@@ -640,69 +549,59 @@ export default {
                 }
             })
 
-        
- 
-          
+
+
+
         }).catch(() => {
           me.$message({
             type: 'info',
             message: '已取消删除'
-          });          
+          });
         });
 
 
-       
+
     },
 
-    change_table_selection1(val){
-      this.selectList1 = val
-      console.log('勾选数据selectList1', this.selectList1)
+    change_barn_group_selection(val){
+      var me = this
+      me.barnIds = []
+      val.forEach(function (item,index) {
+        item.barns.forEach(function (v,k){
+          me.barnIds.push(v)
+        })
+      })
+
+      // 栏舍数据
+      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
+          }
+        })
+      }
     },
 
-    change_table_selection2(val){
+    change_barn_selection(val){
       this.selectList2 = val
       console.log('勾选数据selectList2', this.selectList1)
     },
 
- 
     form_export() {
-    //获取请求表格数据的参数
-    //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
-    //请求表格
-    // GetDataByName(this.download.getdataListParm).then(response => {
-    //     if (response.data.list !== null) {
-    //       this.download.list = response.data.list
-    //     } else {
-    //       this.download.list = []
-    //     }
-    //     var excelDatas = [
-    //       {
-    //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
-    //         filterVal: ['title1', 'title2', 'title3', 'title4'],
-    //         tableDatas: this.download.list,
-    //         sheetName: 'Sheet1'
-    //       }
-    //     ]
-    //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
-    // })
-
-    var excelDatas = [
+      var excelDatas = [
         {
             tHeader: ['表头1', '表头2', '表头3', '表头4',],
             filterVal: ['title1', 'title2', 'title3', 'title4'],
-            tableDatas: [ 
+            tableDatas: [
                 {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
                 {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
                 {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
             ],
             sheetName: 'Sheet1'
         }
-    ]
-    json2excel(excelDatas, '表格大标题', true, 'xlsx')
-}
-
-     
-
+      ]
+      json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    }
   }
 }
 </script>