From 19a9486f48e6467578f40a81752c466557f84187 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 27 Dec 2024 12:12:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(xumu):=20=E6=96=B0=E5=A2=9E=E5=85=8D?=
 =?UTF-8?q?=E7=96=AB=E7=99=BB=E8=AE=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加免疫登记管理页面登记的新增、编辑和删除功能
- 集成耳标和相关组件
- 实现免疫号选择器组件
- 优化称重管理功能，修复相关问题
---
 .../AppImmunityManage/AppImmunityManage.vue   |  35 +++
 project/xumu/AppImmunityManage/add.vue        | 200 ++++++++++++++++++
 project/xumu/AppImmunityManage/list.vue       | 106 ++++++++++
 project/xumu/AppWeightManage/add.vue          |   3 +-
 project/xumu/AppWeightManage/list.vue         |   2 +-
 project/xumu/components/AiEartagPicker.vue    |  80 +++++++
 ui/packages/basic/AiInput.vue                 |  26 +++
 7 files changed, 450 insertions(+), 2 deletions(-)
 create mode 100644 project/xumu/AppImmunityManage/AppImmunityManage.vue
 create mode 100644 project/xumu/AppImmunityManage/add.vue
 create mode 100644 project/xumu/AppImmunityManage/list.vue
 create mode 100644 project/xumu/components/AiEartagPicker.vue
 create mode 100644 ui/packages/basic/AiInput.vue

