From 8cde26a20141d60c07860edf7f55afdf6b237dee Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 25 Dec 2023 10:43:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                  |  10 +++
 pages/jump/jumpDetail.vue   |  10 +--
 pages/leave/addLeave.vue    |  16 +++--
 pages/leave/leave.vue       |   2 +-
 pages/leave/leaveDetail.vue | 128 ++++++++++++++++++++++++++++++++++++
 5 files changed, 152 insertions(+), 14 deletions(-)
 create mode 100644 pages/leave/leaveDetail.vue

diff --git a/pages.json b/pages.json
index da48721..74223c7 100644
--- a/pages.json
+++ b/pages.json
@@ -393,6 +393,16 @@
         "navigationBarTextStyle": "white",
         "enablePullDownRefresh": false
       }
+    },
+    {
+      "path" : "pages/leave/leaveDetail",
+      "style" : 
+      {
+        "navigationBarTitleText": "离栏详情",
+        "navigationBarBackgroundColor": "#feb048",
+        "navigationBarTextStyle": "white",
+        "enablePullDownRefresh": false
+      }
     }
 
 
diff --git a/pages/jump/jumpDetail.vue b/pages/jump/jumpDetail.vue
index a2351c0..4182fa8 100644
--- a/pages/jump/jumpDetail.vue
+++ b/pages/jump/jumpDetail.vue
@@ -8,23 +8,19 @@
 						<up-input  readonly type="txt"
 							border="none" v-model="formData.id"></up-input>
 					</u-form-item>
-					<u-form-item label="所在栏舍" borderBottom>
+					<u-form-item label="转出栏舍" borderBottom>
 						<up-input  readonly 
 							border="none" v-model="formData.lanse"></up-input>
 					</u-form-item>
-					<u-form-item label="离舍类型" borderBottom >
+					<u-form-item label="转入类型" borderBottom >
 						<up-input  readonly 
 							border="none" v-model="formData.type"></up-input>
 					</u-form-item>
-          <u-form-item label="离舍原因" borderBottom >
-          	<up-input  readonly 
-          		border="none" v-model="formData.why"></up-input>
-          </u-form-item>
           <u-form-item label="操作人员" borderBottom >
           	<up-input  readonly
           		border="none" v-model="formData.user"></up-input>
           </u-form-item>
-          <u-form-item label="离舍时间" borderBottom >
+          <u-form-item label="转舍时间" borderBottom >
           	<up-input   readonly
           		border="none" v-model="formData.create_time"></up-input>
           </u-form-item>
diff --git a/pages/leave/addLeave.vue b/pages/leave/addLeave.vue
index 52ab931..d6be695 100644
--- a/pages/leave/addLeave.vue
+++ b/pages/leave/addLeave.vue
@@ -9,19 +9,23 @@
             <up-input input-align="right" placeholder="请输入耳号" :disabled="mode=='detail'" border="none"
               v-model="formData.breed"></up-input>
           </u-form-item>
-          <up-form-item label="转出栏舍" prop="master_name" borderBottom required @click="showFun=true">
-            <up-input input-align="right" placeholder="请选择转出栏舍" border="none" suffixIcon="arrow-down"
+          <up-form-item label="所在栏舍" prop="master_name" borderBottom required @click="showFun=true">
+            <up-input input-align="right" placeholder="请选择所在栏舍" border="none" suffixIcon="arrow-down"
               suffix-icon-style="color: #b6b6b6;" v-model="formData.fun" readonly></up-input>
           </up-form-item>
-          <up-form-item label="转入栏舍" prop="master_name" borderBottom required @click="showPart=true">
-            <up-input input-align="right" placeholder="请选择转入栏舍" border="none" suffixIcon="arrow-down"
+          <up-form-item label="离舍类型" prop="master_name" borderBottom required @click="showPart=true">
+            <up-input input-align="right" placeholder="请选择类型" border="none" suffixIcon="arrow-down"
               suffix-icon-style="color: #b6b6b6;" v-model="formData.part" readonly></up-input>
           </up-form-item>
+          <u-form-item label="离舍原因" prop="start_date" borderBottom required>
+            <up-input input-align="right" placeholder="请输入离舍原因" :disabled="mode=='detail'" border="none"
+              v-model="formData.breed"></up-input>
+          </u-form-item>
           <u-form-item label="操作人员" prop="start_date" borderBottom required>
             <up-input input-align="right" placeholder="请输入操作人员姓名" :disabled="mode=='detail'" border="none"
               v-model="formData.breed"></up-input>
           </u-form-item>
-          <u-form-item label="转舍时间" prop="start_date" @click="openDate" borderBottom required>
+          <u-form-item label="离舍时间" prop="start_date" @click="openDate" borderBottom required>
             <up-input input-align="right" placeholder="请选择时间" suffixIcon="arrow-down"
               suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.start_date"
               style="pointer-events: none;"></up-input>
