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

src/assets/styles/public.scss

@@ -112,6 +112,10 @@ $colors: (
     res-0: #f6881c,
     res-1: #2F9E4A,
     res-2: #FD2D39,
+    instore-1: #1EBDDC,
+    instore-2: #C7A262,
+    instore-3: #37A954,
+    instore-4: #67c23a,
 );
 @each $color, $value in $colors {
     .c-#{$color} {

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

@@ -25,8 +25,7 @@
                         <view class="d-flex flex1 mb-10">
                             <view class="flex1">
                                 <span class="f-s-34 c-#333 f-w-500 mr-10">{{ item?.materialName }}</span>
-                                <span class="f-s-24 c-#666">{{ selectDictLabel(pt_material_type, item?.materialType)
-                                    }}</span>
+                                <span class="f-s-24 c-#666">{{ selectDictLabel(pt_material_type, item?.materialType) }}</span>
                             </view>
                             <view>
                                 <view v-if="item?.examinReport?.length" class="tag-span c-primary bg-#EBF6EE">已检验</view>

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

@@ -55,7 +55,7 @@
             <view class="pd-24 bg-#fff">
                 <!-- 入库类型 -->
                 <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_seed_instore_type, form.instoreType) }}</view>
+                    <view v-if="form.instoreType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_fresh_instore_type, form.instoreType) }}</view>
                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择入库类型</view>
                 </up-form-item>
                 <!-- 入库日期 -->
@@ -109,7 +109,7 @@ import { parseTime } from '@/utils/ruoyi';
 import SelectWarehouseInput from '@/models/select-warehouse-input/select-warehouse-input.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { pt_seed_instore_type, pt_warehouse_type, pt_seed_type, pt_seed_source } = toRefs<any>(proxy?.useDict('pt_seed_instore_type', 'pt_warehouse_type', 'pt_seed_type', 'pt_seed_source'));
+const { pt_fresh_instore_type, pt_warehouse_type, pt_seed_type, pt_seed_source } = toRefs<any>(proxy?.useDict('pt_fresh_instore_type', 'pt_warehouse_type', 'pt_seed_type', 'pt_seed_source'));
 // 表单与分页等基础状态（参考 base-edit 风格）
 const paging = ref<any>(null);
 const upFormRef = ref<any>(null);

src/plant/storage/fresh-goods/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-${selectDictListClass(pt_seed_instore_type, form?.instoreType)}`]: true }">{{ selectDictLabel(pt_seed_instore_type, form?.instoreType) }}</view>
+                    <view class="li-left-tag" :class="{ [`bg-instore-${form?.instoreType}`]: true }">{{ selectDictLabel(pt_seed_instore_type, form?.instoreType) }}</view>
                     <view class="f-s-22 c-#666">{{ form?.instoreBizInfo?.instoreDate }}</view>
                 </view>
                 <view class="mb-10">

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

@@ -117,7 +117,7 @@
             <view class="pd-24 bg-#fff">
                 <!-- 入库类型 -->
                 <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_seed_instore_type, form.instoreType) }}</view>
+                    <view v-if="form.instoreType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_fresh_instore_type, form.instoreType) }}</view>
                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择入库类型</view>
                 </up-form-item>
                 <!-- 入库日期 -->
@@ -169,7 +169,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_seed_instore_type, pt_warehouse_type, pt_medicine_source,pt_medicine_unit, yes_no  } = toRefs<any>(proxy?.useDict('pt_seed_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  } = toRefs<any>(proxy?.useDict('pt_fresh_instore_type', 'pt_warehouse_type', 'pt_medicine_source','pt_medicine_unit', 'yes_no'));
 const paging = ref<any>(null);
 const upFormRef = ref<any>(null);
 // 单条鲜货信息 + 入库信息的合并表单

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

@@ -10,9 +10,9 @@
             </view>
             <view class="d-flex a-c">
                 <view class="min-w-230 flex1">
-                    <ut-action-sheet v-model="form.instoreType" :tabs="[{ label: '全部', value: '' }, ...pt_seed_instore_type]" mode="custom" @change="onRefresh" title="选择入库类型">
+                    <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_seed_instore_type, form.instoreType) || '全部' }} </view>
+                            <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>
@@ -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-${selectDictListClass(pt_seed_instore_type, item?.instoreType)}`]: true }">{{ selectDictLabel(pt_seed_instore_type, item?.instoreType) }}</view>
+                            <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">
@@ -88,7 +88,7 @@ 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_seed_instore_type } = toRefs<any>(proxy?.useDict('pt_seed_instore_type'));
+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();

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

