事件模块

src/pages.json

@@ -51,7 +51,7 @@
   },
   "pages": [
     {
-      "path": "pages/my/my",
+      "path": "pages/index/index",
       "type": "home",
       "style": {
         "navigationStyle": "custom",
@@ -59,7 +59,7 @@
       }
     },
     {
-      "path": "pages/index/index",
+      "path": "pages/my/my",
       "type": "home",
       "style": {
         "navigationStyle": "custom",
@@ -77,7 +77,7 @@
       "path": "pages/approach/approach",
       "type": "page",
       "style": {
-        "navigationBarTitleText": "入场"
+        "navigationBarTitleText": "入场录入"
       }
     },
     {
@@ -164,6 +164,20 @@
         "navigationBarTitleText": "服务条款"
       }
     },
+    {
+      "path": "pages/untyNeckRing/untyNeckRing",
+      "type": "page",
+      "style": {
+        "navigationBarTitleText": "脖环解绑"
+      }
+    },
+    {
+      "path": "pages/weight/weight",
+      "type": "page",
+      "style": {
+        "navigationBarTitleText": "称重录入"
+      }
+    },
     {
       "path": "pages/workAll/workAll",
       "type": "page",

src/pages/approach/approach.vue

@@ -1,13 +1,13 @@
 <route lang="json5" type="page">
 {
-  style: { navigationBarTitleText: '入场' },
+  style: { navigationBarTitleText: '入场录入' },
 }
 </route>
 
 <template>
-  <view class="container center">
-    <wd-form ref="form" :model="model" class="px-1">
-      <wd-cell-group custom-class="group" title="肉牛进场" border>
+  <view class="container">
+    <wd-form ref="form" :model="model" class="px-2">
+      <wd-cell-group custom-class="group" title="入场信息" border>
         <wd-input
           prop="earTag"
           clearable
@@ -144,8 +144,9 @@
           auto-height
         />
       </wd-cell-group>
-      <view class="footer mx-4 mt-10">
-        <wd-button type="primary" size="large" @click="handleSubmit" block>提交</wd-button>
+      <view class="footer mt-5 center">
+        <wd-button type="info" size="medium" class="mr-4" @click="goBack">取消</wd-button>
+        <wd-button type="primary" size="medium" @click="handleSubmit">提交</wd-button>
       </view>
     </wd-form>
   </view>
@@ -153,8 +154,6 @@
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
-import QQMapWX from '../../utils/qqmap-wx-jssdk.min.js'
-var qqmapsdk
 
 defineOptions({
   name: 'neckRing',
@@ -189,13 +188,16 @@ const maxDate = ref(today)
 const disableFutureDates = (date: Date) => {
   return date > today
 }
+
+// 取消返回上一级
+function goBack() {
+  uni.navigateBack({
+    delta: 1,
+  })
+}
+
 // 品种选择
 const columns = ref(['选项1', '选项2', '选项3', '选项4', '选项5', '选项6', '选项7'])
-const fileList = ref<any[]>([
-  {
-    url: 'https://img12.360buyimg.com//n0/jfs/t1/29118/6/4823/55969/5c35c16bE7c262192/c9fdecec4b419355.jpg',
-  },
-])
 
 function handleConfirm({ value }) {
   value.value = value
@@ -204,7 +206,11 @@ function handleConfirm({ value }) {
 // 图片上传
 const action: string =
   'https://mockapi.eolink.com/zhTuw2P8c29bc981a741931bdd86eb04dc1e8fd64865cb5/upload'
-
+const fileList = ref<any[]>([
+  {
+    url: 'https://img12.360buyimg.com//n0/jfs/t1/29118/6/4823/55969/5c35c16bE7c262192/c9fdecec4b419355.jpg',
+  },
+])
 function handleUpload({ fileList: files }) {
   fileList.value = files
 }

src/pages/index/index.vue

@@ -92,7 +92,13 @@ const workList = reactive([
     id: 1,
     img: '../../static/images/work/weight.png',
     title: '称重登记',
-    url: '',
+    url: '/pages/weight/weight',
+  },
+  {
+    id: 5,
+    img: '../../static/images/work/bohuan1.png',
+    title: '脖环解绑',
+    url: '/pages/untyNeckRing/untyNeckRing',
   },
   {
     id: 2,
@@ -112,12 +118,7 @@ const workList = reactive([
     title: '流产登记',
     url: '',
   },
-  {
-    id: 5,
-    img: '../../static/images/work/bohuan1.png',
-    title: '脖环制定',
-    url: '',
-  },
+
   {
     id: 6,
     img: '../../static/images/work/result.png',

src/pages/neckRing/neckRing.vue

@@ -5,8 +5,8 @@
 </route>
 
 <template>
-  <view class="container px-2">
-    <wd-form ref="form" :model="model">
+  <view class="container">
+    <wd-form ref="form" :model="model" class="px-2">
       <wd-cell-group border custom-class="group" title="绑定信息">
         <wd-input
           label="牛号"
@@ -26,14 +26,7 @@
           placeholder="请输入脖环号"
           required
         />
-        <!-- <wd-cell title="脖环号" title-width="100px" prop="value1" center required>
-          <view style="text-align: left">
-            <wd-radio-group v-model="model.value1" inline shape="dot" prop="value2">
-              <wd-radio value="1">绑定</wd-radio>
-              <wd-radio value="2">解绑</wd-radio>
-            </wd-radio-group>
-          </view>
-        </wd-cell> -->
+
         <wd-calendar
           label="绑定时间"
           prop="date"
@@ -57,8 +50,9 @@
           auto-height
         />
       </wd-cell-group>
-      <view class="footer mx-4 mt-6">
-        <wd-button type="primary" size="large" @click="handleSubmit" block>提交</wd-button>
+      <view class="footer mt-5 pb-20 center">
+        <wd-button type="info" size="medium" class="mr-4" @click="goBack">取消</wd-button>
+        <wd-button type="primary" size="medium" @click="handleSubmit">提交</wd-button>
       </view>
     </wd-form>
   </view>

src/pages/purchase/purchase.vue

@@ -5,8 +5,8 @@
 </route>
 
 <template>
-  <view class="container center">
-    <wd-form ref="form" :model="model" class="px-1">
+  <view class="container">
+    <wd-form ref="form" :model="model" class="px-2">
       <wd-cell-group custom-class="group" title="采购" border>
         <wd-input
           prop="earTag"
@@ -83,8 +83,9 @@
           v-model="location"
         />
       </wd-cell-group>
-      <view class="footer mx-4 mt-10">
-        <wd-button type="primary" size="large" @click="handleSubmit" block>提交</wd-button>
+      <view class="footer mt-5 center">
+        <wd-button type="info" size="medium" class="mr-4" @click="goBack">取消</wd-button>
+        <wd-button type="primary" size="medium" @click="handleSubmit">提交</wd-button>
       </view>
     </wd-form>
   </view>
@@ -118,6 +119,13 @@ const model = reactive<{
   remark: '',
 })
 
+// 取消返回上一级
+function goBack() {
+  uni.navigateBack({
+    delta: 1,
+  })
+}
+
 // 日期选择器
 const today = new Date()
 const minDate = ref(new Date(2000, 0, 1)) // 可选择的最早日期

src/pages/untyNeckRing/untyNeckRing.vue

@@ -0,0 +1,112 @@
+<route lang="json5" type="page">
+{
+  style: { navigationBarTitleText: '脖环解绑' },
+}
+</route>
+
+<template>
+  <view class="container">
+    <wd-form ref="form" :model="model" class="px-2">
+      <wd-cell-group border custom-class="group" title="解绑信息">
+        <wd-input
+          label="牛号"
+          label-width="100px"
+          prop="value2"
+          clearable
+          v-model="model.value2"
+          placeholder="请输入牛号"
+          required
+        />
+
+        <wd-calendar
+          label="解绑时间"
+          prop="date"
+          label-width="100px"
+          type="datetime"
+          hide-second
+          v-model="model.date"
+          :min-date="minDate"
+          :max-date="maxDate"
+          :disabled-date="disableFutureDates"
+        />
+        <wd-picker
+          :columns="columns"
+          label="解绑原因"
+          v-model="model.value1"
+          @confirm="handleConfirm"
+          placeholder="请选择解绑原因"
+        />
+        <wd-textarea
+          label="备注信息"
+          label-width="100px"
+          v-model="model.remark"
+          :maxlength="200"
+          clearable
+          show-word-limit
+          placeholder="请输入备注"
+          auto-height
+        />
+      </wd-cell-group>
+      <view class="footer mt-5 pb-20 center">
+        <wd-button type="info" size="medium" class="mr-4" @click="goBack">取消</wd-button>
+        <wd-button type="primary" size="medium" @click="handleSubmit">提交</wd-button>
+      </view>
+    </wd-form>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+
+defineOptions({
+  name: 'neckRing',
+})
+// 品种选择
+const columns = ref(['选项1', '选项2', '选项3', '选项4', '选项5', '选项6', '选项7'])
+
+function handleConfirm({ value }) {
+  value.value = value
+}
+
+// 日期选择器
+const today = new Date()
+const minDate = ref(new Date(2000, 0, 1)) // 可选择的最早日期
+const maxDate = ref(today)
+
+const disableFutureDates = (date: Date) => {
+  return date > today
+}
+
+const model = reactive<{
+  value1: string
+  value2: string
+  date: number
+}>({
+  value1: '',
+  value2: '',
+  date: Date.now(),
+})
+
+const form = ref()
+
+function handleSubmit() {
+  form.value
+    .validate()
+    .then(({ valid, errors }) => {
+      if (valid) {
+        // showSuccess({
+        //   msg: '校验通过',
+        // })
+      }
+    })
+    .catch((error) => {
+      console.log(error, 'error')
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  background: #fff;
+}
+</style>

src/pages/weight/weight.vue

@@ -0,0 +1,143 @@
+<route lang="json5" type="page">
+{
+  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-input
+          label="牛号"
+          label-width="100px"
+          prop="earTag"
+          clearable
+          v-model="model.earTag"
+          placeholder="请输入牛号"
+          required
+        />
+
+        <wd-cell title="体重" title-width="100px" prop="value1" right required>
+          <view style="text-align: left">
+            <wd-input-number
+              v-model="model.weight"
+              @change="handleChange"
+              :precision="2"
+              :step="0.1"
+            />
+            <text class="pl-2 mt-2">KG</text>
+          </view>
+        </wd-cell>
+        <wd-input
+          label="体高"
+          label-width="100px"
+          prop="earTag"
+          clearable
+          required
+          v-model="model.earTag"
+          placeholder="请输入价格"
+        />
+        <!-- <wd-input label="操作人" label-width="100px" prop="value2" disabled v-model="model.user" /> -->
+        <wd-calendar
+          label="称重时间"
+          prop="date"
+          label-width="100px"
+          type="datetime"
+          hide-second
+          v-model="model.date"
+          :min-date="minDate"
+          :max-date="maxDate"
+          :disabled-date="disableFutureDates"
+          required
+        />
+
+        <wd-textarea
+          label="备注信息"
+          label-width="100px"
+          v-model="model.remark"
+          :maxlength="200"
+          clearable
+          show-word-limit
+          placeholder="请输入备注"
+          auto-height
+        />
+      </wd-cell-group>
+      <view class="footer mt-5 pb-10 center">
+        <wd-button type="info" size="medium" class="mr-4" @click="goBack">取消</wd-button>
+        <wd-button type="primary" size="medium" @click="handleSubmit">提交</wd-button>
+      </view>
+    </wd-form>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+
+defineOptions({
+  name: 'neckRing',
+})
+
+// form信息
+const model = reactive<{
+  value1: string
+  value2: string
+  date: number
+  earTag: string | null
+  user: string
+  weight: string
+  remark: string
+}>({
+  value1: '',
+  value2: '',
+  date: Date.now(),
+  earTag: '',
+  user: 'hss',
+  weight: '321.2',
+  remark: '',
+})
+
+// 取消返回上一级
+function goBack() {
+  uni.navigateBack({
+    delta: 1,
+  })
+}
+
+// 日期选择器
+const today = new Date()
+const minDate = ref(new Date(2000, 0, 1)) // 可选择的最早日期
+const maxDate = ref(today)
+
+const disableFutureDates = (date: Date) => {
+  return date > today
+}
+
+const form = ref()
+
+function handleChange({ value }) {
+  // console.log(value)
+}
+
+function handleSubmit() {
+  form.value
+    .validate()
+    .then(({ valid, errors }) => {
+      if (valid) {
+        // showSuccess({
+        //   msg: '校验通过',
+        // })
+      }
+    })
+    .catch((error) => {
+      console.log(error, 'error')
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding-bottom: 10rem;
+  background: #fff;
+}
+</style>

src/types/uni-pages.d.ts

@@ -4,10 +4,9 @@
 // Generated by vite-plugin-uni-pages
 
 interface NavigateToOptions {
-  url: 
-       "/pages/index/index" |
-       "/pages/about/about" |
+  url:  "/pages/index/index" |
        "/pages/my/my" |
+       "/pages/about/about" |
        "/pages/approach/approach" |
        "/pages/battleForm/battleForm" |
        "/pages/editPassword/editPassword" |
@@ -21,6 +20,8 @@ interface NavigateToOptions {
        "/pages/searchDetail/searchDetail" |
        "/pages/serch/serch" |
        "/pages/serviceText/serviceText" |
+       "/pages/untyNeckRing/untyNeckRing" |
+       "/pages/weight/weight" |
        "/pages/workAll/workAll" |
        "/pages/login/component/weixin";
 }