@@ -41,7 +45,7 @@
     </view>
     <u-action-sheet :show="showFun" keyName="name" closeOnClickOverlay :actions="[{name:'栏舍1'}, {name:'栏舍2'}]" title="请选择接种方式"
        @close="showFun = false" @select="selectFun"></u-action-sheet>
-    <u-action-sheet :show="showPart" keyName="name" closeOnClickOverlay :actions="[{name:'栏舍1'}, {name:'栏舍2'}]" title="请选择接种部位"
+    <u-action-sheet :show="showPart" keyName="name" closeOnClickOverlay :actions="[{name:'转卖'}, {name:'生病'}]" title="请选择接种部位"
        @close="showPart = false" @select="selectPart"></u-action-sheet>
     <u-datetime-picker :show="show1" :max-date="getNowTime()" v-model="value1" mode="datetime" @confirm="dateConfirmfn"
       :formatter="formatter" @cancel="show1=false"></u-datetime-picker>
diff --git a/pages/leave/leave.vue b/pages/leave/leave.vue
index 586842c..9189036 100644
--- a/pages/leave/leave.vue
+++ b/pages/leave/leave.vue
@@ -34,7 +34,7 @@
       <view class="">
         <block class="" v-if="dataList.length>0">
           <view class="thing-card" v-for="(item, index) in dataList" :key="index"
-            @click="navTo('/pages/jump/jumpDetail?id=23')">
+            @click="navTo('/pages/leave/leaveDetail?id=23')">
             <view class="c-title">耳号</view>
             <view class="c-body">
               <view class="c-item">
diff --git a/pages/leave/leaveDetail.vue b/pages/leave/leaveDetail.vue
new file mode 100644
index 0000000..a2351c0
--- /dev/null
+++ b/pages/leave/leaveDetail.vue
@@ -0,0 +1,128 @@
+<template>
+	<view class="content">
+		<view class="card-d">
+			<u--form labelWidth='130' :model="formData" ref="form">
+				<view class="c-title">操作信息</view>
+				<view class="c-box">
+					<u-form-item label="耳号" borderBottom>
+						<up-input  readonly type="txt"
+							border="none" v-model="formData.id"></up-input>
+					</u-form-item>
+					<u-form-item label="所在栏舍" borderBottom>
+						<up-input  readonly 
+							border="none" v-model="formData.lanse"></up-input>
+					</u-form-item>
+					<u-form-item label="离舍类型" borderBottom >
+						<up-input  readonly 
+							border="none" v-model="formData.type"></up-input>
+					</u-form-item>
+          <u-form-item label="离舍原因" borderBottom >
+          	<up-input  readonly 
+          		border="none" v-model="formData.why"></up-input>
+          </u-form-item>
+          <u-form-item label="操作人员" borderBottom >
+          	<up-input  readonly
+          		border="none" v-model="formData.user"></up-input>
+          </u-form-item>
+          <u-form-item label="离舍时间" borderBottom >
+          	<up-input   readonly
+          		border="none" v-model="formData.create_time"></up-input>
+          </u-form-item>
+          <u-form-item label="备注" borderBottom >
+          	<up-input   readonly
+          		border="none" v-model="formData.notes"></up-input>
+          </u-form-item>
+				</view>
+			</u--form>
+		</view>
+	</view>
+
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref
+	} from "vue";
+	import {
+		onLoad,
+		onReady
+	} from "@dcloudio/uni-app"
+
+	const formData = reactive({
+		id: "23",
+		lanse: "栏舍一号",
+		type: "生病",
+    why: "去治疗",
+		user: "张某某",
+    create_time: "2023-12-22"
+	})
+	
+</script>
+
+<style lang='scss' scoped>
+	page {
+		background-color: #fffcf5;
+	}
+
+	.card-d {
+		background-color: #fffcf5;
+
+		.c-title {
+			font-weight: bold;
+			display: flex;
+			align-items: center;
+			padding: 30rpx;
+			padding-bottom: 15rpx;
+
+			&:before {
+				content: '';
+				display: inline-block;
+				height: 0.8rem;
+				width: 6rpx;
+				margin-top: 0.2rem;
+				margin-right: 10rpx;
+				background-color: #feb048;
+				border-radius: 6rpx;
+			}
+		}
+
+		.c-box {
+			background-color: #fff;
+			padding: 20rpx;
+      margin: 28rpx;
+      margin-top: 0;
+      border-radius: 14rpx;
+			box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.1);
+		}
+
+		.c-box-p {
+			padding: 20rpx;
+		}
+
+		.btn {
+			margin: 20rpx auto;
+			width: 694rpx;
+			height: 80rpx;
+			border-radius: 80rpx;
+			background-color: #feb048;
+			color: #fff;
+		}
+	}
+  
+  .swiper{
+    width: 654rpx;
+    height: 400rpx;
+    margin: 20rpx 0;
+    border-radius: 14rpx;
+    overflow: hidden;
+    .img{
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  :deep(.u-form-item__body){
+    padding: 5rpx 0 !important;
+  }
+</style>
\ No newline at end of file