Shan9312 8 tháng trước cách đây
mục cha
commit
b71dc00f02

+ 1 - 1
src/pages.json

@@ -72,7 +72,7 @@
       "path": "pages/approach/approach",
       "type": "page",
       "style": {
-        "navigationBarTitleText": "场录入"
+        "navigationBarTitleText": "场录入"
       }
     },
     {

+ 5 - 5
src/pages/approach/approach.vue

@@ -1,13 +1,13 @@
 <route lang="json5" type="page">
 {
-  style: { navigationBarTitleText: '场录入' },
+  style: { navigationBarTitleText: '场录入' },
 }
 </route>
 
 <template>
   <view class="container">
     <wd-form ref="form" :model="model" class="px-2">
-      <wd-cell-group custom-class="group" title="场信息" border>
+      <wd-cell-group custom-class="group" title="场信息" border>
         <wd-input
           prop="earTag"
           clearable
@@ -65,7 +65,7 @@
           placeholder="请选择品种"
         />
 
-        <wd-cell title="场方式" title-width="100px" prop="value1" right required>
+        <wd-cell title="场方式" title-width="100px" prop="value1" right required>
           <view style="text-align: left">
             <wd-radio-group v-model="model.type" shape="button" @change="change">
               <wd-radio :value="1">购入</wd-radio>
@@ -74,7 +74,7 @@
             </wd-radio-group>
           </view>
         </wd-cell>
-        <wd-cell title="场体重" title-width="100px" prop="value1" right required>
+        <wd-cell title="场体重" title-width="100px" prop="value1" right required>
           <view style="text-align: left">
             <wd-input-number
               v-model="model.weight"
@@ -112,7 +112,7 @@
           placeholder="请选择牛群类型"
         />
         <wd-calendar
-          label="场时间"
+          label="场时间"
           prop="date"
           label-width="100px"
           type="datetime"

+ 181 - 11
src/pages/index/components/works.vue

@@ -31,23 +31,31 @@
           :throttle="false"
         >
           <wd-cell :title="item.title" value="待办事件" class="title-border"></wd-cell>
+          <!-- 页面展示 -->
           <view v-show="item.title == activeTitle">
             <view v-if="activeTitle == item.label">
               <view class="card" v-for="(child, index) in item.children" :key="index">
                 <!-- 诊断 -->
-                <view v-if="item.label == '诊断'">
+                <view v-if="activeTitle == '诊断'">
                   <view class="card-not" :style="{ backgroundColor: getColor(item.title) }">
                     {{ item.title }}
                   </view>
-                  <text class="cattle-num mb-2">牛号: 23874166</text>
-                  <wd-row>
+                  <wd-row class="mb-1">
+                    <wd-col :span="12">
+                      <view class="cattle-num">
+                        牛号:
+                        <text>23874166</text>
+                      </view>
+                    </wd-col>
                     <wd-col :span="12">
                       <view>
                         栏舍:
-                        <text>5A-1001</text>
+                        <text>1A-01</text>
                       </view>
                     </wd-col>
-                    <wd-col :span="12">
+                  </wd-row>
+                  <wd-row class="mb-1">
+                    <wd-col :span="24">
                       <view>
                         备注:
                         <text>12</text>
@@ -55,27 +63,189 @@
                     </wd-col>
                   </wd-row>
                 </view>
+
                 <!-- 治疗 -->
-                <view v-if="item.label == '治疗'">
+                <view v-if="activeTitle == '治疗'">
                   <view class="card-not" :style="{ backgroundColor: getColor(item.title) }">
                     {{ item.title }}
                   </view>
-                  <text class="cattle-num mb-2">牛号: 23874166</text>
-                  <wd-row>
+                  <wd-row class="mb-1">
+                    <wd-col :span="12">
+                      <view class="cattle-num">
+                        牛号:
+                        <text>23874166</text>
+                      </view>
+                    </wd-col>
                     <wd-col :span="12">
                       <view>
                         栏舍:
-                        <text>5A-1001</text>
+                        <text>1A-01</text>
                       </view>
                     </wd-col>
-                    <wd-col :span="12">
+                  </wd-row>
+                  <wd-row class="mb-1">
+                    <wd-col :span="24">
                       <view>
-                        备注:
+                        发病时间:
+                        <text>2024-05-01</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                  <wd-row class="mb-1">
+                    <wd-col :span="24">
+                      <view>
+                        治疗结果:
                         <text>12</text>
                       </view>
                     </wd-col>
                   </wd-row>
                 </view>
+
+                <!-- 免疫 -->
+                <view v-if="activeTitle == '免疫'">
+                  <view class="card-not" :style="{ backgroundColor: getColor(item.title) }">
+                    {{ item.title }}
+                  </view>
+                  <wd-row class="mt-1">
+                    <wd-col :span="12">
+                      <view class="cattle-num">
+                        栏舍:
+                        <text>1A-1111</text>
+                      </view>
+                    </wd-col>
+                    <wd-col :span="12">
+                      <view>
+                        牛头数:
+                        <text>130头</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                  <wd-row class="mt-1">
+                    <wd-col :span="24">
+                      <view>
+                        免疫类型:
+                        <text>CCCC AAAA</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                  <wd-row class="mt-1">
+                    <wd-col :span="24">
+                      <view>
+                        免疫日期:
+                        <text>2024-08-23</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                </view>
+
+                <!-- 驱虫 -->
+                <view v-if="activeTitle == '驱虫'">
+                  <view class="card-not" :style="{ backgroundColor: getColor(item.title) }">
+                    {{ item.title }}
+                  </view>
+                  <wd-row class="mt-1">
+                    <wd-col :span="12">
+                      <view class="cattle-num">
+                        栏舍:
+                        <text>1A-1111</text>
+                      </view>
+                    </wd-col>
+                    <wd-col :span="12">
+                      <view>
+                        牛头数:
+                        <text>130头</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                  <wd-row class="mt-1">
+                    <wd-col :span="24">
+                      <view>
+                        驱虫方式:
+                        <text>CCCC AAAA</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                  <wd-row class="mt-1">
+                    <wd-col :span="24">
+                      <view>
+                        驱虫日期:
+                        <text>2024-08-23</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                </view>
+
+                <!-- 进场 -->
+                <view v-if="activeTitle == '进场'">
+                  <view class="card-not" :style="{ backgroundColor: getColor(item.title) }">
+                    {{ item.title }}
+                  </view>
+                  <wd-row class="mb-1">
+                    <wd-col :span="12">
+                      <view class="cattle-num">
+                        牛号:
+                        <text>23874166</text>
+                      </view>
+                    </wd-col>
+                    <wd-col :span="12">
+                      <view>
+                        体重 :
+                        <text>200KG</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                  <wd-row class="mb-1">
+                    <wd-col :span="12">
+                      <view>
+                        电子耳标:
+                        <text>10013131</text>
+                      </view>
+                    </wd-col>
+                    <wd-col :span="12">
+                      <view>
+                        类型:
+                        <text>肉牛进场</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                </view>
+
+                <!-- 离场 -->
+                <view v-if="activeTitle == '离场'">
+                  <view class="card-not" :style="{ backgroundColor: getColor(item.title) }">
+                    {{ item.title }}
+                  </view>
+                  <wd-row class="mb-1">
+                    <wd-col :span="12">
+                      <view class="cattle-num">
+                        牛号:
+                        <text>23874166</text>
+                      </view>
+                    </wd-col>
+                    <wd-col :span="12">
+                      <view>
+                        体重 :
+                        <text>200KG</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                  <wd-row class="mb-1">
+                    <wd-col :span="24">
+                      <view>
+                        离场原因:
+                        <text>10013131</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                  <wd-row class="mb-1">
+                    <wd-col :span="24">
+                      <view>
+                        离场时间:
+                        <text>20240809</text>
+                      </view>
+                    </wd-col>
+                  </wd-row>
+                </view>
               </view>
             </view>
           </view>

+ 1 - 1
src/pages/index/index.vue

@@ -21,7 +21,7 @@
     <wd-fab v-model:active="active"></wd-fab>
     <!-- 弹出层导航 -->
     <wd-popup v-model="active" position="right" custom-style="padding:40rpx 20rpx  ;width:90%">
-      <view v-for="(item, index) in navList" :key="item.id">
+      <view v-for="item in navList" :key="item.id">
         <view class="mt-4 mb-4 px-2 title">{{ item.name }}</view>
         <view class="work-box-t flex justify-left flex-row flex-wrap">
           <view class="work-item mb-4 px-2" v-for="(child, index) in item.children" :key="index">

+ 1 - 1
src/pages/index/index2.vue

@@ -78,7 +78,7 @@ const workList = reactive([
   {
     id: '2',
     img: '../../static/images/work/lichang.png',
-    title: '场',
+    title: '场',
     url: '/pages/approach/approach',
   },
   {