Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/forestry-wx

src/models/select-warehouse-dialog/select-warehouse-dialog.vue

@@ -2,7 +2,7 @@
     <root-portal>
         <up-popup :show="show" mode="right" @close="close">
             <view class="w-680 p-rtv" style="height: 100vh">
-                <z-paging ref="paging" v-model="list" bgColor="#fff" :fixed="false" @query="query" safe-area-inset-bottom>
+                <z-paging ref="paging" v-model="list" bgColor="#fff" :fixed="false" @query="query" safe-area-inset-bottom hide-no-more-inside :show-loading-more-no-more-view="false">
                     <template #top>
                         <up-navbar :fixed="false" border>
                             <template #left>

src/pages.json

@@ -371,6 +371,13 @@
                     "style": {
                         "navigationBarTitleText": "修改鲜货信息"
                     }
+                },
+                // 药材库
+                {
+                    "path": "medicine/list/index",
+                    "style": {
+                        "navigationBarTitleText": "药材库"
+                    }
                 }
             ]
         },

src/pages/plant/storage/index.vue

@@ -37,11 +37,11 @@
                 </view>
                 <up-icon name="arrow-right"></up-icon>
             </view>
-            <!-- 中间品库 -->
-            <view class="bg-#fff d-flex a-c j-c radius-16 pd2-30-24 mb-20" @click="$u.route({ url: '/plant/storage/intermediate-product/list/index' })">
+            <!-- 药材库 -->
+            <view class="bg-#fff d-flex a-c j-c radius-16 pd2-30-24 mb-20" @click="$u.route({ url: '/plant/storage/medicine/list/index' })">
                 <image class="w-72 h-72" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/storage/nav_zjpk_icon.png" mode="widthFix" />
                 <view class="flex1 pd2-0-20">
-                    <view class="f-s-30 c-#333 f-w-500">中间品库</view>
+                    <view class="f-s-30 c-#333 f-w-500">药材库</view>
                     <view class="f-s-22 c-#999">加工后待包装药材的存储库房</view>
                 </view>
                 <up-icon name="arrow-right"></up-icon>

src/plant/storage/agro-product/info-update/index.vue

