修改

src/plant/packaging/select-object/models/select-fresh-list.vue

@@ -22,66 +22,10 @@
         </view>
         <view class="pd-24 bg-#f7f7f7">
             <template v-for="(item, index) in list" :key="index">
-                <view class="b-radius bg-#fff pd-20 p-rtv mb-20 select-item-list"
+                <view class="b-radius bg-#fff p-rtv mb-20 select-item-list"
                     :class="{ 'active': item.id + '-' + item.storageType === checkedId }"
                     @click="emit('clickItem', item)">
-                    <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_fresh_instore_type, item?.instoreType) }}</view>
-                        <view class="f-s-22 c-#666">{{ item?.instoreBizInfo?.instoreDate }}</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 v-if="item?.partName" class="f-s-24 c-#666">{{ item?.level || '' }}{{ item?.partName
-                                }}</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>
-                    <template v-if="item?.instoreType == '2'">
-                        <view class="pd2-4-0 f-s-28">
-                            <span class="c-#666">入库批号：</span>
-                            <span class="c-#333 f-w-500">{{ item?.batchCode || '-' }}</span>
-                        </view>
-                        <view v-if="item?.supplierId" class="pd2-4-0 f-s-28">
-                            <span class="c-#666">供应商：</span>
-                            <span class="c-#333 f-w-500">{{ item?.supplierInfo?.cusName || '-' }}</span>
-                        </view>
-                    </template>
-                    <template v-if="item?.instoreType == '3'">
-                        <view class="pd2-4-0 f-s-28">
-                            <span class="c-#666">采收批号：</span>
-                            <span class="c-#333 f-w-500">{{ item?.harvestInfo?.harvestCode || '-' }}</span>
-                        </view>
-                        <view class="pd2-4-0 f-s-28">
-                            <span class="c-#666">采收基地：</span>
-                            <span class="c-#333 f-w-500">
-                                {{ item?.harvestInfo?.baseInfo?.baseName || '-' }}
-                            </span>
-                        </view>
-                    </template>
-
-                    <view v-if="item?.warehouses?.length" class="pd2-4-0 f-s-28">
-                        <span class="c-#666">存放库房：</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">入库量：</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-danger">剩余量：</span>
-                            <span class="c-danger f-w-500">{{ item?.restAmount || '0' }}{{ item?.unit }}</span>
-                        </view>
-                    </view>
+                    <FreshGoodsCard :item="item" :dict="{ pt_fresh_instore_type }"></FreshGoodsCard>
                     <image v-if="item.id + '-' + item.storageType === checkedId" 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" />
@@ -104,6 +48,7 @@
 <script setup lang="ts">
 import { useClientRequest } from '@/utils/request';
 import { getStorageRoomNames } from '@/utils/common';