@@ -18,29 +18,55 @@
             </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-${selectDictListClass(pt_seed_instore_type, form?.instoreType)}`]: true }">{{ selectDictLabel(pt_seed_instore_type, form?.instoreType) }}</view>
+                    <view class="li-left-tag" :class="{ [`bg-instore-${form?.instoreType}`]: true }">{{ 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 class="f-s-24 c-#666">{{ selectDictLabel(pt_seed_type, form?.seedType) }}</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="['A3', 'A4'].includes(form?.fungusCodeType)" 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>
-                <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>
-                <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>
-                </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 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(form?.fungusCodeType)" 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>
+                    <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>
+                    <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>
+                    </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>
+                    <view v-if="['A3', 'A4'].includes(form?.fungusCodeType)" 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>
+                    <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>
+                    </view>
+                </template>
                 <view class="pd2-4-0 f-s-28">
                     <span class="c-#666">入库量：</span>
                     <span class="c-#333 f-w-500">{{ form?.capacity }}{{ form?.unit }}</span>
@@ -59,6 +85,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?.processingMethod || '-' }}
+                    </span>
+                </view>
+            </view>
             <view class="pd-24">
                 <view class="startline-title">种源信息</view>
             </view>
@@ -228,14 +276,16 @@
                     <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>
-                </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 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>

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

@@ -5,107 +5,45 @@
         </template>
         <up-form class="p-rtv" labelPosition="top" :model="form" :rules="rules" labelWidth="auto" ref="upFormRef">
             <!-- 种源信息（复制自 info-edit 字段与顺序） -->
-            <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>
-                <view class="h-1" id="varietyIdpppp"></view>
-                <up-form-item borderBottom label="物种基原" required prop="varietyId">
-                    <view class="flex1">
-                        <up-button v-if="!form.varietyId" @click="selectVarietyId" type="primary" plain>
-                            <image class="w-36 h-36 mr-10" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/common/select_push_icon.png" mode="widthFix" />
-                            <span>请选择物种基原</span>
-                        </up-button>
-                        <view v-else class="bg-#FBFDFB card-info-block pd-24 p-rtv">
-                            <view class="mb-16">
-                                <span class="f-s-34 c-#333 f-w-5 mr-16">{{ form?.varietyInfo?.varietyName }}</span>
-                                <span class="f-s-24 c-#666">{{ form?.varietyInfo?.latinName }}</span>
-                            </view>
-                            <view class="mb-16">
-                                <span class="f-s-28 c-#333 f-w-5 mr-16">{{ form?.varietyInfo?.genusName }}</span>
-                                <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>
-                <up-form-item borderBottom label="具体品种/品系名称" prop="seedName">
-                    <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>
-                <view class="h-1" id="motherFatherFlagpppp"></view>
-                <ut-action-sheet :tabs="pt_mother_father_flag" mode="custom" title="父母本情况" v-model="form.instoreBizInfo.motherFatherFlag">
-                    <template v-if="['A3', 'A4'].includes(form.seedType as string) || ['3'].includes(form.seedSource as string)">
-                        <up-form-item borderBottom label="父母本情况" prop="instoreBizInfo.motherFatherFlag" required>
-                            <view v-if="form.instoreBizInfo.motherFatherFlag" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mother_father_flag, form.instoreBizInfo.motherFatherFlag) }}</view>
-                            <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择父母本情况</view>
+            <!-- 非溯源入库编辑 -->
+            <template v-if="form.instoreType == '2'">
+                <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>
-                    </template>
-                    <template v-else>
-                        <up-form-item borderBottom label="父母本情况">
-                            <view v-if="form.instoreBizInfo.motherFatherFlag" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mother_father_flag, form.instoreBizInfo.motherFatherFlag) }}</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>
-                    </template>
-                </ut-action-sheet>
-                <template>
-                    <!-- 父本品种 -->
-                    <up-form-item v-if="form?.instoreBizInfo?.motherFatherFlag == '2'" borderBottom label="父本品种" prop="fatherVarietyId">
+                    </ut-action-sheet>
+                    <view class="h-1" id="varietyIdpppp"></view>
+                    <up-form-item borderBottom label="物种基原" required prop="varietyId">
                         <view class="flex1">
-                            <up-button v-if="!form.instoreBizInfo.fatherVarietyId" @click="selectFatherVarietyId" type="primary" plain>
+                            <up-button v-if="!form.varietyId" @click="selectVarietyId" type="primary" plain>
                                 <image class="w-36 h-36 mr-10" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/common/select_push_icon.png" mode="widthFix" />
-                                <span>请选择父本品种</span>
+                                <span>请选择物种基原</span>
                             </up-button>
                             <view v-else class="bg-#FBFDFB card-info-block pd-24 p-rtv">
                                 <view class="mb-16">
-                                    <span class="f-s-34 c-#333 f-w-5 mr-16">{{ form?.instoreBizInfo?.fatherVarietyInfo?.varietyName }}</span>
-                                    <span class="f-s-24 c-#666">{{ form?.instoreBizInfo?.fatherVarietyInfo?.latinName }}</span>
+                                    <span class="f-s-34 c-#333 f-w-5 mr-16">{{ form?.varietyInfo?.varietyName }}</span>
+                                    <span class="f-s-24 c-#666">{{ form?.varietyInfo?.latinName }}</span>
                                 </view>
                                 <view class="mb-16">
-                                    <span class="f-s-28 c-#333 f-w-5 mr-16">{{ form?.instoreBizInfo?.fatherVarietyInfo?.genusName }}</span>
-                                    <span class="f-s-24 c-#666">{{ form?.instoreBizInfo?.fatherVarietyInfo?.genusLatinName }}</span>
+                                    <span class="f-s-28 c-#333 f-w-5 mr-16">{{ form?.varietyInfo?.genusName }}</span>
+                                    <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?.instoreBizInfo?.fatherVarietyInfo?.medicineName }}</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.instoreBizInfo.fatherVarietyId = '';
-                                        form.instoreBizInfo.fatherVarietyInfo = null;
+                                        form.varietyId = '';
+                                        form.varietyInfo = null;
                                     "
                                 >
                                     <up-icon color="#F81242" name="close" size="32rpx"></up-icon>
@@ -113,258 +51,321 @@
                             </view>
                         </view>
                     </up-form-item>
-                    <!-- 母本品种 -->
-                    <up-form-item borderBottom label="母本品种" prop="instoreBizInfo.motherVarietyId">
-                        <view class="flex1">
-                            <up-button v-if="!form.instoreBizInfo.motherVarietyId" @click="selectMotherVarietyId" type="primary" plain>
-                                <image class="w-36 h-36 mr-10" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/common/select_push_icon.png" mode="widthFix" />
-                                <span>请选择母本品种</span>
-                            </up-button>
-                            <view v-else class="bg-#FBFDFB card-info-block pd-24 p-rtv mt-16">
-                                <view class="mb-16">
-                                    <span class="f-s-34 c-#333 f-w-5 mr-16">{{ form?.instoreBizInfo?.motherVarietyInfo?.varietyName }}</span>
-                                    <span class="f-s-24 c-#666">{{ form?.instoreBizInfo?.motherVarietyInfo?.latinName }}</span>
-                                </view>
-                                <view class="mb-16">
-                                    <span class="f-s-28 c-#333 f-w-5 mr-16">{{ form?.instoreBizInfo?.motherVarietyInfo?.genusName }}</span>
-                                    <span class="f-s-24 c-#666">{{ form?.instoreBizInfo?.motherVarietyInfo?.genusLatinName }}</span>
+                    <up-form-item borderBottom label="具体品种/品系名称" prop="seedName">
+                        <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>
+                    <view class="h-1" id="motherFatherFlagpppp"></view>
+                    <ut-action-sheet :tabs="pt_mother_father_flag" mode="custom" title="父母本情况" v-model="form.instoreBizInfo.motherFatherFlag">
+                        <template v-if="['A3', 'A4'].includes(form.seedType as string) || ['3'].includes(form.seedSource as string)">
+                            <up-form-item borderBottom label="父母本情况" prop="instoreBizInfo.motherFatherFlag" required>
+                                <view v-if="form.instoreBizInfo.motherFatherFlag" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mother_father_flag, form.instoreBizInfo.motherFatherFlag) }}</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>
+                        </template>
+                        <template v-else>
+                            <up-form-item borderBottom label="父母本情况">
+                                <view v-if="form.instoreBizInfo.motherFatherFlag" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mother_father_flag, form.instoreBizInfo.motherFatherFlag) }}</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>
+                        </template>
+                    </ut-action-sheet>
+                    <template>
+                        <!-- 父本品种 -->
+                        <up-form-item v-if="form?.instoreBizInfo?.motherFatherFlag == '2'" borderBottom label="父本品种" prop="fatherVarietyId">
+                            <view class="flex1">
+                                <up-button v-if="!form.instoreBizInfo.fatherVarietyId" @click="selectFatherVarietyId" type="primary" plain>
+                                    <image class="w-36 h-36 mr-10" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/common/select_push_icon.png" mode="widthFix" />
+                                    <span>请选择父本品种</span>
+                                </up-button>
+                                <view v-else class="bg-#FBFDFB card-info-block pd-24 p-rtv">
+                                    <view class="mb-16">
+                                        <span class="f-s-34 c-#333 f-w-5 mr-16">{{ form?.instoreBizInfo?.fatherVarietyInfo?.varietyName }}</span>
+                                        <span class="f-s-24 c-#666">{{ form?.instoreBizInfo?.fatherVarietyInfo?.latinName }}</span>
+                                    </view>
+                                    <view class="mb-16">
+                                        <span class="f-s-28 c-#333 f-w-5 mr-16">{{ form?.instoreBizInfo?.fatherVarietyInfo?.genusName }}</span>
+                                        <span class="f-s-24 c-#666">{{ form?.instoreBizInfo?.fatherVarietyInfo?.genusLatinName }}</span>
+                                    </view>
+                                    <view v-if="form?.varietyInfo?.medicineName" class="f-s-24 c-#666">产出：{{ form?.instoreBizInfo?.fatherVarietyInfo?.medicineName }}</view>
+                                    <view
+                                        class="close-icon pd-16"
+                                        @click="
+                                            form.instoreBizInfo.fatherVarietyId = '';
+                                            form.instoreBizInfo.fatherVarietyInfo = null;
+                                        "
+                                    >
+                                        <up-icon color="#F81242" name="close" size="32rpx"></up-icon>
+                                    </view>
                                 </view>
-                                <view v-if="form?.varietyInfo?.medicineName" class="f-s-24 c-#666">产出：{{ form?.instoreBizInfo?.motherVarietyInfo?.medicineName }}</view>
-                                <view
-                                    class="close-icon pd-16"
-                                    @click="
-                                        form.instoreBizInfo.motherVarietyId = '';
-                                        form.instoreBizInfo.motherVarietyInfo = null;
-                                    "
-                                >
-                                    <up-icon color="#F81242" name="close" size="32rpx"></up-icon>
+                            </view>
+                        </up-form-item>
+                        <!-- 母本品种 -->
+                        <up-form-item borderBottom label="母本品种" prop="instoreBizInfo.motherVarietyId">
+                            <view class="flex1">
+                                <up-button v-if="!form.instoreBizInfo.motherVarietyId" @click="selectMotherVarietyId" type="primary" plain>
+                                    <image class="w-36 h-36 mr-10" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/common/select_push_icon.png" mode="widthFix" />
+                                    <span>请选择母本品种</span>
+                                </up-button>
+                                <view v-else class="bg-#FBFDFB card-info-block pd-24 p-rtv mt-16">
+                                    <view class="mb-16">
+                                        <span class="f-s-34 c-#333 f-w-5 mr-16">{{ form?.instoreBizInfo?.motherVarietyInfo?.varietyName }}</span>
+                                        <span class="f-s-24 c-#666">{{ form?.instoreBizInfo?.motherVarietyInfo?.latinName }}</span>
+                                    </view>
+                                    <view class="mb-16">
+                                        <span class="f-s-28 c-#333 f-w-5 mr-16">{{ form?.instoreBizInfo?.motherVarietyInfo?.genusName }}</span>
+                                        <span class="f-s-24 c-#666">{{ form?.instoreBizInfo?.motherVarietyInfo?.genusLatinName }}</span>
+                                    </view>
+                                    <view v-if="form?.varietyInfo?.medicineName" class="f-s-24 c-#666">产出：{{ form?.instoreBizInfo?.motherVarietyInfo?.medicineName }}</view>
+                                    <view
+                                        class="close-icon pd-16"
+                                        @click="
+                                            form.instoreBizInfo.motherVarietyId = '';
+                                            form.instoreBizInfo.motherVarietyInfo = null;
+                                        "
+                                    >
+                                        <up-icon color="#F81242" name="close" size="32rpx"></up-icon>
+                                    </view>
                                 </view>
                             </view>
-                        </view>
-                    </up-form-item>
-                </template>
-                <view class="h-1" id="genCountpppp"></view>
-                <view class="h-1" id="genUnitpppp"></view>
-                <template v-if="['A3', 'A4'].includes(form.seedType as string)">
-                    <up-form-item :label="`${genCountMap[form.seedType as 'A3' | 'A4']}`" required class="form-item-bottom-padding-0">
-                        <view class="d-flex flex1">
-                            <view class="flex1 ov-hd">
-                                <up-form-item prop="instoreBizInfo.genCount" border-bottom class="form-item-top-padding-0">
-                                    <up-input v-model="form.instoreBizInfo.genCount" :placeholder="`请输入${genCountMap[form.seedType as 'A3' | 'A4']}`" border="none" clearable></up-input>
-                                </up-form-item>
+                        </up-form-item>
+                    </template>
+                    <view class="h-1" id="genCountpppp"></view>
+                    <view class="h-1" id="genUnitpppp"></view>
+                    <template v-if="['A3', 'A4'].includes(form.seedType as string)">
+                        <up-form-item :label="`${genCountMap[form.seedType as 'A3' | 'A4']}`" required class="form-item-bottom-padding-0">
+                            <view class="d-flex flex1">
+                                <view class="flex1 ov-hd">
+                                    <up-form-item prop="instoreBizInfo.genCount" border-bottom class="form-item-top-padding-0">
+                                        <up-input v-model="form.instoreBizInfo.genCount" :placeholder="`请输入${genCountMap[form.seedType as 'A3' | 'A4']}`" border="none" clearable></up-input>
+                                    </up-form-item>
+                                </view>
+                                <view class="pd-5"></view>
+                                <view class="min-w-200">
+                                    <ut-action-sheet v-model="form.instoreBizInfo.genUnit" :tabs="pt_gen_unit" mode="custom" title="选择单位">
+                                        <up-form-item prop="instoreBizInfo.genUnit" border-bottom class="form-item-top-padding-0">
+                                            <view class="flex1" style="line-height: 24px">
+                                                <view v-if="form.instoreBizInfo.genUnit" class="f-s-30 c-333 f-w-5 text-center">{{ selectDictLabel(pt_gen_unit, form.instoreBizInfo.genUnit) }}</view>
+                                                <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
+                                            </view>
+                                            <template #right>
+                                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            </template>
+                                        </up-form-item>
+                                    </ut-action-sheet>
+                                </view>
                             </view>
-                            <view class="pd-5"></view>
-                            <view class="min-w-200">
-                                <ut-action-sheet v-model="form.instoreBizInfo.genUnit" :tabs="pt_gen_unit" mode="custom" title="选择单位">
-                                    <up-form-item prop="instoreBizInfo.genUnit" border-bottom class="form-item-top-padding-0">
-                                        <view class="flex1" style="line-height: 24px">
-                                            <view v-if="form.instoreBizInfo.genUnit" class="f-s-30 c-333 f-w-5 text-center">{{ selectDictLabel(pt_gen_unit, form.instoreBizInfo.genUnit) }}</view>
-                                            <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
-                                        </view>
-                                        <template #right>
-                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
-                                        </template>
+                        </up-form-item>
+                    </template>
+                    <template v-else>
+                        <up-form-item label="繁衍世代" class="form-item-bottom-padding-0">
+                            <view class="d-flex flex1">
+                                <view class="flex1 ov-hd">
+                                    <up-form-item border-bottom class="form-item-top-padding-0">
+                                        <up-input v-model="form.instoreBizInfo.genCount" placeholder="请输入繁衍世代" border="none" clearable></up-input>
                                     </up-form-item>
-                                </ut-action-sheet>
+                                </view>
+                                <view class="pd-5"></view>
+                                <view class="min-w-200">
+                                    <ut-action-sheet v-model="form.instoreBizInfo.genUnit" :tabs="pt_gen_unit" mode="custom" title="选择单位">
+                                        <up-form-item border-bottom class="form-item-top-padding-0">
+                                            <view class="flex1" style="line-height: 24px">
+                                                <view v-if="form.instoreBizInfo.genUnit" class="f-s-30 c-333 f-w-5 text-center">{{ selectDictLabel(pt_gen_unit, form.instoreBizInfo.genUnit) }}</view>
+                                                <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
+                                            </view>
+                                            <template #right>
+                                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            </template>
+                                        </up-form-item>
+                                    </ut-action-sheet>
+                                </view>
                             </view>
+                        </up-form-item>
+                    </template>
+                    <view class="h-1" id="entrustIdpppp"></view>
+                    <up-form-item borderBottom label="受托单位" prop="entrustId" required>
+                        <view class="flex1">
+                            <ContactUnitInput v-model="form.entrustId" v-model:info="form.entrustInfo" :params="{ cpyType: '2' }" title="选择受托单位" placeholder="请选择受托单位信息"></ContactUnitInput>
                         </view>
                     </up-form-item>
-                </template>
-                <template v-else>
-                    <up-form-item label="繁衍世代" class="form-item-bottom-padding-0">
-                        <view class="d-flex flex1">
-                            <view class="flex1 ov-hd">
-                                <up-form-item border-bottom class="form-item-top-padding-0">
-                                    <up-input v-model="form.instoreBizInfo.genCount" placeholder="请输入繁衍世代" border="none" clearable></up-input>
-                                </up-form-item>
+                    <!-- 入库数量与单位 -->
+                    <view class="h-1" id="capacitypppp"></view>
+                    <view class="h-1" id="unitpppp"></view>
+                    <up-form-item label="入库量" prop="capacity" required class="form-item-bottom-padding-0">
+                        <view class="f-s-30 c-333 f-w-5 flex1">{{ form?.capacity }}{{ form?.unit }}</view>
+                    </up-form-item>
+                    <!-- 检验报告与供应商信息 -->
+                    <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>
-                            <view class="pd-5"></view>
-                            <view class="min-w-200">
-                                <ut-action-sheet v-model="form.instoreBizInfo.genUnit" :tabs="pt_gen_unit" mode="custom" title="选择单位">
-                                    <up-form-item border-bottom class="form-item-top-padding-0">
+                        </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.instoreBizInfo.genUnit" class="f-s-30 c-333 f-w-5 text-center">{{ selectDictLabel(pt_gen_unit, form.instoreBizInfo.genUnit) }}</view>
-                                            <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
+                                            <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 size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <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>
                     </up-form-item>
-                </template>
-
-                <view class="h-1" id="entrustIdpppp"></view>
-                <up-form-item borderBottom label="受托单位" prop="entrustId" required>
-                    <view class="flex1">
-                        <ContactUnitInput v-model="form.entrustId" v-model:info="form.entrustInfo" :params="{ cpyType: '2' }" title="选择受托单位" placeholder="请选择受托单位信息"></ContactUnitInput>
-                    </view>
-                </up-form-item>
-
-                <!-- 入库数量与单位 -->
-                <view class="h-1" id="capacitypppp"></view>
-                <view class="h-1" id="unitpppp"></view>
-                <up-form-item label="入库量" prop="capacity" required class="form-item-bottom-padding-0">
-                    <view class="f-s-30 c-333 f-w-5 flex1">{{ form?.capacity }}{{ form?.unit }}</view>
-                </up-form-item>
-                <!-- 检验报告与供应商信息 -->
-                <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">
+                    <!-- 个体标识：此处仅占位，后续可改为多选列表 -->
+                    <view class="h-1" id="instoreBizInfo.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>
-                    <up-form-item borderBottom label="生产商" prop="producer">
-                        <up-input v-model="form.producer" placeholder="请输入生产商名称" border="none" clearable></up-input>
+                    <!-- 个体标识：此处仅占位，后续可改为多选列表 -->
+                    <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>
+                    </template>
+                    <!-- 保藏方法 -->
+                    <up-form-item borderBottom label="保藏方法" prop="instoreBizInfo.storageMethod">
+                        <up-input v-model="form.instoreBizInfo.storageMethod" 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>
-                </up-form-item>
-                <!-- 个体标识：此处仅占位，后续可改为多选列表 -->
-                <view class="h-1" id="instoreBizInfo.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>
-                <!-- 个体标识：此处仅占位，后续可改为多选列表 -->
-                <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 borderBottom label="种源图片" prop="imgs">
+                        <ut-upload v-model="form.imgs" :max-count="9" valueType="string"></ut-upload>
+                    </up-form-item>
+                    <up-form-item borderBottom label="种源视频" prop="vedios">
+                        <ut-upload v-model="form.vedios" :max-count="3" accept="video" valueType="string"></ut-upload>
                     </up-form-item>
-                </template>
-                <!-- 保藏方法 -->
-                <up-form-item borderBottom label="保藏方法" prop="instoreBizInfo.storageMethod">
-                    <up-input v-model="form.instoreBizInfo.storageMethod" placeholder="请输入保藏方法" border="none" clearable></up-input>
-                </up-form-item>
-                <!-- 媒体与附件 -->
-                <up-form-item borderBottom label="种源图片" prop="imgs">
-                    <ut-upload v-model="form.imgs" :max-count="9" valueType="string"></ut-upload>
-                </up-form-item>
-                <up-form-item borderBottom label="种源视频" prop="vedios">
-                    <ut-upload v-model="form.vedios" :max-count="3" accept="video" valueType="string"></ut-upload>
-                </up-form-item>
 
-                <!-- 种源产地 -->
-                <PickerAreaInput v-model="form.adcode" v-model:full-name="form.adcodeName" title="选择种源产地">
-                    <up-form-item borderBottom label="种源产地" prop="adcode">
-                        <view v-if="form.adcode" class="f-s-30 c-333 f-w-5 flex1">{{ form.adcodeName }}</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>
+                    <!-- 种源产地 -->
+                    <PickerAreaInput v-model="form.adcode" v-model:full-name="form.adcodeName" title="选择种源产地">
+                        <up-form-item borderBottom label="种源产地" prop="adcode">
+                            <view v-if="form.adcode" class="f-s-30 c-333 f-w-5 flex1">{{ form.adcodeName }}</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>
+                    </PickerAreaInput>
+                    <ut-action-sheet :tabs="pt_breeding_materials" mode="custom" title="繁殖材料" multiple v-model="form.generationMaterial">
+                        <up-form-item borderBottom label="繁殖材料" prop="generationMaterial">
+                            <view v-if="form.generationMaterial" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabels(pt_breeding_materials, form.generationMaterial, ',') }}</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>
+
+                    <PickerAreaInput v-model="form.generationAdcode" v-model:full-name="form.generationAdcodeName" :maxLevel="4" title="选择繁殖地点/采集地点">
+                        <up-form-item borderBottom label="繁殖地点/采集地点" prop="generationAdcode">
+                            <view v-if="form.generationAdcode" class="f-s-30 c-333 f-w-5 flex1">{{ form.generationAdcodeName }}</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>
+                    </PickerAreaInput>
+                    <!-- 资质证明附件（暂按上传控件处理，可后续细化） -->
+                    <up-form-item borderBottom label="物种鉴定证书" prop="spCert">
+                        <ut-upload v-model="form.spCert" :max-count="9" valueType="array" accept="file"></ut-upload>
                     </up-form-item>
-                </PickerAreaInput>
-                <ut-action-sheet :tabs="pt_breeding_materials" mode="custom" title="繁殖材料" multiple v-model="form.generationMaterial">
-                    <up-form-item borderBottom label="繁殖材料" prop="generationMaterial">
-                        <view v-if="form.generationMaterial" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabels(pt_breeding_materials, form.generationMaterial, ',') }}</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 borderBottom label="种源检疫证号" prop="seedCheckSn">
+                        <up-input v-model="form.seedCheckSn" placeholder="请输入种源检疫证号" border="none" clearable></up-input>
                     </up-form-item>
-                </ut-action-sheet>
-
-                <PickerAreaInput v-model="form.generationAdcode" v-model:full-name="form.generationAdcodeName" :maxLevel="4" title="选择繁殖地点/采集地点">
-                    <up-form-item borderBottom label="繁殖地点/采集地点" prop="generationAdcode">
-                        <view v-if="form.generationAdcode" class="f-s-30 c-333 f-w-5 flex1">{{ form.generationAdcodeName }}</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 borderBottom label="种源检疫证书" prop="seedCheckCert">
+                        <ut-upload v-model="form.seedCheckCert" :max-count="9" valueType="array" accept="file"></ut-upload>
                     </up-form-item>
-                </PickerAreaInput>
-                <!-- 资质证明附件（暂按上传控件处理，可后续细化） -->
-                <up-form-item borderBottom label="物种鉴定证书" prop="spCert">
-                    <ut-upload v-model="form.spCert" :max-count="9" valueType="array" accept="file"></ut-upload>
-                </up-form-item>
-                <!-- 检疫信息 -->
-                <up-form-item borderBottom label="种源检疫证号" prop="seedCheckSn">
-                    <up-input v-model="form.seedCheckSn" placeholder="请输入种源检疫证号" border="none" clearable></up-input>
-                </up-form-item>
-                <up-form-item borderBottom label="种源检疫证书" prop="seedCheckCert">
-                    <ut-upload v-model="form.seedCheckCert" :max-count="9" valueType="array" accept="file"></ut-upload>
-                </up-form-item>
-            </view>
+                </view>
 
-            <view class="pd-24">
-                <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_seed_instore_type, form.instoreType) }}</view>
-                    <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择入库类型</view>
-                </up-form-item>
-                <!-- 入库日期 -->
-                <view class="h-1" id="instoreDatepppp"></view>
-                <ut-datetime-picker v-model="form.instoreBizInfo.instoreDate" :maxDate="new Date()" mode="date">
-                    <up-form-item borderBottom label="入库日期" required prop="instoreBizInfo.instoreDate">
-                        <up-input v-model="form.instoreBizInfo.instoreDate" placeholder="请选择入库日期" border="none" clearable></up-input>
-                        <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
-                        </template>
+                <view class="pd-24">
+                    <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>
-                </ut-datetime-picker>
-                <!-- 入库批号 -->
-                <up-form-item borderBottom label="入库批号" required prop="batchCode">
-                    <view class="f-s-30 c-333 f-w-5 flex1">{{ form.batchCode }}</view>
-                </up-form-item>
-                <!-- 库房类型 -->
-                <up-form-item borderBottom label="库房类型" prop="storageType" required>
-                    <view v-if="form.storageType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_warehouse_type, form.storageType) }}</view>
-                    <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择库房类型</view>
-                </up-form-item>
-                <!-- 存放库房（具体库房/货架信息稍后补充为选择器） -->
-                <up-form-item borderBottom label="存放库房" prop="warehouses">
-                    <select-warehouse-input v-model="form.warehouses" title="添加种源存放库房" :params="{ type: '2' }"></select-warehouse-input>
-                </up-form-item>
-                <!-- 入库人 -->
-                <up-form-item borderBottom label="入库人" required prop="instoreBizInfo.instoreMg">
-                    <up-input v-model="form.instoreBizInfo.instoreMg" placeholder="请输入入库人" border="none" clearable></up-input>
-                </up-form-item>
-                <!-- 入库备注 -->
-                <up-form-item borderBottom label="入库备注" prop="instoreBizInfo.remark">
-                    <up-textarea v-model="form.instoreBizInfo.remark" placeholder="请输入入库备注" autoHeight></up-textarea>
-                </up-form-item>
-            </view>
+                    <!-- 入库类型 -->
+                    <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_seed_instore_type, form.instoreType) }}</view>
+                        <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择入库类型</view>
+                    </up-form-item>
+                    <!-- 入库日期 -->
+                    <view class="h-1" id="instoreDatepppp"></view>
+                    <ut-datetime-picker v-model="form.instoreBizInfo.instoreDate" :maxDate="new Date()" mode="date">
+                        <up-form-item borderBottom label="入库日期" required prop="instoreBizInfo.instoreDate">
+                            <up-input v-model="form.instoreBizInfo.instoreDate" placeholder="请选择入库日期" border="none" clearable></up-input>
+                            <template #right>
+                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            </template>
+                        </up-form-item>
+                    </ut-datetime-picker>
+                    <!-- 入库批号 -->
+                    <up-form-item borderBottom label="入库批号" required prop="batchCode">
+                        <view class="f-s-30 c-333 f-w-5 flex1">{{ form.batchCode }}</view>
+                    </up-form-item>
+                    <!-- 库房类型 -->
+                    <up-form-item borderBottom label="库房类型" prop="storageType" required>
+                        <view v-if="form.storageType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_warehouse_type, form.storageType) }}</view>
+                        <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择库房类型</view>
+                    </up-form-item>
+                    <!-- 存放库房（具体库房/货架信息稍后补充为选择器） -->
+                    <up-form-item borderBottom label="存放库房" prop="warehouses">
+                        <select-warehouse-input v-model="form.warehouses" title="添加种源存放库房" :params="{ type: '2' }"></select-warehouse-input>
+                    </up-form-item>
+                    <!-- 入库人 -->
+                    <up-form-item borderBottom label="入库人" required prop="instoreBizInfo.instoreMg">
+                        <up-input v-model="form.instoreBizInfo.instoreMg" placeholder="请输入入库人" border="none" clearable></up-input>
+                    </up-form-item>
+                    <!-- 入库备注 -->
+                    <up-form-item borderBottom label="入库备注" prop="instoreBizInfo.remark">
+                        <up-textarea v-model="form.instoreBizInfo.remark" placeholder="请输入入库备注" autoHeight></up-textarea>
+                    </up-form-item>
+                </view>
+            </template>
         </up-form>
         <template #bottom>
             <view class="pd-20 d-flex">

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

@@ -25,10 +25,10 @@
         </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">
+                <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-${selectDictListClass(pt_seed_instore_type, item?.instoreType)}`]: true }">{{ selectDictLabel(pt_seed_instore_type, item?.instoreType) }}</view>
+                            <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">
@@ -41,26 +41,48 @@
                                 <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">