diff --git a/project/xumu/AppImmunityManage/AppImmunityManage.vue b/project/xumu/AppImmunityManage/AppImmunityManage.vue
new file mode 100644
index 00000000..862f4c95
--- /dev/null
+++ b/project/xumu/AppImmunityManage/AppImmunityManage.vue
@@ -0,0 +1,35 @@
+<script>
+import add from "./add.vue";
+import list from "./list.vue";
+
+export default {
+  name: "AppImmunityManage",
+  label: "免疫登记",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentPage() {
+      let {hash} = this.$route
+      return hash == "#add" ? add : list
+    }
+  },
+  data() {
+    return {}
+  }
+}
+</script>
+
+<template>
+  <section class="AppImmunityManage">
+    <component :is="currentPage" v-bind="$props"/>
+  </section>
+</template>
+
+<style scoped lang="scss">
+.AppImmunityManage {
+  height: 100%;
+}
+</style>
diff --git a/project/xumu/AppImmunityManage/add.vue b/project/xumu/AppImmunityManage/add.vue
new file mode 100644
index 00000000..7a1f616f
--- /dev/null
+++ b/project/xumu/AppImmunityManage/add.vue
@@ -0,0 +1,200 @@
+<script>
+import {mapState} from "vuex"
+import AiEartagPicker from "../components/AiEartagPicker.vue";
+
+const columns = [
+  {label: "序号", type: "index"},
+  {label: "疫苗名称", prop: "vaccineName"},
+  {label: "用药方式", prop: "method"},
+  {label: "药量", prop: "dosage"},
+  {label: "生产厂家", prop: "factory"},
+  {label: "厂家批号", prop: "batchNumber"},
+  {label: "免疫时间", prop: "immunityTime"},
+  {label: "登记时间", prop: "createTime"},
+  {label: "防疫员", prop: "userName"},
+]
+export default {
+  name: "immunityAdd",
+  components: {AiEartagPicker},
+  props: {
+    instance: Function,
+    permissions: Function,
+    dict: Object
+  },
+  data() {
+    return {
+      detail: {detailList: []},
+      columns,
+      dialog: false,
+      form: {}
+    }
+  },
+  computed: {
+    ...mapState(["user"]),
+    userinfo: v => v.user.info || {},
+    isAdd: v => !v.$route.query.id,
+    pageTitle: v => {
+      const appName = v.$parent.menuName || v.$parent.$options.label
+      return v.$route.query.id ? v.isEdit ? `编辑${appName}` : `${appName}详情` : `新增${appName}`
+    },
+  },
+  methods: {
+    back(params = {}) {
+      this.$router.push(params)
+    },
+    getDetail() {
+      const {id} = this.$route.query
+      return id && this.instance.post("/api/breed/immunity/getInfo", null, {params: {biochipEarNumber: id}}).then(res => {
+        if (res?.data) {
+          const detail = res.data
+          detail.detailList = detail.immunityList || []
+          return this.detail = {...detail}
+        }
+      })
+    },
+    handleDelete(id) {
+      this.$confirm("确定删除该条数据？").then(() => {
+        this.instance.post("/api/breed/immunity/del", null, {
+          params: {id}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.getDetail()
+          }
+        })
+      })
+    },
+    handleAdd() {
+      this.$refs.detail.validate().then(() => {
+        this.instance.post("/api/breed/immunity/add", this.detail).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("新增成功!")
+            this.back()
+          }
+        })
+      })
+    },
+    submit() {
+      this.$refs.detail.validate().then(() => {
+        this.instance.post("/api/breed/immunity/update", this.form).then(res => {
+          if (res?.code == 0) {
+            this.dialog = false
+            this.getDetail()
+          }
+        })
+      })
+    }
+  },
+  created() {
+    this.dict.load("yesOrNo", "category", "variety", "source")
+    this.getDetail()
+  }
+}
+</script>
+
+<template>
+  <ai-page :title="pageTitle" class="immunityAdd" showBack content-string="blank">
+    <el-form size="small" label-width="120px" :model="detail" ref="detail">
+      <ai-card title="基础信息">
+        <div class="grid c-3" v-if="isAdd">
+          <el-form-item label="养殖场" prop="farmId" :rules="{required:true,message:'请选择 养殖场'}">
+            <ai-select v-model="detail.farmId" :instance="instance" :action="`/api/siteUser/querySiteByUserId?userId=${userinfo.id}`" :prop="{label:'name'}"/>
+          </el-form-item>
+          <el-form-item label="养殖舍" prop="houseId" :rules="{required:true,message:'请选择 养殖舍'}">
+            <ai-select v-model="detail.houseId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${detail.farmId||-1}`" :prop="{label:'name'}"/>
+          </el-form-item>
+          <el-form-item label="养殖栏" prop="penId" :rules="{required:true,message:'请选择 养殖栏'}">
+            <ai-select v-model="detail.penId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${detail.houseId||-1}`" :prop="{label:'name'}"/>
+          </el-form-item>
+          <el-form-item label="牲畜" prop="earNumberList" :rules="{required:true,message:'请选择 牲畜'}">
+            <ai-eartag-picker v-model="detail.earNumberList" :instance="instance" :penId="detail.penId"/>
+          </el-form-item>
+        </div>
+        <div v-else class="grid c-4">
+          <el-form-item label="养殖场" prop="farmId">
+            <b v-text="detail.farmName"/>
+          </el-form-item>
+          <el-form-item label="养殖舍" prop="houseId">
+            <b v-text="detail.houseName"/>
+          </el-form-item>
+          <el-form-item label="养殖栏" prop="penId">
+            <b v-text="detail.penName"/>
+          </el-form-item>
+          <el-form-item label="生物芯片耳标号">
+            <b v-text="detail.biochipEarNumber"/>
+          </el-form-item>
+        </div>
+      </ai-card>
+      <ai-card title="免疫登记">
+        <template v-if="isAdd">
+          <div class="grid c-3">
+            <el-form-item label="免疫日期" prop="immunityTime" :rules="{required:true,message:'请选择 免疫日期'}">
+              <el-date-picker v-model="detail.immunityTime"/>
+            </el-form-item>
+            <el-form-item label="疫苗名称" prop="vaccineName" :rules="{required:true,message:'请选择 疫苗名称'}">
+              <ai-input v-model="detail.vaccineName"/>
+            </el-form-item>
+            <el-form-item label="用药方式" prop="method">
+              <ai-input v-model="detail.method"/>
+            </el-form-item>
+            <el-form-item label="生产厂家" prop="factory">
+              <ai-input v-model="detail.factory"/>
+            </el-form-item>
+            <el-form-item label="每头药量" prop="dosage">
+              <ai-input v-model="detail.dosage"/>
+            </el-form-item>
+            <el-form-item label="厂家批号" prop="batchNumber">
+              <ai-input v-model="detail.batchNumber"/>
+            </el-form-item>
+          </div>
+        </template>
+        <template v-else>
+          <el-button type="text" slot="right" @click="dialog=true">新增</el-button>
+          <ai-table :tableData="detail.detailList" :colConfigs="columns" :isShowPagination="!1">
+            <el-table-column slot="options" label="操作" fixed="right" align="center">
+              <template slot-scope="{row,$index}">
+                <div class="table-options">
+                  <el-button type="text" @click="dialog=true,form=row">编辑</el-button>
+                  <el-button type="text" class="deleteBtn" @click="handleDelete(row.id)">删除</el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </ai-table>
+        </template>
+      </ai-card>
+      <ai-dialog v-model="dialog" title="免疫登记" @closed="form={}" @confirm="submit">
+        <el-form size="small" label-width="120px"  class="grid">
+          <el-form-item label="免疫日期" prop="immunityTime" :rules="{required:true,message:'请选择 免疫日期'}">
+            <el-date-picker v-model="form.immunityTime"/>
+          </el-form-item>
+          <el-form-item label="疫苗名称" prop="vaccineName" :rules="{required:true,message:'请选择 疫苗名称'}">
+            <ai-input v-model="form.vaccineName"/>
+          </el-form-item>
+          <el-form-item label="用药方式" prop="method">
+            <ai-input v-model="form.method"/>
+          </el-form-item>
+          <el-form-item label="生产厂家" prop="factory">
+            <ai-input v-model="form.factory"/>
+          </el-form-item>
+          <el-form-item label="每头药量" prop="dosage">
+            <ai-input v-model="form.dosage"/>
+          </el-form-item>
+          <el-form-item label="厂家批号" prop="batchNumber">
+            <ai-input v-model="form.batchNumber"/>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+    </el-form>
+    <div slot="footer">
+      <el-button v-if="isAdd" type="primary" @click="handleAdd">提交</el-button>
+      <el-button @click="back">返回</el-button>
+    </div>
+  </ai-page>
+</template>
+
+<style scoped lang="scss">
+.immunityAdd {
+  .el-date-editor {
+    width: 100%;
+  }
+}
+</style>
diff --git a/project/xumu/AppImmunityManage/list.vue b/project/xumu/AppImmunityManage/list.vue
new file mode 100644
index 00000000..1bd74b87
--- /dev/null
+++ b/project/xumu/AppImmunityManage/list.vue
@@ -0,0 +1,106 @@
+<script>
+import {mapState} from "vuex"
+
+const columns = [
+  {label: "序号", type: "index"},
+  {label: "养殖场", prop: "userName", format: (v, row) => `${[row.farmName, row.houseName, row.penName].join("-")}`},
+  {label: "生物芯片耳标号", prop: "biochipEarNumber"},
+  {label: "最近免疫日期", prop: "immunityTime"},
+  {label: "最近登记时间", prop: "createTime"},
+]
+export default {
+  name: "immunityList",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  data() {
+    return {
+      columns,
+      tableData: [],
+      page: {pageNum: 1, pageSize: 10, total: 0},
+      search: {},
+      dialog: false,
+      form: {}
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    userinfo: v => v.user.info || {},
+    pageTitle: v => v.$parent.menuName || v.$parent.$options.label
+  },
+  watch: {
+    search: {
+      deep: true,
+      handler() {
+        this.page.pageNum = 1
+        this.getTableData()
+      }
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/api/breed/immunity/page", {...this.page, ...this.search}).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+  },
+  created() {
+    this.dict.load("auditStatus", "category", "variety")
+    this.getTableData()
+  }
+}
+</script>
+
+<template>
+  <ai-page class="immunityList" :title="pageTitle">
+    <ai-search-bar>
+      <template #left>
+        <ai-select placeholder="全部养殖场" v-model="search.farmId" :instance="instance" :action="`/api/siteUser/querySiteByUserId?userId=${userinfo.id}`" :prop="{label:'name'}"/>
+        <ai-select placeholder="全部养殖舍" v-model="search.houseId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.farmId||-1}`" :prop="{label:'name'}"/>
+        <ai-select placeholder="全部养殖栏" v-model="search.penId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.houseId||-1}`" :prop="{label:'name'}"/>
+        <ai-search label="免疫日期">
+          <el-date-picker v-model="search.immunityBeginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker v-model="search.immunityEndDate" type="datetime" placeholder="结束日期" size="small"/>
+        </ai-search>
+        <ai-search label="登记日期">
+          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+        </ai-search>
+        <el-input placeholder="原场耳标号" v-model="search.originalEarNumber" dict="authStatus" size="small" clearable/>
+        <el-input placeholder="生物芯片耳标号" v-model="search.biochipEarNumber" dict="authStatus" size="small" clearable/>
+        <el-input placeholder="电子耳标号" v-model="search.electronicEarNumber" dict="authStatus" size="small" clearable/>
+      </template>
+    </ai-search-bar>
+    <ai-search-bar>
+      <template #left>
+        <el-button type="primary" icon="iconfont iconAdd" @click="$router.push({hash:'#add'})">新增</el-button>
+        <ai-download :instance="instance" url="/api/breed/immunity/export" :params="{...search,...page}" :fileName="`称重导出表-${Date.now()}`"/>
+      </template>
+    </ai-search-bar>
+    <ai-table :tableData="tableData" :colConfigs="columns" :dict="dict" @getList="getTableData"
+              :total="page.total" :current.sync="page.pageNum" :size.sync="page.pageSize">
+      <el-table-column slot="options" label="操作" fixed="right" align="center">
+        <template slot-scope="{row}">
+          <div class="table-options">
+            <el-button type="text" @click="$router.push({hash:'#add',query:{id:row.biochipEarNumber}})">查看</el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </ai-table>
+  </ai-page>
+</template>
+
+<style scoped lang="scss">
+.immunityList {
+  height: 100%;
+
+  .deleteBtn {
+    color: $errorColor;
+  }
+}
+</style>
diff --git a/project/xumu/AppWeightManage/add.vue b/project/xumu/AppWeightManage/add.vue
index ef9b8d2a..cf73d3e9 100644
--- a/project/xumu/AppWeightManage/add.vue
+++ b/project/xumu/AppWeightManage/add.vue
@@ -61,7 +61,8 @@ export default {
     },
     submit() {
       this.$refs.detail.validate().then(() => {
-        this.instance.post("/api/breed/weight/addOrEdit", this.detail).then(res => {
+        this.form.biochipEarNumber = this.detail.biochipEarNumber
+        this.instance.post("/api/breed/weight/addOrEdit", this.form).then(res => {
           if (res?.code == 0) {
             this.dialog = false
             this.getDetail()
diff --git a/project/xumu/AppWeightManage/list.vue b/project/xumu/AppWeightManage/list.vue
index b68b1ee9..4443cc4c 100644
--- a/project/xumu/AppWeightManage/list.vue
+++ b/project/xumu/AppWeightManage/list.vue
@@ -81,7 +81,7 @@ export default {
         <ai-download :instance="instance" url="/api/breed/weight/export" :params="{...search,...page}" :fileName="`称重导出表-${Date.now()}`"/>
       </template>
     </ai-search-bar>
-    <ai-table :tableData="tableData" :colConfigs="columns" :dict="dict" @gweightList="getTableData"
+    <ai-table :tableData="tableData" :colConfigs="columns" :dict="dict" @getList="getTableData"
               :total="page.total" :current.sync="page.pageNum" :size.sync="page.pageSize">
       <el-table-column slot="options" label="操作" fixed="right" align="center">
         <template slot-scope="{row}">
diff --git a/project/xumu/components/AiEartagPicker.vue b/project/xumu/components/AiEartagPicker.vue
new file mode 100644
index 00000000..1157eb30
--- /dev/null
+++ b/project/xumu/components/AiEartagPicker.vue
@@ -0,0 +1,80 @@
+<script>
+export default {
+  name: "AiEartagPicker",
+  props: {
+    instance: Function,
+    value: {default: () => []},
+    penId: {default: "", required: true}
+  },
+  model: {
+    prop: "value",
+    event: "input"
+  },
+  data() {
+    return {
+      list: [],
+      dialog: false,
+      selected: []
+    }
+  },
+  watch: {
+    penId: {
+      immediate: true,
+      handler(v) {
+        this.getEartag(v)
+      }
+    }
+  },
+  methods: {
+    getEartag(penId) {
+      penId && this.instance.post("/api/breed/earTag/getEarTagByPenId", null, {
+        params: {penId}
+      }).then(res => {
+        if (res?.data) {
+          this.list = res.data
+        }
+      })
+    },
+    handleConfirm() {
+      this.dialog = false
+      this.$emit("input", this.selected)
+    }
+  }
+}
+</script>
+
+<template>
+  <section class="AiEartagPicker">
+    <el-select :value="value" clearable multiple placeholder="请选择">
+      <el-option v-for="op in list" :key="op.id" :label="op.earTag" :value="op.id"/>
+      <div slot="prefix" @click.stop="dialog=true"/>
+    </el-select>
+    <ai-dialog v-model="dialog" title="选择牲畜" width="640px" @confirm="handleConfirm" @closed="selected=[]" @open="selected=value">
+      <el-transfer :data="list" v-model="selected" :titles="['可选','已选择']"/>
+    </ai-dialog>
+  </section>
+</template>
+
+<style scoped lang="scss">
+.AiEartagPicker {
+  width: 100%;
+
+  :deep(.el-select) {
+    width: 100%;
+
+    .el-input__inner {
+      padding-left: 15px !important;
+    }
+
+    .el-input__prefix {
+      left: 0;
+      right: 0;
+      z-index: 202412271101;
+
+      & > div {
+        height: 100%;
+      }
+    }
+  }
+}
+</style>
diff --git a/ui/packages/basic/AiInput.vue b/ui/packages/basic/AiInput.vue
new file mode 100644
index 00000000..157dae7d
--- /dev/null
+++ b/ui/packages/basic/AiInput.vue
@@ -0,0 +1,26 @@
+<script>
+export default {
+  name: "AiInput",
+  props: {
+    value: {default: ""},
+    edit: {default: true}
+  },
+  model: {
+    prop: 'value',
+    event: 'input'
+  }
+}
+</script>
+
+<template>
+  <section class="AiInput">
+    <el-input v-if="edit" :value="value" size="small" placeholder="请输入" v-bind="$attrs"
+              @input="v=>$emit('input', v)" clearable autofocus/>
+    <b v-else v-text="value"/>
+  </section>
+</template>
+
+<style scoped lang="scss">
+.AiInput {
+}
+</style>