+import FreshGoodsCard from '@/plant/models/warehouseCard/fresh-goods-card.vue';
 const props = defineProps({
     checkedId: {
         type: String,

src/plant/packaging/select-object/models/select-medicine-list.vue

@@ -25,49 +25,7 @@
                 <view class="b-radius bg-#fff pd-20 p-rtv mb-20 select-item-list"
                     :class="{ active: item.id + '-' + item.storageType === checkedId }"
                     @click="emit('clickItem', item)">
-                    <view class="d-flex j-sb a-c li-item-head mb-16">
-                        <view class="li-left-tag"
-                            :class="{ [`bg-instore-${item?.instoreBizInfo?.processType}`]: true }">{{ item?.seedLevel ||
-                            '' }}{{ selectDictLabel(st_medicine_process_type, item?.instoreBizInfo?.processType) }}
-                        </view>
-                        <view class="f-s-22 c-#666">{{ item?.instoreBizInfo?.instoreDate }}</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 v-if="item?.partName" class="f-s-24 c-#666">{{ item?.partName }}</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">生产批号：</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">{{ item?.supplierInfo?.cusName || '-' }}</span>
-                    </view>
-                    <view class="pd2-4-0 f-s-28">
-                        <span class="c-#666">加工工艺：</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">入库量：</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-danger">剩余量：</span>
-                            <span class="c-danger f-w-500">{{ item?.restAmount || '0' }}{{ item?.unit }}</span>
-                        </view>
-                    </view>
+                    <MedicineCard :item="item" :dict="{ st_medicine_process_type }"></MedicineCard>
                     <image v-if="item.id + '-' + item.storageType === checkedId" 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" />
@@ -89,6 +47,7 @@
 </template>
 <script setup lang="ts">
 import { useClientRequest } from '@/utils/request';
+import MedicineCard from '@/plant/models/warehouseCard/medicine-card.vue';
 const props = defineProps({
     checkedId: {
         type: String,

src/plant/packaging/select-object/models/select-seed-source-list.vue

@@ -26,80 +26,7 @@
                 <view class="b-radius bg-#fff pd-20 p-rtv mb-20 select-item-list"
                     :class="{ 'active': item.id + '-' + item.storageType === checkedId }"
                     @click="emit('clickItem', item)">
-                    <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">{{ item?.instoreBizInfo?.instoreDate }}</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">{{ item?.seedLevel }}{{ 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>
-                    <template v-if="item?.instoreType == '2'">
-                        <view class="pd2-4-0 f-s-28">
-                            <span class="c-#666">入库批号：</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">菌种/菌株编号：</span>
-                            <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, item?.fungusCodeType)
-                                }}/{{ item?.fungusCode }}</span>
-                        </view>
-                        <view v-if="item?.supplierId" class="pd2-4-0 f-s-28">
-                            <span class="c-#666">供应商：</span>
-                            <span class="c-#333 f-w-500">{{ item?.supplierInfo?.cusName || '-' }}</span>
-                        </view>
-                        <view v-if="item?.warehouses?.length" class="pd2-4-0 f-s-28">
-                            <span class="c-#666">存放库房：</span>
-                            <span class="c-#333 f-w-500">{{ getStorageRoomNames(item?.warehouses) || '-' }}</span>
-                        </view>
-                    </template>
-                    <template v-if="item?.instoreType == '3'">
-                        <view class="pd2-4-0 f-s-28">
-                            <span class="c-#666">采收批号：</span>
-                            <span class="c-#333 f-w-500">{{ item?.harvestInfo?.harvestCode || '-' }}</span>
-                        </view>
-                        <view class="pd2-4-0 f-s-28">
-                            <span class="c-#666">采收基地：</span>
-                            <span class="c-#333 f-w-500">
-                                {{ item?.harvestInfo?.baseInfo?.baseName || '-' }}
-                            </span>
-                        </view>
-                        <view v-if="['A3', 'A4'].includes(item?.seedType)" class="pd2-4-0 f-s-28">
-                            <span class="c-#666">菌种/菌株编号：</span>
-                            <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, item?.fungusCodeType)
-                                }}/{{ item?.fungusCode }}</span>
-                        </view>
-                        <view v-if="item?.warehouses?.length" class="pd2-4-0 f-s-28">
-                            <span class="c-#666">存放库房：</span>
-                            <span class="c-#333 f-w-500">{{ getStorageRoomNames(item?.warehouses) || '-' }}</span>
-                        </view>
-                    </template>
-                    <view class="pd2-4-0 f-s-28">
-                        <span class="c-#666">入库量：</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-danger">剩余量：</span>
-                            <span class="c-danger f-w-500">{{ item?.restAmount || '0' }}{{ item?.unit }}</span>
-                        </view>
-                    </view>
+                    <SeedSourceCard :item="item" :dict="{ pt_seed_instore_type, pt_seed_type, pt_fungus_code_type }"></SeedSourceCard>
                     <image v-if="item.id + '-' + item.storageType === checkedId" 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" />
@@ -121,7 +48,7 @@
 </template>
 <script setup lang="ts">
 import { useClientRequest } from '@/utils/request';
-
+import SeedSourceCard from '@/plant/models/warehouseCard/seed-source-card.vue';
 import { getStorageRoomNames } from '@/utils/common';
 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'));