@@ -365,6 +365,10 @@ const getDetailById = async (id: string) => {
         form.value = {
             ...form.value,
             ...res.data,
+            instoreBizInfo: {
+                ...form.value.instoreBizInfo,
+                ...res.data.instoreBizInfo,
+            },
         };
         if (mode.value === 'copy') {
             form.value.batchCode = '';

src/plant/storage/agro-product/list/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query">
+    <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query" hide-no-more-inside>
         <template #top>
             <ut-navbar title="农资库" :fixed="false"></ut-navbar>
         </template>

src/plant/storage/agro-product/list/model/agro-bottom.vue

@@ -1,5 +1,5 @@
 <template>
-    <view class="source-bottom p-rtv">
+    <view class="source-bottom-fixed">
         <view class="source-top-view h-49"></view>
         <view class="source-bottom-view pt-49 text-center bg-#fff pt-60" :style="{ opacity: btnStyle == 'close' ? 0 : 1 }">
              <view style="opacity: 0;">{{ mapTextBtn[btnStyle] }}</view>
@@ -33,6 +33,10 @@
                 </view>
         </view>
     </view>
+    <view class="pt-60">
+        <view style="opacity: 0;">{{ mapTextBtn[btnStyle] }}</view>
+    </view>
+    <view class="bg-#fff" :style="{ height: safeAreaBottom + 'px' }"></view>
 </template>
 <script setup lang="ts">
 const windowInfo = uni.getWindowInfo();
@@ -48,6 +52,13 @@ const clickBtnBall = () => {
 </script>
 
 <style scoped lang="scss">
+.source-bottom-fixed {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 10;
+}
 .source-center-view {
     position: absolute;
     top: 0;

src/plant/storage/fresh-goods/add/index.vue

@@ -53,6 +53,9 @@
                 <view class="startline-title">入库信息</view>
             </view>
             <view class="pd-24 bg-#fff">
+                <up-form-item borderBottom label="鲜货级别" prop="seedLevel">
+                    <up-input v-model="form.seedLevel" placeholder="请输入鲜货级别" border="none" clearable></up-input>
+                </up-form-item>
                 <!-- 入库类型 -->
                 <up-form-item borderBottom label="入库类型" required prop="instoreType">
                     <view v-if="form.instoreType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_fresh_instore_type, form.instoreType) }}</view>

src/plant/storage/fresh-goods/detail/index.vue

@@ -18,21 +18,35 @@
             </view>
             <view class="bg-#fff pd-24">
                 <view class="d-flex j-sb a-c li-item-head mb-16">
-                    <view class="li-left-tag" :class="{ [`bg-instore-${form?.instoreType}`]: true }">{{ selectDictLabel(pt_seed_instore_type, form?.instoreType) }}</view>
+                    <view class="li-left-tag" :class="{ [`bg-instore-${form?.instoreType}`]: true }">{{ form?.seedLevel || '' }}{{ selectDictLabel(pt_seed_instore_type, form?.instoreType) }}</view>
                     <view class="f-s-22 c-#666">{{ form?.instoreBizInfo?.instoreDate }}</view>
                 </view>
                 <view class="mb-10">
                     <span class="f-s-34 c-#333 f-w-500 mr-10">{{ form?.variety }}</span>
                     <span v-if="form?.partName" class="f-s-24 c-#666">{{ form?.partName }}</span>
                 </view>
-                <view class="pd2-4-0 f-s-28">
-                    <span class="c-#666">入库批号：</span>
-                    <span class="c-#333 f-w-500">{{ form?.batchCode }}</span>
-                </view>
-                <view v-if="form?.supplierId" class="pd2-4-0 f-s-28">
-                    <span class="c-#666">供应商：</span>
-                    <span class="c-#333 f-w-500">{{ form?.supplierInfo?.cusName || '-' }}</span>
-                </view>
+                <template v-if="form?.instoreType == '2'">
+                    <view class="pd2-4-0 f-s-28">
+                        <span class="c-#666">入库批号：</span>
+                        <span class="c-#333 f-w-500">{{ form?.batchCode || '-' }}</span>
+                    </view>
+                    <view v-if="form?.supplierId" class="pd2-4-0 f-s-28">
+                        <span class="c-#666">供应商：</span>
+                        <span class="c-#333 f-w-500">{{ form?.supplierInfo?.cusName || '-' }}</span>
+                    </view>
+                </template>
+                <template v-if="form?.instoreType == '3'">
+                    <view class="pd2-4-0 f-s-28">
+                        <span class="c-#666">采收批号：</span>
+                        <span class="c-#333 f-w-500">{{ form?.harvestInfo?.harvestCode || '-' }}</span>
+                    </view>
+                    <view class="pd2-4-0 f-s-28">
+                        <span class="c-#666">采收基地：</span>
+                        <span class="c-#333 f-w-500">
+                            {{ form?.harvestInfo?.baseInfo?.baseName || '-' }}
+                        </span>
+                    </view>
+                </template>
                 <view v-if="form?.warehouses?.length" class="pd2-4-0 f-s-28">
                     <span class="c-#666">存放库房：</span>
                     <span class="c-#333 f-w-500">{{ getStorageRoomNames(form?.warehouses) || '-' }}</span>
@@ -55,6 +69,28 @@
                     <up-button @click="navigateToInventoryLoss" type="warning" plain :customStyle="{ background: '#FFF9EF', borderColor: '#F9D9A3' }">库存有消耗？库存损耗登记{{ '>' }}</up-button>
                 </view>
             </view>
+            <view class="pd-24">
+                <view class="startline-title">采收信息</view>
+            </view>
+            <view class="bg-#fff pd-24" v-if="form?.harvestInfo">
+                <view class="f-s-30 pd2-16-0 info-border-bottom">
+                    <span class="c-#666">采收日期：</span>
+                    <span class="c-#333 f-w-600">{{ form?.harvestInfo?.harvestDate || '-' }}至{{ form?.harvestInfo?.harvestDateEnd || '-' }}</span>
+                </view>
+                <view class="f-s-30 pd2-16-0 info-border-bottom">
+                    <span class="c-#666">采收批号：</span>
+                    <span class="c-#333 f-w-600">
+                        {{ form?.harvestInfo?.harvestCode || '-' }}
+                    </span>
+                </view>
+                <!-- 基地挖坑 -->
+                <view class="f-s-30 pd2-16-0 info-border-bottom">
+                    <span class="c-#666">种源加工处理工艺：</span>
+                    <span class="c-#333 f-w-600">
+                        {{ form?.harvestInfo?.ptech ? form?.harvestInfo?.ptech.replace(/,/g, '→') : '-' }}
+                    </span>
+                </view>
+            </view>
             <view class="pd-24">
                 <view class="startline-title">鲜货信息</view>
             </view>
@@ -83,7 +119,7 @@
 
                 <view class="f-s-30 pd2-16-0 info-border-bottom">
                     <span class="c-#666">鲜货来源：</span>
-                    <span class="c-#333 f-w-600">{{ selectDictLabel(pt_medicine_source, form?.sourceType) || '-' }}</span>
+                    <span class="c-#333 f-w-600">{{ selectDictLabel(pt_medicine_source_tag, form?.sourceType) || '-' }}</span>
                 </view>
 
                 <view class="f-s-30 pd2-16-0 info-border-bottom">
@@ -134,17 +170,23 @@
             </view>
             <view class="bg-#fff pd-24">
                 <view class="f-s-30 pd2-16-0 info-border-bottom">
-                    <span class="c-#666">入库类型：</span>
-                    <span class="c-#333 f-w-600">{{ selectDictLabel(pt_seed_instore_type, form?.instoreType) || '-' }}</span>
-                </view>
-                <view class="f-s-30 pd2-16-0 info-border-bottom">
-                    <span class="c-#666">入库日期：</span>
-                    <span class="c-#333 f-w-600">{{ form?.instoreBizInfo?.instoreDate || '-' }}</span>
+                    <span class="c-#666">鲜货级别：</span>
+                    <span class="c-#333 f-w-600">{{ form?.level || '-' }}</span>
                 </view>
                 <view class="f-s-30 pd2-16-0 info-border-bottom">
-                    <span class="c-#666">入库批号：</span>
-                    <span class="c-#333 f-w-600">{{ form?.batchCode || '-' }}</span>
+                    <span class="c-#666">入库类型：</span>
+                    <span class="c-#333 f-w-600">{{ selectDictLabel(pt_seed_instore_type, form?.instoreType) || '-' }}</span>
                 </view>
+                <template v-if="form.instoreType == '2'">
+                    <view class="f-s-30 pd2-16-0 info-border-bottom">
+                        <span class="c-#666">入库日期：</span>
+                        <span class="c-#333 f-w-600">{{ form?.instoreBizInfo?.instoreDate || '-' }}</span>
+                    </view>
+                    <view class="f-s-30 pd2-16-0 info-border-bottom">
+                        <span class="c-#666">入库批号：</span>
+                        <span class="c-#333 f-w-600">{{ form?.batchCode || '-' }}</span>
+                    </view>
+                </template>
                 <view class="f-s-30 pd2-16-0 info-border-bottom">
                     <span class="c-#666">库房类型：</span>
                     <span class="c-#333 f-w-600">鲜货库</span>
@@ -186,7 +228,7 @@ import { useClientRequest } from '@/utils/request';
 import { selectDictListClass } from '@/utils/ruoyi';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-const { pt_seed_instore_type,yes_no, pt_medicine_source, pt_medicine_unit } = toRefs<any>(proxy?.useDict('pt_seed_instore_type','yes_no', 'pt_medicine_source', 'pt_medicine_unit'));
+const { pt_seed_instore_type, yes_no, pt_medicine_source_tag, pt_medicine_unit } = toRefs<any>(proxy?.useDict('pt_seed_instore_type', 'yes_no', 'pt_medicine_source_tag', 'pt_medicine_unit'));
 const paging = ref<any>(null);
 const form = ref<any>({});
 const did = ref('');

src/plant/storage/fresh-goods/info-update/index.vue

@@ -49,7 +49,7 @@
                 <view class="h-1" id="sourceTypepppp"></view>
                 <ut-action-sheet :tabs="pt_medicine_source" mode="custom" title="鲜货来源" v-model="form.sourceType">
                     <up-form-item borderBottom label="鲜货来源" required prop="sourceType">
-                        <view v-if="form.sourceType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_medicine_source, form.sourceType) }}</view>
+                        <view v-if="form.sourceType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_medicine_source_tag, form.sourceType) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择鲜货来源</view>
                         <template #right>
                             <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
@@ -115,6 +115,9 @@
                 <view class="startline-title">入库信息</view>
             </view>
             <view class="pd-24 bg-#fff">
+                <up-form-item borderBottom label="鲜货级别" prop="level">
+                    <up-input v-model="form.level" placeholder="请输入鲜货级别" border="none" clearable></up-input>
+                </up-form-item>
                 <!-- 入库类型 -->
                 <up-form-item borderBottom label="入库类型" required prop="instoreType">
                     <view v-if="form.instoreType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_fresh_instore_type, form.instoreType) }}</view>
@@ -141,7 +144,7 @@
                 </up-form-item>
                 <!-- 存放库房（具体库房/货架信息稍后补充为选择器） -->
                 <up-form-item borderBottom label="存放库房" prop="warehouses">
-                    <select-warehouse-input v-model="form.warehouses" title="添加鲜货存放库房" :params="{ type: '2' }"></select-warehouse-input>
+                    <select-warehouse-input v-model="form.warehouses" title="添加鲜货存放库房" :params="{ type: '4' }"></select-warehouse-input>
                 </up-form-item>
                 <!-- 入库人 -->
                 <up-form-item borderBottom label="入库人" required prop="instoreBizInfo.instoreMg">
@@ -169,7 +172,7 @@ import SelectWarehouseInput from '@/models/select-warehouse-input/select-warehou
 import SelectMedicinalPart from '@/models/select-medicinal-part/select-medicinal-part.vue';
 import { parseTime } from '@/utils/ruoyi';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { pt_fresh_instore_type, pt_warehouse_type, pt_medicine_source,pt_medicine_unit, yes_no  } = toRefs<any>(proxy?.useDict('pt_fresh_instore_type', 'pt_warehouse_type', 'pt_medicine_source','pt_medicine_unit', 'yes_no'));
+const { pt_fresh_instore_type, pt_warehouse_type, pt_medicine_source,pt_medicine_unit, yes_no, pt_medicine_source_tag  } = toRefs<any>(proxy?.useDict('pt_fresh_instore_type', 'pt_warehouse_type', 'pt_medicine_source','pt_medicine_unit', 'yes_no', 'pt_medicine_source_tag'));
 const paging = ref<any>(null);
 const upFormRef = ref<any>(null);
 // 单条鲜货信息 + 入库信息的合并表单
@@ -235,32 +238,7 @@ const selectVarietyId = () => {
         },
     });
 };
-const selectFatherVarietyId = () => {
-    uni.$once('updateBiologicalname', function (data) {
-        form.value.instoreBizInfo.fatherVarietyId = data.msg.id;
-        form.value.instoreBizInfo.fatherVarietyInfo = data.msg;
-    });
-    uni.$u.route({
-        type: 'navigateTo',
-        url: '/tools/por-torganism/index',
-        params: {
-            title: '选择父本品种',
-        },
-    });
-};
-const selectMotherVarietyId = () => {
-    uni.$once('updateBiologicalname', function (data) {
-        form.value.instoreBizInfo.motherVarietyId = data.msg.id;
-        form.value.instoreBizInfo.motherVarietyInfo = data.msg;
-    });
-    uni.$u.route({
-        type: 'navigateTo',
-        url: '/tools/por-torganism/index',
-        params: {
-            title: '选择母本品种',
-        },
-    });
-};
+
 const did = ref('');
 // 获取详情（仓库信息）
 const getDetailById = async (id: string) => {
@@ -270,6 +248,10 @@ const getDetailById = async (id: string) => {
         form.value = {
             ...form.value,
             ...res.data,
+            instoreBizInfo: {
+                ...form.value.instoreBizInfo,
+                ...res.data.instoreBizInfo,
+            },
         };
     }
 };

src/plant/storage/fresh-goods/list/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query">
+    <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query" hide-no-more-inside>
         <template #top>
             <ut-navbar title="鲜货库" :fixed="false"></ut-navbar>
         </template>
@@ -28,7 +28,7 @@
                 <up-swipe-action-item v-for="(item, index) in list" :key="index" :name="item?.id" :options="optionsActionTemp" @click="clickTempSwipe" class="mb-20 b-radius">
                     <view class="b-radius bg-#fff pd-20 p-rtv" @click.stop="$u.route({ url: '/plant/storage/fresh-goods/detail/index', params: { id: item.id } })">
                         <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="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ item?.level || '' }}{{ 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">
@@ -41,14 +41,29 @@
                                 <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 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 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>
@@ -153,7 +168,6 @@ const onRefresh = () => {
     paging.value.reload();
 };
 onMounted(() => {
-
     uni.$on('refreshStorageRoomList', () => {
         onRefresh();
     });

src/plant/storage/fresh-goods/list/model/fresh-goods-bottom.vue

@@ -1,5 +1,5 @@
 <template>
-    <view class="source-bottom p-rtv">
+    <view class="source-bottom-fixed">
         <view class="source-top-view h-49"></view>
         <view class="source-bottom-view pt-49 text-center bg-#fff pt-60" :style="{ opacity: btnStyle == 'close' ? 0 : 1 }">
              <view style="opacity: 0;">{{ mapTextBtn[btnStyle] }}</view>
@@ -37,6 +37,10 @@
                 </view>
         </view>
     </view>
+      <view class="pt-60">
+        <view style="opacity: 0;">{{ mapTextBtn[btnStyle] }}</view>
+    </view>
+    <view class="bg-#fff" :style="{ height: safeAreaBottom + 'px' }"></view>
 </template>
 <script setup lang="ts">
 const windowInfo = uni.getWindowInfo();
@@ -52,6 +56,13 @@ const clickBtnBall = () => {
 </script>
 
 <style scoped lang="scss">
+.source-bottom-fixed {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 10;
+}
 .source-center-view {
     position: absolute;
     top: 0;

src/plant/storage/loss-register/index.vue

@@ -5,7 +5,7 @@
         </template>
         <up-form class="p-rtv pd-24" labelPosition="top" :model="form" :rules="rules" labelWidth="auto" ref="upFormRef">
             <view class="bg-fff b-radius-16">
-                <view class="pd3-10-24-24 up-border-bottom">
+                <view class="pd-24 up-border-bottom">
                     <template v-if="info?.stockType === '1'">
                         <view class="d-flex j-ed a-c mb-16">
                             <view class="f-s-22 c-#666">{{ info?.instoreBizInfo?.instoreDate }}</view>
@@ -45,7 +45,7 @@
                     </template>
                     <template v-if="info?.stockType === '2'">
                         <view class="d-flex j-sb a-c li-item-head mb-16">
-                            <view class="li-left-tag" :class="{ [`bg-${selectDictListClass(pt_seed_instore_type, info?.instoreType)}`]: true }">{{ selectDictLabel(pt_seed_instore_type, info?.instoreType) }}</view>
+                            <view class="li-left-tag" :class="{ [`bg-instore-${info?.instoreType}`]: true }">{{ info?.seedLevel }}{{ selectDictLabel(pt_seed_instore_type, info?.instoreType) }}</view>
                             <view class="f-s-22 c-#666">{{ info?.updateTime || info?.createTime }}</view>
                         </view>
                         <view class="mb-10">
@@ -81,7 +81,7 @@
                     </template>
                     <template v-if="info?.stockType === '4'">
                         <view class="d-flex j-sb a-c li-item-head mb-16">
-                            <view class="li-left-tag" :class="{ [`bg-${selectDictListClass(pt_seed_instore_type, info?.instoreType)}`]: true }">{{ selectDictLabel(pt_seed_instore_type, info?.instoreType) }}</view>
+                            <view class="li-left-tag" :class="{ [`bg-instore-${info?.instoreType}`]: true }">{{ info?.level }}{{ selectDictLabel(pt_seed_instore_type, info?.instoreType) }}</view>
                             <view class="f-s-22 c-#666">{{ info?.instoreBizInfo?.instoreDate }}</view>
                         </view>
                         <view class="mb-10">

src/plant/storage/medicine/list/index.vue

@@ -0,0 +1,197 @@
+<template>
+    <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query">
+        <template #top>
+            <ut-navbar title="鲜货库" :fixed="false"></ut-navbar>
+        </template>
+
+        <view class="pd3-24-24-0">
+            <view class="mb-20">
+                <ut-tabs mode="subsection" v-model="form.restFlag" :tabs="tabs" @change="onRefresh"></ut-tabs>
+            </view>
+            <view class="d-flex a-c">
+                <view class="min-w-230 flex1">
+                    <ut-action-sheet v-model="form.instoreType" :tabs="[{ label: '全部', value: '' }, ...pt_fresh_instore_type]" mode="custom" @change="onRefresh" title="选择入库类型">
+                        <view class="d-flex search-select-item a-c">
+                            <view class="flex1 ov-hd f-s-28 c-333 text-center f-w-5 w-s-no">{{ selectDictLabel(pt_fresh_instore_type, form.instoreType) || '全部' }} </view>
+                            <up-icon size="24rpx" color="#333" name="arrow-down-fill" class="mr-5"></up-icon>
+                        </view>
+                    </ut-action-sheet>
+                </view>
+                <view class="h-86 pl-20 w-100%">
+                    <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" margin="0" :border="false" placeholder="搜名称、批号、库房、供应商" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
+                </view>
+            </view>
+            <view></view>
+        </view>
+        <view class="pd-24 bg-#f7f7f7">
+            <up-swipe-action>
+                <up-swipe-action-item v-for="(item, index) in list" :key="index" :name="item?.id" :options="optionsActionTemp" @click="clickTempSwipe" class="mb-20 b-radius">
+                    <view class="b-radius bg-#fff pd-20 p-rtv" @click.stop="$u.route({ url: '/plant/storage/fresh-goods/detail/index', params: { id: item.id } })">
+                        <view class="d-flex j-sb a-c li-item-head mb-16">
+                            <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ item?.seedLevel || '' }}{{ 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?.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>
+                    </view>
+                </up-swipe-action-item>
+            </up-swipe-action>
+        </view>
+
+        <template #empty>
+            <view class="d-flex flex-cln a-c" style="margin-top: -200rpx">
+                <ut-empty class="mg-at" color="#ccc" size="28rpx">暂无鲜货信息，点击下方＋号新增吧</ut-empty>
+            </view>
+        </template>
+    </z-paging>
+</template>
+<script setup lang="ts">
+import { useClientRequest } from '@/utils/request';
+import { selectDictListClass } from '@/utils/ruoyi';
+import { getStorageRoomNames } from '@/utils/common';
+import FreshGoodsBottom from './model/fresh-goods-bottom.vue';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { pt_fresh_instore_type } = toRefs<any>(proxy?.useDict('pt_fresh_instore_type'));
+const list = ref<any[]>();
+const form = ref({ keyword: '', restFlag: '1', instoreType: '', storageType: '4' });
+const paging = ref();
+const tabs = ref([
+    { label: '有库存', value: '1' },
+    { label: '无库存', value: '0' },
+]);
+
+const changeSeach = () => {
+    paging.value.reload();
+};
+const query = async (pageNum: number, pageSize: number) => {
+    const params = {
+        pageNum,
+        pageSize,
+        ...form.value,
+    };
+    const res = await useClientRequest.get('/plt-api/app/storage/list', params);
+    if (res) {
+        const { rows } = res;
+        paging.value.complete(rows);
+    }
+};
+// 暂存项左滑删除配置
+const optionsActionTemp = reactive([
+    {
+        text: '删除',
+        style: {
+            backgroundColor: '#F74C30',
+        },
+    },
+]);
+// 暂存项删除点击（本地移除）
+const clickTempSwipe = async (event: object) => {
+    const { name, index } = event as any;
+    if (index === 0) {
+        try {
+            const res = await uni.showModal({
+                title: '删除提示',
+                content: '确定删除鲜货信息吗？',
+                confirmColor: '#F74C30',
+            });
+            if (!res.confirm) return;
+            await uni.showLoading({
+                title: '删除中...',
+                mask: true,
+            });
+            await useClientRequest.get(`/plt-api/app/storage/removeById/${name}`);
+            uni.hideLoading();
+            uni.showToast({
+                title: '删除成功',
+                icon: 'success',
+            });
+            paging.value?.reload();
+        } catch (error) {
+            console.error('删除暂存鲜货信息失败:', error);
+        }
+    }
+};
+
+const onRefresh = () => {
+    paging.value.reload();
+};
+onMounted(() => {
+    uni.$on('refreshStorageRoomList', () => {
+        onRefresh();
+    });
+});
+</script>
+<style lang="scss" scoped>
+.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>

src/plant/storage/seed-source/detail/index.vue

@@ -18,7 +18,7 @@
             </view>
             <view class="bg-#fff pd-24">
                 <view class="d-flex j-sb a-c li-item-head mb-16">
-                    <view class="li-left-tag" :class="{ [`bg-instore-${form?.instoreType}`]: true }">{{ selectDictLabel(pt_seed_instore_type, form?.instoreType) }}</view>
+                    <view class="li-left-tag" :class="{ [`bg-instore-${form?.instoreType}`]: true }">{{ form?.seedLevel }}{{ selectDictLabel(pt_seed_instore_type, form?.instoreType) }}</view>
                     <view class="f-s-22 c-#666">{{ form?.instoreBizInfo?.instoreDate }}</view>
                 </view>
                 <view class="mb-10">
@@ -34,7 +34,7 @@
                             <span class="c-#666">溯源批号：</span>
                             <span class="c-#333 f-w-500">暂无</span>
                         </view> -->
-                    <view v-if="['A3', 'A4'].includes(form?.fungusCodeType)" class="pd2-4-0 f-s-28">
+                    <view v-if="['A3', 'A4'].includes(form?.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, form?.fungusCodeType) }}/{{ form?.fungusCode }}</span>
                     </view>
@@ -58,7 +58,7 @@
                             {{ form?.harvestInfo?.baseInfo?.baseName || '-' }}
                         </span>
                     </view>
-                    <view v-if="['A3', 'A4'].includes(form?.fungusCodeType)" class="pd2-4-0 f-s-28">
+                    <view v-if="['A3', 'A4'].includes(form?.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, form?.fungusCodeType) }}/{{ form?.fungusCode }}</span>
                     </view>
@@ -103,7 +103,7 @@
                 <view class="f-s-30 pd2-16-0 info-border-bottom">
                     <span class="c-#666">种源加工处理工艺：</span>
                     <span class="c-#333 f-w-600">
-                        {{ form?.harvestInfo?.ptech ? form?.harvestInfo?.ptech.replace(/,/g, '->') : '-' }}
+                        {{ form?.harvestInfo?.ptech ? form?.harvestInfo?.ptech.replace(/,/g, '→') : '-' }}
                     </span>
                 </view>
             </view>

src/plant/storage/seed-source/info-update/index.vue

@@ -253,15 +253,15 @@
                         </view>
                     </up-form-item>
                     <!-- 个体标识：此处仅占位，后续可改为多选列表 -->
-                    <view class="h-1" id="instoreBizInfo.idFlagpppp"></view>
+                    <view class="h-1" id="idFlagpppp"></view>
                     <up-form-item borderBottom label="是否有个体标识" prop="instoreBizInfo.idFlag" required>
                         <up-radio-group v-model="form.instoreBizInfo.idFlag">
                             <up-radio :customStyle="{ marginRight: '60rpx' }" v-for="(item, index) in yes_no" :key="index" :label="item.label" :name="item.value"></up-radio>
                         </up-radio-group>
                     </up-form-item>
                     <!-- 个体标识：此处仅占位，后续可改为多选列表 -->
+                    <view class="h-1" id="animalspppp"></view>
                     <template v-if="+form?.instoreBizInfo?.idFlag">
-                        <view class="h-1" id="instoreBizInfo.animalspppp"></view>
                         <up-form-item borderBottom label="个体标识号" prop="instoreBizInfo.animals" required>
                             <AnimalsInput v-model="form.instoreBizInfo.animals"></AnimalsInput>
                         </up-form-item>
@@ -366,22 +366,17 @@
                     </up-form-item>
                 </view>
             </template>
-             <template v-if="form.instoreType == '3'">
+            <template v-if="form.instoreType == '3'">
                 <view class="pd-24">
                     <view class="startline-title">种源信息</view>
                 </view>
                 <view class="pd-24 bg-#fff">
                     <!-- 基本信息 -->
                     <view class="h-1" id="seedTypepppp"></view>
-                    <ut-action-sheet :tabs="pt_seed_type" mode="custom" title="种源类型" v-model="form.seedType">
-                        <up-form-item borderBottom label="种源类型" required prop="seedType">
-                            <view v-if="form.seedType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_seed_type, form.seedType) }}</view>
-                            <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种源类型</view>
-                            <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
-                            </template>
-                        </up-form-item>
-                    </ut-action-sheet>
+                    <up-form-item borderBottom label="种源类型" required prop="seedType">
+                        <view v-if="form.seedType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_seed_type, form.seedType) }}</view>
+                        <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种源类型</view>
+                    </up-form-item>
                     <view class="h-1" id="varietyIdpppp"></view>
                     <up-form-item borderBottom label="物种基原" required prop="varietyId">
                         <view class="flex1">
@@ -399,15 +394,6 @@
                                     <span class="f-s-24 c-#666">{{ form?.varietyInfo?.genusLatinName }}</span>
                                 </view>
                                 <view v-if="form?.varietyInfo?.medicineName" class="f-s-24 c-#666">产出：{{ form?.varietyInfo?.medicineName }}</view>
-                                <view
-                                    class="close-icon pd-16"
-                                    @click="
-                                        form.varietyId = '';
-                                        form.varietyInfo = null;
-                                    "
-                                >
-                                    <up-icon color="#F81242" name="close" size="32rpx"></up-icon>
-                                </view>
                             </view>
                         </view>
                     </up-form-item>
@@ -415,15 +401,10 @@
                         <up-input v-model="form.seedName" placeholder="请输入具体品种/品系名称" border="none" clearable></up-input>
                     </up-form-item>
                     <view class="h-1" id="seedSourcepppp"></view>
-                    <ut-action-sheet :tabs="pt_seed_source_tag" mode="custom" title="种源来源" v-model="form.seedSource">
-                        <up-form-item borderBottom label="种源来源" required prop="seedSource">
-                            <view v-if="form.seedSource" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_seed_source, form.seedSource) }}</view>
-                            <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种源来源</view>
-                            <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
-                            </template>
-                        </up-form-item>
-                    </ut-action-sheet>
+                    <up-form-item borderBottom label="种源来源" required prop="seedSource">
+                        <view v-if="form.seedSource" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_seed_source, form.seedSource) }}</view>
+                        <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种源来源</view>
+                    </up-form-item>
                     <!-- 入库数量与单位 -->
                     <view class="h-1" id="capacitypppp"></view>
                     <view class="h-1" id="unitpppp"></view>