+                        <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?.fungusCodeType)" 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>
+                            <view v-if="['A3', 'A4'].includes(item?.fungusCodeType)" 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?.fungusCodeType)" 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>
@@ -96,7 +118,7 @@ import SourceBottom from './model/source-bottom.vue';
 import { selectDictListClass } from '@/utils/ruoyi';
 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'));
+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'));
 const list = ref<any[]>();
 const form = ref({ keyword: '', restFlag: '1', instoreType: '' });
 const paging = ref();
@@ -130,9 +152,20 @@ const optionsActionTemp = reactive([
     },
 ]);
 // 暂存项删除点击（本地移除）
-const clickTempSwipe = async (event: object) => {
+const clickTempSwipe = async (event: object, item: any) => {
+    console.log(item);
     const { name, index } = event as any;
+  
     if (index === 0) {
+        if (item.instoreType == '3') {
+            return uni.showModal({
+                title: '提示',
+                content: '该批次为采收入库的种源，请前往种养殖-采收管理里删除采收记录，入库记录将同步删除。',
+                showCancel: false,
+                confirmText: '知道了',
+                confirmColor: '#41c06d',
+            });
+        }
         try {
             const res = await uni.showModal({
                 title: '删除提示',
@@ -155,13 +188,13 @@ const clickTempSwipe = async (event: object) => {
             console.error('删除暂存种源信息失败:', error);
         }
     }
+
 };
 
 const onRefresh = () => {
     paging.value.reload();
 };
 onMounted(() => {
-
     uni.$on('refreshStorageRoomList', () => {
         onRefresh();
     });

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

@@ -2,7 +2,7 @@
     <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-${selectDictListClass(pt_seed_instore_type, item?.instoreType)}`]: true }">{{ selectDictLabel(pt_seed_instore_type, item?.instoreType) }}</view>
+                <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">