From 0a6b77943f7e39f1203d4f66f0e3d0ee3e15c148 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 15 Jan 2025 15:51:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(xumu):=20=E4=BC=98=E5=8C=96=E8=80=B3?=
 =?UTF-8?q?=E6=A0=87=E5=8F=B7=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 AppInsuranceApply 和 AppLoanApply 组件中添加 value-key 属性
- 在 AiEartagPicker 组件中增加对 valueKey 属性的支持- 优化 AiEartagPicker 组件的样式和布局
---
 project/xumu/AppInsuranceApply/add.vue     |  2 +-
 project/xumu/AppLoanApply/add.vue          |  2 +-
 project/xumu/components/AiEartagPicker.vue | 41 ++++++++++++++++------
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/project/xumu/AppInsuranceApply/add.vue b/project/xumu/AppInsuranceApply/add.vue
index cdef3f64..def1e907 100644
--- a/project/xumu/AppInsuranceApply/add.vue
+++ b/project/xumu/AppInsuranceApply/add.vue
@@ -125,7 +125,7 @@ export default {
       </ai-card>
       <ai-card title="投保对象">
         <template #right v-if="isAdd||isEdit">
-          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance"
+          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance" value-key="biochipEarNumber"
                             :action="`/api/insurance/apply/getEarNumberList?farmId=${detail.farmId}`">
             <el-button type="text">选择</el-button>
           </ai-eartag-picker>
diff --git a/project/xumu/AppLoanApply/add.vue b/project/xumu/AppLoanApply/add.vue
index cc6fd96f..5772b42c 100644
--- a/project/xumu/AppLoanApply/add.vue
+++ b/project/xumu/AppLoanApply/add.vue
@@ -129,7 +129,7 @@ export default {
       <ai-card title="质押标的">
         <template #right>
           <ai-input placeholder="请输入/扫描耳标号" v-model="filterText" class="shrink"/>
-          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance" v-if="isAdd||isEdit"
+          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance" v-if="isAdd||isEdit" value-key="biochipEarNumber"
                             :action="`/api/insurance/apply/getEarNumberList?farmId=${detail.farmId}`">
             <el-button type="text">选择</el-button>
           </ai-eartag-picker>
diff --git a/project/xumu/components/AiEartagPicker.vue b/project/xumu/components/AiEartagPicker.vue
index cafaf8ac..db3701d9 100644
--- a/project/xumu/components/AiEartagPicker.vue
+++ b/project/xumu/components/AiEartagPicker.vue
@@ -3,9 +3,10 @@ export default {
   name: "AiEartagPicker",
   props: {
     instance: Function,
-    value: { default: () => [] },
-    action: { default: "/api/breed/earTag/getEarTagByPenId" },
-    penId: String
+    value: {default: () => []},
+    action: {default: "/api/breed/earTag/getEarTagByPenId"},
+    penId: String,
+    valueKey: String
   },
   model: {
     prop: "value",
@@ -39,7 +40,14 @@ export default {
     getEartag() {
       !/undefined/.test(this.api) && this.instance.post(this.api).then(res => {
         if (res?.data) {
-          this.list = res.data?.map(v => ({ key: v, label: v })) || []
+          const key = this.valueKey
+          this.list = res.data?.map(v => {
+            if (typeof v == 'string') {
+              return {key: v, label: v}
+            } else if (key) {
+              return {key: v[key], label: v[key]}
+            }
+          }) || []
         }
       })
     },
@@ -55,15 +63,15 @@ export default {
 <template>
   <section class="AiEartagPicker">
     <div style="width: auto;" v-if="$slots.default" @click="dialog = true">
-      <slot />
+      <slot/>
     </div>
     <el-select v-else :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-option v-for="(op,i) in list" :key="i" :label="op.label" :value="op.key"/>
+      <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 v-model="dialog" title="选择牲畜" width="800px" @confirm="handleConfirm" @closed="selected = []"
+               @open="selected = value">
+      <el-transfer :data="list" v-model="selected" :titles="['可选', '已选择']"/>
     </ai-dialog>
   </section>
 </template>
@@ -85,10 +93,21 @@ export default {
       right: 0;
       z-index: 999;
 
-      &>div {
+      & > div {
         height: 100%;
       }
     }
   }
+
+  :deep(.el-transfer) {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .el-transfer-panel {
+      width: auto;
+      min-width: 200px;
+    }
+  }
 }
 </style>