defaultpara

.env.production

@@ -13,7 +13,7 @@ NODE_ENV = 'production'
 VUE_APP_BASE_API = 'http://192.168.1.70:8087'
 
 # 圣力
-#VUE_APP_BASE_API = 'http://jsxzsl8087.kptyun.com'
+# VUE_APP_BASE_API = 'http://jsxzsl8087.kptyun.com'
 
 # 徐州圣力8090
 # VUE_APP_BASE_API = 'http://jsxzsl8090.kptyun.com'

src/views/Welcome.vue

@@ -1,6 +1,7 @@
 <template>
+<!-- 100 -->
   <div class="login_container">
-    <!-- 光明设备系统 -->
+   
 
 
     <!-- <div class="card-bx">

src/views/Welcome10.vue

@@ -1,123 +0,0 @@
-<template>
-  <div class="login_container">
-    <!-- 光明设备系统 -->
-
-
-    <!-- <div class="card-bx">
-             
-             <div class="card-cont">
-                 <div id="chartPie1"  style="width: 100%;height:280px;"></div>
-             </div>
-             
-          </div> -->
-      
-  </div>
-</template> 
-
-<script>
-import {   ajaxDataPost } from '@/api/common'
-import * as echarts from 'echarts';
-
-//  require('echarts/theme/macarons')
-export default {
-  data() {
-    return {
-       //图表请求参数
-      chart1: {
-        getdataListParm: {
-          name: 'getChart1ByHomepage',
-          page: 1,
-          offset: 1,
-          pagecount: '',
-          returntype: 'Map',
-          parammaps: {
-            inputDatetime: '',
-            beginDate: '',
-            endDate: '',
-        
-          }
-        }
-      },
-      //图表实例
-      chartPie1: null,
-      //图表数据
-      chartPie1_data: {
-        monthdate:['一月', '二月', '三月', '四月', '五月', '六月', '七月'],
-        arr1:[22, 22, 22, 2, 22, 22, 55],
-        arr2:[33, 11, 44, 55, 90, 230, 55],
-       
-      },
-    }
-  },
-
-  created(){
-  
-  },
-  mounted() {
-    //加载 - 图表假数据，如果是图表需要放mounted里测试假数据
-     // this.roadchartPie1(this.chartPie1_data)
-
- 
-
-  },
-  methods:{
-     
-    //图表数据加载
-    roadchartPie1(chartPie1_data) {
-
-      
-      if (this.chartPie1 != null) {
-        this.chartPie1.dispose()
-      }
-
-      console.log(echarts)
-      this.chartPie1 = echarts.init(document.getElementById('chartPie1'))
-      var option = {
-        title: [
-          { subtext: '犊牛总数', left: '16.67%',  top: '75%', textAlign: 'center' },
-          { subtext: '公犊牛', left: '50%', top: '75%',  textAlign: 'center' },
-          { subtext: '母犊牛', left: '83.33%', top: '75%', textAlign: 'center' }
-        ],
-        series: [
-          {
-            type: 'pie',radius: '25%',radius: ['50%', '70%'],
-            data: [
-              { name: '犊牛总数', value: 2300 },
-            ],
-            itemStyle: { color: '#fac229'},
-            label: {formatter: '{c}',position: 'center', fontSize: 20 },
-            left: 0,right: '66.6667%',top: 0, bottom: 0
-          },
-          {
-            type: 'pie', radius: '25%', radius: ['50%', '70%'],
-            data: [
-              { name: '公犊牛', value: 928, itemStyle: { color: '#6af7a4'},label: {formatter: '{c}',position: 'center', fontSize: 20 }},
-              { name: '', value: 2700, itemStyle: { color: '#104658'},label: {formatter: ' ',position: 'center', fontSize: 20}},
-            ],
-            left: '33.3333%',right: '33.3333%', top: 0,bottom: 0
-          },
-          {
-            type: 'pie',radius: '25%',radius: ['50%', '70%'],
-            data: [
-              { name: '母犊牛', value: 1372,itemStyle: { color: '#6cd6fc'},label: {formatter: '{c}',position: 'center', fontSize: 20 }},
-              { name: '', value: 400,itemStyle: { color: '#093580'},label: {formatter: ' ',position: 'center', fontSize: 20 } },
-            ],    
-            left: '66.6667%', right: 0,  top: 0, bottom: 0
-          }
-        ]
-      }
-   
-      
-      this.chartPie1.setOption(option)
-      window.onresize = function () {
-        this.chartPie1.resize()
-      }
-    },
-    
-   
-  }
-}
-</script>
-<!-- 加了scoped，则是仅在此组件里生效 -->
-<style scoped> 
-</style>

src/views/Welcome100.vue

@@ -0,0 +1,125 @@
+<template>
+  <!-- 100 -->
+    <div class="login_container">
+     
+  
+  
+      <!-- <div class="card-bx">
+               
+               <div class="card-cont">
+                   <div id="chartPie1"  style="width: 100%;height:280px;"></div>
+               </div>
+               
+            </div> -->
+        
+    </div>
+  </template> 
+  
+  <script>
+  import {   ajaxDataPost } from '@/api/common'
+  import * as echarts from 'echarts';
+  
+  //  require('echarts/theme/macarons')
+  export default {
+    data() {
+      return {
+         //图表请求参数
+        chart1: {
+          getdataListParm: {
+            name: 'getChart1ByHomepage',
+            page: 1,
+            offset: 1,
+            pagecount: '',
+            returntype: 'Map',
+            parammaps: {
+              inputDatetime: '',
+              beginDate: '',
+              endDate: '',
+          
+            }
+          }
+        },
+        //图表实例
+        chartPie1: null,
+        //图表数据
+        chartPie1_data: {
+          monthdate:['一月', '二月', '三月', '四月', '五月', '六月', '七月'],
+          arr1:[22, 22, 22, 2, 22, 22, 55],
+          arr2:[33, 11, 44, 55, 90, 230, 55],
+         
+        },
+      }
+    },
+  
+    created(){
+    
+    },
+    mounted() {
+      //加载 - 图表假数据，如果是图表需要放mounted里测试假数据
+       // this.roadchartPie1(this.chartPie1_data)
+  
+   
+  
+    },
+    methods:{
+       
+      //图表数据加载
+      roadchartPie1(chartPie1_data) {
+  
+        
+        if (this.chartPie1 != null) {
+          this.chartPie1.dispose()
+        }
+  
+        console.log(echarts)
+        this.chartPie1 = echarts.init(document.getElementById('chartPie1'))
+        var option = {
+          title: [
+            { subtext: '犊牛总数', left: '16.67%',  top: '75%', textAlign: 'center' },
+            { subtext: '公犊牛', left: '50%', top: '75%',  textAlign: 'center' },
+            { subtext: '母犊牛', left: '83.33%', top: '75%', textAlign: 'center' }
+          ],
+          series: [
+            {
+              type: 'pie',radius: '25%',radius: ['50%', '70%'],
+              data: [
+                { name: '犊牛总数', value: 2300 },
+              ],
+              itemStyle: { color: '#fac229'},
+              label: {formatter: '{c}',position: 'center', fontSize: 20 },
+              left: 0,right: '66.6667%',top: 0, bottom: 0
+            },
+            {
+              type: 'pie', radius: '25%', radius: ['50%', '70%'],
+              data: [
+                { name: '公犊牛', value: 928, itemStyle: { color: '#6af7a4'},label: {formatter: '{c}',position: 'center', fontSize: 20 }},
+                { name: '', value: 2700, itemStyle: { color: '#104658'},label: {formatter: ' ',position: 'center', fontSize: 20}},
+              ],
+              left: '33.3333%',right: '33.3333%', top: 0,bottom: 0
+            },
+            {
+              type: 'pie',radius: '25%',radius: ['50%', '70%'],
+              data: [
+                { name: '母犊牛', value: 1372,itemStyle: { color: '#6cd6fc'},label: {formatter: '{c}',position: 'center', fontSize: 20 }},
+                { name: '', value: 400,itemStyle: { color: '#093580'},label: {formatter: ' ',position: 'center', fontSize: 20 } },
+              ],    
+              left: '66.6667%', right: 0,  top: 0, bottom: 0
+            }
+          ]
+        }
+     
+        
+        this.chartPie1.setOption(option)
+        window.onresize = function () {
+          this.chartPie1.resize()
+        }
+      },
+      
+     
+    }
+  }
+  </script>
+  <!-- 加了scoped，则是仅在此组件里生效 -->
+  <style scoped> 
+  </style>
+  

src/views/basicSettings/DefaultPara.vue

@@ -52,19 +52,37 @@
           <el-col :span="12">
        
             <el-form-item label="犊牛断奶提醒：" prop="weaning_reminder">
-              <el-input  v-model="addForm.weaning_reminder" :controls="false" placeholder="比例" >
+              <el-input  v-model="addForm.weaning_reminder" :controls="false" placeholder="" >
                 <template slot="append">天</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="饲喂时间误差范围：" prop="feed_plan_time_rang">
-              <el-input  v-model="addForm.feed_plan_time_rang" :controls="false" placeholder="比例" >
+              <el-input  v-model="addForm.feed_plan_time_rang" :controls="false" placeholder="" >
                 <template slot="append">分钟</template>
               </el-input>
             </el-form-item>
           </el-col>
         </el-row>
+        
+        
+
+        <el-row>
+          <el-col :span="12">
+       
+            <el-form-item label="饲喂车感应时间：" prop="exec_time">
+              <el-input  v-model="addForm.exec_time" :controls="false" placeholder="" >
+                <template slot="append">秒</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            
+          </el-col>
+        </el-row>
+
+
 
         <el-row>
           <el-col :span="12">
@@ -174,7 +192,7 @@ export default {
       addFormStatus: '',
       addFormTxt: {  edit: '修改',  create: '新增' },
       addForm:{
-        name:'',id:'' 
+        name:'',id:'' ,exec_time:""
       },
 
       addFormRules:{
@@ -346,7 +364,10 @@ export default {
               "measurement_decimals": me.addForm.measurement_decimals,
               "ratio_decimals": me.addForm.ratio_decimals,
               "weaning_reminder": parseFloat(me.addForm.weaning_reminder),
-              "feed_plan_time_rang": parseFloat(me.addForm.feed_plan_time_rang) 
+              "feed_plan_time_rang": parseFloat(me.addForm.feed_plan_time_rang),
+              "exec_time": parseFloat(me.addForm.exec_time) 
+
+              
           }
           console.log("弹窗参数：", send_data)
 

src/views/basicSettings/DiseaseManagement.vue

@@ -1,5 +1,5 @@
 <template>
- 
+ <!-- 102 -->
   <div>
 
 

src/views/basicSettings/DiseaseManagement11.vue → src/views/basicSettings/DiseaseManagement102.vue

@@ -1,5 +1,5 @@
 <template>
- 
+  <!-- 102 -->
   <div>
 
 

src/views/basicSettings/InfoRemind.vue

@@ -1,5 +1,5 @@
 <template>
- 
+  <!-- 100 -->
   <div>
         1.1版本页面，待开发
   </div>

src/views/cowManagement/WeightRecord10.vue → src/views/basicSettings/InfoRemind100.vue

@@ -1,5 +1,5 @@
 <template>
- 
+   <!-- 100 -->
   <div>
         1.1版本页面，待开发
   </div>

src/views/basicSettings/InfoRemind11.vue → src/views/basicSettings/InfoRemind102.vue

@@ -1,5 +1,5 @@
 <template>
- 
+  <!-- 102 -->
   <div>
 
 

src/views/basicSettings/WorkOrderType.vue

@@ -1,5 +1,5 @@
 <template>
- 
+   <!-- 100 -->
   <div>
         1.1版本页面，待开发
   </div>

src/views/basicSettings/WorkOrderType10.vue → src/views/basicSettings/WorkOrderType100.vue

@@ -1,5 +1,5 @@
 <template>
- 
+  <!-- 100 -->
   <div>
         1.1版本页面，待开发
   </div>

src/views/basicSettings/WorkOrderType11.vue → src/views/basicSettings/WorkOrderType102.vue

@@ -1,5 +1,5 @@
 <template>
- 
+  <!-- 102 -->
   <div>
 
 

src/views/cowManagement/CowInfo.vue

@@ -1,745 +1,746 @@
 <template>
+  <!-- 100 -->
+   <div>
  
-  <div>
-
-
-    <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.barn_number" placeholder="栏舍身份ID"  style="width: 180px;" class="g-mr20" clearable />
-          <el-input v-model="searchData.barn_name" placeholder="栏舍"  style="width: 180px;" class="g-mr20" clearable />
-          <!-- <el-input v-model="searchData.mother_code" 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-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-select v-model="searchData.genders" filterable placeholder="性别" class="g-mr20" style="width: 180px;" clearable>
-            <el-option v-for="item in sexList" :key="item.id" :label="item.value" :value="item.id" />
-          </el-select>
-
-          <!-- <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-input-number v-model="searchData.min_daily_age" style="width:120px;" :controls="false" placeholder="日龄" />
-          <span style="margin:0px 8px;">至</span>
-          <el-input-number v-model="searchData.max_daily_age" style="width:120px;" class="g-mr20" :controls="false" placeholder="日龄" />
-
-
-          <el-button type="primary"   @click="form_search">搜索</el-button>
-          <el-button type="primary"   @click="form_clear">重置</el-button>
-          <el-button type="primary"  v-if="isButtonEdit" @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>
-        <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.calf_code }}</span>
-          </template>
-        </el-table-column>
-       
-        <el-table-column label="耳号" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.ear_number }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="栏舍身份ID" min-width="150px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.barn_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>
-          </template>
-        </el-table-column>
-        <el-table-column label="犊牛类型" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <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.birth_date_format }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="性别" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.genders == 1">公</span>
-            <span v-if="scope.row.genders == 2">母</span>
-            <span v-else> </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="日龄" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.daily_age }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="出生体重(KG)" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.birth_weight }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="当前体重(KG)" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.current_weight }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="日均增重(KG)" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.daily_weight_gain }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="母号" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.mother_code }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="建档日期" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.created_at_format }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="出栏日期" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.leave_barn_date_format }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="状态" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.status == 1" style="color:#67c23a;font-weight:bold">健康</span>
-            <span v-if="scope.row.status == 2" style="color:#ff9100;font-weight:bold">疾病</span>
-            <span v-if="scope.row.status == 3" style="color:#dec40d;font-weight:bold">出栏</span>
-            <span v-if="scope.row.status == 4" style="color:#ff0000;font-weight:bold">死亡</span>
-            <span v-if="scope.row.status == 5" style="color:#fa00ff;font-weight:bold">淘汰</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"  v-if="isButtonEdit" @click="form_edit(scope.row)">修改</el-button>
-             <!-- 删除按钮 -->
-             <el-button type="danger" size="mini" icon="el-icon-delete"  v-if="isButtonEdit"  @click="form_delete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页区域 -->
-      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.total"/>
-    </el-card>
-
-
-    <!-- 弹窗 新增or修改 -->
-    <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
-      <div class="">
-        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="140px"  style="width:50%;margin:0 auto 50px">
-            <el-form-item label="栏舍：" prop="barn_id">
-              <el-select  v-model="addForm.barn_id" filterable placeholder="请选择"   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=""   :disabled="addFormStatus=='edit'"></el-input>  
-            </el-form-item>
-            <el-form-item label="耳号：" prop="ear_number">
-                <el-input   v-model="addForm.ear_number"  placeholder=""   :disabled="addFormStatus=='edit'"></el-input>  
-            </el-form-item>
-
-            
-
-            <el-form-item label="犊牛类型：" prop="calf_category_id">
-              <el-select  v-model="addForm.calf_category_id" filterable placeholder="请选择"   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="请选择"   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-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.barn_number" placeholder="栏舍身份ID"  style="width: 180px;" class="g-mr20" clearable />
+           <el-input v-model="searchData.barn_name" placeholder="栏舍"  style="width: 180px;" class="g-mr20" clearable />
+           <!-- <el-input v-model="searchData.mother_code" placeholder="母号"  style="width: 180px;" class="g-mr20" clearable /> -->
           
