修改获取种源信息卡片

src/plant/models/warehouseCard/medicine-card.vue

@@ -28,7 +28,7 @@
         </view>
         <view class="pd2-4-0 f-s-28">
             <span class="c-#666">加工工艺：</span>
-            <span class="c-#333 f-w-500">{{ item?.instoreBizInfo?.ptech || '-' }}</span>
+            <span class="c-#333 f-w-500">{{ item?.instoreBizInfo?.ptech ? item?.instoreBizInfo?.ptech.replace(/,/g, '→') : '-' }}</span>
         </view>
         <view class="pd2-4-0 f-s-28">
             <span class="c-#666">入库量：</span>
@@ -48,8 +48,6 @@
     </view>
 </template>
 <script setup lang="ts" name="MedicineCard">
-import { selectDictListClass } from '@/utils/ruoyi';
-import { getStorageRoomNames } from '@/utils/common';
 // 种源展示卡片
 const props = defineProps({
     item: {

src/plant/models/warehouseCard/seed-source-card.vue

@@ -1,7 +1,11 @@
 <template>
     <view class="d-flex j-sb a-c li-item-head">
         <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ selectDictLabel(pt_seed_instore_type, item?.instoreType) }}</view>
-        <view v-if="isInstoreDate" class="f-s-22 c-#666 mr-24">{{ item?.instoreBizInfo?.instoreDate }}</view>
+        <template v-if="isInstoreDate">
+            <view v-if="item?.instoreType != '3'" class="f-s-22 c-#666 mr-24">{{ item?.instoreBizInfo?.instoreDate }}</view>
+            <view v-else class="f-s-22 c-#666 mr-24">{{ item?.instoreBizInfo?.instoreDate }}</view>
+        </template>
+        
     </view>
     <view class="pd-20">
         <view class="d-flex flex1 mb-10">

src/tools/species-info/index.vue

@@ -16,9 +16,11 @@
                 <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" @change="changeSeach" margin="0" :border="false" placeholder="搜批次号、品种名、基地名" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
             </view>
         </view>
-        <template v-for="(item, index) in list" :key="index">
-            <info-card :item="item" :selected="selectedItems.has(item.id)" @click="toggleSelection(item)" />
-        </template>
+        <view class="pd-24">
+            <template v-for="(item, index) in list" :key="index">
+                <info-card :item="item" :selected="selectedItems.has(item.id)" @click="toggleSelection(item)" />
+            </template>
+        </view>
         <template #bottom>
             <view v-if="formDate.inputs.length > 0" class="bg-#EBF6EE c-primary f-s-24 pd-10 pl-24">
                 已选择种源：

src/tools/species-info/models/info-card.vue

@@ -1,66 +1,14 @@
 <template>
-    <view class="pd-24 pb-10 select-item" @click="$emit('click')">
-        <view class="b-radius bg-#fff pd-20 p-rtv noactive" :class="{ active: selected }">
-            <view class="d-flex j-sb a-c li-item-head mb-16">
-                <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{
-                    selectDictLabel(pt_seed_instore_type, item?.instoreType) }}</view>
-                <view class="f-s-22 c-#666 pt-10">{{ item?.updateTime || item?.createTime }}</view>
-            </view>
-            <view class="d-flex flex1 mb-10">
-                <view class="flex1">
-                    <span class="f-s-34 c-#333 f-w-500 mr-10">{{ item?.variety }}</span>
-                    <span class="f-s-24 c-#666">{{ selectDictLabel(pt_seed_type, item?.seedType) }}</span>
-                </view>
-                <view>
-                    <view v-if="item?.examinReport?.length" class="tag-span c-primary bg-#EBF6EE">已检验</view>
-                    <view v-else class="tag-span c-danger bg-#F9ECEA">未检验</view>
-                </view>
-            </view>
-            <view class="pd2-4-0 f-s-28">
-                <span class="c-#666 w-s-no">入库批号：</span>
-                <span class="c-#333 f-w-500">{{ item?.batchCode }}</span>
-            </view>
-            <!-- <view class="pd2-4-0 f-s-28">
-                            <span class="c-#666">溯源批号：</span>
-                            <span class="c-#333 f-w-500">暂无</span>
-                        </view> -->
-            <view v-if="['A3', 'A4'].includes(item?.seedType)" class="pd2-4-0 f-s-28">
-                <span class="c-#666 w-s-no">菌种/菌株编号：</span>
-                <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, item?.fungusCodeType) }}/{{
-                    item?.fungusCode }}</span>
-            </view>
-            <view class="pd2-4-0 f-s-28">
-                <span class="c-#666 w-s-no">供应商：</span>
-                <span class="c-#333 f-w-500">{{ item?.supplierInfo?.cusName || '-' }}</span>
-            </view>
-            <view class="pd2-4-0 f-s-28">
-                <span class="c-#666 w-s-no">存放库房：</span>
-                <span class="c-#333 f-w-500">{{ getStorageRoomNames(item?.warehouses) || '-' }}</span>
-            </view>
-            <view class="pd2-4-0 f-s-28">
-                <span class="c-#666 w-s-no">入库量：</span>
-                <span class="c-#333 f-w-500">{{ item?.capacity }}{{ item?.unit }}</span>
-            </view>
-            <view class="d-flex">
-                <view v-if="item?.inputAmount" class="pd2-4-0 f-s-28 flex1">
-                    <span class="c-#666">出库量：</span>
-                    <span class="c-#333 f-w-500">{{ item?.inputAmount || '0' }}{{ item?.unit }}</span>
-                </view>
-                <view v-if="item?.restAmount" class="pd2-4-0 f-s-28 flex1">
-                    <span class="c-primary">剩余量：</span>
-                    <span class="c-primary f-w-500">{{ item?.restAmount || '0' }}{{ item?.unit }}</span>
-                </view>
-            </view>
-            <!-- 选中图标 -->
-            <image v-if="selected" class="w-40 h-40 checked-icon"
-                src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/common/btn_checked_icon.png"
-                mode="widthFix" />
-        </view>
+    <view @click="$emit('click')" class="b-radius bg-#fff pd-20 p-rtv mb-20 select-item-list" :class="{ active: selected }">
+        <SeedSourceCard :item="item" :dict="{ pt_seed_instore_type, pt_seed_type, pt_fungus_code_type }" />
+        <!-- 选中图标 -->
+        <image v-if="selected" class="w-40 h-40 checked-icon" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/common/btn_checked_icon.png" mode="widthFix" />
     </view>
 </template>
 <script setup lang="ts">
 import { selectDictListClass } from '@/utils/ruoyi';
 import { getStorageRoomNames } from '@/utils/common';