@@ -434,43 +415,11 @@
                     <up-form-item borderBottom label="检验报告" prop="examinReport">
                         <ut-upload v-model="form.examinReport" :max-count="50" valueType="array" accept="image,file"></ut-upload>
                     </up-form-item>
-                    <template v-if="['2', '3'].includes(form.seedSource as string)">
-                        <up-form-item borderBottom label="供应商" prop="supplierId" required>
-                            <view class="flex1">
-                                <ContactUnitInput v-model="form.supplierId" v-model:info="form.supplierInfo" :params="{ cpyType: '4' }" title="选择供应商" placeholder="请选择供应商信息"></ContactUnitInput>
-                            </view>
-                        </up-form-item>
-                        <up-form-item borderBottom label="供应商是否是生产商" prop="supplierProducerFlag">
-                            <up-radio-group v-model="form.supplierProducerFlag">
-                                <up-radio :customStyle="{ marginRight: '60rpx' }" v-for="(item, index) in yes_no" :key="index" :label="item.label" :name="item.value"></up-radio>
-                            </up-radio-group>
-                        </up-form-item>
-                        <up-form-item borderBottom label="生产商" prop="producer">
-                            <up-input v-model="form.producer" placeholder="请输入生产商名称" border="none" clearable></up-input>
-                        </up-form-item>
-                    </template>
+               
                     <!-- 菌种编码信息 -->
                     <up-form-item required v-if="['A4', 'A8'].includes(form.seedType as string)" :label="`${selectDictLabel(pt_seed_type, form.seedType as string)}编号`" class="form-item-bottom-padding-0">
