|
@@ -101,42 +101,44 @@
|
|
|
<!-- 弹窗 新增or修改 -->
|
|
|
<el-dialog :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
|
|
|
<div class="">
|
|
|
- <el-form ref="addFormRef" :rules="addFormRules" :model="addForm" label-position="right" label-width="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" :rows="3" />
|
|
|
- </el-form-item>
|
|
|
+ <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="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>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="12">
|
|
@@ -155,7 +157,19 @@
|
|
|
</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>
|
|
|
|
|
@@ -299,61 +313,12 @@ export default {
|
|
|
selectList1:[],
|
|
|
|
|
|
tableListShed1:[
|
|
|
- {
|
|
|
- id: 1,
|
|
|
- date: '2016-05-02',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1518 弄',
|
|
|
- children:[{name:1,id:2},{name:1,id:2}]
|
|
|
- }, {
|
|
|
- id: 2,
|
|
|
- date: '2016-05-04',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1517 弄'
|
|
|
- }, {
|
|
|
- id: 3,
|
|
|
- date: '2016-05-01',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1519 弄',
|
|
|
- children: [{
|
|
|
- id: 31,
|
|
|
- date: '2016-05-01',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1519 弄'
|
|
|
- }, {
|
|
|
- id: 32,
|
|
|
- date: '2016-05-01',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1519 弄'
|
|
|
- }]
|
|
|
- }, {
|
|
|
- id: 4,
|
|
|
- date: '2016-05-03',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1516 弄'
|
|
|
- }],
|
|
|
- tableData1: [{
|
|
|
- id: 1,
|
|
|
- date: '2016-05-02',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1518 弄'
|
|
|
- }, {
|
|
|
- id: 2,
|
|
|
- date: '2016-05-04',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1517 弄'
|
|
|
- }, {
|
|
|
- id: 3,
|
|
|
- date: '2016-05-01',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1519 弄',
|
|
|
- hasChildren: true
|
|
|
- }, {
|
|
|
- id: 4,
|
|
|
- date: '2016-05-03',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1516 弄'
|
|
|
- }
|
|
|
+ ],
|
|
|
+
|
|
|
+
|
|
|
+ selectList2:[],
|
|
|
+
|
|
|
+ tableListShed2:[
|
|
|
]
|
|
|
|
|
|
|
|
@@ -693,6 +658,11 @@ export default {
|
|
|
console.log('勾选数据selectList1', this.selectList1)
|
|
|
},
|
|
|
|
|
|
+ change_table_selection2(val){
|
|
|
+ this.selectList2 = val
|
|
|
+ console.log('勾选数据selectList2', this.selectList1)
|
|
|
+ },
|
|
|
+
|
|
|
|
|
|
form_export() {
|
|
|
//获取请求表格数据的参数
|