-            
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="addFormStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
-          <el-button @click="addFormShow = false">关闭</el-button>
-        </div>
-      </div>
-    </el-dialog>
-
- 
-    
-  </div>
-
-
-</template> 
-
-<script>
-import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
-import { parseTime, json2excel } from '@/utils/index.js'
-export default {
-  data() {
-
-
-    
+           <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-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-select v-model="searchData.genders" filterable placeholder="性别" class="g-mr20" style="width: 180px;" clearable>
+             <el-option v-for="item in sexList" :key="item.id" :label="item.value" :value="item.id" />
+           </el-select>
+ 
+           <!-- <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-input-number v-model="searchData.min_daily_age" style="width:120px;" :controls="false" placeholder="日龄" />
+           <span style="margin:0px 8px;">至</span>
+           <el-input-number v-model="searchData.max_daily_age" style="width:120px;" class="g-mr20" :controls="false" placeholder="日龄" />
+ 
+ 
+           <el-button type="primary"   @click="form_search">搜索</el-button>
+           <el-button type="primary"   @click="form_clear">重置</el-button>
+           <el-button type="primary"  v-if="isButtonEdit" @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>
+         <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.calf_code }}</span>
+           </template>
+         </el-table-column>
+        
+         <el-table-column label="耳号" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.ear_number }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="栏舍身份ID" min-width="150px" align="center">
+             <template slot-scope="scope">
+               <span>{{ scope.row.barn_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>
+           </template>
+         </el-table-column>
+         <el-table-column label="犊牛类型" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <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.birth_date_format }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="性别" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.genders == 1">公</span>
+             <span v-if="scope.row.genders == 2">母</span>
+             <span v-else> </span>
+           </template>
+         </el-table-column>
+         <el-table-column label="日龄" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.daily_age }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="出生体重(KG)" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.birth_weight }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="当前体重(KG)" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.current_weight }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="日均增重(KG)" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.daily_weight_gain }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="母号" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.mother_code }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="建档日期" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.created_at_format }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="出栏日期" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.leave_barn_date_format }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="状态" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.status == 1" style="color:#67c23a;font-weight:bold">健康</span>
+             <span v-if="scope.row.status == 2" style="color:#ff9100;font-weight:bold">疾病</span>
+             <span v-if="scope.row.status == 3" style="color:#dec40d;font-weight:bold">出栏</span>
+             <span v-if="scope.row.status == 4" style="color:#ff0000;font-weight:bold">死亡</span>
+             <span v-if="scope.row.status == 5" style="color:#fa00ff;font-weight:bold">淘汰</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"  v-if="isButtonEdit" @click="form_edit(scope.row)">编辑</el-button>
+              <!-- 删除按钮 -->
+              <el-button type="danger" size="mini" icon="el-icon-delete"  v-if="isButtonEdit"  @click="form_delete(scope.row)">删除</el-button>
+           </template>
+         </el-table-column>
+       </el-table>
+ 
+       <!-- 分页区域 -->
+       <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.total"/>
+     </el-card>
+ 
+ 
+     <!-- 弹窗 新增or修改 -->
+     <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
+       <div class="">
+         <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="140px"  style="width:50%;margin:0 auto 50px">
+             <el-form-item label="栏舍：" prop="barn_id">
+               <el-select  v-model="addForm.barn_id" filterable placeholder="请选择"   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=""   :disabled="addFormStatus=='edit'"></el-input>  
+             </el-form-item>
+             <el-form-item label="耳号：" prop="ear_number">
+                 <el-input   v-model="addForm.ear_number"  placeholder=""   :disabled="addFormStatus=='edit'"></el-input>  
+             </el-form-item>
+ 
+             
+ 
+             <el-form-item label="犊牛类型：" prop="calf_category_id">
+               <el-select  v-model="addForm.calf_category_id" filterable placeholder="请选择"   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="请选择"   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>
+         <div slot="footer" class="dialog-footer">
+           <el-button type="primary" @click="addFormStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
+           <el-button @click="addFormShow = false">关闭</el-button>
+         </div>
+       </div>
+     </el-dialog>
  
   
-    return {
-
- 
-
-      //接口 - 获取 - 表格
-      url_get_table:'/api/v1/ops/calf/list',
-      //接口 - 新增 - 表格
-      url_add_table:'/api/v1/ops/calf/add',  
-      //接口 - 修改 - 表格
-      url_edit_table:'/api/v1/ops/calf/update', 
-      //接口 - 删除 - 表格
-      url_delete_table:'/api/v1/ops/calf/delete', 
-      
-      //接口 - 下拉框 列表 
-      url_get_select1:'/api/v1/ops/calf_feed/enum/list',
-
-      //接口 - 下拉框 列表 栏舍组
-      url_get_select2:'/api/v1/ops/barn_group/list?page=1&page_size=1000',
-
-      
-
-      //获取 - 表格数据 - 参数
-      searchData:{
-        calf_code: "",
-        barn_name: "",
-        barn_number: "",
-        barn_id:undefined,
-        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,
-        page: 1,  //页码
-        page_size: 10,   //每页数量
-        total:0,  //总页数
-        pastureId: ""
-      },
-      tableLoading: false,
-      //表格内容
-      tableList:[
-        //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-      ],
-
-
-      //栏舍状态
-      statusList:[
-        {id: 1, value: '正常'},
-        {id: 2, value: '空栏'},
-        {id: 3, value: '损坏'},
-      ],
-
-    
-
-      //犊牛类型
-      calfTypeList:[
-         
-      ],
-
-    //栏舍
-      cowsheList:[
-         
-      ],
-
-      sexList:[
-        {id: 1, value: '公'},
-        {id: 2, value: '母'},
-      ],
-
-      healthList:[
-        {id: 1, value: '健康'},
-        {id: 2, value: '疾病'},
-        {id: 3, value: '出栏'},
-        {id: 4, value: '死亡'},
-        {id: 5, value: '淘汰'},
-      ],
-
-
- 
-
-      addFormShow:false,
-      addFormStatus: '',
-      addFormTxt: {  edit: '修改',  create: '新增' },
-      addForm:{
-        barn_id:undefined,ear_number:'',calf_code:'',calf_category_id:undefined, id:undefined, birth_date_format: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),genders:undefined, birth_weight:undefined, current_weight:undefined, mother_code:'',remark:'',
-      },
-
-      addFormRules:{
-        barn_id: [ { required: true, message: '栏舍必选', trigger: 'change' },  ],
-        calf_code: [ { required: true, message: '犊牛编号必填', trigger: 'blur' },  ],
-        // ear_number: [ { required: true, message: '耳号必填', trigger: 'blur' },  ],
-        calf_category_id: [ { required: true, message: '犊牛类型必选', trigger: 'change' },  ],
-        birth_date_format: [ { required: true, message: '出生日期必填', trigger: 'blur' },  ],
-        genders: [ { required: true, message: '性别必选', trigger: 'change' },  ],
-        birth_weight: [ { required: true, message: '出生体重必填', trigger: 'blur' },  ],
-        current_weight: [ { required: true, message: '当前体重必填', trigger: 'blur' },  ],
-        mother_code: [ { required: true, message: '母号必填', trigger: 'blur' },  ],
-
-      },
-      //按钮权限
-      isButtonEdit:false,
-
      
-       
-    }
-  },
-  created(){
-      //获取按钮权限
-      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "牛只信息编辑")
-      this.isButtonEdit = isButtonEdit
-      console.log('this.isButtonEdit==========',this.isButtonEdit)
+   </div>
+ 
+ 
+ </template> 
+ 
+ <script>
+ import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
+ import { parseTime, json2excel } from '@/utils/index.js'
+ export default {
+   data() {
+ 
+ 
      
-
-      //获取下拉框
-      this.get_select_list1()
-
-      //表格 - 初始化 
-      this.get_table_data()
-
-
+  
+   
+     return {
+ 
+  
+ 
+       //接口 - 获取 - 表格
+       url_get_table:'/api/v1/ops/calf/list',
+       //接口 - 新增 - 表格
+       url_add_table:'/api/v1/ops/calf/add',  
+       //接口 - 修改 - 表格
+       url_edit_table:'/api/v1/ops/calf/update', 
+       //接口 - 删除 - 表格
+       url_delete_table:'/api/v1/ops/calf/delete', 
+       
+       //接口 - 下拉框 列表 
+       url_get_select1:'/api/v1/ops/calf_feed/enum/list',
+ 
+       //接口 - 下拉框 列表 栏舍组
+       url_get_select2:'/api/v1/ops/barn_group/list?page=1&page_size=1000',
+ 
+       
+ 
+       //获取 - 表格数据 - 参数
+       searchData:{
+         calf_code: "",
+         barn_name: "",
+         barn_number: "",
+         barn_id:undefined,
+         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,
+         page: 1,  //页码
+         page_size: 10,   //每页数量
+         total:0,  //总页数
+         pastureId: ""
+       },
+       tableLoading: false,
+       //表格内容
+       tableList:[
+         //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+       ],
+ 
+ 
+       //栏舍状态
+       statusList:[
+         {id: 1, value: '正常'},
+         {id: 2, value: '空栏'},
+         {id: 3, value: '损坏'},
+       ],
  
      
-
-    
-  },
-  methods:{
-
+ 
+       //犊牛类型
+       calfTypeList:[
+          
+       ],
+ 
+     //栏舍
+       cowsheList:[
+          
+       ],
+ 
+       sexList:[
+         {id: 1, value: '公'},
+         {id: 2, value: '母'},
+       ],
+ 
+       healthList:[
+         {id: 1, value: '健康'},
+         {id: 2, value: '疾病'},
+         {id: 3, value: '出栏'},
+         {id: 4, value: '死亡'},
+         {id: 5, value: '淘汰'},
+       ],
+ 
+ 
   
-    
-    //获取 下拉框
-    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
-            }
-
-        })
-
-
-
+ 
+       addFormShow:false,
+       addFormStatus: '',
+       addFormTxt: {  edit: '修改',  create: '新增' },
+       addForm:{
+         barn_id:undefined,ear_number:'',calf_code:'',calf_category_id:undefined, id:undefined, birth_date_format: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),genders:undefined, birth_weight:undefined, current_weight:undefined, mother_code:'',remark:'',
+       },
+ 
+       addFormRules:{
+         barn_id: [ { required: true, message: '栏舍必选', trigger: 'change' },  ],
+         calf_code: [ { required: true, message: '犊牛编号必填', trigger: 'blur' },  ],
+         // ear_number: [ { required: true, message: '耳号必填', trigger: 'blur' },  ],
+         calf_category_id: [ { required: true, message: '犊牛类型必选', trigger: 'change' },  ],
+         birth_date_format: [ { required: true, message: '出生日期必填', trigger: 'blur' },  ],
+         genders: [ { required: true, message: '性别必选', trigger: 'change' },  ],
+         birth_weight: [ { required: true, message: '出生体重必填', trigger: 'blur' },  ],
+         current_weight: [ { required: true, message: '当前体重必填', trigger: 'blur' },  ],
+         mother_code: [ { required: true, message: '母号必填', trigger: 'blur' },  ],
+ 
+       },
+       //按钮权限
+       isButtonEdit:false,
+ 
+      
         
-
-
-        // ajaxDataGet('/authdata/pasture', {  "page": 1,   "page_size": 1000}).then(e => {
-        //   console.log("牧场下拉框1：",e)
-
-        //   //打印请求成功结果
-        //   if(e.data == null || e.data == undefined ||e.data.length == 0   ){
-        //     me.pastureList = []
-        //   } else {
-        //     me.pastureList = e.data
-        //   }
-  
-        // })
-
-    
-    },
-
-    
-    //获取 表格
-    get_table_data() {
- 
-     var me = this
-
-     me.tableLoading = true
-     console.log("searchData======>", me.searchData)
-
-     if( me.searchData.status == ""){
-        me.searchData.status = undefined
-      }
+     }
+   },
+   created(){
+       //获取按钮权限
+       const isButtonEdit = checkButtons(this.$store.state.buttonsList, "牛只信息编辑")
+       this.isButtonEdit = isButtonEdit
+       console.log('this.isButtonEdit==========',this.isButtonEdit)
       
-      if( me.searchData.calf_category_id == ""){
-        me.searchData.calf_category_id = undefined
-      }
-      if( me.searchData.genders == ""){
-        me.searchData.genders = undefined
-      }
-
-      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)
+ 
+       //获取下拉框
+       this.get_select_list1()
+ 
+       //表格 - 初始化 
+       this.get_table_data()
+ 
+ 
   
-        })
-
-       
-    },
-    //搜索 查询表格
-    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.barn_name = ""
-      me.searchData.mother_code = ""
-      me.searchData.barn_number = ""
-      me.searchData.calf_category_id = undefined
-      me.searchData.genders = undefined
-      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.searchData.page = 1
-      me.searchData.page_size = 10
-
+      
+ 
      
-
-
-      me.get_table_data()
-    },
-
-    //监听 page_size 改变的事件
-    change_size_page(item){
-      console.log(item)
-     // this.searchData.page_size = item
-      //  this.getUserList()
-    },
-
-    //监听 page 改变的事件
-    change_current_page(item){
-      console.log(item)
-       this.searchData.page = item
-       this.get_table_data()
-    },
-
-    //清空弹窗表单信息
-    reset_form(){
-      this.addForm.calf_code = ''
-      this.addForm.ear_number = ''
-      this.addForm.name = ''
-      this.addForm.barn_id = undefined
-      this.addForm.barn_number = ''
-
-        
-      this.addForm.calf_category_id = undefined
-      this.addForm.id = undefined
-      this.addForm.genders = undefined
-      this.addForm.birth_weight = undefined
-      this.addForm.current_weight = undefined
-      this.addForm.mother_code = ''
-      this.addForm.remark = ''
- 
-      this.addForm.birth_date_format = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
-
-
-    
-       
-    },
-
-    //新增
-    form_add() {
-      this.reset_form()
-      this.addFormStatus = 'create'
-      this.addFormShow = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-    //编辑
-    form_edit(row) {
-      this.reset_form()
-      console.log('行内容row=========', row)
-      //编辑行内容赋值
-      this.addForm = Object.assign({}, row)  
-
-      if(row.genders == 0){
-        this.addForm.genders = undefined
-      }
-      this.addFormStatus = 'edit'
-      this.addFormShow = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-
-    //新增关闭
-    add_dialog_close(){
-       //内容重置
-       this.$refs['addFormRef'].resetFields()
-    },
-
-    //新增 保存
-    add_dialog_save() {
-      var me = this
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-          var send_data = {
-              "barn_id": me.addForm.barn_id,
-              "calf_code": me.addForm.calf_code,
-              "ear_number": me.addForm.ear_number,
-              
-              "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}'), 
-
-          }
-
- 
- 
-
-
-          console.log("弹窗参数：", send_data)
-
-          //关闭弹窗
-          // me.addFormShow = false
-         //加载 - 发送新增保存
-           ajaxDataPost(me.url_add_table, send_data).then(e => {
-                console.log("新增结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
-                  //关闭弹窗
-                  me.addFormShow = false
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
-                }
-            })
+   },
+   methods:{
+ 
+   
+     
+     //获取 下拉框
+     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
+             }
+ 
+         })
+ 
+ 
+ 
          
-        }
-      })
-    },
-    //编辑 保存
-    edit_dialog_save(){
+ 
+ 
+         // ajaxDataGet('/authdata/pasture', {  "page": 1,   "page_size": 1000}).then(e => {
+         //   console.log("牧场下拉框1：",e)
+ 
+         //   //打印请求成功结果
+         //   if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+         //     me.pastureList = []
+         //   } else {
+         //     me.pastureList = e.data
+         //   }
+   
+         // })
+ 
+     
+     },
+ 
+     
+     //获取 表格
+     get_table_data() {
+  
       var me = this
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-          var send_data = {
-    
-              "id": me.addForm.id,
-              "barn_id": me.addForm.barn_id,
-              "calf_code": me.addForm.calf_code,
-              "ear_number": me.addForm.ear_number,
-              "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}'), 
-          }
-
-          // var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
-          // console.log(name)
-
-           // 编辑保存
-          console.log("弹窗参数：", send_data)
-
-          //关闭弹窗
-          // me.addFormShow = false
-         //加载 - 发送新增保存
-         ajaxDataPut(me.url_edit_table, send_data).then(e => {
-                console.log("编辑结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
-                  //关闭弹窗
-                  me.addFormShow = false
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
-                }
-            })
+ 
+      me.tableLoading = true
+      console.log("searchData======>", me.searchData)
+ 
+      if( me.searchData.status == ""){
+         me.searchData.status = undefined
+       }
+       
+       if( me.searchData.calf_category_id == ""){
+         me.searchData.calf_category_id = undefined
+       }
+       if( me.searchData.genders == ""){
+         me.searchData.genders = undefined
+       }
+ 
+       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)
+   
+         })
+ 
+        
+     },
+     //搜索 查询表格
+     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.barn_name = ""
+       me.searchData.mother_code = ""
+       me.searchData.barn_number = ""
+       me.searchData.calf_category_id = undefined
+       me.searchData.genders = undefined
+       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.searchData.page = 1
+       me.searchData.page_size = 10
+ 
+      
+ 
+ 
+       me.get_table_data()
+     },
+ 
+     //监听 page_size 改变的事件
+     change_size_page(item){
+       console.log(item)
+      // this.searchData.page_size = item
+       //  this.getUserList()
+     },
+ 
+     //监听 page 改变的事件
+     change_current_page(item){
+       console.log(item)
+        this.searchData.page = item
+        this.get_table_data()
+     },
+ 
+     //清空弹窗表单信息
+     reset_form(){
+       this.addForm.calf_code = ''
+       this.addForm.ear_number = ''
+       this.addForm.name = ''
+       this.addForm.barn_id = undefined
+       this.addForm.barn_number = ''
+ 
          
-        }
-      })
-    },
-
-
-    
-    
-
-
-
-    form_delete(row) {
-      var me = this
-
-       me.$confirm('是否删除此条内容?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-            console.log("删除的ID参数：", row.id)
-            //加载 - 发送新增保存
-            ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
-                console.log("编辑结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success',  message: '删除成功!'  });
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
-                }
-            })
-
+       this.addForm.calf_category_id = undefined
+       this.addForm.id = undefined
+       this.addForm.genders = undefined
+       this.addForm.birth_weight = undefined
+       this.addForm.current_weight = undefined
+       this.addForm.mother_code = ''
+       this.addForm.remark = ''
+  
+       this.addForm.birth_date_format = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
+ 
+ 
+     
         
