Przeglądaj źródła

system: 修改配方模板名称=》日龄饲喂模板

Yi 1 rok temu
rodzic
commit
a851b89d08

+ 77 - 77
src/views/formulaPlan/FeedPlan.vue

@@ -7,7 +7,7 @@
           <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-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>
@@ -51,7 +51,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="配方模板" min-width="150px" align="center">
+        <el-table-column label="日龄饲喂模板" min-width="150px" align="center">
           <template slot-scope="scope">
              <el-button type="primary" size="mini"  @click="form_record_see(scope.row)">{{ scope.row.formula_name }}</el-button>
           </template>
@@ -113,7 +113,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="配方模板:" prop="formula_id">
+              <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>
@@ -147,7 +147,7 @@
                     <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">
@@ -161,13 +161,13 @@
                   <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  ref="multipleTable2"  row-key="id"  :data="barnTableList"  element-loading-text="给我一点时间"  highlight-current-row  @selection-change="change_barn_selection"    
+                <el-table  ref="multipleTable2"  row-key="id"  :data="barnTableList"  element-loading-text="给我一点时间"  highlight-current-row  @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">
@@ -176,7 +176,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column label="犊牛数量" min-width="150px" align="center">
-                    
+
                     <template slot-scope="scope">
 
                       <span v-if ="scope.row.status == 4">0</span>
@@ -331,7 +331,7 @@ export default {
         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
       ],
 
-      //配方模板
+      //日龄饲喂模板
       formulaList:[],
 
       // 饲喂车列表
@@ -362,17 +362,17 @@ export default {
         feed_time: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
       },
 
-      
+
 
       addFormRules:{
         name: [ { required: true, message: '饲喂计划名称必填', trigger: 'blur' },  ],
-        formula_id: [ { required: true, message: '配方模板必填', trigger: 'blur' },  ],
+        formula_id: [ { required: true, message: '日龄饲喂模板必填', trigger: 'blur' },  ],
         class_number: [ { required: true, message: '班次必填', trigger: 'blur' },  ],
         feed_vehicle_id: [ { required: true, message: '饲喂车必填', trigger: 'blur' },  ],
         status: [ { required: true, message: '车次状态必填', trigger: 'blur' },  ],
         feed_time: [ { required: true, message: '饲喂时间必填', trigger: 'blur' },  ],
       },
-     
+
       barnGroupTableList:[],
       barnTableList:[],
 
@@ -384,7 +384,7 @@ export default {
       barnGroupIdsArr:[],
       barnIdsArr:[],
 
-    
+
 
 
       tableLoading2: false,
@@ -401,12 +401,12 @@ export default {
     }
   },
   created(){
- 
+
     //获取按钮权限
     const isButtonEdit = checkButtons(this.$store.state.buttonsList, "饲喂计划编辑")
       this.isButtonEdit = isButtonEdit
       console.log('this.isButtonEdit==========',this.isButtonEdit)
-     
+
 
 
     //获取下拉框
@@ -433,7 +433,7 @@ export default {
       })
     },
 