-                        <view class="d-flex flex1">
-                            <view class="flex1">
-                                <ut-action-sheet v-model="form.fungusCodeType" :tabs="pt_fungus_code_type" mode="custom" title="选择单位">
-                                    <up-form-item prop="fungusCodeType" border-bottom class="form-item-top-padding-0">
-                                        <view class="flex1" style="line-height: 24px">
-                                            <view v-if="form.fungusCodeType" class="f-s-30 c-333 f-w-5">{{ selectDictLabel(pt_fungus_code_type, form.fungusCodeType) }}</view>
-                                            <view v-else class="f-s-30 c-ccc f-w-4">选择编号类型</view>
-                                        </view>
-                                        <template #right>
-                                            <up-icon class="pr-20" size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
-                                        </template>
-                                    </up-form-item>
-                                </ut-action-sheet>
-                            </view>
-                            <view class="pd-5"></view>
-                            <view class="flex1">
-                                <up-form-item prop="fungusCode" border-bottom class="form-item-top-padding-0">
-                                    <up-input v-model="form.fungusCode" placeholder="输入数字小数点" border="none" clearable></up-input>
-                                </up-form-item>
-                            </view>
+                        <view class="f-s-30 c-333 f-w-5 flex1">
+                           {{ selectDictLabel(pt_fungus_code_type, form?.fungusCodeType) }}/{{ form?.fungusCode }}
                         </view>
                     </up-form-item>
                     <!-- 个体标识：此处仅占位，后续可改为多选列表 -->