+     },
+ 
+     //新增
+     form_add() {
+       this.reset_form()
+       this.addFormStatus = 'create'
+       this.addFormShow = true
+       this.$nextTick(() => {
+         this.$refs['addFormRef'].clearValidate()
+       })
+     },
+ 
+     //编辑
+     form_edit(row) {
+       this.reset_form()
+       console.log('行内容row=========', row)
+       //编辑行内容赋值
+       this.addForm = Object.assign({}, row)  
+ 
+       if(row.genders == 0){
+         this.addForm.genders = undefined
+       }
+       this.addFormStatus = 'edit'
+       this.addFormShow = true
+       this.$nextTick(() => {
+         this.$refs['addFormRef'].clearValidate()
+       })
+     },
+ 
+ 
+     //新增关闭
+     add_dialog_close(){
+        //内容重置
+        this.$refs['addFormRef'].resetFields()
+     },
+ 
+     //新增 保存
+     add_dialog_save() {
+       var me = this
+       this.$refs['addFormRef'].validate(valid => {
+         //验证成功
+         if (valid) {
+           //发起请求
+           var send_data = {
+               "barn_id": me.addForm.barn_id,
+               "calf_code": me.addForm.calf_code,
+               "ear_number": me.addForm.ear_number,
+               
+               "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}'), 
+ 
+           }
+ 
+  
+  
+ 
+ 
+           console.log("弹窗参数：", send_data)
  
+           //关闭弹窗
+           // me.addFormShow = false
+          //加载 - 发送新增保存
+            ajaxDataPost(me.url_add_table, send_data).then(e => {
+                 console.log("新增结果：",e)
+                 //打印请求成功结果
+                 if(e.code == 200  ){
+                   me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
+                   //关闭弹窗
+                   me.addFormShow = false
+                   me.get_table_data()
+                 } else {
+                   me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
+                 }
+             })
           
-        }).catch(() => {
-          me.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-
-
-       
-    },
-
- 
-    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 = [
-        {
-            tHeader: ['表头1', '表头2', '表头3', '表头4',],
-            filterVal: ['title1', 'title2', 'title3', 'title4'],
-            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')
-}
-
+         }
+       })
+     },
+     //编辑 保存
+     edit_dialog_save(){
+       var me = this
+       this.$refs['addFormRef'].validate(valid => {
+         //验证成功
+         if (valid) {
+           //发起请求
+           var send_data = {
+     
+               "id": me.addForm.id,
+               "barn_id": me.addForm.barn_id,
+               "calf_code": me.addForm.calf_code,
+               "ear_number": me.addForm.ear_number,
+               "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}'), 
+           }
+ 
+           // var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
+           // console.log(name)
+ 
+            // 编辑保存
+           console.log("弹窗参数：", send_data)
+ 
+           //关闭弹窗
+           // me.addFormShow = false
+          //加载 - 发送新增保存
+          ajaxDataPut(me.url_edit_table, send_data).then(e => {
+                 console.log("编辑结果：",e)
+                 //打印请求成功结果
+                 if(e.code == 200  ){
+                   me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
+                   //关闭弹窗
+                   me.addFormShow = false
+                   me.get_table_data()
+                 } else {
+                   me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
+                 }
+             })
+          
+         }
+       })
+     },
+ 
+ 
+     
      
-
-  }
-}
-</script>
-<!-- 加了scoped，则是仅在此组件里生效 -->
-<style scoped>
-
-</style>
+ 
+ 
+ 
+     form_delete(row) {
+       var me = this
+ 
+        me.$confirm('是否删除此条内容?', '提示', {
+           confirmButtonText: '确定',
+           cancelButtonText: '取消',
+           type: 'warning'
+         }).then(() => {
+             console.log("删除的ID参数：", row.id)
+             //加载 - 发送新增保存
+             ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
+                 console.log("编辑结果：",e)
+                 //打印请求成功结果
+                 if(e.code == 200  ){
+                   me.$message({ type: 'success',  message: '删除成功!'  });
+                   me.get_table_data()
+                 } else {
+                   me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
+                 }
+             })
+ 
+         
+  
+           
+         }).catch(() => {
+           me.$message({
+             type: 'info',
+             message: '已取消删除'
+           });          
+         });
+ 
+ 
+        
+     },
+ 
+  
+     form_export() {
+     //获取请求表格数据的参数
+     //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 = [
+         {
+             tHeader: ['表头1', '表头2', '表头3', '表头4',],
+             filterVal: ['title1', 'title2', 'title3', 'title4'],
+             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')
+ }
+ 
+      
+ 
+   }
+ }
+ </script>
+ <!-- 加了scoped，则是仅在此组件里生效 -->
+ <style scoped>
+ 
+ </style>
+ 

src/views/cowManagement/CowInfo10.vue

@@ -1,745 +0,0 @@
-<template>
- 
-  <div>
-
-
-    <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.barn_number" placeholder="栏舍身份ID"  style="width: 180px;" class="g-mr20" clearable />
-          <el-input v-model="searchData.barn_name" placeholder="栏舍"  style="width: 180px;" class="g-mr20" clearable />
-          <!-- <el-input v-model="searchData.mother_code" 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-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-select v-model="searchData.genders" filterable placeholder="性别" class="g-mr20" style="width: 180px;" clearable>
-            <el-option v-for="item in sexList" :key="item.id" :label="item.value" :value="item.id" />
-          </el-select>
-
-          <!-- <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-input-number v-model="searchData.min_daily_age" style="width:120px;" :controls="false" placeholder="日龄" />
-          <span style="margin:0px 8px;">至</span>
-          <el-input-number v-model="searchData.max_daily_age" style="width:120px;" class="g-mr20" :controls="false" placeholder="日龄" />
-
-
-          <el-button type="primary"   @click="form_search">搜索</el-button>
-          <el-button type="primary"   @click="form_clear">重置</el-button>
-          <el-button type="primary"  v-if="isButtonEdit" @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>
-        <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.calf_code }}</span>
-          </template>
-        </el-table-column>
-       
-        <el-table-column label="耳号" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.ear_number }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="栏舍身份ID" min-width="150px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.barn_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>
-          </template>
-        </el-table-column>
-        <el-table-column label="犊牛类型" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <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.birth_date_format }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="性别" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.genders == 1">公</span>
-            <span v-if="scope.row.genders == 2">母</span>
-            <span v-else> </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="日龄" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.daily_age }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="出生体重(KG)" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.birth_weight }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="当前体重(KG)" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.current_weight }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="日均增重(KG)" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.daily_weight_gain }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="母号" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.mother_code }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="建档日期" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.created_at_format }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="出栏日期" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.leave_barn_date_format }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="状态" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.status == 1" style="color:#67c23a;font-weight:bold">健康</span>
-            <span v-if="scope.row.status == 2" style="color:#ff9100;font-weight:bold">疾病</span>
-            <span v-if="scope.row.status == 3" style="color:#dec40d;font-weight:bold">出栏</span>
-            <span v-if="scope.row.status == 4" style="color:#ff0000;font-weight:bold">死亡</span>
-            <span v-if="scope.row.status == 5" style="color:#fa00ff;font-weight:bold">淘汰</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"  v-if="isButtonEdit" @click="form_edit(scope.row)">修改</el-button>
-             <!-- 删除按钮 -->
-             <el-button type="danger" size="mini" icon="el-icon-delete"  v-if="isButtonEdit"  @click="form_delete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页区域 -->
-      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.total"/>
-    </el-card>
-
-
-    <!-- 弹窗 新增or修改 -->
-    <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
-      <div class="">
-        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="140px"  style="width:50%;margin:0 auto 50px">
-            <el-form-item label="栏舍：" prop="barn_id">
-              <el-select  v-model="addForm.barn_id" filterable placeholder="请选择"   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=""   :disabled="addFormStatus=='edit'"></el-input>  
-            </el-form-item>
-            <el-form-item label="耳号：" prop="ear_number">
-                <el-input   v-model="addForm.ear_number"  placeholder=""   :disabled="addFormStatus=='edit'"></el-input>  
-            </el-form-item>
-
-            
-
-            <el-form-item label="犊牛类型：" prop="calf_category_id">
-              <el-select  v-model="addForm.calf_category_id" filterable placeholder="请选择"   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="请选择"   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>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="addFormStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
-          <el-button @click="addFormShow = false">关闭</el-button>
-        </div>
-      </div>
-    </el-dialog>
-
- 
-    
-  </div>
-
-
-</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/calf/list',
-      //接口 - 新增 - 表格
-      url_add_table:'/api/v1/ops/calf/add',  
-      //接口 - 修改 - 表格
-      url_edit_table:'/api/v1/ops/calf/update', 
-      //接口 - 删除 - 表格
-      url_delete_table:'/api/v1/ops/calf/delete', 
-      
-      //接口 - 下拉框 列表 
-      url_get_select1:'/api/v1/ops/calf_feed/enum/list',
-
-      //接口 - 下拉框 列表 栏舍组
-      url_get_select2:'/api/v1/ops/barn_group/list?page=1&page_size=1000',
-
-      
-
-      //获取 - 表格数据 - 参数
-      searchData:{
-        calf_code: "",
-        barn_name: "",
-        barn_number: "",
-        barn_id:undefined,
-        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,
-        page: 1,  //页码
-        page_size: 10,   //每页数量
-        total:0,  //总页数
-        pastureId: ""
-      },
-      tableLoading: false,
-      //表格内容
-      tableList:[
-        //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-      ],
-
-
-      //栏舍状态
-      statusList:[
-        {id: 1, value: '正常'},
-        {id: 2, value: '空栏'},
-        {id: 3, value: '损坏'},
-      ],
-
-    
-
-      //犊牛类型
-      calfTypeList:[
-         
-      ],
-
-    //栏舍
-      cowsheList:[
-         
-      ],
-
-      sexList:[
-        {id: 1, value: '公'},
-        {id: 2, value: '母'},
-      ],
-
-      healthList:[
-        {id: 1, value: '健康'},
-        {id: 2, value: '疾病'},
-        {id: 3, value: '出栏'},
-        {id: 4, value: '死亡'},
-        {id: 5, value: '淘汰'},
-      ],
-
-
- 
-
-      addFormShow:false,
-      addFormStatus: '',
-      addFormTxt: {  edit: '修改',  create: '新增' },
-      addForm:{
-        barn_id:undefined,ear_number:'',calf_code:'',calf_category_id:undefined, id:undefined, birth_date_format: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),genders:undefined, birth_weight:undefined, current_weight:undefined, mother_code:'',remark:'',
-      },
-
-      addFormRules:{
-        barn_id: [ { required: true, message: '栏舍必选', trigger: 'change' },  ],
-        calf_code: [ { required: true, message: '犊牛编号必填', trigger: 'blur' },  ],
-        // ear_number: [ { required: true, message: '耳号必填', trigger: 'blur' },  ],
-        calf_category_id: [ { required: true, message: '犊牛类型必选', trigger: 'change' },  ],
-        birth_date_format: [ { required: true, message: '出生日期必填', trigger: 'blur' },  ],
-        genders: [ { required: true, message: '性别必选', trigger: 'change' },  ],
-        birth_weight: [ { required: true, message: '出生体重必填', trigger: 'blur' },  ],
-        current_weight: [ { required: true, message: '当前体重必填', trigger: 'blur' },  ],
-        mother_code: [ { required: true, message: '母号必填', trigger: 'blur' },  ],
-
-      },
-      //按钮权限
-      isButtonEdit:false,
-
-     
-       
-    }
-  },
-  created(){
-      //获取按钮权限
-      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "牛只信息编辑")
-      this.isButtonEdit = isButtonEdit
-      console.log('this.isButtonEdit==========',this.isButtonEdit)
-     
-
-      //获取下拉框
-      this.get_select_list1()
-
-      //表格 - 初始化 
-      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 => {
-            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)
-
-        //   //打印请求成功结果
-        //   if(e.data == null || e.data == undefined ||e.data.length == 0   ){
-        //     me.pastureList = []
-        //   } else {
-        //     me.pastureList = e.data
-        //   }
-  
-        // })
-
-    
-    },
-
-    
-    //获取 表格
-    get_table_data() {
- 
-     var me = this
-
-     me.tableLoading = true
-     console.log("searchData======>", me.searchData)
-
-     if( me.searchData.status == ""){
-        me.searchData.status = undefined
-      }
-      
-      if( me.searchData.calf_category_id == ""){
-        me.searchData.calf_category_id = undefined
-      }
-      if( me.searchData.genders == ""){
-        me.searchData.genders = undefined
-      }
-
-      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)
-  
-        })
-
-       
-    },
-    //搜索 查询表格
-    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.barn_name = ""
-      me.searchData.mother_code = ""
-      me.searchData.barn_number = ""
-      me.searchData.calf_category_id = undefined
-      me.searchData.genders = undefined
-      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.searchData.page = 1
-      me.searchData.page_size = 10
-
-     
-
-
-      me.get_table_data()
-    },
-
-    //监听 page_size 改变的事件
-    change_size_page(item){
-      console.log(item)
-     // this.searchData.page_size = item
-      //  this.getUserList()
-    },
-
-    //监听 page 改变的事件
-    change_current_page(item){
-      console.log(item)
-       this.searchData.page = item
-       this.get_table_data()
-    },
-
-    //清空弹窗表单信息
-    reset_form(){
-      this.addForm.calf_code = ''
-      this.addForm.ear_number = ''
-      this.addForm.name = ''
-      this.addForm.barn_id = undefined
-      this.addForm.barn_number = ''
-
-        
-      this.addForm.calf_category_id = undefined
-      this.addForm.id = undefined
-      this.addForm.genders = undefined
-      this.addForm.birth_weight = undefined
-      this.addForm.current_weight = undefined
-      this.addForm.mother_code = ''
-      this.addForm.remark = ''
- 
-      this.addForm.birth_date_format = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
-
-
-    
-       
-    },
-
-    //新增
-    form_add() {
-      this.reset_form()
-      this.addFormStatus = 'create'
-      this.addFormShow = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-    //编辑
-    form_edit(row) {
-      this.reset_form()
-      console.log('行内容row=========', row)
-      //编辑行内容赋值
-      this.addForm = Object.assign({}, row)  
-
-      if(row.genders == 0){
-        this.addForm.genders = undefined
-      }
-      this.addFormStatus = 'edit'
-      this.addFormShow = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-
-    //新增关闭
-    add_dialog_close(){
-       //内容重置
-       this.$refs['addFormRef'].resetFields()
-    },
-
-    //新增 保存
-    add_dialog_save() {
-      var me = this
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-          var send_data = {
-              "barn_id": me.addForm.barn_id,
-              "calf_code": me.addForm.calf_code,
-              "ear_number": me.addForm.ear_number,
-              
-              "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}'), 
-
-          }
-
- 
- 
-
-
-          console.log("弹窗参数：", send_data)
-
-          //关闭弹窗
-          // me.addFormShow = false
-         //加载 - 发送新增保存
-           ajaxDataPost(me.url_add_table, send_data).then(e => {
-                console.log("新增结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
-                  //关闭弹窗
-                  me.addFormShow = false
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
-                }
-            })
-         
-        }
-      })
-    },
-    //编辑 保存
-    edit_dialog_save(){
-      var me = this
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-          var send_data = {
-    
-              "id": me.addForm.id,
-              "barn_id": me.addForm.barn_id,
-              "calf_code": me.addForm.calf_code,
-              "ear_number": me.addForm.ear_number,
-              "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}'), 
-          }
-
-          // var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
-          // console.log(name)
-
-           // 编辑保存
-          console.log("弹窗参数：", send_data)
-
-          //关闭弹窗
-          // me.addFormShow = false
-         //加载 - 发送新增保存
-         ajaxDataPut(me.url_edit_table, send_data).then(e => {
-                console.log("编辑结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
-                  //关闭弹窗
-                  me.addFormShow = false
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
-                }
-            })
-         
-        }
-      })
-    },
-
-
-    
-    
-
-
-
-    form_delete(row) {
-      var me = this
-
-       me.$confirm('是否删除此条内容?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-            console.log("删除的ID参数：", row.id)
-            //加载 - 发送新增保存
-            ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
-                console.log("编辑结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success',  message: '删除成功!'  });
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
-                }
-            })
-
-        
- 
-          
-        }).catch(() => {
-          me.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-
-
-       
-    },
-
- 
-    form_export() {
-    //获取请求表格数据的参数
-    //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 = [
-        {
-            tHeader: ['表头1', '表头2', '表头3', '表头4',],
-            filterVal: ['title1', 'title2', 'title3', 'title4'],
-            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')
-}
-
-     
-
-  }
-}
-</script>
-<!-- 加了scoped，则是仅在此组件里生效 -->
-<style scoped>
-
-</style>