-  
+
 
     //获取 下拉框
     get_select_list1(){
@@ -515,7 +515,7 @@ export default {
       me.searchData.page = 1
       me.searchData.page_size = 10
 
-     
+
       me.get_table_data()
     },
 
@@ -547,9 +547,9 @@ export default {
 
 
 
-     
 
-      
+
+
     },
 
     //查看记录
@@ -562,7 +562,7 @@ export default {
       this.seeFormShow = true
 
       ajaxDataGet('/api/v1/ops/formula_plan/formula/'+row.formula_id, {  }).then(e => {
-          console.log("配方模板:",e)
+          console.log("日龄饲喂模板:",e)
 
           //打印请求成功结果
           if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
@@ -571,7 +571,7 @@ export default {
             me.tableListTxt2 = e.data.name
             me.tableList2 = e.data.list
           }
-  
+
         })
 
     },
@@ -584,8 +584,8 @@ export default {
 
     //新增
     form_add() {
-     
-      
+
+
 
       this.barnGroupArr = []
       this.barnArr = []
@@ -602,23 +602,23 @@ export default {
          this.$refs.multipleTable2.clearSelection()
       })
 
- 
+
 
       this.reset_form()
-       
-    
 
-     
+
+
+
     },
 
-     
+
 
     //编辑
     form_edit(row) {
       var me = this
 
-    
-     
+
+
 
       this.reset_form()
 
@@ -628,12 +628,12 @@ export default {
       this.barnIdsArr = []
       this.barnTableList = []
 
- 
-     
-      
 
 
-    
+
+
+
+
 
       //编辑行内容赋值
       this.addForm = Object.assign({}, row)
@@ -651,7 +651,7 @@ export default {
       me.barnIdsArr = barnIdsArr
       me.addFormStatus = 'edit'
       me.addFormShow = true
-      
+
 
 
       this.$nextTick(() => {
@@ -660,7 +660,7 @@ export default {
         //  this.$refs.multipleTable2.clearSelection()
       })
       console.log('  me.barnGroupTableList==========',me.barnGroupTableList)
-      console.log('  barnGroupIdsArr==========',barnGroupIdsArr)    
+      console.log('  barnGroupIdsArr==========',barnGroupIdsArr)
        // 查询栏舍组下的所有栏舍数据
        if(barnGroupIdsArr.length > 0) {
           me.$nextTick(() => {
@@ -685,42 +685,42 @@ export default {
                               for(let j = 0; i< barnIdsArr.length;i++){
                                 if(me.barnTableList[i].id ==  barnIdsArr[i]){
                                     me.$refs['multipleTable2'].toggleRowSelection(me.barnTableList[i])
-                                  
-                                    
+
+
                                 }
                               }
                           }
 
                       }, 800)
-                      
-                       
-                       
 
-                        
-          
+
+
+
+
+
                     }
                 })
 
 
-        
+
           })
-          
 
-          
 
-         
+
+
+
       }
 
-     
-     
-      
-     
+
+
+
+
     },
 
     //新增关闭
     add_dialog_close(){
        //内容重置
- 
+
 
       var me = this
       me.$nextTick(() => {
@@ -754,16 +754,16 @@ export default {
               if(item.barn_group_id == items.id){
                 barnArrTemp.push(item)
               }
-            }) 
+            })
           })
 
           console.log('新增保存 有组别的栏舍 barnArrTemp', barnArrTemp)
           me.barnGroupArr.forEach(function(items){
             barnGroupIdsArr.push(items.id)
-          }) 
+          })
           barnArrTemp.forEach(function(items){
             barnIdsArr.push(items.id)
-          }) 
+          })
 
           var send_data = {
 
@@ -774,16 +774,16 @@ 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": parseTime(me.addForm.feed_time, '{h}:{i}:{s}'), 
+            "feed_time": parseTime(me.addForm.feed_time, '{h}:{i}:{s}'),
             "barn_group_ids":barnGroupIdsArr,
             "barn_ids":barnIdsArr,
           }
- 
-     
+
+
           //关闭弹窗
          // me.addFormShow = false
          //加载 - 发送新增保存
- 
+
            ajaxDataPost(me.url_add_table, send_data).then(e => {
               console.log("新增结果:",e)
               //打印请求成功结果
@@ -796,7 +796,7 @@ export default {
                 me.$message({ type: 'error', message: '新增失败!' + e.msg, duration: 2000 })
               }
             })
- 
+
 
         }
       })
@@ -818,16 +818,16 @@ export default {
               if(item.barn_group_id == items.id){
                 barnArrTemp.push(item)
               }
-            }) 
+            })
           })
 
           console.log('新增保存 有组别的栏舍 barnArrTemp', barnArrTemp)
           me.barnGroupArr.forEach(function(items){
             barnGroupIdsArr.push(items.id)
-          }) 
+          })
           barnArrTemp.forEach(function(items){
             barnIdsArr.push(items.id)
-          }) 
+          })
 
           var send_data = {
             "id": me.addForm.id,
@@ -838,13 +838,13 @@ 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": parseTime(me.addForm.feed_time, '{h}:{i}:{s}'), 
+            "feed_time": parseTime(me.addForm.feed_time, '{h}:{i}:{s}'),
             "barn_group_ids":barnGroupIdsArr,
             "barn_ids":barnIdsArr,
           }
- 
 
-       
+
+
 
           console.log('编辑保存 barnGroupArr', me.barnGroupArr)
           console.log('编辑保存 barnArr', me.barnArr)
@@ -907,25 +907,25 @@ export default {
 
     },
 