@@ -481,8 +430,8 @@
                         </up-radio-group>
                     </up-form-item>
                     <!-- 个体标识：此处仅占位，后续可改为多选列表 -->
+                    <view class="h-1" id="instoreBizInfo.animalspppp"></view>
                     <template v-if="+form?.instoreBizInfo?.idFlag">
-                        <view class="h-1" id="instoreBizInfo.animalspppp"></view>
                         <up-form-item borderBottom label="个体标识号" prop="instoreBizInfo.animals" required>
                             <AnimalsInput v-model="form.instoreBizInfo.animals"></AnimalsInput>
                         </up-form-item>
@@ -717,24 +666,6 @@ const submitForm = async () => {
         true,
     );
 };
-// 点击随机生成服务端生成唯一的批号（与 add 一致）
-const generateBatchCode = async () => {
-    uni.showLoading({
-        title: '生成中...',
-    });
-    const res = await useClientRequest.post('/plt-api/app/plantationTask/getBatchCode', {
-        plType: 'S',
-        linkType: 'I',
-    });
-    if (res && res.code === 200) {
-        uni.hideLoading();
-        form.value.batchCode = res.data;
-        uni.showToast({
-            title: '批号生成成功',
-            icon: 'success',
-        });
-    }
-};
 
 // 选择物种、父母本逻辑保持与 info-edit 一致
 const selectVarietyId = () => {
@@ -785,6 +716,10 @@ const getDetailById = async (id: string) => {
         form.value = {
             ...form.value,
             ...res.data,
+            instoreBizInfo: {
+                ...form.value.instoreBizInfo,
+                ...res.data.instoreBizInfo,
+            },
         };
     }
 };