src/views/cowManagement/CowInfo11.vue → src/views/cowManagement/CowInfo100.vue

@@ -1,5 +1,5 @@
 <template>
- 
+ <!-- 100 -->
   <div>
 
 
@@ -131,9 +131,9 @@
         </el-table-column>
 
         <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="scope">
+          <template slot-scope="scope"> 
              <!-- 修改按钮 -->
-             <el-button type="primary" size="mini" icon="el-icon-edit"  v-if="isButtonEdit" @click="form_edit(scope.row)">修改</el-button>
+             <el-button type="primary" size="mini" icon="el-icon-edit"  v-if="isButtonEdit" @click="form_edit(scope.row)">编辑</el-button>
              <!-- 删除按钮 -->
              <el-button type="danger" size="mini" icon="el-icon-delete"  v-if="isButtonEdit"  @click="form_delete(scope.row)">删除</el-button>
           </template>

src/views/cowManagement/CowInfo102.vue

@@ -0,0 +1,1107 @@
+<template>
+  <!-- 102 -->
+   <div>
+ 
+ 
+     <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.barn_number" placeholder="栏舍身份ID"  style="width: 180px;" class="g-mr20" clearable />
+           <el-input v-model="searchData.barn_name" placeholder="栏舍"  style="width: 180px;" class="g-mr20" clearable />
+           <!-- <el-input v-model="searchData.mother_code" 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-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-select v-model="searchData.genders" filterable placeholder="性别" class="g-mr20" style="width: 180px;" clearable>
+             <el-option v-for="item in sexList" :key="item.id" :label="item.value" :value="item.id" />
+           </el-select>
+ 
+           <!-- <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-input-number v-model="searchData.min_daily_age" style="width:120px;" :controls="false" placeholder="日龄" />
+           <span style="margin:0px 8px;">至</span>
+           <el-input-number v-model="searchData.max_daily_age" style="width:120px;" class="g-mr20" :controls="false" placeholder="日龄" />
+ 
+ 
+           <el-button type="primary"   @click="form_search">搜索</el-button>
+           <el-button type="primary"   @click="form_clear">重置</el-button>
+           <el-button type="primary"  v-if="isButtonEdit" @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>
+         <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.calf_code }}</span>
+           </template>
+           <template slot-scope="scope">
+             <span  style = "color:#409EFF; cursor: pointer;" @click="click_cowcode(scope.row)">{{ scope.row.calf_code }}</span>
+           </template>
+         </el-table-column>
+        
+         <el-table-column label="耳号" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.ear_number }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="栏舍身份ID" min-width="150px" align="center">
+             <template slot-scope="scope">
+               <span>{{ scope.row.barn_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>
+           </template>
+         </el-table-column>
+         <el-table-column label="犊牛类型" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <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.birth_date_format }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="性别" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.genders == 1">公</span>
+             <span v-if="scope.row.genders == 2">母</span>
+             <span v-else> </span>
+           </template>
+         </el-table-column>
+         <el-table-column label="日龄" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.daily_age }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="出生体重(KG)" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.birth_weight }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="当前体重(KG)" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.current_weight }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="日均增重(KG)" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.daily_weight_gain }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="母号" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.mother_code }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="建档日期" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.created_at_format }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="出栏日期" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span>{{ scope.row.leave_barn_date_format }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="状态" min-width="150px" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.status == 1" style="color:#67c23a;font-weight:bold">健康</span>
+             <span v-if="scope.row.status == 2" style="color:#ff9100;font-weight:bold">疾病</span>
+             <span v-if="scope.row.status == 3" style="color:#dec40d;font-weight:bold">出栏</span>
+             <span v-if="scope.row.status == 4" style="color:#ff0000;font-weight:bold">死亡</span>
+             <span v-if="scope.row.status == 5" style="color:#fa00ff;font-weight:bold">淘汰</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"  v-if="isButtonEdit" @click="form_edit(scope.row)">编辑</el-button>
+ 
+              <el-button type="primary" size="mini" icon="el-icon-edit"  v-if="isButtonEdit" @click="form_event(scope.row)">事件记录</el-button>
+              <!-- 删除按钮 -->
+              <el-button type="danger" size="mini" icon="el-icon-delete"  v-if="isButtonEdit"  @click="form_delete(scope.row)">删除</el-button>
+           </template>
+         </el-table-column>
+       </el-table>
+ 
+       <!-- 分页区域 -->
+       <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.total"/>
+     </el-card>
+ 
+ 
+     <!-- 弹窗 新增or修改 -->
+     <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
+       <div class="">
+         <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="140px"  style="width:50%;margin:0 auto 50px">
+             <el-form-item label="栏舍：" prop="barn_id">
+               <el-select  v-model="addForm.barn_id" filterable placeholder="请选择"   style="width: 100%;" >
+                 <el-option v-for="item in cowshedList" :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=""   :disabled="addFormStatus=='edit'"></el-input>  
+             </el-form-item>
+             <el-form-item label="耳号：" prop="ear_number">
+                 <el-input   v-model="addForm.ear_number"  placeholder=""   :disabled="addFormStatus=='edit'"></el-input>  
+             </el-form-item>
+ 
+             
+ 
+             <el-form-item label="犊牛类型：" prop="calf_category_id">
+               <el-select  v-model="addForm.calf_category_id" filterable placeholder="请选择"   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="请选择"   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>
+         <div slot="footer" class="dialog-footer">
+           <el-button type="primary" @click="addFormStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
+           <el-button @click="addFormShow = false">关闭</el-button>
+         </div>
+       </div>
+     </el-dialog>
+ 
+ 
+     <!-- 弹窗 牛只信息 -->
+     <el-dialog   title="牛只信息" :visible.sync="eventFormShow" @close="event_dialog_close" width="50%">
+       <div class="">
+         <el-form  ref="eventFormRef"  :rules="eventFormRules"  :model="eventForm"  label-position="right" label-width="170px"  style="width:50%;margin:0 auto 50px">
+              
+ 
+             <el-row>
+               
+                 <el-form-item label="牛号：" prop="calf_code">
+                   <el-input ref="calf_code" v-model="eventForm.calf_code"    disabled />
+                 </el-form-item> 
+             
+                 <el-form-item label="犊牛类型：" prop="calf_category_name">
+                   <el-input ref="calf_category_name" v-model="eventForm.calf_category_name"    disabled />
+                 </el-form-item> 
+           
+                 <el-form-item label="事件类型：" prop="event_kind">
+                   <el-select ref="event_kind" v-model="eventForm.event_kind" filterable placeholder="请选择"  style="width: 100%;"    >
+                     <el-option v-for="item in eventNameList" :key="item.id" :label="item.name" :value="item.id"  />
+                   </el-select>
+                 </el-form-item>
+    
+             </el-row>
+ 
+              <!-- 1 称重 2 饲喂 3 粪便情况 4 测量体温 5 测量心跳 6 测量呼吸 7 疾病 8 病愈 9 去角 10 去副乳 11 转栏 12 出栏 13 死亡 -->
+              <!-- 称重 -->
+             <el-row   v-if="eventForm.event_kind == 1" >
+                <el-form-item label="体重：" prop="weight">
+                   <el-input ref="weight" v-model="eventForm.weight"   />
+                 </el-form-item> 
+             </el-row>
+             <!-- 饲喂 -->
+             <el-row   v-if="eventForm.event_kind == 2">
+                 <el-form-item label="一班进食量：" prop="first_class_food_number"  >
+                   <el-input ref="first_class_food_number" v-model="eventForm.first_class_food_number"   />
+                 </el-form-item> 
+                 <el-form-item label="二班进食量：" prop="second_class_food_number" v-if="class_num == 2 || class_num == 3 || class_num == 4">
+                   <el-input ref="second_class_food_number" v-model="eventForm.second_class_food_number"   />
+                 </el-form-item> 
+                 <el-form-item label="三班进食量：" prop="third_class_food_number" v-if="class_num == 3 || class_num == 4 ">
+                   <el-input ref="third_class_food_number" v-model="eventForm.third_class_food_number"  />
+                 </el-form-item> 
+                 <el-form-item label="四班进食量：" prop="fourth_class_food_number" v-if="class_num == 4">
+                   <el-input ref="fourth_class_food_number" v-model="eventForm.fourth_class_food_number"  />
+                 </el-form-item> 
+             </el-row>
+             <!-- 粪便情况 -->
+             <el-row   v-if="eventForm.event_kind == 3">
+                 <el-form-item label="粪便评分：" prop="fecal_score">
+                   <el-select ref="fecal_score" v-model="eventForm.fecal_score" filterable placeholder="请选择"  style="width: 100%;"  >
+                     <el-option v-for="item in scoreNameList" :key="item.id" :label="item.name" :value="item.id" />
+                   </el-select>
+                 </el-form-item>
+             </el-row>
+             <!-- 测量体温 -->
+             <el-row   v-if="eventForm.event_kind == 4" >
+                <el-form-item label="体温(℃)：" prop="temp">
+                   <el-input ref="temp" v-model="eventForm.temp"   />
+                 </el-form-item> 
+             </el-row>
+             <!-- 测量心跳 -->
+             <el-row   v-if="eventForm.event_kind == 5" >
+                <el-form-item label="心跳频率(次/分钟)：" prop="heartbeat">
+                   <el-input ref="heartbeat" v-model="eventForm.heartbeat"   />
+                 </el-form-item> 
+             </el-row>
+             <!-- 测量呼吸 -->
+             <el-row   v-if="eventForm.event_kind == 6" >
+                <el-form-item label="呼吸频率(次/分钟)：" prop="breathe">
+                   <el-input ref="breathe" v-model="eventForm.breathe"   />
+                 </el-form-item> 
+             </el-row>
+             <!-- 疾病 -->
+             <el-row   v-if="eventForm.event_kind == 7" >
+                <el-form-item label="疾病名称：" prop="diseased_type">
+                   <el-select ref="diseased_type" v-model="eventForm.diseased_type" filterable placeholder="请选择"  style="width: 100%;"  >
+                     <el-option v-for="item in diseaseNameList" :key="item.id" :label="item.name" :value="item.id" />
+                   </el-select>
+                 </el-form-item>
+                 <el-form-item label="用药：" prop="medication">
+                   <el-input ref="medication" v-model="eventForm.medication"   />
+                 </el-form-item> 
+             </el-row>
+             <!-- 转投栏舍 -->
+             <el-row   v-if="eventForm.event_kind == 11" >
+                 <el-form-item label="原栏舍：" prop="original_barn_name">
+                   <el-input ref="original_barn_name" v-model="eventForm.original_barn_name"   disabled/>
+                 </el-form-item> 
+                 <el-form-item label="转投栏舍：" prop="new_barn_id">
+                   <el-select ref="new_barn_id" v-model="eventForm.new_barn_id" filterable placeholder="请选择"  style="width: 100%;"  @change = "change_cowshed" >
+                     <el-option v-for="item in cowshedList" :key="item.id" :label="item.name" :value="item.id" />
+                   </el-select>
+                 </el-form-item>
+             </el-row>
+             <!-- 死亡 -->
+             <el-row   v-if="eventForm.event_kind == 13" >
+                <el-form-item label="死亡原因：" prop="reason">
+                   <el-input ref="reason" v-model="eventForm.reason"   />
+                 </el-form-item> 
+             </el-row>
+ 
+             <el-row  >
+                 <el-form-item label="备注：" prop="remark">
+                   <el-input ref="remark" v-model="eventForm.remark"   />
+                 </el-form-item>
+             </el-row>
+ 
+  
+            
+             
+         </el-form>
+         <div slot="footer" class="dialog-footer">
+           <el-button type="primary" @click="event_dialog_save()">确认</el-button>
+           <el-button @click="eventFormShow = false">关闭</el-button>
+         </div>
+       </div>
+     </el-dialog>
+  
+     
+   </div>
+ 
+ 
+ </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/calf/list',
+       //接口 - 新增 - 表格
+       url_add_table:'/api/v1/ops/calf/add',  
+       //接口 - 修改 - 表格
+       url_edit_table:'/api/v1/ops/calf/update', 
+       //接口 - 删除 - 表格
+       url_delete_table:'/api/v1/ops/calf/delete', 
+ 
+ 
+        //接口 - 新增事件 - 表格
+        url_add_event_table:'/api/v1/ops/event/add',  
+       
+       //接口 - 下拉框 列表 
+       url_get_select1:'/api/v1/ops/calf_feed/enum/list',
+ 
+       //接口 - 下拉框 列表 栏舍组
+       url_get_select2:'/api/v1/ops/barn_group/list?page=1&page_size=1000',
+ 
+       
+ 
+       //获取 - 表格数据 - 参数
+       searchData:{
+         calf_code: "",
+         barn_name: "",
+         barn_number: "",
+         barn_id:undefined,
+         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,
+         page: 1,  //页码
+         page_size: 10,   //每页数量
+         total:0,  //总页数
+         pastureId: ""
+       },
+       tableLoading: false,
+       //表格内容
+       tableList:[
+         //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+       ],
+ 
+ 
+       //栏舍状态
+       statusList:[
+         {id: 1, value: '正常'},
+         {id: 2, value: '空栏'},
+         {id: 3, value: '损坏'},
+       ],
+ 
+     
+ 
+       //犊牛类型
+       calfTypeList:[
+          
+       ],
+ 
+        //  下拉框 - 犊牛 
+        cowNameList: [
+     
+       ], 
+ 
+       sexList:[
+         {id: 1, value: '公'},
+         {id: 2, value: '母'},
+       ],
+ 
+       healthList:[
+         {id: 1, value: '健康'},
+         {id: 2, value: '疾病'},
+         {id: 3, value: '出栏'},
+         {id: 4, value: '死亡'},
+         {id: 5, value: '淘汰'},
+       ],
+ 
+ 
+ 
+ 
+        //  下拉框 - 事件类型 
+        eventNameList: [
+         {id: 1, name: "称重"}, 
+         {id: 2, name: "饲喂"}, 
+         {id: 3, name: "粪便情况"},
+         {id: 4, name: "测量体温"},
+         {id: 5, name: "测量心跳"},
+         {id: 6, name: "测量呼吸"},
+         {id: 7, name: "疾病"},
+         {id: 8, name: "痊愈"},
+         {id: 9, name: "去角"},
+         {id: 10, name: "去副乳"},
+         {id: 11, name: "转投栏舍"},
+         {id: 12, name: "出栏"},
+         {id: 13, name: "死亡"},
+       ], 
+ 
+ 
+       //  下拉框 - 粪便评分 
+       scoreNameList: [
+         {id: 5, name: "5分"}, 
+         {id: 4, name: "4分"}, 
+         {id: 3, name: "3分"},
+         {id: 2, name: "2分"},
+         {id: 1, name: "1分"},
+       ], 
+ 
+       //  下拉框 - 疾病 
+       diseaseNameList: [
+         // {id: 1, name: "腹泻"}, 
+         // {id: 2, name: "便秘"}, 
+         // {id: 3, name: "下痢"},
+         // {id: 4, name: "脐炎"},
+         // {id: 5, name: "肺炎"},
+         // {id: 6, name: "软瘫衰弱"}
+       ], 
+ 
+       //  下拉框 - 栏舍
+       cowshedList: [
+         // {id: "栏舍组1", name: "栏舍组1"}, 
+         // {id: "栏舍组2", name: "栏舍组2"}, 
+         // {id: "栏舍组3", name: "栏舍组3"}
+       ], 
+       class_num:4,
+ 
+ 
+  
+ 
+       addFormShow:false,
+       addFormStatus: '',
+       addFormTxt: {  edit: '修改',  create: '新增' },
+       addForm:{
+         barn_id:undefined,ear_number:'',calf_code:'',calf_category_id:undefined, id:undefined, birth_date_format: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),genders:undefined, birth_weight:undefined, current_weight:undefined, mother_code:'',remark:'',
+       },
+ 
+       addFormRules:{
+         barn_id: [ { required: true, message: '栏舍必选', trigger: 'change' },  ],
+         calf_code: [ { required: true, message: '犊牛编号必填', trigger: 'blur' },  ],
+         // ear_number: [ { required: true, message: '耳号必填', trigger: 'blur' },  ],
+         calf_category_id: [ { required: true, message: '犊牛类型必选', trigger: 'change' },  ],
+         birth_date_format: [ { required: true, message: '出生日期必填', trigger: 'blur' },  ],
+         genders: [ { required: true, message: '性别必选', trigger: 'change' },  ],
+         birth_weight: [ { required: true, message: '出生体重必填', trigger: 'blur' },  ],
+         current_weight: [ { required: true, message: '当前体重必填', trigger: 'blur' },  ],
+         mother_code: [ { required: true, message: '母号必填', trigger: 'blur' },  ],
+ 
+       },
+       //按钮权限
+       isButtonEdit:false,
+ 
+ 
+ 
+       eventFormShow:false,
+       eventForm:{
+         calf_code:'',id:'' ,event_kind:undefined,medication:'',remark:''
+       },
+       eventFormRules:{
+       
+ 
+       },
+ 
+ 
+      
+        
+     }
+   },
+   created(){
+       //获取按钮权限
+       const isButtonEdit = checkButtons(this.$store.state.buttonsList, "牛只信息编辑")
+       this.isButtonEdit = isButtonEdit
+       console.log('this.isButtonEdit==========',this.isButtonEdit)
+      
+ 
+       //获取下拉框
+       this.get_select_list1()
+ 
+       //表格 - 初始化 
+       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 => {
+             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.cowshedList = []
+             } else {
+               me.cowshedList = e.data.list
+             }
+ 
+         })
+ 
+ 
+ 
+         
+ 
+ 
+         ajaxDataPost('/api/v1/ops/calf/list?page=1&page_size=10000', {}).then(e => {
+           console.log("牛只下拉框：",e)
+ 
+           if(e.code == 200 ){
+             me.cowNameList = e.data.list
+            
+           } else {
+             me.cowNameList = []
+           }
+         })
+ 
+ 
+         ajaxDataPost('/api/v1/ops/base_setting/category_table/list?page=1&page_size=10000', {category_type:3}).then(e => {
+           console.log("疾病下拉框：",e)
+ 
+           if(e.code == 200 ){
+             me.diseaseNameList = e.data.list
+            
+           } else {
+             me.diseaseNameList = []
+           }
+         })
+ 
+ 
+         
+  
+ 
+       // 班次数量下拉框
+       ajaxDataGet('/api/v1/ops/calf_feed/enum/list').then(e => {
+         console.log(e)
+         if(e.code === 200){
+           var class_num = e.data.class_list.length
+         } else {
+           var class_num = 4
+         }
+         console.log("class_num========",class_num)
+         me.class_num = class_num
+       })
+ 
+ 
+     
+     },
+ 
+     
+     //获取 表格
+     get_table_data() {
+  
+      var me = this
+ 
+      me.tableLoading = true
+      console.log("searchData======>", me.searchData)
+ 
+      if( me.searchData.status == ""){
+         me.searchData.status = undefined
+       }
+       
+       if( me.searchData.calf_category_id == ""){
+         me.searchData.calf_category_id = undefined
+       }
+       if( me.searchData.genders == ""){
+         me.searchData.genders = undefined
+       }
+ 
+       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)
+   
+         })
+ 
+        
+     },
+     //搜索 查询表格
+     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.barn_name = ""
+       me.searchData.mother_code = ""
+       me.searchData.barn_number = ""
+       me.searchData.calf_category_id = undefined
+       me.searchData.genders = undefined
+       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.searchData.page = 1
+       me.searchData.page_size = 10
+ 
+      
+ 
+ 
+       me.get_table_data()
+     },
+ 
+     //监听 page_size 改变的事件
+     change_size_page(item){
+       console.log(item)
+      // this.searchData.page_size = item
+       //  this.getUserList()
+     },
+ 
+     //监听 page 改变的事件
+     change_current_page(item){
+       console.log(item)
+        this.searchData.page = item
+        this.get_table_data()
+     },
+ 
+     //清空弹窗表单信息
+     reset_form(){
+       this.addForm.calf_code = ''
+       this.addForm.ear_number = ''
+       this.addForm.name = ''
+       this.addForm.barn_id = undefined
+       this.addForm.barn_number = ''
+ 
+         
+       this.addForm.calf_category_id = undefined
+       this.addForm.id = undefined
+       this.addForm.genders = undefined
+       this.addForm.birth_weight = undefined
+       this.addForm.current_weight = undefined
+       this.addForm.mother_code = ''
+       this.addForm.remark = ''
+  
+       this.addForm.birth_date_format = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
+ 
+ 
+     
+        
+     },
+ 
+     //新增
+     form_add() {
+       this.reset_form()
+       this.addFormStatus = 'create'
+       this.addFormShow = true
+       this.$nextTick(() => {
+         this.$refs['addFormRef'].clearValidate()
+       })
+     },
+ 
+     //编辑
+     form_edit(row) {
+       this.reset_form()
+       console.log('行内容row=========', row)
+       //编辑行内容赋值
+       this.addForm = Object.assign({}, row)  
+ 
+       if(row.genders == 0){
+         this.addForm.genders = undefined
+       }
+       this.addFormStatus = 'edit'
+       this.addFormShow = true
+       this.$nextTick(() => {
+         this.$refs['addFormRef'].clearValidate()
+       })
+     },
+ 
+ 
+     //新增关闭
+     add_dialog_close(){
+        //内容重置
+        this.$refs['addFormRef'].resetFields()
+     },
+ 
+     //新增 保存
+     add_dialog_save() {
+       var me = this
+       this.$refs['addFormRef'].validate(valid => {
+         //验证成功
+         if (valid) {
+           //发起请求
+           var send_data = {
+               "barn_id": me.addForm.barn_id,
+               "calf_code": me.addForm.calf_code,
+               "ear_number": me.addForm.ear_number,
+               
+               "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}'), 
+ 
+           }
+ 
+  
+  
+ 
+ 
+           console.log("弹窗参数：", send_data)
+ 
+           //关闭弹窗
+           // me.addFormShow = false
+          //加载 - 发送新增保存
+            ajaxDataPost(me.url_add_table, send_data).then(e => {
+                 console.log("新增结果：",e)
+                 //打印请求成功结果
+                 if(e.code == 200  ){
+                   me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
+                   //关闭弹窗
+                   me.addFormShow = false
+                   me.get_table_data()
+                 } else {
+                   me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
+                 }
+             })
+          
+         }
+       })
+     },
+     //编辑 保存
+     edit_dialog_save(){
+       var me = this
+       this.$refs['addFormRef'].validate(valid => {
+         //验证成功
+         if (valid) {
+           //发起请求
+           var send_data = {
+     
+               "id": me.addForm.id,
+               "barn_id": me.addForm.barn_id,
+               "calf_code": me.addForm.calf_code,
+               "ear_number": me.addForm.ear_number,
+               "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}'), 
+           }
+ 
+           // var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
+           // console.log(name)
+ 
+            // 编辑保存
+           console.log("弹窗参数：", send_data)
+ 
+           //关闭弹窗
+           // me.addFormShow = false
+          //加载 - 发送新增保存
+          ajaxDataPut(me.url_edit_table, send_data).then(e => {
+                 console.log("编辑结果：",e)
+                 //打印请求成功结果
+                 if(e.code == 200  ){
+                   me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
+                   //关闭弹窗
+                   me.addFormShow = false
+                   me.get_table_data()
+                 } else {
+                   me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
+                 }
+             })
+          
+         }
+       })
+     },
+ 
+ 
+     //删除
+     form_delete(row) {
+       var me = this
+ 
+        me.$confirm('是否删除此条内容?', '提示', {
+           confirmButtonText: '确定',
+           cancelButtonText: '取消',
+           type: 'warning'
+         }).then(() => {
+             console.log("删除的ID参数：", row.id)
+             //加载 - 发送新增保存
+             ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
+                 console.log("编辑结果：",e)
+                 //打印请求成功结果
+                 if(e.code == 200  ){
+                   me.$message({ type: 'success',  message: '删除成功!'  });
+                   me.get_table_data()
+                 } else {
+                   me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
+                 }
+             })
+ 
+         
+  
+           
+         }).catch(() => {
+           me.$message({
+             type: 'info',
+             message: '已取消删除'
+           });          
+         });
+ 
+ 
+        
+     },
+ 
+     //事件编辑
+     form_event(row) {
+       console.log('行内容row=========', row)
+       //编辑行内容赋值
+       this.eventForm = Object.assign({}, row)  
+      if(row.message && row.message !== ""){
+         var messageTxt = JSON.parse(row.message)
+         //编辑行内容赋值
+         this.eventForm  = Object.assign({}, row ,messageTxt)  
+       } else {
+         this.eventForm  = Object.assign({}, row)  
+       }
+  
+       this.eventFormShow = true
+       this.$nextTick(() => {
+         this.$refs['eventFormRef'].clearValidate()
+       })
+     },
+ 
+ 
+     //事件关闭
+     event_dialog_close(){
+        //内容重置
+        this.$refs['eventFormRef'].resetFields()
+        this.eventFormShow = false
+     },
+ 
+     //事件 保存
+     event_dialog_save() {
+       var me = this
+       this.$refs['eventFormRef'].validate(valid => {
+         //验证成功
+         if (valid) {
+           //发起请求
+            
+           var send_data = {
+               "calf_code": me.eventForm.calf_code,
+               "calf_category_id":  me.eventForm.calf_category_id,
+               "calf_category_name": me.eventForm.calf_category_name,
+               "event_kind":me.eventForm.event_kind,
+               "remark": me.eventForm.remark,
+               "source": 2,
+               "message": "",
+           }
+           console.log("弹窗参数：", send_data)
+ 
+           // event_kind 1 称重 2 饲喂 3 粪便情况 4 测量体温 5 测量心跳 6 测量呼吸 7 疾病 8 病愈 9 去角 10 去副乳 11 转栏 12 出栏 13 死亡
+           var event_kind = me.eventForm.event_kind
+           if(event_kind == 1){
+             var messageTxt = {
+               "weight":  parseFloat(me.eventForm.weight)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+           if(event_kind == 2){
+             var messageTxt = {
+               "first_class_food_number":  parseFloat(me.eventForm.first_class_food_number),
+               "second_class_food_number":  parseFloat(me.eventForm.second_class_food_number),
+               "third_class_food_number":  parseFloat(me.eventForm.third_class_food_number),
+               "fourth_class_food_number":  parseFloat(me.eventForm.fourth_class_food_number),
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 3){
+             var messageTxt = {
+               "fecal_score":  me.eventForm.fecal_score  
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 4){
+             var messageTxt = {
+               "temp":   parseFloat(me.eventForm.temp)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 5){
+             var messageTxt = {
+               "heartbeat":  parseFloat(me.eventForm.heartbeat)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 6){
+             var messageTxt = {
+               "breathe":  parseFloat(me.eventForm.breathe)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 7){
+             var messageTxt = {
+               "diseased_type":  me.eventForm.diseased_type,
+               "medication":  me.eventForm.medication,
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 11){
+             var messageTxt = {
+               "original_barn_id":   parseFloat(me.eventForm.original_barn_id),
+               "original_barn_name":  me.eventForm.original_barn_name,
+               "new_barn_id":   parseFloat(me.eventForm.new_barn_id),
+               "new_barn_string":  me.eventForm.new_barn_string,
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           
+           if(event_kind == 13){
+             var messageTxt = {
+               "reason":  me.eventForm.reason
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+       
+  
+ 
+           //关闭弹窗
+           // me.addFormShow = false
+          //加载 - 发送新增保存
+            ajaxDataPost(me.url_add_event_table, send_data).then(e => {
+                 console.log("新增结果：",e)
+                 //打印请求成功结果
+                 if(e.code == 200  ){
+                   me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
+                   //关闭弹窗
+                   me.eventFormShow = false
+                   me.get_table_data()
+                 } else {
+                   me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
+                 }
+             })
+          
+         }
+       })
+     },
+ 
+ 
+     
+ 
+     //查看牛号信息
+     click_cowcode(row) {
+       console.log('查看牛号信息卡片', row)
+       // this.customerData.id = row.id
+       // this.seeCustomer.dialogFormVisible = true
+     },
+ 
+     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 = [
+         {
+             tHeader: ['表头1', '表头2', '表头3', '表头4',],
+             filterVal: ['title1', 'title2', 'title3', 'title4'],
+             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')
+ }
+ 
+      
+ 
+   }
+ }
+ </script>
+ <!-- 加了scoped，则是仅在此组件里生效 -->
+ <style scoped>
+ 
+ </style>
+ 

src/views/cowManagement/EventRecord.vue

@@ -1,939 +1,925 @@
 <template>
+  <!-- 100 -->
+   <div>
+ 
+ 
+     <el-card class="box-card">
+       <!-- 搜索区域 -->
+       <div class="search-bx1">
+           <el-select v-model="searchData.source" filterable placeholder="操作方式" class="g-mr20" style="width: 180px;" clearable>
+                 <el-option v-for="item in sourceList" :key="item.id" :label="item.name" :value="item.id" />
+           </el-select>
+ 
+        
+ 
+           <el-input v-model="searchData.operation_user" placeholder="操作人"  style="width: 220px;" class="g-mr20" clearable />
+ 
+           <el-date-picker v-model="searchData.inputDatetime1" class="g-mr20" type="daterange" range-separator="至" start-placeholder="操作日期" end-placeholder="操作日期" style="width: 250px;" />
+ 
+ 
+           <el-button type="primary"   @click="form_search">搜索</el-button>
+           <el-button type="primary"   @click="form_clear">重置</el-button>
+           <el-button type="primary"  v-if="isButtonEdit"  @click="form_add">添加</el-button>
+            <!-- <el-button type="primary"   @click="form_export">导出</el-button> -->
+       </div>
  
-  <div>
-
-
-    <el-card class="box-card">
-      <!-- 搜索区域 -->
-      <div class="search-bx1">
-          <el-select v-model="searchData.source" filterable placeholder="操作方式" class="g-mr20" style="width: 180px;" clearable>
-                <el-option v-for="item in sourceList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
-
-       
-
-          <el-input v-model="searchData.operation_user" placeholder="操作人"  style="width: 220px;" class="g-mr20" clearable />
-
-          <el-date-picker v-model="searchData.inputDatetime1" class="g-mr20" type="daterange" range-separator="至" start-placeholder="操作日期" end-placeholder="操作日期" style="width: 250px;" />
-
-
-          <el-button type="primary"   @click="form_search">搜索</el-button>
-          <el-button type="primary"   @click="form_clear">重置</el-button>
-          <el-button type="primary"  v-if="isButtonEdit"  @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>
-          <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="120px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span>{{ scope.row.calf_code  }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="犊牛类型" min-width="120px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span>{{ scope.row.calf_category_name  }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="事件类型" min-width="120px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span v-if="scope.row.event_kind == 1">称重</span>
-              <span v-if="scope.row.event_kind == 2">饲喂</span>
-              <span v-if="scope.row.event_kind == 3">粪便情况</span>
-              <span v-if="scope.row.event_kind == 4">测量体温</span>
-              <span v-if="scope.row.event_kind == 5">测量心跳</span>
-              <span v-if="scope.row.event_kind == 6">测量呼吸</span>
-              <span v-if="scope.row.event_kind == 7">疾病</span>
-              <span v-if="scope.row.event_kind == 8">病愈</span>
-              <span v-if="scope.row.event_kind == 9">去角</span>
-              <span v-if="scope.row.event_kind == 10">去副乳</span>
-              <span v-if="scope.row.event_kind == 11">转栏</span>
-              <span v-if="scope.row.event_kind == 12">出栏</span>
-              <span v-if="scope.row.event_kind == 13">死亡</span>
-
-            </template>
-          </el-table-column>
-          <el-table-column label="事件描述" min-width="120px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span>{{ scope.row.description  }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" min-width="120px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span>{{ scope.row.remark  }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="来源" min-width="120px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span v-if="scope.row.source == 2">录入</span>
-              <span v-if="scope.row.source == 1">导入</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作人" min-width="120px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span>{{ scope.row.operation_user  }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="操作日期" min-width="120px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span>{{ scope.row.operation_time  }}</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" v-if="isButtonEdit" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
-             <!-- 删除按钮 -->
-             <el-button type="danger" v-if="isButtonEdit" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页区域 -->
-      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.total"/>
-    </el-card>
-
-
-    <!-- 弹窗 新增or修改 -->
-    <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
-      <div class="">
-        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="170px"  style="width:50%;margin:0 auto 50px">
-             
-
-            <el-row>
-                <el-form-item label="牛号：" prop="calf_code">
-                  <el-select ref="calf_code" v-model="addForm.calf_code" filterable placeholder="请选择" style="width: 100%;"  @change = "change_cow" :disabled="addFormStatus=='edit'" >
-                    <el-option v-for="item in cowNameList" :key="item.calf_code" :label="item.calf_code" :value="item.calf_code" />
-                  </el-select>
-                </el-form-item>
-            
-                <el-form-item label="犊牛类型：" prop="calf_category_name">
-                  <el-input ref="calf_category_name" v-model="addForm.calf_category_name"    disabled />
-                </el-form-item> 
+       <!-- 表格 -->
+       <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
+           <el-table-column label="序号"  width="50px" align="center">
+             <template slot-scope="scope">
+               <span>{{ scope.row.id }}</span>
+             </template>
+           </el-table-column>
+           <el-table-column label="牛号" min-width="120px" align="center" show-overflow-tooltip>
+             <template slot-scope="scope">
+               <span>{{ scope.row.calf_code  }}</span>
+             </template>
+           </el-table-column>
+           <el-table-column label="犊牛类型" min-width="120px" align="center" show-overflow-tooltip>
+             <template slot-scope="scope">
+               <span>{{ scope.row.calf_category_name  }}</span>
+             </template>
+           </el-table-column>
+           <el-table-column label="事件类型" min-width="120px" align="center" show-overflow-tooltip>
+             <template slot-scope="scope">
+               <span v-if="scope.row.event_kind == 1">称重</span>
+               <span v-if="scope.row.event_kind == 2">饲喂</span>
+               <span v-if="scope.row.event_kind == 3">粪便情况</span>
+               <span v-if="scope.row.event_kind == 4">测量体温</span>
+               <span v-if="scope.row.event_kind == 5">测量心跳</span>
+               <span v-if="scope.row.event_kind == 6">测量呼吸</span>
+               <span v-if="scope.row.event_kind == 7">疾病</span>
+               <span v-if="scope.row.event_kind == 8">病愈</span>
+               <span v-if="scope.row.event_kind == 9">去角</span>
+               <span v-if="scope.row.event_kind == 10">去副乳</span>
+               <span v-if="scope.row.event_kind == 11">转栏</span>
+               <span v-if="scope.row.event_kind == 12">出栏</span>
+               <span v-if="scope.row.event_kind == 13">死亡</span>
+ 
+             </template>
+           </el-table-column>
+           <el-table-column label="事件描述" min-width="120px" align="center" show-overflow-tooltip>
+             <template slot-scope="scope">
+               <span>{{ scope.row.description  }}</span>
+             </template>
+           </el-table-column>
+           <el-table-column label="备注" min-width="120px" align="center" show-overflow-tooltip>
+             <template slot-scope="scope">
+               <span>{{ scope.row.remark  }}</span>
+             </template>
+           </el-table-column>
+           <el-table-column label="来源" min-width="120px" align="center" show-overflow-tooltip>
+             <template slot-scope="scope">
+               <span v-if="scope.row.source == 2">录入</span>
+               <span v-if="scope.row.source == 1">导入</span>
+             </template>
+           </el-table-column>
+           <el-table-column label="操作人" min-width="120px" align="center" show-overflow-tooltip>
+             <template slot-scope="scope">
+               <span>{{ scope.row.operation_user  }}</span>
+             </template>
+           </el-table-column>
+ 
+           <el-table-column label="操作日期" min-width="120px" align="center" show-overflow-tooltip>
+             <template slot-scope="scope">
+               <span>{{ scope.row.operation_time  }}</span>
+             </template>
+           </el-table-column>
           
-                <el-form-item label="事件类型：" prop="event_kind">
-                  <el-select ref="event_kind" v-model="addForm.event_kind" filterable placeholder="请选择"  style="width: 100%;"  :disabled="addFormStatus=='edit'" >
-                    <el-option v-for="item in eventNameList" :key="item.id" :label="item.name" :value="item.id"  />
-                  </el-select>
-                </el-form-item>
    
-            </el-row>
-
-             <!-- 1 称重 2 饲喂 3 粪便情况 4 测量体温 5 测量心跳 6 测量呼吸 7 疾病 8 病愈 9 去角 10 去副乳 11 转栏 12 出栏 13 死亡 -->
-             <!-- 称重 -->
-            <el-row   v-if="addForm.event_kind == 1" >
-               <el-form-item label="体重：" prop="weight">
-                  <el-input ref="weight" v-model="addForm.weight"   />
-                </el-form-item> 
-            </el-row>
-            <!-- 饲喂 -->
-            <el-row   v-if="addForm.event_kind == 2">
-                <el-form-item label="一班进食量：" prop="first_class_food_number"  >
-                  <el-input ref="first_class_food_number" v-model="addForm.first_class_food_number"   />
-                </el-form-item> 
-                <el-form-item label="二班进食量：" prop="second_class_food_number" v-if="class_num == 2 || class_num == 3 || class_num == 4">
-                  <el-input ref="second_class_food_number" v-model="addForm.second_class_food_number"   />
-                </el-form-item> 
-                <el-form-item label="三班进食量：" prop="third_class_food_number" v-if="class_num == 3 || class_num == 4 ">
-                  <el-input ref="third_class_food_number" v-model="addForm.third_class_food_number"  />
-                </el-form-item> 
-                <el-form-item label="四班进食量：" prop="fourth_class_food_number" v-if="class_num == 4">
-                  <el-input ref="fourth_class_food_number" v-model="addForm.fourth_class_food_number"  />
-                </el-form-item> 
-            </el-row>
-            <!-- 粪便情况 -->
-            <el-row   v-if="addForm.event_kind == 3">
-                <el-form-item label="粪便评分：" prop="fecal_score">
-                  <el-select ref="fecal_score" v-model="addForm.fecal_score" filterable placeholder="请选择"  style="width: 100%;"  >
-                    <el-option v-for="item in scoreNameList" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-            </el-row>
-            <!-- 测量体温 -->
-            <el-row   v-if="addForm.event_kind == 4" >
-               <el-form-item label="体温(℃)：" prop="temp">
-                  <el-input ref="temp" v-model="addForm.temp"   />
-                </el-form-item> 
-            </el-row>
-            <!-- 测量心跳 -->
-            <el-row   v-if="addForm.event_kind == 5" >
-               <el-form-item label="心跳频率(次/分钟)：" prop="heartbeat">
-                  <el-input ref="heartbeat" v-model="addForm.heartbeat"   />
-                </el-form-item> 
-            </el-row>
-            <!-- 测量呼吸 -->
-            <el-row   v-if="addForm.event_kind == 6" >
-               <el-form-item label="呼吸频率(次/分钟)：" prop="breathe">
-                  <el-input ref="breathe" v-model="addForm.breathe"   />
-                </el-form-item> 
-            </el-row>
-            <!-- 疾病 -->
-            <el-row   v-if="addForm.event_kind == 7" >
-               <el-form-item label="疾病名称：" prop="diseased_type">
-                  <el-select ref="diseased_type" v-model="addForm.diseased_type" filterable placeholder="请选择"  style="width: 100%;"  >
-                    <el-option v-for="item in diseaseNameList" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="用药：" prop="medication">
-                  <el-input ref="medication" v-model="addForm.medication"   />
-                </el-form-item> 
-            </el-row>
-            <!-- 转投栏舍 -->
-            <el-row   v-if="addForm.event_kind == 11" >
-                <el-form-item label="原栏舍：" prop="original_barn_name">
-                  <el-input ref="original_barn_name" v-model="addForm.original_barn_name"   disabled/>
-                </el-form-item> 
-                <el-form-item label="转投栏舍：" prop="new_barn_id">
-                  <el-select ref="new_barn_id" v-model="addForm.new_barn_id" filterable placeholder="请选择"  style="width: 100%;"  @change = "change_cowshed" >
-                    <el-option v-for="item in cowshedList" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-            </el-row>
-            <!-- 死亡 -->
-            <el-row   v-if="addForm.event_kind == 13" >
-               <el-form-item label="死亡原因：" prop="reason">
-                  <el-input ref="reason" v-model="addForm.reason"   />
-                </el-form-item> 
-            </el-row>
-
-            <el-row  >
-                <el-form-item label="备注：" prop="remark">
-                  <el-input ref="remark" v-model="addForm.remark"   />
-                </el-form-item>
-            </el-row>
-
  
+         <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
+           <template slot-scope="scope">
+              <!-- 修改按钮 -->
+              <el-button type="primary" v-if="isButtonEdit" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">编辑</el-button>
+              <!-- 删除按钮 -->
+              <el-button type="danger" v-if="isButtonEdit" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
+           </template>
+         </el-table-column>
+       </el-table>
+ 
+       <!-- 分页区域 -->
+       <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.total"/>
+     </el-card>
+ 
+ 
+     <!-- 弹窗 新增or修改 -->
+     <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
+       <div class="">
+         <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="170px"  style="width:50%;margin:0 auto 50px">
+              
+ 
+             <el-row>
+                 <el-form-item label="牛号：" prop="calf_code">
+                   <el-select ref="calf_code" v-model="addForm.calf_code" filterable placeholder="请选择" style="width: 100%;"  @change = "change_cow" :disabled="addFormStatus=='edit'" >
+                     <el-option v-for="item in cowNameList" :key="item.calf_code" :label="item.calf_code" :value="item.calf_code" />
+                   </el-select>
+                 </el-form-item>
+             
+                 <el-form-item label="犊牛类型：" prop="calf_category_name">
+                   <el-input ref="calf_category_name" v-model="addForm.calf_category_name"    disabled />
+                 </el-form-item> 
            
+                 <el-form-item label="事件类型：" prop="event_kind">
+                   <el-select ref="event_kind" v-model="addForm.event_kind" filterable placeholder="请选择"  style="width: 100%;"  :disabled="addFormStatus=='edit'" >
+                     <el-option v-for="item in eventNameList" :key="item.id" :label="item.name" :value="item.id"  />
+                   </el-select>
+                 </el-form-item>
+    
+             </el-row>
+ 
+              <!-- 1 称重 2 饲喂 3 粪便情况 4 测量体温 5 测量心跳 6 测量呼吸 7 疾病 8 病愈 9 去角 10 去副乳 11 转栏 12 出栏 13 死亡 -->
+              <!-- 称重 -->
+             <el-row   v-if="addForm.event_kind == 1" >
+                <el-form-item label="体重：" prop="weight">
+                   <el-input ref="weight" v-model="addForm.weight"   />
+                 </el-form-item> 
+             </el-row>
+             <!-- 饲喂 -->
+             <el-row   v-if="addForm.event_kind == 2">
+                 <el-form-item label="一班进食量：" prop="first_class_food_number"  >
+                   <el-input ref="first_class_food_number" v-model="addForm.first_class_food_number"   />
+                 </el-form-item> 
+                 <el-form-item label="二班进食量：" prop="second_class_food_number" v-if="class_num == 2 || class_num == 3 || class_num == 4">
+                   <el-input ref="second_class_food_number" v-model="addForm.second_class_food_number"   />
+                 </el-form-item> 
+                 <el-form-item label="三班进食量：" prop="third_class_food_number" v-if="class_num == 3 || class_num == 4 ">
+                   <el-input ref="third_class_food_number" v-model="addForm.third_class_food_number"  />
+                 </el-form-item> 
+                 <el-form-item label="四班进食量：" prop="fourth_class_food_number" v-if="class_num == 4">
+                   <el-input ref="fourth_class_food_number" v-model="addForm.fourth_class_food_number"  />
+                 </el-form-item> 
+             </el-row>
+             <!-- 粪便情况 -->
+             <el-row   v-if="addForm.event_kind == 3">
+                 <el-form-item label="粪便评分：" prop="fecal_score">
+                   <el-select ref="fecal_score" v-model="addForm.fecal_score" filterable placeholder="请选择"  style="width: 100%;"  >
+                     <el-option v-for="item in scoreNameList" :key="item.id" :label="item.name" :value="item.id" />
+                   </el-select>
+                 </el-form-item>
+             </el-row>
+             <!-- 测量体温 -->
+             <el-row   v-if="addForm.event_kind == 4" >
+                <el-form-item label="体温(℃)：" prop="temp">
+                   <el-input ref="temp" v-model="addForm.temp"   />
+                 </el-form-item> 
+             </el-row>
+             <!-- 测量心跳 -->
+             <el-row   v-if="addForm.event_kind == 5" >
+                <el-form-item label="心跳频率(次/分钟)：" prop="heartbeat">
+                   <el-input ref="heartbeat" v-model="addForm.heartbeat"   />
+                 </el-form-item> 
+             </el-row>
+             <!-- 测量呼吸 -->
+             <el-row   v-if="addForm.event_kind == 6" >
+                <el-form-item label="呼吸频率(次/分钟)：" prop="breathe">
+                   <el-input ref="breathe" v-model="addForm.breathe"   />
+                 </el-form-item> 
+             </el-row>
+             <!-- 疾病 -->
+             <el-row   v-if="addForm.event_kind == 7" >
+                <el-form-item label="疾病名称：" prop="diseased_type">
+                   <el-select ref="diseased_type" v-model="addForm.diseased_type" filterable placeholder="请选择"  style="width: 100%;"  >
+                     <el-option v-for="item in diseaseNameList" :key="item.id" :label="item.name" :value="item.id" />
+                   </el-select>
+                 </el-form-item>
+                 <el-form-item label="用药：" prop="medication">
+                   <el-input ref="medication" v-model="addForm.medication"   />
+                 </el-form-item> 
+             </el-row>
+             <!-- 转投栏舍 -->
+             <el-row   v-if="addForm.event_kind == 11" >
+                 <el-form-item label="原栏舍：" prop="original_barn_name">
+                   <el-input ref="original_barn_name" v-model="addForm.original_barn_name"   disabled/>
+                 </el-form-item> 
+                 <el-form-item label="转投栏舍：" prop="new_barn_id">
+                   <el-select ref="new_barn_id" v-model="addForm.new_barn_id" filterable placeholder="请选择"  style="width: 100%;"  @change = "change_cowshed" >
+                     <el-option v-for="item in cowshedList" :key="item.id" :label="item.name" :value="item.id" />
+                   </el-select>
+                 </el-form-item>
+             </el-row>
+             <!-- 死亡 -->
+             <el-row   v-if="addForm.event_kind == 13" >
+                <el-form-item label="死亡原因：" prop="reason">
+                   <el-input ref="reason" v-model="addForm.reason"   />
+                 </el-form-item> 
+             </el-row>
+ 
+             <el-row  >
+                 <el-form-item label="备注：" prop="remark">
+                   <el-input ref="remark" v-model="addForm.remark"   />
+                 </el-form-item>
+             </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>
-          <el-button @click="addFormShow = false">关闭</el-button>
-        </div>
-      </div>
-    </el-dialog>
-
+             
+         </el-form>
+         <div slot="footer" class="dialog-footer">
+           <el-button type="primary" @click="addFormStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
+           <el-button @click="addFormShow = false">关闭</el-button>
+         </div>
+       </div>
+     </el-dialog>
  
-    
-  </div>
-
-
-</template> 
-
-<script>
-import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
-import { parseTime, json2excel } from '@/utils/index.js'
-export default {
-  data() {
-
-
-    
+  
+     
+   </div>
+ 
+ 
+ </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/event/list',
+       //接口 - 新增 - 表格
+       url_add_table:'/api/v1/ops/event/add',  
+       //接口 - 修改 - 表格
+       url_edit_table:'/api/v1/ops/event/update', 
+       //接口 - 删除 - 表格
+       url_delete_table:'/api/v1/ops/event', 
+       
+       //接口 - 下拉框 列表 
+       url_get_select1:'/role/getAll',
+ 
+       //按钮权限
+       isButtonEdit:false,
+ 
+       //获取 - 表格数据 - 参数
+       searchData:{
+         operation_user: "",
+         inputDatetime1:"",
+         min_operation_time:"",
+         min_operation_time:"",
+         source:undefined,
+         page: 1,  //页码
+         page_size: 10,   //每页数量
+         total:0,  //总页数
+         pastureId: ""
+       },
+       tableLoading: false,
+       //表格内容
+       tableList:[
+         //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+         // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+       ],
+ 
+ 
+       
+       pastureList:[
+     
+       ],
+ 
+     
  
   
-    return {
-
- 
-
-      //接口 - 获取 - 表格
-      url_get_table:'/api/v1/ops/event/list',
-      //接口 - 新增 - 表格
-      url_add_table:'/api/v1/ops/event/add',  
-      //接口 - 修改 - 表格
-      url_edit_table:'/api/v1/ops/event/update', 
-      //接口 - 删除 - 表格
-      url_delete_table:'/api/v1/ops/event', 
+ 
+ 
+       addFormShow:false,
+       addFormStatus: '',
+       addFormTxt: {  edit: '修改',  create: '新增' },
+       addForm:{
+         calf_code:'',id:'' ,event_kind:undefined
+       },
+ 
+       addFormRules:{
+         calf_code: [ { required: true, message: '牛号必填', trigger: 'blur' },  ],
+         event_kind: [ { required: true, message: '事件类型必选', trigger: 'blur' },  ],
+ 
+       },
+ 
+       //  下拉框 - 操作方式 
+       sourceList: [
+         {id: 1, name: "导入"}, 
+         {id: 2, name: "录入"},
       
-      //接口 - 下拉框 列表 
-      url_get_select1:'/role/getAll',
-
-      //按钮权限
-      isButtonEdit:false,
-
-      //获取 - 表格数据 - 参数
-      searchData:{
-        operation_user: "",
-        inputDatetime1:"",
-        min_operation_time:"",
-        min_operation_time:"",
-        source:undefined,
-        page: 1,  //页码
-        page_size: 10,   //每页数量
-        total:0,  //总页数
-        pastureId: ""
-      },
-      tableLoading: false,
-      //表格内容
-      tableList:[
-        //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
-        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-      ],
-
-
+       ], 
+ 
+       //  下拉框 - 犊牛类型 
+       cowNameList: [
+     
+       ], 
+ 
+ 
+       //  下拉框 - 事件类型 
+       eventNameList: [
+         {id: 1, name: "称重"}, 
+         {id: 2, name: "饲喂"}, 
+         {id: 3, name: "粪便情况"},
+         {id: 4, name: "测量体温"},
+         {id: 5, name: "测量心跳"},
+         {id: 6, name: "测量呼吸"},
+         {id: 7, name: "疾病"},
+         {id: 8, name: "痊愈"},
+         {id: 9, name: "去角"},
+         {id: 10, name: "去副乳"},
+         {id: 11, name: "转投栏舍"},
+         {id: 12, name: "出栏"},
+         {id: 13, name: "死亡"},
+       ], 
+ 
+ 
+       //  下拉框 - 粪便评分 
+       scoreNameList: [
+         {id: 5, name: "5分"}, 
+         {id: 4, name: "4分"}, 
+         {id: 3, name: "3分"},
+         {id: 2, name: "2分"},
+         {id: 1, name: "1分"},
+       ], 
+ 
+       //  下拉框 - 疾病 
+       diseaseNameList: [
+         {id: 1, name: "腹泻"}, 
+         {id: 2, name: "便秘"}, 
+         {id: 3, name: "下痢"},
+         {id: 4, name: "脐炎"},
+         {id: 5, name: "肺炎"},
+         {id: 6, name: "软瘫衰弱"}
+       ], 
+ 
+       //  下拉框 - 栏舍
+       cowshedList: [
+         // {id: "栏舍组1", name: "栏舍组1"}, 
+         // {id: "栏舍组2", name: "栏舍组2"}, 
+         // {id: "栏舍组3", name: "栏舍组3"}
+       ], 
+       class_num:4,
+ 
       
-      pastureList:[
-    
-      ],
-
-    
-
- 
-
-
-      addFormShow:false,
-      addFormStatus: '',
-      addFormTxt: {  edit: '修改',  create: '新增' },
-      addForm:{
-        calf_code:'',id:'' ,event_kind:undefined,medication:'',remark:''
-      },
-
-      addFormRules:{
-        calf_code: [ { required: true, message: '牛号必填', trigger: 'blur' },  ],
-        event_kind: [ { required: true, message: '事件类型必选', trigger: 'blur' },  ],
-
-      },
-
-      //  下拉框 - 操作方式 
-      sourceList: [
-        {id: 1, name: "导入"}, 
-        {id: 2, name: "录入"},
+        
+     }
+   },
+   created(){
+       //获取按钮权限
+       const isButtonEdit = checkButtons(this.$store.state.buttonsList, "事件记录编辑")
+       this.isButtonEdit = isButtonEdit
+       console.log('this.isButtonEdit==========',this.isButtonEdit)
+ 
+      //获取下拉框
+       this.get_select_list1()
+ 
+    var me = this
+ 
+        //表格 - 初始化 
+       setTimeout(function () {
+         me.get_table_data()
+       }, 1000);
+ 
+      
+       
+ 
+      
+ 
      
-      ], 
-
-      //  下拉框 - 犊牛类型 
-      cowNameList: [
-    
-      ], 
-
-
-      //  下拉框 - 事件类型 
-      eventNameList: [
-        {id: 1, name: "称重"}, 
-        {id: 2, name: "饲喂"}, 
-        {id: 3, name: "粪便情况"},
-        {id: 4, name: "测量体温"},
-        {id: 5, name: "测量心跳"},
-        {id: 6, name: "测量呼吸"},
-        {id: 7, name: "疾病"},
-        {id: 8, name: "痊愈"},
-        {id: 9, name: "去角"},
-        {id: 10, name: "去副乳"},
-        {id: 11, name: "转投栏舍"},
-        {id: 12, name: "出栏"},
-        {id: 13, name: "死亡"},
-      ], 
-
-
-      //  下拉框 - 粪便评分 
-      scoreNameList: [
-        {id: 5, name: "5分"}, 
-        {id: 4, name: "4分"}, 
-        {id: 3, name: "3分"},
-        {id: 2, name: "2分"},
-        {id: 1, name: "1分"},
-      ], 
-
-      //  下拉框 - 疾病 
-      diseaseNameList: [
-        // {id: 1, name: "腹泻"}, 
-        // {id: 2, name: "便秘"}, 
-        // {id: 3, name: "下痢"},
-        // {id: 4, name: "脐炎"},
-        // {id: 5, name: "肺炎"},
-        // {id: 6, name: "软瘫衰弱"}
-      ], 
-
-      //  下拉框 - 栏舍
-      cowshedList: [
-        // {id: "栏舍组1", name: "栏舍组1"}, 
-        // {id: "栏舍组2", name: "栏舍组2"}, 
-        // {id: "栏舍组3", name: "栏舍组3"}
-      ], 
-      class_num:4,
-
+   },
+   methods:{
+ 
+  
      
-       
-    }
-  },
-  created(){
-      //获取按钮权限
-      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "事件记录编辑")
-      this.isButtonEdit = isButtonEdit
-      console.log('this.isButtonEdit==========',this.isButtonEdit)
-
-     //获取下拉框
-      this.get_select_list1()
-
-   var me = this
-
-       //表格 - 初始化 
-      setTimeout(function () {
-        me.get_table_data()
-			}, 1000);
-
+     //获取 下拉框
+     get_select_list1(){
+         var me = this
+ 
+         ajaxDataPost('/api/v1/ops/calf/list?page=1&page_size=10000', {}).then(e => {
+           console.log("牛只下拉框：",e)
+ 
+           if(e.code == 200 ){
+             me.cowNameList = e.data.list
+            
+           } else {
+             me.cowNameList = []
+           }
+         })
+ 
+ 
+ 
+   
+ 
+         ajaxDataPost('/api/v1/ops/barn/list?page=1&page_size=1000', {}).then(e => {
+           console.log("栏舍下拉框：",e)
+ 
+           if(e.code == 200 ){
+             me.cowshedList = e.data.list
+            
+           } else {
+             me.cowshedList = []
+           }
+         })
+ 
+ 
+       // 班次数量下拉框
+       ajaxDataGet('/api/v1/ops/calf_feed/enum/list').then(e => {
+         console.log(e)
+         if(e.code === 200){
+           var class_num = e.data.class_list.length
+         } else {
+           var class_num = 4
+         }
+         console.log("class_num========",class_num)
+         me.class_num = class_num
+       })
+ 
+  
+ 
+     
+     },
+ 
      
+     //获取 表格
+     get_table_data() {
+  
+      var me = this
+ 
+      me.tableLoading = true
+      console.log("searchData======>", me.searchData)
+ 
+ 
       
-
+       if( me.searchData.source == ""){
+         me.searchData.source = undefined
+       }
+ 
+       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)
+   
+         })
+ 
+        
+     },
+     //搜索 查询表格
+     form_search(){
+       var me = this
+       console.log('请求表格列表searchData',me.searchData)
+       if (me.searchData.inputDatetime1 !== '' && me.searchData.inputDatetime1 !== null) {
+           me.searchData.min_operation_time = parseTime(me.searchData.inputDatetime1[0], '{y}-{m}-{d}')
+           me.searchData.max_operation_time = parseTime(me.searchData.inputDatetime1[1], '{y}-{m}-{d}')
+         } else {
+           me.searchData.inputDatetime1 = ''
+           me.searchData.min_operation_time = ''
+           me.searchData.max_operation_time = ''
+         }
+       me.get_table_data()
+ 
+     },
+ 
+     //重置 表格
+     form_clear(){
+       var me = this
+       me.searchData.operation_user = ""
+       me.searchData.inputDatetime1 = ""
+       me.searchData.min_operation_time = ""
+       me.searchData.min_operation_time = ""
+       me.searchData.source = undefined
+       me.searchData.page = 1
+       me.searchData.page_size = 10
+ 
      
-
-    
-  },
-  methods:{
-
  
-    
-    //获取 下拉框
-    get_select_list1(){
-        var me = this
-
-        ajaxDataPost('/api/v1/ops/calf/list?page=1&page_size=10000', {}).then(e => {
-          console.log("牛只下拉框：",e)
-
-          if(e.code == 200 ){
-            me.cowNameList = e.data.list
+       me.get_table_data()
+     },
+ 
+     //监听 page_size 改变的事件
+     change_size_page(item){
+       console.log(item)
+      // this.searchData.page_size = item
+       //  this.getUserList()
+     },
+ 
+     //监听 page 改变的事件
+     change_current_page(item){
+       console.log(item)
+        this.searchData.page = item
+        this.get_table_data()
+     },
+ 
+     //清空弹窗表单信息
+     reset_form(){
+       this.addForm.calf_code = ''
+       this.addForm.id = ''
+       this.addForm.event_kind = undefined
+       this.addForm.remark = ''
+ 
+  
+     },
+ 
+     //监听 - 更改牛号
+     change_cow(value){
+       var me = this 
+       console.log("更改牛号Id",value)
+       var item  = me.cowNameList.find(obj => obj.calf_code == value)
+       console.log("更改牛号当前的内容",item)
+       me.addForm.calf_code = item.calf_code
+       me.addForm.calf_category_id = item.calf_category_id
+       me.addForm.calf_category_name = item.calf_category_name
+       me.addForm.original_barn_id = item.barn_id
+       me.addForm.original_barn_name = item.barn_name
            
-          } else {
-            me.cowNameList = []
-          }
-        })
-
-
-        ajaxDataPost('/api/v1/ops/base_setting/category_table/list?page=1&page_size=10000', {category_type:3}).then(e => {
-          console.log("疾病下拉框：",e)
-
-          if(e.code == 200 ){
-            me.diseaseNameList = e.data.list
+     },
+      //监听 - 更改栏舍
+     change_cowshed(value){
+       var me = this 
+       console.log("更改栏舍Id",value)
+       var item  = me.cowshedList.find(obj => obj.id == value)
+       console.log("更改栏舍当前的内容",item)
+   
+       
+       me.addForm.new_barn_string = item.name
            
-          } else {
-            me.diseaseNameList = []
-          }
-        })
-
-
-        
-
-
-
+     },
+ 
+     //新增
+     form_add() {
+       this.reset_form()
+       this.addFormStatus = 'create'
+       this.addFormShow = true
+       this.$nextTick(() => {
+         this.$refs['addFormRef'].clearValidate()
+       })
+     },
+ 
+     //编辑
+     form_edit(row) {
+       console.log('行内容row=========', row)
+       if(row.message && row.message !== ""){
+         var messageTxt = JSON.parse(row.message)
+         //编辑行内容赋值
+         this.addForm  = Object.assign({}, row ,messageTxt)  
+       } else {
+         this.addForm  = Object.assign({}, row)  
+       }
   
-
-        ajaxDataPost('/api/v1/ops/barn/list?page=1&page_size=1000', {}).then(e => {
-          console.log("栏舍下拉框：",e)
-
-          if(e.code == 200 ){
-            me.cowshedList = e.data.list
-           
-          } else {
-            me.cowshedList = []
-          }
-        })
-
-
-      // 班次数量下拉框
-      ajaxDataGet('/api/v1/ops/calf_feed/enum/list').then(e => {
-        console.log(e)
-        if(e.code === 200){
-          var class_num = e.data.class_list.length
-        } else {
-          var class_num = 4
-        }
-        console.log("class_num========",class_num)
-        me.class_num = class_num
-      })
-
- 
-
-    
-    },
-
-    
-    //获取 表格
-    get_table_data() {
- 
-     var me = this
-
-     me.tableLoading = true
-     console.log("searchData======>", me.searchData)
-
-
+       
+ 
      
-      if( me.searchData.source == ""){
-        me.searchData.source = undefined
-      }
-
-      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;	//每页数量
+ 
+       console.log("this.addForm=========",this.addForm)
+       this.addFormStatus = 'edit'
+       this.addFormShow = true
+       this.$nextTick(() => {
+         this.$refs['addFormRef'].clearValidate()
+       })
+     },
+ 
+ 
+     //新增关闭
+     add_dialog_close(){
+        //内容重置
+        this.$refs['addFormRef'].resetFields()
+     },
+ 
+     //新增 保存
+     add_dialog_save() {
+       var me = this
+       this.$refs['addFormRef'].validate(valid => {
+         //验证成功
+         if (valid) {
+           //发起请求
            
-          } else {
-            me.$message({ type: 'error', message: '请求表格列表失败！' + e.msg, duration: 2000 })
-          }
-
-          setTimeout(() => {
-            me.tableLoading = false
-          }, 100)
-  
-        })
-
+           var send_data = {
+               "calf_code": me.addForm.calf_code,
+               "calf_category_id":  me.addForm.calf_category_id,
+               "calf_category_name": me.addForm.calf_category_name,
+               "event_kind":me.addForm.event_kind,
+               "remark": me.addForm.remark,
+               "source": 2,
+               "message": "",
+           }
+           console.log("弹窗参数：", send_data)
+ 
+           // event_kind 1 称重 2 饲喂 3 粪便情况 4 测量体温 5 测量心跳 6 测量呼吸 7 疾病 8 病愈 9 去角 10 去副乳 11 转栏 12 出栏 13 死亡
+           var event_kind = me.addForm.event_kind
+           if(event_kind == 1){
+             var messageTxt = {
+               "weight":  parseFloat(me.addForm.weight)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+           if(event_kind == 2){
+             var messageTxt = {
+               "first_class_food_number":  parseFloat(me.addForm.first_class_food_number),
+               "second_class_food_number":  parseFloat(me.addForm.second_class_food_number),
+               "third_class_food_number":  parseFloat(me.addForm.third_class_food_number),
+               "fourth_class_food_number":  parseFloat(me.addForm.fourth_class_food_number),
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 3){
+             var messageTxt = {
+               "fecal_score":  me.addForm.fecal_score  
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 4){
+             var messageTxt = {
+               "temp":   parseFloat(me.addForm.temp)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 5){
+             var messageTxt = {
+               "heartbeat":  parseFloat(me.addForm.heartbeat)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 6){
+             var messageTxt = {
+               "breathe":  parseFloat(me.addForm.breathe)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 7){
+             var messageTxt = {
+               "diseased_type":  me.addForm.diseased_type,
+               "medication":  me.addForm.medication,
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 11){
+             var messageTxt = {
+               "original_barn_id":   parseFloat(me.addForm.original_barn_id),
+               "original_barn_name":  me.addForm.original_barn_name,
+               "new_barn_id":   parseFloat(me.addForm.new_barn_id),
+               "new_barn_string":  me.addForm.new_barn_string,
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           
+           if(event_kind == 13){
+             var messageTxt = {
+               "reason":  me.addForm.reason
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
        
-    },
-    //搜索 查询表格
-    form_search(){
-      var me = this
-      console.log('请求表格列表searchData',me.searchData)
-      if (me.searchData.inputDatetime1 !== '' && me.searchData.inputDatetime1 !== null) {
-          me.searchData.min_operation_time = parseTime(me.searchData.inputDatetime1[0], '{y}-{m}-{d}')
-          me.searchData.max_operation_time = parseTime(me.searchData.inputDatetime1[1], '{y}-{m}-{d}')
-        } else {
-          me.searchData.inputDatetime1 = ''
-          me.searchData.min_operation_time = ''
-          me.searchData.max_operation_time = ''
-        }
-      me.get_table_data()
-
-    },
-
-    //重置 表格
-    form_clear(){
-      var me = this
-      me.searchData.operation_user = ""
-      me.searchData.inputDatetime1 = ""
-      me.searchData.min_operation_time = ""
-      me.searchData.min_operation_time = ""
-      me.searchData.source = undefined
-      me.searchData.page = 1
-      me.searchData.page_size = 10
-
-    
-
-      me.get_table_data()
-    },
-
-    //监听 page_size 改变的事件
-    change_size_page(item){
-      console.log(item)
-     // this.searchData.page_size = item
-      //  this.getUserList()
-    },
-
-    //监听 page 改变的事件
-    change_current_page(item){
-      console.log(item)
-       this.searchData.page = item
-       this.get_table_data()
-    },
-
-    //清空弹窗表单信息
-    reset_form(){
-      this.addForm.calf_code = ''
-      this.addForm.id = ''
-      this.addForm.event_kind = undefined
-      this.addForm.remark = ''
-
- 
-    },
-
-    //监听 - 更改牛号
-    change_cow(value){
-      var me = this 
-      console.log("更改牛号Id",value)
-      var item  = me.cowNameList.find(obj => obj.calf_code == value)
-      console.log("更改牛号当前的内容",item)
-      me.addForm.calf_code = item.calf_code
-      me.addForm.calf_category_id = item.calf_category_id
-      me.addForm.calf_category_name = item.calf_category_name
-      me.addForm.original_barn_id = item.barn_id
-      me.addForm.original_barn_name = item.barn_name
-          
-    },
-     //监听 - 更改栏舍
-    change_cowshed(value){
-      var me = this 
-      console.log("更改栏舍Id",value)
-      var item  = me.cowshedList.find(obj => obj.id == value)
-      console.log("更改栏舍当前的内容",item)
   
-      
-      me.addForm.new_barn_string = item.name
-          
-    },
-
-    //新增
-    form_add() {
-      this.reset_form()
-      this.addFormStatus = 'create'
-      this.addFormShow = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-    //编辑
-    form_edit(row) {
-      console.log('行内容row=========', row)
-      if(row.message && row.message !== ""){
-        var messageTxt = JSON.parse(row.message)
-        //编辑行内容赋值
-        this.addForm  = Object.assign({}, row ,messageTxt)  
-      } else {
-        this.addForm  = Object.assign({}, row)  
-      }
  
-      
-
-    
-
-      console.log("this.addForm=========",this.addForm)
-      this.addFormStatus = 'edit'
-      this.addFormShow = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-
-    //新增关闭
-    add_dialog_close(){
-       //内容重置
-       this.$refs['addFormRef'].resetFields()
-    },
-
-    //新增 保存
-    add_dialog_save() {
-      var me = this
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
+           //关闭弹窗
+           // me.addFormShow = false
+          //加载 - 发送新增保存
+            ajaxDataPost(me.url_add_table, send_data).then(e => {
+                 console.log("新增结果：",e)
+                 //打印请求成功结果
+                 if(e.code == 200  ){
+                   me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
+                   //关闭弹窗
+                   me.addFormShow = false
+                   me.get_table_data()
+                 } else {
+                   me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
+                 }
+             })
           
-          var send_data = {
-              "calf_code": me.addForm.calf_code,
-              "calf_category_id":  me.addForm.calf_category_id,
-              "calf_category_name": me.addForm.calf_category_name,
-              "event_kind":me.addForm.event_kind,
-              "remark": me.addForm.remark,
-              "source": 2,
-              "message": "",
-          }
-          console.log("弹窗参数：", send_data)
-
-          // event_kind 1 称重 2 饲喂 3 粪便情况 4 测量体温 5 测量心跳 6 测量呼吸 7 疾病 8 病愈 9 去角 10 去副乳 11 转栏 12 出栏 13 死亡
-          var event_kind = me.addForm.event_kind
-          if(event_kind == 1){
-            var messageTxt = {
-              "weight":  parseFloat(me.addForm.weight)
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-          if(event_kind == 2){
-            var messageTxt = {
-              "first_class_food_number":  parseFloat(me.addForm.first_class_food_number),
-              "second_class_food_number":  parseFloat(me.addForm.second_class_food_number),
-              "third_class_food_number":  parseFloat(me.addForm.third_class_food_number),
-              "fourth_class_food_number":  parseFloat(me.addForm.fourth_class_food_number),
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 3){
-            var messageTxt = {
-              "fecal_score":  me.addForm.fecal_score  
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 4){
-            var messageTxt = {
-              "temp":   parseFloat(me.addForm.temp)
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 5){
-            var messageTxt = {
-              "heartbeat":  parseFloat(me.addForm.heartbeat)
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 6){
-            var messageTxt = {
-              "breathe":  parseFloat(me.addForm.breathe)
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 7){
-            var messageTxt = {
-              "diseased_type":  me.addForm.diseased_type,
-              "medication":  me.addForm.medication,
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 11){
-            var messageTxt = {
-              "original_barn_id":   parseFloat(me.addForm.original_barn_id),
-              "original_barn_name":  me.addForm.original_barn_name,
-              "new_barn_id":   parseFloat(me.addForm.new_barn_id),
-              "new_barn_string":  me.addForm.new_barn_string,
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
+         }
+       })
+     },
+     //编辑 保存
+     edit_dialog_save(){
+       var me = this
+       this.$refs['addFormRef'].validate(valid => {
+         //验证成功
+         if (valid) {
+           //发起请求
+         
+           
+           var send_data = {
+              "id": me.addForm.id,
+               "calf_code": me.addForm.calf_code,
+               "calf_category_id":  me.addForm.calf_category_id,
+               "calf_category_name": me.addForm.calf_category_name,
+               "event_kind":me.addForm.event_kind,
+               "remark": me.addForm.remark,
+               "source": 2,
+               "message": "",
+           }
+           console.log("弹窗参数：", send_data)
+ 
+           // event_kind 1 称重 2 饲喂 3 粪便情况 4 测量体温 5 测量心跳 6 测量呼吸 7 疾病 8 病愈 9 去角 10 去副乳 11 转栏 12 出栏 13 死亡
+           var event_kind = me.addForm.event_kind
+           if(event_kind == 1){
+             var messageTxt = {
+               "weight":  parseFloat(me.addForm.weight)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+           if(event_kind == 2){
+             var messageTxt = {
+               "first_class_food_number":  parseFloat(me.addForm.first_class_food_number),
+               "second_class_food_number":  parseFloat(me.addForm.second_class_food_number),
+               "third_class_food_number":  parseFloat(me.addForm.third_class_food_number),
+               "fourth_class_food_number":  parseFloat(me.addForm.fourth_class_food_number),
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 3){
+             var messageTxt = {
+               "fecal_score":  me.addForm.fecal_score  
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 4){
+             var messageTxt = {
+               "temp":   parseFloat(me.addForm.temp)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 5){
+             var messageTxt = {
+               "heartbeat":  parseFloat(me.addForm.heartbeat)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 6){
+             var messageTxt = {
+               "breathe":  parseFloat(me.addForm.breathe)
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 7){
+             var messageTxt = {
+               "diseased_type":  me.addForm.diseased_type,
+               "medication":  me.addForm.medication,
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           if(event_kind == 11){
+             var messageTxt = {
+               "original_barn_id":   parseFloat(me.addForm.original_barn_id),
+               "original_barn_name":  me.addForm.original_barn_name,
+               "new_barn_id":   parseFloat(me.addForm.new_barn_id),
+               "new_barn_string":  me.addForm.new_barn_string,
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+           
+           if(event_kind == 13){
+             var messageTxt = {
+               "reason":  me.addForm.reason
+             }
+             send_data.message = JSON.stringify(messageTxt)
+           }
+ 
+       
+           //关闭弹窗
+           // me.addFormShow = false
+          //加载 - 发送新增保存
+          ajaxDataPut(me.url_edit_table, send_data).then(e => {
+                 console.log("编辑结果：",e)
+                 //打印请求成功结果
+                 if(e.code == 200  ){
+                   me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
+                   //关闭弹窗
+                   me.addFormShow = false
+                   me.get_table_data()
+                 } else {
+                   me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
+                 }
+             })
           
-          if(event_kind == 13){
-            var messageTxt = {
-              "reason":  me.addForm.reason
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-      
+         }
+       })
+     },
+ 
+ 
+     
+     
+ 
+ 
+ 
+     form_delete(row) {
+       var me = this
+ 
+        me.$confirm('是否删除此条内容?', '提示', {
+           confirmButtonText: '确定',
+           cancelButtonText: '取消',
+           type: 'warning'
+         }).then(() => {
+             console.log("删除的ID参数：", row.id)
+             //加载 - 发送新增保存
+             ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
+                 console.log("编辑结果：",e)
+                 //打印请求成功结果
+                 if(e.code == 200  ){
+                   me.$message({ type: 'success',  message: '删除成功!'  });
+                   me.get_table_data()
+                 } else {
+                   me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
+                 }
+             })
  
-
-          //关闭弹窗
-          // me.addFormShow = false
-         //加载 - 发送新增保存
-           ajaxDataPost(me.url_add_table, send_data).then(e => {
-                console.log("新增结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
-                  //关闭弹窗
-                  me.addFormShow = false
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
-                }
-            })
          
-        }
-      })
-    },
-    //编辑 保存
-    edit_dialog_save(){
-      var me = this
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
+  
+           
+         }).catch(() => {
+           me.$message({
+             type: 'info',
+             message: '已取消删除'
+           });          
+         });
+ 
+ 
         
-          
-          var send_data = {
-             "id": me.addForm.id,
-              "calf_code": me.addForm.calf_code,
-              "calf_category_id":  me.addForm.calf_category_id,
-              "calf_category_name": me.addForm.calf_category_name,
-              "event_kind":me.addForm.event_kind,
-              "remark": me.addForm.remark,
-              "source": 2,
-              "message": "",
-          }
-          console.log("弹窗参数：", send_data)
-
-          // event_kind 1 称重 2 饲喂 3 粪便情况 4 测量体温 5 测量心跳 6 测量呼吸 7 疾病 8 病愈 9 去角 10 去副乳 11 转栏 12 出栏 13 死亡
-          var event_kind = me.addForm.event_kind
-          if(event_kind == 1){
-            var messageTxt = {
-              "weight":  parseFloat(me.addForm.weight)
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-          if(event_kind == 2){
-            var messageTxt = {
-              "first_class_food_number":  parseFloat(me.addForm.first_class_food_number),
-              "second_class_food_number":  parseFloat(me.addForm.second_class_food_number),
-              "third_class_food_number":  parseFloat(me.addForm.third_class_food_number),
-              "fourth_class_food_number":  parseFloat(me.addForm.fourth_class_food_number),
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 3){
-            var messageTxt = {
-              "fecal_score":  me.addForm.fecal_score  
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 4){
-            var messageTxt = {
-              "temp":   parseFloat(me.addForm.temp)
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 5){
-            var messageTxt = {
-              "heartbeat":  parseFloat(me.addForm.heartbeat)
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 6){
-            var messageTxt = {
-              "breathe":  parseFloat(me.addForm.breathe)
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 7){
-            var messageTxt = {
-              "diseased_type":  me.addForm.diseased_type,
-              "medication":  me.addForm.medication,
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          if(event_kind == 11){
-            var messageTxt = {
-              "original_barn_id":   parseFloat(me.addForm.original_barn_id),
-              "original_barn_name":  me.addForm.original_barn_name,
-              "new_barn_id":   parseFloat(me.addForm.new_barn_id),
-              "new_barn_string":  me.addForm.new_barn_string,
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
-          
-          if(event_kind == 13){
-            var messageTxt = {
-              "reason":  me.addForm.reason
-            }
-            send_data.message = JSON.stringify(messageTxt)
-          }
-
+     },
+ 
+  
+     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 = [
+         {
+             tHeader: ['表头1', '表头2', '表头3', '表头4',],
+             filterVal: ['title1', 'title2', 'title3', 'title4'],
+             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')
+ }
+ 
       
-          //关闭弹窗
-          // me.addFormShow = false
-         //加载 - 发送新增保存
-         ajaxDataPut(me.url_edit_table, send_data).then(e => {
-                console.log("编辑结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
-                  //关闭弹窗
-                  me.addFormShow = false
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
-                }
-            })
-         
-        }
-      })
-    },
-
-
-    
-    
-
-
-
-    form_delete(row) {
-      var me = this
-
-       me.$confirm('是否删除此条内容?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-            console.log("删除的ID参数：", row.id)
-            //加载 - 发送新增保存
-            ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
-                console.log("编辑结果：",e)
-                //打印请求成功结果
-                if(e.code == 200  ){
-                  me.$message({ type: 'success',  message: '删除成功!'  });
-                  me.get_table_data()
-                } else {
-                  me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
-                }
-            })
-
-        
  
-          
-        }).catch(() => {
-          me.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-
-
-       
-    },
-
- 
-    form_export() {
-    //获取请求表格数据的参数
-    //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 = [
-        {
-            tHeader: ['表头1', '表头2', '表头3', '表头4',],
-            filterVal: ['title1', 'title2', 'title3', 'title4'],
-            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')
-}
-
-     
-
-  }
-}
-</script>
-<!-- 加了scoped，则是仅在此组件里生效 -->
-<style scoped>
-
-</style>
+   }
+ }
+ </script>
+ <!-- 加了scoped，则是仅在此组件里生效 -->
+ <style scoped>
+ 
+ </style>
+ 

src/views/cowManagement/EventRecord10.vue → src/views/cowManagement/EventRecord100.vue

@@ -1,5 +1,5 @@
 <template>
- 
+ <!-- 100 -->
   <div>
 
 
@@ -92,7 +92,7 @@
         <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
              <!-- 修改按钮 -->
-             <el-button type="primary" v-if="isButtonEdit" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
+             <el-button type="primary" v-if="isButtonEdit" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">编辑</el-button>
              <!-- 删除按钮 -->
              <el-button type="danger" v-if="isButtonEdit" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
           </template>

src/views/cowManagement/EventRecord11.vue → src/views/cowManagement/EventRecord102.vue

@@ -1,5 +1,5 @@
 <template>
- 
+ <!-- 102 -->
   <div>
 
 
@@ -833,7 +833,7 @@ export default {
           //关闭弹窗
           // me.addFormShow = false
          //加载 - 发送新增保存
-         ajaxDataPut(me.url_edit_table, send_data).then(e => {
+          ajaxDataPut(me.url_edit_table, send_data).then(e => {
                 console.log("编辑结果：",e)
                 //打印请求成功结果
                 if(e.code == 200  ){
@@ -844,7 +844,7 @@ export default {
                 } else {
                   me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
                 }
-            })
+          })
          
         }
       })

src/views/dataStatistics/DiseaseSituation11.vue → src/views/dataStatistics/DiseaseSituation102.vue

@@ -38,7 +38,7 @@
 
       <!-- 表格 -->
       <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
-        <el-table-column label="日期"  width="50px" align="center">
+        <el-table-column label="日期"  width="250px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.date_month }}</span>
           </template>
@@ -55,7 +55,7 @@
         </el-table-column>  
         <el-table-column label="治愈率" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.number }}</span>
+            <span>{{ scope.row.recover_ratio }}</span>
           </template>
         </el-table-column>  
         

src/views/formulaPlan/FormulaTemplate.vue

@@ -1,5 +1,5 @@
 <template>
-
+<!-- 100 -->
   <div>
 
 

src/views/formulaPlan/FormulaTemplate10.vue → src/views/formulaPlan/FormulaTemplate100.vue

@@ -1,5 +1,5 @@
 <template>
-
+<!-- 100 -->
   <div>
 
 

src/views/formulaPlan/FormulaTemplate11.vue → src/views/formulaPlan/FormulaTemplate102.vue

@@ -1,5 +1,5 @@
 <template>
-
+<!-- 102 -->
   <div>