-     
+
     //栏舍组选择
     change_barn_group_selection(val){
       console.log("选中的数组", val)
       var me = this
       me.barnGroupArr = val
       console.log("选中的栏舍组数组", me.barnGroupArr)
-  
-    
+
+
      var barnGroupIdsArr = []
-    
+
       val.forEach(function (item,index) {
         barnGroupIdsArr.push(item.id)
-        
+
       })
       me.barnGroupIdsArr = barnGroupIdsArr
 
-      
-    
+
+
       // me.$refs.multipleTable2.clearSelection()
 
       // 查询栏舍组下的所有栏舍数据
@@ -933,14 +933,14 @@ export default {
         ajaxDataPost('/api/v1/ops/barn/list/ids',{ids:barnGroupIdsArr}).then(e => {
           if(e.code === 200) {
             me.barnTableList = e.data.list
- 
+
           }
         })
       }
     },
 
 
-   
+
     change_barn_selection(val){
       var me = this
       var barnArr = []
@@ -950,13 +950,13 @@ export default {
       // var barnIdsArr = []
       // val.forEach(function (item,index) {
       //   barnIdsArr.push(item.id)
-        
+
       // })
       // me.barnIdsArr = barnIdsArr
       // console.log('栏舍选中的ID',  me.barnIdsArr)
-      
 
-    
+
+
 
     },
 

+ 141 - 141
src/views/formulaPlan/FormulaTemplate.vue

@@ -1,5 +1,5 @@
 <template>
- 
+
   <div>
 
 
@@ -11,12 +11,12 @@
           <el-select v-model="searchData.calf_category_id" filterable placeholder="犊牛类型" class="g-mr20" style="width: 180px;" clearable>
             <el-option v-for="item in calfTypeList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
- 
+
           <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>
@@ -25,7 +25,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">
@@ -63,7 +63,7 @@
             <span>{{ scope.row.female_calf_daily_weight }}</span>
           </template>
         </el-table-column>
-        
+
 
         <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
@@ -89,36 +89,36 @@
             <el-col :span="12">
               <el-form-item label="配方名称:" prop="name">
                 <el-input v-model="addForm.name"      />
-              </el-form-item>  
-            </el-col> 
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="犊牛类型:" prop="calf_category_id">
                 <el-select  v-model="addForm.calf_category_id" filterable placeholder="请选择" class="filter-item" style="width: 100%;" >
                   <el-option v-for="item in calfTypeList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
-              </el-form-item> 
-            </el-col> 
-         </el-row>  
+              </el-form-item>
+            </el-col>
+         </el-row>
 
          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="公犊增重指标(KG/日):" prop="male_calf_daily_weight">
                 <el-input v-model="addForm.male_calf_daily_weight"    placeholder="建议填写,用以统计牛只成长达标率"   />
-              </el-form-item>  
-               
-            </el-col> 
+              </el-form-item>
+
+            </el-col>
             <el-col :span="12">
               <el-form-item label="母犊增重指标(KG/日):" prop="female_calf_daily_weight">
                 <el-input v-model="addForm.female_calf_daily_weight"    placeholder="建议填写,用以统计牛只成长达标率"   />
-              </el-form-item> 
-            </el-col> 
-         </el-row>  
+              </el-form-item>
+            </el-col>
+         </el-row>
+
+
 
-         
- 
          <el-row :gutter="20"  >
             <el-button type="primary"   @click="add_step">增加一个阶段</el-button>
-         </el-row>  
+         </el-row>
 
 
          <el-row>
@@ -184,7 +184,7 @@
                   <span>{{ scope.row.allow_temp_error }}</span>
                 </template>
               </el-table-column>
-              
+
 
               <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
@@ -195,10 +195,10 @@
                 </template>
               </el-table-column>
             </el-table>
-         </el-row>  
-         
- 
-            
+         </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>
@@ -216,87 +216,87 @@
             <el-col :span="12">
               <el-form-item label="阶段:"  >
                 <el-input v-model="addFormStep.id"    placeholder=""  disabled />
-              </el-form-item>  
-            </el-col>  
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="开始日龄:" prop="start_daily_age">
                 <el-input v-model="addFormStep.start_daily_age"    placeholder=""   />
-              </el-form-item>  
-               
-            </el-col> 
+              </el-form-item>
+
+            </el-col>
             <el-col :span="12">
               <el-form-item label="结束日龄:" prop="end_daily_age">
                 <el-input v-model="addFormStep.end_daily_age"    placeholder=""   />
-              </el-form-item> 
-            </el-col> 
-         </el-row>  
+              </el-form-item>
+            </el-col>
+         </el-row>
          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="饲料类型:" prop="forage_id">
                 <el-select  v-model="addFormStep.forage_id" filterable placeholder="请选择"  style="width: 100%;" >
                   <el-option v-for="item in forageList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
-              </el-form-item> 
-            </el-col> 
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="日饲喂量(kg):" prop="daily_feed_number">
                 <el-input v-model="addFormStep.daily_feed_number"    placeholder=""   />
-              </el-form-item> 
-            </el-col> 
-         </el-row>  
+              </el-form-item>
+            </el-col>
+         </el-row>
          <el-row :gutter="20">
           <el-col :span="12">
               <el-form-item label="第一班占比(%):" prop="first_class_ratio">
                 <el-input v-model="addFormStep.first_class_ratio"    placeholder=""   />
-              </el-form-item> 
-            </el-col> 
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="第二班占比(%):" prop="second_class_ratio" v-if="class_num == 2 || class_num == 3 || class_num == 4">
                 <el-input v-model="addFormStep.second_class_ratio"    placeholder=""   />
-              </el-form-item> 
-            </el-col> 
-         </el-row>  
+              </el-form-item>
+            </el-col>
+         </el-row>
          <el-row :gutter="20">
           <el-col :span="12">
               <el-form-item label="第三班占比(%):" prop="third_class_ratio" v-if=" class_num == 3 || class_num == 4">
                 <el-input v-model="addFormStep.third_class_ratio"    placeholder=""   />
-              </el-form-item> 
-            </el-col> 
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="第四班占比(%):" prop="fourth_class_ratio" v-if=" class_num == 4">
                 <el-input v-model="addFormStep.fourth_class_ratio"    placeholder=""   />
-              </el-form-item> 
-            </el-col> 
-         </el-row>  
-         
+              </el-form-item>
+            </el-col>
+         </el-row>
+
          <el-row :gutter="20">
           <el-col :span="12">
               <el-form-item label="饲喂温度℃:" prop="feed_temp">
                 <el-input v-model="addFormStep.feed_temp"    placeholder=""   />
-              </el-form-item> 
-            </el-col> 
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="允许温差℃:" prop="allow_temp_error">
                 <el-input v-model="addFormStep.allow_temp_error"    placeholder=""   />
-              </el-form-item> 
-            </el-col> 
-         </el-row>  
+              </el-form-item>
+            </el-col>
+         </el-row>
          <el-row :gutter="20">
           <el-col :span="12">
               <el-form-item label="班次允许误差(kg):" prop="allow_class_error">
                 <el-input v-model="addFormStep.allow_class_error"    placeholder=""   />
-              </el-form-item> 
-            </el-col> 
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
-             
-            </el-col> 
-         </el-row>  
 
-            
-           
-            
+            </el-col>
+         </el-row>
+
+
+
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="addFormStatusStep==='create'?add_step_save():edit_step_save()">确认</el-button>
@@ -305,11 +305,11 @@
       </div>
     </el-dialog>
 
-    
+
   </div>
 
 
-</template> 
+</template>
 
 <script>
 import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
@@ -318,23 +318,23 @@ export default {
   data() {
 
 
-    
- 
-  
+
+
+
     return {
 
- 
+
 
       //接口 - 获取 - 表格
       url_get_table:'/api/v1/ops/formula_plan/formula/list',
       //接口 - 新增 - 表格
-      url_add_table:'/api/v1/ops/formula_plan/formula/add',  
+      url_add_table:'/api/v1/ops/formula_plan/formula/add',
       //接口 - 修改 - 表格
-      url_edit_table:'/api/v1/ops/formula_plan/formula/update', 
+      url_edit_table:'/api/v1/ops/formula_plan/formula/update',
       //接口 - 删除 - 表格
-      url_delete_table:'/api/v1/ops/formula_plan/formula', 
-      
-      //接口 - 下拉框 列表 
+      url_delete_table:'/api/v1/ops/formula_plan/formula',
+
+      //接口 - 下拉框 列表
       url_get_select1:'/api/v1/ops/calf_feed/enum/list',
 
       //接口 - 下拉框 列表 栏舍组
@@ -379,8 +379,8 @@ export default {
 
 
 
-     
-      
+
+
 
 
 
@@ -391,16 +391,16 @@ export default {
         {id: 3, value: '损坏'},
       ],
 
-    
+
 
       //犊牛类型
       calfTypeList:[
-         
+
       ],
 
     //栏舍
       cowsheList:[
-         
+
       ],
        //饲料
       forageList:[
@@ -412,15 +412,15 @@ export default {
         {id: 2, value: '母'},
       ],
 
-  
 
- 
+
+
 
       addFormShow:false,
       addFormStatus: '',
       addFormTxt: {  edit: '修改',  create: '新增' },
       addForm:{
-        name:'',id:'' ,calf_category_id:undefined, male_calf_daily_weight:undefined, female_calf_daily_weight:undefined, 
+        name:'',id:'' ,calf_category_id:undefined, male_calf_daily_weight:undefined, female_calf_daily_weight:undefined,
       },
       addFormRules:{
         name: [ { required: true, message: '配方名称必填', trigger: 'blur' },  ],
@@ -433,7 +433,7 @@ export default {
       tableLoadingStep: false,
       //表格内容
       tableListStep:[
-     
+
       ],
 
       addFormShowStep:false,
@@ -442,48 +442,48 @@ export default {
       addFormStep:{
         name:'',id:'' , start_daily_age:undefined,end_daily_age:undefined,forage_id:undefined,forage_name:'',daily_feed_number:undefined,first_class_ratio:undefined,second_class_ratio:undefined,third_class_ratio:undefined,fourth_class_ratio:undefined,allow_class_error:undefined,feed_temp:undefined,feed_temp:undefined,allow_temp_error:undefined,
       },
- 
+
       addFormRulesStep:{
         // name: [
         //   { required: true, message: '类型必填', trigger: 'blur' },
         // ],
       },
 
- 
+
       class_num:4
-       
+
     }
   },
   created(){
-     
+
      //获取按钮权限
-     const isButtonEdit = checkButtons(this.$store.state.buttonsList, "配方模板编辑")
+     const isButtonEdit = checkButtons(this.$store.state.buttonsList, "日龄饲喂模板编辑")
       this.isButtonEdit = isButtonEdit
       console.log('this.isButtonEdit==========',this.isButtonEdit)
-     
+
 
      var me = this
 
      //获取下拉框
      this.get_select_list1()
 
-     //表格 - 初始化 
+     //表格 - 初始化
      setTimeout(function () {
        me.get_table_data()
 			}, 1000);
 
-     
+
 //  this.get_table_data()
-    
+
   },
   methods:{
 
-    
-    
+
+
     //获取 下拉框
     get_select_list1(){
         var me = this
-         
+
 
 
         ajaxDataPost('/api/v1/ops/base_setting/calf_type/list?page=1&page_size=1000', {name:"" }).then(e => {
@@ -515,7 +515,7 @@ export default {
 
 
 
-        
+
 
 
         ajaxDataGet('/api/v1/ops/base_setting/forage/list?page=1&page_size=1000', {  }).then(e => {
@@ -527,7 +527,7 @@ export default {
           } else {
             me.forageList = e.data.list
           }
-  
+
         })
         // 班次数量下拉框
         ajaxDataGet('/api/v1/ops/calf_feed/enum/list').then(e => {
@@ -542,20 +542,20 @@ export default {
         })
 
 
-    
+
     },
 
-    
+
     //获取 表格
     get_table_data() {
- 
+
      var me = this
 
      me.tableLoading = true
      console.log("searchData======>", me.searchData)
 
 
-     
+
 
      if( me.searchData.calf_category_id == ""){
         me.searchData.calf_category_id = undefined
@@ -572,7 +572,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 })
           }
@@ -580,10 +580,10 @@ export default {
           setTimeout(() => {
             me.tableLoading = false
           }, 100)
-  
+
         })
 
-       
+
     },
     //搜索 查询表格
     form_search(){
@@ -606,7 +606,7 @@ export default {
       me.searchData.max_daily_weight_gain = undefined
       me.searchData.min_daily_age = undefined
       me.searchData.max_daily_age = undefined
- 
+
 
 
       me.get_table_data()
@@ -635,9 +635,9 @@ export default {
       this.addForm.female_calf_daily_weight = undefined
       this.addForm.number = ''
 
- 
+
       this.tableListStep = []
-       
+
     },
 
     //新增
@@ -656,13 +656,13 @@ export default {
       var me = this
       console.log('行内容row=========', row)
       //编辑行内容赋值
-      this.addForm = Object.assign({}, row)  
+      this.addForm = Object.assign({}, row)
 
       if(row.genders == 0){
         this.addForm.genders = undefined
       }
       me.tableListStep = row.formula_stage
-    
+
       this.addFormStatus = 'edit'
       this.addFormShow = true
       this.$nextTick(() => {
@@ -692,10 +692,10 @@ export default {
               "female_calf_daily_weight": parseFloat(me.addForm.female_calf_daily_weight),
               "formula_stage": me.tableListStep
           }
-          
 
- 
- 
+
+
+
 
 
           console.log("弹窗参数:", send_data)
@@ -715,7 +715,7 @@ export default {
                   me.$message({ type: 'error', message: '新增失败!' + e.msg, duration: 2000 })
                 }
             })
-         
+
         }
       })
     },
@@ -757,7 +757,7 @@ export default {
                   me.$message({ type: 'error', message: '编辑失败!' + e.msg, duration: 2000 })
                 }
             })
-         
+
         }
       })
     },
@@ -784,18 +784,18 @@ export default {
                 }
             })
 
