|
|
@@ -6,21 +6,17 @@
|
|
|
<el-card class="box-card">
|
|
|
<!-- 搜索区域 -->
|
|
|
<div class="search-bx1">
|
|
|
- <el-input v-model="searchData.calf_code" placeholder="配方名称" style="width: 180px;" class="g-mr20 g-mb20" clearable />
|
|
|
+ <el-input v-model="searchData.name" placeholder="配方名称" style="width: 180px;" class="g-mr20 g-mb20" clearable />
|
|
|
|
|
|
<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-input-number v-model="searchData.min_daily_weight_gain" style="width:120px;" :controls="false" placeholder="日龄阶段" />
|
|
|
- <span style="margin:0px 8px;">至</span>
|
|
|
- <el-input-number v-model="searchData.max_daily_weight_gain" style="width:120px;" class="g-mr20" :controls="false" placeholder="日龄阶段" />
|
|
|
+
|
|
|
|
|
|
|
|
|
<el-button type="primary" @click="form_search">搜索</el-button>
|
|
|
@@ -39,32 +35,32 @@
|
|
|
</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.name }}</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.calf_category_name }}</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>{{ }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="配方阶段数" min-width="150px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ scope.row.birth_date_format }}</span>
|
|
|
+ <span>{{ }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="公犊增重指标（KG/日）" min-width="150px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ scope.row.birth_date_format }}</span>
|
|
|
+ <span>{{ scope.row.male_calf_daily_weight }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="母犊增重指标（KG/日）" min-width="150px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ scope.row.birth_date_format }}</span>
|
|
|
+ <span>{{ scope.row.female_calf_daily_weight }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
@@ -85,45 +81,123 @@
|
|
|
|
|
|
|
|
|
<!-- 弹窗 新增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:50%;margin:0 auto 50px">
|
|
|
- <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-form-item label="犊牛编号：" prop="calf_code">
|
|
|
- <el-input v-model="addForm.calf_code" placeholder="" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <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-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>
|
|
|
- <el-form-item label="性别：" prop="genders">
|
|
|
- <el-select v-model="addForm.genders" filterable placeholder="请选择" class="filter-item" style="width: 100%;" >
|
|
|
- <el-option v-for="item in sexList" :key="item.id" :label="item.value" :value="item.id" />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="出生体重(KG)：" prop="birth_weight">
|
|
|
- <el-input v-model="addForm.birth_weight" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="当前体重(KG)：" prop="current_weight">
|
|
|
- <el-input v-model="addForm.current_weight" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="母号：" prop="mother_code">
|
|
|
- <el-input v-model="addForm.mother_code" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="备注：" prop="remark">
|
|
|
- <el-input v-model="addForm.remark" type="textarea" maxlength="200" class="filter-item" :rows="3" />
|
|
|
- </el-form-item>
|
|
|
+ <el-form ref="addFormRef" :rules="addFormRules" :model="addForm" label-position="right" label-width="160px" style="width:80%;margin:0 auto 50px">
|
|
|
+
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="配方名称：" prop="name">
|
|
|
+ <el-input v-model="addForm.name" />
|
|
|
+ </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-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-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-row :gutter="20" >
|
|
|
+ <el-button type="primary" @click="add_step">增加一个阶段</el-button>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+
|
|
|
+ <el-row>
|
|
|
+ <!-- 表格 -->
|
|
|
+ <el-table key="0" ref="tableStep" :data="tableListStep" v-loading="tableLoadingStep" 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-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="edit_step(scope.$index, scope.row)">修改</el-button>
|
|
|
+ <!-- 删除按钮 -->
|
|
|
+ <el-button type="danger" size="mini" icon="el-icon-delete" @click="delete_step(scope.$index, scope.row)">删除</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+
|
|
|
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -133,7 +207,104 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
-
|
|
|
+ <!-- 弹窗 新增or修改 -->
|
|
|
+ <el-dialog :title="addFormTxtStep[addFormStatusStep]" :visible.sync="addFormShowStep" @close="add_step_close" width="80%">
|
|
|
+ <div class="">
|
|
|
+ <el-form ref="addFormRefStep" :rules="addFormRulesStep" :model="addFormStep" label-position="right" label-width="150px" style="width:80%;margin:0 auto 50px">
|
|
|
+
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="阶段：" >
|
|
|
+ <el-input v-model="addFormStep.id" placeholder="" disabled />
|
|
|
+ </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-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-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-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-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-col :span="12">
|
|
|
+ <el-form-item label="第二班占比(%)：" prop="second_class_ratio">
|
|
|
+ <el-input v-model="addFormStep.second_class_ratio" placeholder="" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="第三班占比(%)：" prop="third_class_ratio">
|
|
|
+ <el-input v-model="addFormStep.third_class_ratio" placeholder="" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="第四班占比(%)：" prop="fourth_class_ratio">
|
|
|
+ <el-input v-model="addFormStep.fourth_class_ratio" placeholder="" />
|
|
|
+ </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-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-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-col :span="12">
|
|
|
+
|
|
|
+ </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>
|
|
|
+ <el-button @click="addFormShowStep = false">关闭</el-button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
|
|
|
</div>
|
|
|
|
|
|
@@ -155,13 +326,13 @@ export default {
|
|
|
|
|
|
|
|
|
//接口 - 获取 - 表格
|
|
|
- url_get_table:'/api/v1/ops/calf/list',
|
|
|
+ url_get_table:'/api/v1/ops/formula_plan/formula/list',
|
|
|
//接口 - 新增 - 表格
|
|
|
- url_add_table:'/api/v1/ops/calf/add',
|
|
|
+ url_add_table:'/api/v1/ops/formula_plan/formula/add',
|
|
|
//接口 - 修改 - 表格
|
|
|
- url_edit_table:'/api/v1/ops/calf/update',
|
|
|
+ url_edit_table:'/api/v1/ops/formula_plan/formula/update',
|
|
|
//接口 - 删除 - 表格
|
|
|
- url_delete_table:'/api/v1/ops/calf/delete',
|
|
|
+ url_delete_table:'/api/v1/ops/formula_plan/formula',
|
|
|
|
|
|
//接口 - 下拉框 列表
|
|
|
url_get_select1:'/api/v1/ops/calf_feed/enum/list',
|
|
|
@@ -207,6 +378,12 @@ export default {
|
|
|
],
|
|
|
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
//栏舍状态
|
|
|
statusList:[
|
|
|
{id: 1, value: '正常'},
|
|
|
@@ -224,6 +401,10 @@ export default {
|
|
|
//栏舍
|
|
|
cowsheList:[
|
|
|
|
|
|
+ ],
|
|
|
+ //饲料
|
|
|
+ forageList:[
|
|
|
+
|
|
|
],
|
|
|
|
|
|
sexList:[
|
|
|
@@ -241,16 +422,33 @@ export default {
|
|
|
addForm:{
|
|
|
name:'',id:'' ,addForm: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
|
|
|
},
|
|
|
-
|
|
|
addFormRules:{
|
|
|
// name: [
|
|
|
// { required: true, message: '类型必填', trigger: 'blur' },
|
|
|
// ],
|
|
|
-
|
|
|
-
|
|
|
},
|
|
|
|
|
|
+
|
|
|
+ stepIndex:undefined,
|
|
|
+
|
|
|
+ tableLoadingStep: false,
|
|
|
+ //表格内容
|
|
|
+ tableListStep:[
|
|
|
|
|
|
+ ],
|
|
|
+
|
|
|
+ addFormShowStep:false,
|
|
|
+ addFormStatusStep: '',
|
|
|
+ addFormTxtStep: { edit: '修改', create: '新增' },
|
|
|
+ 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' },
|
|
|
+ // ],
|
|
|
+ },
|
|
|
|
|
|
}
|
|
|
},
|
|
|
@@ -316,17 +514,17 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
- // ajaxDataGet('/authdata/pasture', { "page": 1, "page_size": 1000}).then(e => {
|
|
|
- // console.log("牧场下拉框1：",e)
|
|
|
+ ajaxDataGet('/api/v1/ops/base_setting/forage_cost/list?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.list == null || e.data.list == undefined ||e.data.list.length == 0 ){
|
|
|
+ me.forageList = []
|
|
|
+ } else {
|
|
|
+ me.forageList = e.data.list
|
|
|
+ }
|
|
|
|
|
|
- // })
|
|
|
+ })
|
|
|
|
|
|
|
|
|
},
|
|
|
@@ -426,6 +624,7 @@ export default {
|
|
|
//编辑
|
|
|
form_edit(row) {
|
|
|
this.reset_form()
|
|
|
+ var me = this
|
|
|
console.log('行内容row=========', row)
|
|
|
//编辑行内容赋值
|
|
|
this.addForm = Object.assign({}, row)
|
|
|
@@ -433,6 +632,8 @@ export default {
|
|
|
if(row.genders == 0){
|
|
|
this.addForm.genders = undefined
|
|
|
}
|
|
|
+ me.tableListStep = row.formula_stage
|
|
|
+
|
|
|
this.addFormStatus = 'edit'
|
|
|
this.addFormShow = true
|
|
|
this.$nextTick(() => {
|
|
|
@@ -455,18 +656,14 @@ export default {
|
|
|
if (valid) {
|
|
|
//发起请求
|
|
|
var send_data = {
|
|
|
- "barn_id": me.addForm.barn_id,
|
|
|
- "calf_code": me.addForm.calf_code,
|
|
|
+ "name": me.addForm.name,
|
|
|
"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}'),
|
|
|
-
|
|
|
+ "calf_category_name":'11',
|
|
|
+ "male_calf_daily_weight": parseFloat(me.addForm.male_calf_daily_weight),
|
|
|
+ "female_calf_daily_weight": parseFloat(me.addForm.female_calf_daily_weight),
|
|
|
+ "formula_stage": me.tableListStep
|
|
|
}
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
@@ -501,18 +698,13 @@ export default {
|
|
|
if (valid) {
|
|
|
//发起请求
|
|
|
var send_data = {
|
|
|
-
|
|
|
- "id": me.addForm.id,
|
|
|
- "barn_id": me.addForm.barn_id,
|
|
|
- "calf_code": me.addForm.calf_code,
|
|
|
+ "id": me.addForm.id,
|
|
|
+ "name": me.addForm.name,
|
|
|
"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}'),
|
|
|
+ "calf_category_name":'11',
|
|
|
+ "male_calf_daily_weight": parseFloat(me.addForm.male_calf_daily_weight),
|
|
|
+ "female_calf_daily_weight": parseFloat(me.addForm.female_calf_daily_weight),
|
|
|
+ "formula_stage": me.tableListStep
|
|
|
}
|
|
|
|
|
|
// var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
|
|
|
@@ -542,11 +734,6 @@ export default {
|
|
|
},
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
form_delete(row) {
|
|
|
var me = this
|
|
|
|
|
|
@@ -582,6 +769,188 @@ export default {
|
|
|
|
|
|
},
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ //清空弹窗表单信息
|
|
|
+ reset_step(){
|
|
|
+
|
|
|
+ this.addFormStep.name = ''
|
|
|
+ this.addFormStep.start_daily_age = undefined
|
|
|
+ this.addFormStep.end_daily_age = undefined
|
|
|
+ this.addFormStep.forage_id = undefined
|
|
|
+ this.addFormStep.forage_name=""
|
|
|
+ this.addFormStep.daily_feed_number = undefined
|
|
|
+ this.addFormStep.first_class_ratio = undefined
|
|
|
+ this.addFormStep.second_class_ratio = undefined
|
|
|
+ this.addFormStep.third_class_ratio = undefined
|
|
|
+ this.addFormStep.fourth_class_ratio = undefined
|
|
|
+ this.addFormStep.allow_class_error = undefined
|
|
|
+ this.addFormStep.feed_temp = undefined
|
|
|
+ this.addFormStep.allow_temp_error = undefined
|
|
|
+
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+ //新增
|
|
|
+ add_step() {
|
|
|
+ this.reset_step()
|
|
|
+ this.addFormStatusStep = 'create'
|
|
|
+ this.addFormStep.id = this.tableListStep.length + 1
|
|
|
+
|
|
|
+ this.addFormShowStep = true
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs['addFormRefStep'].clearValidate()
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+ //编辑
|
|
|
+ edit_step(index, row) {
|
|
|
+ this.stepIndex = index
|
|
|
+ console.log('行内容row=========', row)
|
|
|
+ //编辑行内容赋值
|
|
|
+ this.addFormStep = Object.assign({}, row)
|
|
|
+
|
|
|
+ if(row.forage_id == 0){
|
|
|
+ this.addFormStep.forage_id = undefined
|
|
|
+ }
|
|
|
+ this.addFormStatusStep = 'edit'
|
|
|
+ this.addFormShowStep = true
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs['addFormRefStep'].clearValidate()
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
+ //新增关闭
|
|
|
+ add_step_close(){
|
|
|
+ //内容重置
|
|
|
+ this.$refs['addFormRefStep'].resetFields()
|
|
|
+ this.reset_step()
|
|
|
+ this.addFormShowStep = false
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+ //新增 保存
|
|
|
+ add_step_save() {
|
|
|
+ var me = this
|
|
|
+ this.$refs['addFormRefStep'].validate(valid => {
|
|
|
+ //验证成功
|
|
|
+ if (valid) {
|
|
|
+ //发起请求
|
|
|
+ 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,
|
|
|
+ "end_daily_age":me.addFormStep.end_daily_age,
|
|
|
+ "forage_id": me.addFormStep.forage_id,
|
|
|
+ "forage_name": forage_name ,
|
|
|
+ "daily_feed_number":me.addFormStep.daily_feed_number,
|
|
|
+ "first_class_ratio": me.addFormStep.first_class_ratio,
|
|
|
+ "second_class_ratio":me.addFormStep.second_class_ratio,
|
|
|
+ "third_class_ratio": me.addFormStep.third_class_ratio,
|
|
|
+ "fourth_class_ratio": me.addFormStep.fourth_class_ratio,
|
|
|
+ "allow_class_error": me.addFormStep.allow_class_error,
|
|
|
+ "feed_temp": me.addFormStep.feed_temp,
|
|
|
+ "allow_temp_error": me.addFormStep.allow_temp_error,
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ console.log("弹窗参数：", send_data)
|
|
|
+
|
|
|
+ //关闭弹窗
|
|
|
+ me.addFormShowStep = false
|
|
|
+ me.tableListStep.push(send_data)
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //编辑 保存
|
|
|
+ edit_step_save(){
|
|
|
+ var me = this
|
|
|
+ this.$refs['addFormRefStep'].validate(valid => {
|
|
|
+ //验证成功
|
|
|
+ if (valid) {
|
|
|
+ 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,
|
|
|
+ "end_daily_age":me.addFormStep.end_daily_age,
|
|
|
+ "forage_id": me.addFormStep.forage_id,
|
|
|
+ "forage_name": forage_name ,
|
|
|
+ "daily_feed_number":me.addFormStep.daily_feed_number,
|
|
|
+ "first_class_ratio": me.addFormStep.first_class_ratio,
|
|
|
+ "second_class_ratio":me.addFormStep.second_class_ratio,
|
|
|
+ "third_class_ratio": me.addFormStep.third_class_ratio,
|
|
|
+ "fourth_class_ratio": me.addFormStep.fourth_class_ratio,
|
|
|
+ "allow_class_error": me.addFormStep.allow_class_error,
|
|
|
+ "feed_temp": me.addFormStep.feed_temp,
|
|
|
+ "allow_temp_error": me.addFormStep.allow_temp_error,
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ // 编辑保存
|
|
|
+ console.log("弹窗参数：", send_data)
|
|
|
+ me.addFormShowStep = false
|
|
|
+ var stepIndex = me.stepIndex
|
|
|
+ this.$set(me.tableListStep, stepIndex, send_data)
|
|
|
+ console.log('me.tableListStep============',me.tableListStep)
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
+ delete_step(index, row) {
|
|
|
+ var me = this
|
|
|
+
|
|
|
+ me.$confirm('是否删除此条内容?', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ console.log('点击了 - 删除一个阶段index===',index,'row===',row)
|
|
|
+ me.tableListStep.splice(index, 1)
|
|
|
+
|
|
|
+ //加载 - 发送新增保存
|
|
|
+ // 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() {
|
|
|
//获取请求表格数据的参数
|