src/plant/storage/seed-source/list/index.vue

@@ -28,7 +28,7 @@
                 <up-swipe-action-item v-for="(item, index) in list" :key="index" :name="item?.id" :options="optionsActionTemp" @click="clickTempSwipe($event, item)" class="mb-20 b-radius">
                     <view class="b-radius bg-#fff pd-20 p-rtv" @click.stop="$u.route({ url: '/plant/storage/seed-source/detail/index', params: { id: item.id } })">
                         <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="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ item?.seedLevel }}{{ 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">
@@ -50,7 +50,7 @@
                             <span class="c-#666">溯源批号：</span>
                             <span class="c-#333 f-w-500">暂无</span>
                         </view> -->
-                            <view v-if="['A3', 'A4'].includes(item?.fungusCodeType)" class="pd2-4-0 f-s-28">
+                            <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>
@@ -74,7 +74,7 @@
                                     {{ item?.harvestInfo?.baseInfo?.baseName || '-' }}
                                 </span>
                             </view>
-                            <view v-if="['A3', 'A4'].includes(item?.fungusCodeType)" class="pd2-4-0 f-s-28">
+                            <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>

src/plant/storage/seed-source/list/model/source-bottom.vue

@@ -1,14 +1,12 @@
 <template>
-    <view class="source-bottom p-rtv">
+    <view class="source-bottom-fixed">
         <view class="source-top-view h-49"></view>
         <view class="source-bottom-view pt-49 text-center bg-#fff pt-60" :style="{ opacity: btnStyle == 'close' ? 0 : 1 }">
              <view style="opacity: 0;">{{ mapTextBtn[btnStyle] }}</view>