-        
- 
-          
+
+
+
         }).catch(() => {
           me.$message({
             type: 'info',
             message: '已取消删除'
-          });          
+          });
         });
 
 
-       
+
     },
 
 
@@ -805,7 +805,7 @@ export default {
 
     //清空弹窗表单信息
     reset_step(){
-       
+
       this.addFormStep.name = ''
       this.addFormStep.start_daily_age = undefined
       this.addFormStep.end_daily_age = undefined
@@ -819,8 +819,8 @@ export default {
       this.addFormStep.allow_class_error = undefined
       this.addFormStep.feed_temp = undefined
       this.addFormStep.allow_temp_error = undefined
- 
- 
+
+
     },
 
     //新增
@@ -828,7 +828,7 @@ export default {
       this.reset_step()
       this.addFormStatusStep = 'create'
       this.addFormStep.id = this.tableListStep.length + 1
-      
+
       this.addFormShowStep = true
       this.$nextTick(() => {
         this.$refs['addFormRefStep'].clearValidate()
@@ -840,7 +840,7 @@ export default {
       this.stepIndex = index
       console.log('行内容row=========', row)
       //编辑行内容赋值
-      this.addFormStep = Object.assign({}, row)  
+      this.addFormStep = Object.assign({}, row)
 
       if(row.forage_id == 0){
         this.addFormStep.forage_id = undefined
@@ -886,9 +886,9 @@ export default {
             "feed_temp": me.addFormStep.feed_temp,
             "allow_temp_error": me.addFormStep.allow_temp_error,
         }
-          
- 
- 
+
+
+
 
 
           console.log("弹窗参数:", send_data)
@@ -896,8 +896,8 @@ export default {
           //关闭弹窗
           me.addFormShowStep = false
           me.tableListStep.push(send_data)
-        
-         
+
+
         }
       })
     },
@@ -910,7 +910,7 @@ export default {
           var forage_name = me.forageList.find(obj => obj.id == me.addFormStep.forage_id).name
           //发起请求
           var send_data = {
-    
+
             "id":  me.addFormStep.id,
             "name":  me.addFormStep.name,
             "start_daily_age":me.addFormStep.start_daily_age,
@@ -927,7 +927,7 @@ export default {
             "allow_temp_error": me.addFormStep.allow_temp_error,
           }
 
-  
+
 
            // 编辑保存
           console.log("弹窗参数:", send_data)
@@ -935,8 +935,8 @@ export default {
           var stepIndex = me.stepIndex
           this.$set(me.tableListStep, stepIndex, send_data)
           console.log('me.tableListStep============',me.tableListStep)
-         
-          
+
+
         }
       })
     },
@@ -950,9 +950,9 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          console.log('点击了 - 删除一个阶段index===',index,'row===',row)  
+          console.log('点击了 - 删除一个阶段index===',index,'row===',row)
           me.tableListStep.splice(index, 1)
-        
+
             //加载 - 发送新增保存
             // ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
             //     console.log("编辑结果:",e)
@@ -965,22 +965,22 @@ export default {
             //     }
             // })
 
-        
- 
-          
+
+
+
         }).catch(() => {
           me.$message({
             type: 'info',
             message: '已取消删除'
-          });          
+          });
         });
 
 
