huangxw 3 tygodni temu
rodzic
commit
6698b074d0

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

@@ -34,7 +34,7 @@
                             <span class="c-#666">溯源批号:</span>
                             <span class="c-#666">溯源批号:</span>
                             <span class="c-#333 f-w-500">暂无</span>
                             <span class="c-#333 f-w-500">暂无</span>
                         </view> -->
                         </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-#666">菌种/菌株编号:</span>
                         <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, form?.fungusCodeType) }}/{{ form?.fungusCode }}</span>
                         <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, form?.fungusCodeType) }}/{{ form?.fungusCode }}</span>
                     </view>
                     </view>
@@ -58,7 +58,7 @@
                             {{ form?.harvestInfo?.baseInfo?.baseName || '-' }}
                             {{ form?.harvestInfo?.baseInfo?.baseName || '-' }}
                         </span>
                         </span>
                     </view>
                     </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-#666">菌种/菌株编号:</span>
                         <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, form?.fungusCodeType) }}/{{ form?.fungusCode }}</span>
                         <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, form?.fungusCodeType) }}/{{ form?.fungusCode }}</span>
                     </view>
                     </view>

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

@@ -253,15 +253,15 @@
                         </view>
                         </view>
                     </up-form-item>
                     </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-form-item borderBottom label="是否有个体标识" prop="instoreBizInfo.idFlag" required>
                         <up-radio-group v-model="form.instoreBizInfo.idFlag">
                         <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 :customStyle="{ marginRight: '60rpx' }" v-for="(item, index) in yes_no" :key="index" :label="item.label" :name="item.value"></up-radio>
                         </up-radio-group>
                         </up-radio-group>
                     </up-form-item>
                     </up-form-item>
                     <!-- 个体标识:此处仅占位,后续可改为多选列表 -->
                     <!-- 个体标识:此处仅占位,后续可改为多选列表 -->
+                    <view class="h-1" id="animalspppp"></view>
                     <template v-if="+form?.instoreBizInfo?.idFlag">
                     <template v-if="+form?.instoreBizInfo?.idFlag">
-                        <view class="h-1" id="instoreBizInfo.animalspppp"></view>
                         <up-form-item borderBottom label="个体标识号" prop="instoreBizInfo.animals" required>
                         <up-form-item borderBottom label="个体标识号" prop="instoreBizInfo.animals" required>
                             <AnimalsInput v-model="form.instoreBizInfo.animals"></AnimalsInput>
                             <AnimalsInput v-model="form.instoreBizInfo.animals"></AnimalsInput>
                         </up-form-item>
                         </up-form-item>
@@ -366,22 +366,17 @@
                     </up-form-item>
                     </up-form-item>
                 </view>
                 </view>
             </template>
             </template>
-             <template v-if="form.instoreType == '3'">
+            <template v-if="form.instoreType == '3'">
                 <view class="pd-24">
                 <view class="pd-24">
                     <view class="startline-title">种源信息</view>
                     <view class="startline-title">种源信息</view>
                 </view>
                 </view>
                 <view class="pd-24 bg-#fff">
                 <view class="pd-24 bg-#fff">
                     <!-- 基本信息 -->
                     <!-- 基本信息 -->
                     <view class="h-1" id="seedTypepppp"></view>
                     <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>
                     <view class="h-1" id="varietyIdpppp"></view>
                     <up-form-item borderBottom label="物种基原" required prop="varietyId">
                     <up-form-item borderBottom label="物种基原" required prop="varietyId">
                         <view class="flex1">
                         <view class="flex1">