-       
         </view>
         <view @click="clickBtnBall" class="source-center-view d-flex flex-cln a-c j-c">
             <view class="source-btn-ball d-flex a-c j-c" :class="{ [`btn-deg-${btnStyle}`]: true }" :style="{ backgroundImage: 'url(https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/storage/add_c_btn.png)' }"></view>
             <view class="c-primary f-s-28 pt-6">{{ mapTextBtn[btnStyle] }}</view>
-            
         </view>
         <view class="bg-#fff" :style="{ height: safeAreaBottom + 'px' }"></view>
         <view class="bottom-circle-line" :class="{ 'bottom-circle-line-active': btnStyle == 'close' }" :style="{ bottom: safeAreaBottom + 'px' }">
@@ -37,6 +35,10 @@
                 </view>
         </view>
     </view>
+    <view class="pt-60">
+        <view style="opacity: 0;">{{ mapTextBtn[btnStyle] }}</view>
+    </view>
+    <view class="bg-#fff" :style="{ height: safeAreaBottom + 'px' }"></view>
 </template>
 <script setup lang="ts">
 const windowInfo = uni.getWindowInfo();
@@ -52,6 +54,13 @@ const clickBtnBall = () => {
 </script>
 
 <style scoped lang="scss">
+.source-bottom-fixed {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 10;
+}
 .source-center-view {
     position: absolute;
     top: 0;

src/plant/storage/storage-room/list/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query" safe-area-inset-bottom>
+    <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query" safe-area-inset-bottom hide-no-more-inside>
         <template #top>
             <ut-navbar title="库房管理" :fixed="false" border></ut-navbar>
             <view class="d-flex a-c pd-25">

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

@@ -23,7 +23,7 @@
                             <span class="c-#666">溯源批号：</span>
                             <span class="c-#333 f-w-500">暂无</span>
                         </view> -->
-            <view v-if="['A3', 'A4'].includes(item?.fungusCodeType)" class="pd2-4-0 f-s-28">
+            <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>