更新

pages/landDetail/results.vue

@@ -99,6 +99,119 @@
           </u-form-item>
       	</view>
       </u--form>
+      <u--form labelWidth='130' :model="item"  ref="form" v-if="item.type==1">
+      	<view class="c-title">消毒信息</view>
+      	<view class="c-box">
+      		<u-form-item label="消毒剂名称" borderBottom>
+      			<up-input  readonly 
+      				border="none" v-model="item.disinfectant_name"></up-input>
+      		</u-form-item>
+      		<u-form-item label="消毒剂浓度" borderBottom>
+      			<up-input  readonly 
+      				border="none" v-model="item.concentration"></up-input>
+      		</u-form-item>
+          <u-form-item label="消毒方法" borderBottom>
+          	<up-input  readonly 
+          		border="none" v-model="item.disinfectant_method"></up-input>
+          </u-form-item>
+          <u-form-item label="消毒区域" borderBottom>
+          	<up-input  readonly 
+          		border="none" v-model="item.disinfectant_area"></up-input>
+          </u-form-item>
+          <u-form-item label="消毒人员" borderBottom >
+          	<up-input  readonly 
+          		border="none" v-model="item.operator"></up-input>
+          </u-form-item>
+          <u-form-item label="消毒时间" borderBottom >
+          	<up-input readonly
+          		border="none" v-model="item.create_time"></up-input>
+          </u-form-item>
+          <swiper class="swiper" autoplay indicator-dots indicator-active-color="#ffb049" indicator-color="rgba(255,255,255,0.4)">
+            <swiper-item class="swiper-item" v-for="(item, index) in item.pic" :key="index">
+              <image class="img" :src="item"></image>
+            </swiper-item>
+          </swiper>
+          <u-form-item label="备注" borderBottom >
+          	<view class="">
+          	  {{item.remark}}
+          	</view>
+          </u-form-item>
+      	</view>
+      </u--form>
+      <u--form labelWidth='130' :model="item"  ref="form" v-if="item.type==4">
+      	<view class="c-title">疫苗信息</view>
+      	<view class="c-box">
+      		<u-form-item label="疫苗名称" borderBottom>
+      			<up-input  readonly
+      				border="none" v-model="item.vaccine_name"></up-input>
+      		</u-form-item>
+      		<u-form-item label="疫苗厂家" borderBottom>
+      			<up-input  readonly 
+      				border="none" v-model="item.vaccine_manufacturers"></up-input>
+      		</u-form-item>
+          <u-form-item label="疫苗批次号" borderBottom>
+          	<up-input  readonly 
+          		border="none" v-model="item.vaccine_batch"></up-input>
+          </u-form-item>
+          <u-form-item label="接种方式" borderBottom >
+          	<up-input  readonly 
+          		border="none" v-model="item.vaccination_method"></up-input>
+          </u-form-item>
+          <u-form-item label="接种部位" borderBottom>
+          	<up-input  readonly 
+          		border="none" v-model="item.vaccination_site"></up-input>
+          </u-form-item>
+          <u-form-item label="免疫有限期" borderBottom >
+          	<up-input   readonly
+          		border="none" v-model="item.immune_validity_period"></up-input>
+          </u-form-item>
+          <u-form-item label="注射人员" borderBottom >
+          	<up-input   readonly
+          		border="none" v-model="item.operator"></up-input>
+          </u-form-item>
+          <u-form-item label="接种时间" borderBottom >
+          	<up-input   readonly
+          		border="none" v-model="item.create_time"></up-input>
+          </u-form-item>
+          <swiper class="swiper" autoplay indicator-dots indicator-active-color="#ffb049" indicator-color="rgba(255,255,255,0.4)">
+            <swiper-item class="swiper-item" v-for="(item, index) in item.pic" :key="index">
+              <image class="img" :src="item"></image>
+            </swiper-item>
+          </swiper>
+          <u-form-item label="备注" borderBottom >
+          	<view class="">
+          	  {{item.remark}}
+          	</view>
+          </u-form-item>
+      	</view>
+      </u--form>
+      <u--form labelWidth='130' :model="item"  ref="form" v-if="item.type==5">
+      	<view class="c-title">喂水信息</view>
+      	<view class="c-box">
+      		<u-form-item label="喂水量(L)" borderBottom>
+      			<up-input  readonly
+      				border="none" v-model="item.water_consumption"></up-input>
+      		</u-form-item>
+          <u-form-item label="喂水人员" borderBottom >
+          	<up-input  readonly
+          		border="none" v-model="item.operator"></up-input>
+          </u-form-item>
+          <u-form-item label="喂水时间" borderBottom >
+          	<up-input  readonly
+          		border="none" v-model="item.create_time"></up-input>
+          </u-form-item>
+          <swiper class="swiper" autoplay indicator-dots indicator-active-color="#ffb049" indicator-color="rgba(255,255,255,0.4)">
+            <swiper-item class="swiper-item" v-for="(item, index) in item.pic" :key="index">
+              <image class="img" :src="item"></image>
+            </swiper-item>
+          </swiper>
+          <u-form-item label="备注" borderBottom >
+          	<view class="">
+          	  {{item.remark}}
+          	</view>
+          </u-form-item>
+      	</view>
+      </u--form>
     </view>
 
 
@@ -115,7 +228,8 @@
   } from "@/api/dict.js"
 	import {
 		onLoad,
-		onReady
+		onReady,
+    onReachBottom
 	} from "@dcloudio/uni-app"
   import {
     fenceHouseDetail,
@@ -137,6 +251,10 @@
 		getFenceHouseDetail();
     getSuYuanData();
 	})
+  onReachBottom(()=>{
+    where.value.page_no++;
+    getSuYuanData();
+  })
 
 	//获取详情
 	const getFenceHouseDetail = () => {

pages/plantAdmin/breedDetail.vue

@@ -141,7 +141,8 @@
   const feedList = ref([])
   const initOperationLogIndex = ()=>{
     operationLogIndex({
-      fence_house_id: typeID.value
+      fence_house_id: houseID.value,
+      animal_info_id: typeID.value
     }).then(res=>{
       res.data = res.data.map(item=>{
         item = {