+import SeedSourceCard from '@/plant/models/warehouseCard/seed-source-card.vue';
 const props = defineProps<{
     item: any;
     selected?: boolean;
@@ -68,43 +16,14 @@ const props = defineProps<{
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { pt_seed_instore_type, pt_seed_type, pt_fungus_code_type } = toRefs<any>(proxy?.useDict('pt_seed_instore_type', 'pt_seed_type', 'pt_fungus_code_type'));
 </script>
-<style lang="scss">
-.search-select-item {
-    height: 86rpx;
-    background-color: #fff;
-    border-radius: 10rpx;
-    box-sizing: border-box;
-    padding: 12rpx;
-}
-
-.tag-span {
-    padding: 4rpx 12rpx;
-    font-size: 20rpx;
-    border-radius: 18rpx;
-}
-
-.li-item-head {
-    margin-left: -24rpx;
-    margin-top: -24rpx;
-}
-
-.li-left-tag {
-    padding: 6rpx 16rpx;
-    color: #fff;
-    border-radius: 16rpx 0 16rpx 0;
-    font-size: 20rpx;
-    font-weight: 500;
-}
+<style lang="scss" scoped>
 
-.select-item {
-    .noactive {
-        border: 1rpx solid transparent;
-    }
+.select-item-list {
+    border: 1rpx solid #fff;
 
-    .active {
+    &.active {
         background-color: #ebf6ee;
-        position: relative;
-        border: 1rpx solid #37a954;
+        border: 1rpx solid $u-primary;
     }
 
     .checked-icon {