@@ -399,15 +394,6 @@
                                     <span class="f-s-24 c-#666">{{ form?.varietyInfo?.genusLatinName }}</span>
                                     <span class="f-s-24 c-#666">{{ form?.varietyInfo?.genusLatinName }}</span>
                                 </view>
                                 </view>
                                 <view v-if="form?.varietyInfo?.medicineName" class="f-s-24 c-#666">产出:{{ form?.varietyInfo?.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.varietyId = '';
-                                        form.varietyInfo = null;
-                                    "
-                                >
-                                    <up-icon color="#F81242" name="close" size="32rpx"></up-icon>
-                                </view>
                             </view>
                             </view>
                         </view>
                         </view>
                     </up-form-item>
                     </up-form-item>
@@ -415,15 +401,10 @@
                         <up-input v-model="form.seedName" placeholder="请输入具体品种/品系名称" border="none" clearable></up-input>
                         <up-input v-model="form.seedName" placeholder="请输入具体品种/品系名称" border="none" clearable></up-input>
                     </up-form-item>
                     </up-form-item>
                     <view class="h-1" id="seedSourcepppp"></view>
                     <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="capacitypppp"></view>
                     <view class="h-1" id="unitpppp"></view>
                     <view class="h-1" id="unitpppp"></view>
@@ -434,43 +415,11 @@
                     <up-form-item borderBottom label="检验报告" prop="examinReport">
                     <up-form-item borderBottom label="检验报告" prop="examinReport">
                         <ut-upload v-model="form.examinReport" :max-count="50" valueType="array" accept="image,file"></ut-upload>
                         <ut-upload v-model="form.examinReport" :max-count="50" valueType="array" accept="image,file"></ut-upload>
                     </up-form-item>
                     </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">
                     <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>
                         </view>
                     </up-form-item>
                     </up-form-item>
                     <!-- 个体标识:此处仅占位,后续可改为多选列表 -->
                     <!-- 个体标识:此处仅占位,后续可改为多选列表 -->
@@ -481,8 +430,8 @@
                         </up-radio-group>
                         </up-radio-group>
                     </up-form-item>
                     </up-form-item>
                     <!-- 个体标识:此处仅占位,后续可改为多选列表 -->
                     <!-- 个体标识:此处仅占位,后续可改为多选列表 -->
+                    <view class="h-1" id="instoreBizInfo.animalspppp"></view>
                     <template v-if="+form?.instoreBizInfo?.idFlag">
                     <template v-if="+form?.instoreBizInfo?.idFlag">
-                        <view class="h-1" id="instoreBizInfo.animalspppp"></view>
                         <up-form-item borderBottom label="个体标识号" prop="instoreBizInfo.animals" required>
                         <up-form-item borderBottom label="个体标识号" prop="instoreBizInfo.animals" required>
                             <AnimalsInput v-model="form.instoreBizInfo.animals"></AnimalsInput>
                             <AnimalsInput v-model="form.instoreBizInfo.animals"></AnimalsInput>
                         </up-form-item>
                         </up-form-item>

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

@@ -50,7 +50,7 @@
                             <span class="c-#666">溯源批号:</span>
                             <span class="c-#666">溯源批号:</span>
                             <span class="c-#333 f-w-500">暂无</span>
                             <span class="c-#333 f-w-500">暂无</span>
                         </view> -->
                         </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-#666">菌种/菌株编号:</span>
                                 <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, item?.fungusCodeType) }}/{{ item?.fungusCode }}</span>
                                 <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, item?.fungusCodeType) }}/{{ item?.fungusCode }}</span>
                             </view>
                             </view>
@@ -74,7 +74,7 @@
                                     {{ item?.harvestInfo?.baseInfo?.baseName || '-' }}
                                     {{ item?.harvestInfo?.baseInfo?.baseName || '-' }}
                                 </span>
                                 </span>
                             </view>
                             </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-#666">菌种/菌株编号:</span>
                                 <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, item?.fungusCodeType) }}/{{ item?.fungusCode }}</span>
                                 <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, item?.fungusCodeType) }}/{{ item?.fungusCode }}</span>
                             </view>
                             </view>

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

@@ -23,7 +23,7 @@
                             <span class="c-#666">溯源批号:</span>
                             <span class="c-#666">溯源批号:</span>
                             <span class="c-#333 f-w-500">暂无</span>
                             <span class="c-#333 f-w-500">暂无</span>
                         </view> -->
                         </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-#666 w-s-no">菌种/菌株编号:</span>
                 <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, item?.fungusCodeType) }}/{{ item?.fungusCode }}</span>
                 <span class="c-#333 f-w-500">{{ selectDictLabel(pt_fungus_code_type, item?.fungusCodeType) }}/{{ item?.fungusCode }}</span>
             </view>
             </view>