-       
+
     },
 
 
- 
+
     form_export() {
     //获取请求表格数据的参数
     //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
@@ -1006,7 +1006,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"},
@@ -1017,7 +1017,7 @@ export default {
     json2excel(excelDatas, '表格大标题', true, 'xlsx')
 }
 
-     
+
 
   }
 }

+ 2 - 2
系统导航Sql备份/system_menu.sql

@@ -58,7 +58,7 @@ INSERT INTO `system_menu` VALUES (97, '事件记录', 1, 2, '事件记录', 'Eve
 INSERT INTO `system_menu` VALUES (98, '牛只栏舍', 1, 2, '牛只栏舍', 'CowCowShed', 'systemManagement/calfBarn/index', 'iconfont el-icon-s-ORDER', 1, '', 89, 1, 1, 1683707629, 1684290645);
 INSERT INTO `system_menu` VALUES (99, '栏舍分组', 1, 2, '栏舍分组', 'CowShedGroup', 'systemManagement/calfBarnGroup/index', 'iconfont el-icon-s-ORDER', 1, '', 89, 1, 1, 1683707629, 1684290645);
 INSERT INTO `system_menu` VALUES (100, '饲喂计划', 1, 2, '饲喂计划', 'FeedPlan', 'systemManagement/feedPlan/index', 'iconfont el-icon-s-ORDER', 1, '', 90, 1, 1, 1683707629, 1684290645);
-INSERT INTO `system_menu` VALUES (101, '配方模板', 1, 2, '配方模板', 'FormulaTemplate', 'systemManagement/forageInfo/index', 'iconfont el-icon-s-ORDER', 1, '', 90, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (101, '日龄饲喂模板', 1, 2, '日龄饲喂模板', 'FormulaTemplate', 'systemManagement/forageInfo/index', 'iconfont el-icon-s-ORDER', 1, '', 90, 1, 1, 1683707629, 1684290645);
 INSERT INTO `system_menu` VALUES (102, '犊牛类型', 1, 2, '犊牛类型', 'CalfType', 'systemManagement/calfInfo/index', 'iconfont el-icon-s-ORDER', 1, '', 92, 1, 1, 1683707629, 1684290645);
 INSERT INTO `system_menu` VALUES (103, '饲喂车管理', 1, 2, '饲喂车管理', 'FeedCarManagement', 'systemManagement/feedVehicle/index', 'iconfont el-icon-s-ORDER', 1, '', 92, 1, 1, 1683707629, 1684290645);
 INSERT INTO `system_menu` VALUES (104, '预设饲喂模板', 1, 2, '预设饲喂模板', 'FeedTemplate', 'systemManagement/feedVehicle/index', 'iconfont el-icon-s-ORDER', 1, '', 92, 1, 1, 1683707629, 1684290645);
@@ -71,7 +71,7 @@ INSERT INTO `system_menu` VALUES (110, '事件记录编辑', 2, 3, '事件记录
 INSERT INTO `system_menu` VALUES (111, '牛只栏舍编辑', 2, 3, '牛只栏舍编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 98, 1, 1, 1683707629, 1685417159);
 INSERT INTO `system_menu` VALUES (112, '栏舍分组编辑', 2, 3, '栏舍分组编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 99, 1, 1, 1683707629, 1685417159);
 INSERT INTO `system_menu` VALUES (113, '饲喂计划编辑', 2, 3, '饲喂计划编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 100, 1, 1, 1683707629, 1685417159);
-INSERT INTO `system_menu` VALUES (114, '配方模板编辑', 2, 3, '配方模板编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 101, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (114, '日龄饲喂模板编辑', 2, 3, '日龄饲喂模板编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 101, 1, 1, 1683707629, 1685417159);
 INSERT INTO `system_menu` VALUES (115, '犊牛类型编辑', 2, 3, '犊牛类型编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 102, 1, 1, 1683707629, 1685417159);
 INSERT INTO `system_menu` VALUES (116, '饲喂车管理编辑', 2, 3, '饲喂车管理编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 103, 1, 1, 1683707629, 1685417159);
 INSERT INTO `system_menu` VALUES (117, '预设饲喂模板编辑', 2, 3, '预设饲喂模板编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 104, 1, 1, 1683707629, 1685417159);