完成

src/tools/species-info-process/index.vue

@@ -1,32 +1,26 @@
 <template>
-    <z-paging ref="paging" v-model="list" paging-class="paging-btm-shadow" bgColor="#f7f7f7" safe-area-inset-bottom
-        @query="query">
+    <z-paging ref="paging" v-model="list" paging-class="paging-btm-shadow" bgColor="#f7f7f7" safe-area-inset-bottom @query="query">
         <template #top>
             <ut-navbar leftText="请选择任务所使用的种子信息" :fixed="false"></ut-navbar>
         </template>
         <view class="d-flex a-c pd-24 pb-0 bg-#f7f7f7">
             <view class="min-w-170 flex1">
-                <ut-action-sheet v-model="form.instoreType"
-                    :tabs="[{ label: '全部', value: '' }, ...pt_fresh_instore_type]" @change="changeSeach" title="选择原料类型">
+                <ut-action-sheet v-model="form.instoreType" :tabs="[{ label: '全部', value: '' }, ...pt_fresh_instore_type]" @change="changeSeach" title="选择原料类型">
                     <view class="d-flex search-select-item a-c">
-                        <view class="flex1 ov-hd f-s-28 c-333 text-center f-w-5 w-s-no">{{
-                            selectDictLabel(pt_fresh_instore_type, form.instoreType) || '全部' }}</view>
+                        <view class="flex1 ov-hd f-s-28 c-333 text-center f-w-5 w-s-no">{{ selectDictLabel(pt_fresh_instore_type, form.instoreType) || '全部' }}</view>
                         <up-icon size="24rpx" color="#333" name="arrow-down-fill" class="mr-5"></up-icon>
                     </view>
                 </ut-action-sheet>
             </view>
             <view class="h-86 pl-20 w-100%">
-                <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" @change="changeSeach" margin="0"
-                    :border="false" placeholder="搜批次号、品种名、基地名" bgColor="#fff" height="86rpx"
-                    borderRadius="10rpx"></ut-search>
+                <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" @change="changeSeach" margin="0" :border="false" placeholder="搜批次号、品种名、基地名" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
             </view>
         </view>
         <template v-for="(item, index) in list" :key="index">
             <info-card :item="item" :selected="selectedItems?.id === item.id" @click="toggleSelection(item)" />
         </template>
         <template #bottom>
-            <view v-if="selectedItems" class="bg-#EBF6EE c-primary f-s-24 pd-10 pl-24"> 已选择种源：{{ selectedItems.variety
-            }} </view>
+            <view v-if="selectedItems" class="bg-#EBF6EE c-primary f-s-24 pd-10 pl-24"> 已选择种源：{{ selectedItems.variety }} </view>
             <view class="pd-20 d-flex">
                 <up-button type="primary" @click="open">确认选择</up-button>
             </view>
@@ -36,18 +30,16 @@
         <view>
             <view class="d-flex a-c pd-24">
                 <view class="f-s-34 f-w-5 c-#333">关联种源信息</view>
-                <view class="bg-#37A954 radius-10 pd4-10-20-10-20 d-flex a-c" style="width: max-content">
+                <!-- <view class="bg-#37A954 radius-10 pd4-10-20-10-20 d-flex a-c" style="width: max-content">
                     <up-icon name="plus" color="#fff" size="24rpx"></up-icon>
-                    <view class="c-#fff f-s-22">添加种源关联信息</view>
-                </view>
+                    <view class="c-#fff f-s-22" @click="close">添加种源关联信息</view>
+                </view> -->
             </view>
             <view class="pd-24">
-                <up-form class="p-rtv" labelPosition="top" :model="formDate" :rules="rules" labelWidth="auto"
-                    ref="upFormRef">
+                <up-form class="p-rtv" labelPosition="top" :model="formDate" :rules="rules" labelWidth="auto" ref="upFormRef">
                     <up-form-item :borderBottom="false" prop="inputs" id="inputspppp">
                         <view class="d-flex flex-cln" style="width: 100%">
-                            <souceinfo v-if="selectedItems" :data="selectedItems" :index="0"
-                                v-model:inputs="formDate.inputs[0]" @close="handleSourceClose" />
+                            <souceinfo v-if="selectedItems" :data="selectedItems" :index="0" v-model:inputs="formDate.inputs[0]" @close="handleSourceClose" />
                         </view>
                     </up-form-item>
                 </up-form>
@@ -78,7 +70,7 @@ const form = ref({
     part: '',
     notIncludePart: '',
     varietyId: '',
-    medicineCode: ''
+    medicineCode: '',
 });
 //表单
 const formDate = ref({

src/tools/species-info/index.vue

@@ -38,10 +38,6 @@
         <scroll-view style="height: 80vh" scroll-y>
             <view class="d-flex a-c pd-24">
                 <view class="f-s-34 f-w-5 c-#333">关联种源信息</view>
-                <view class="bg-#37A954 radius-10 pd4-10-20-10-20 d-flex a-c" style="width: max-content">
-                    <up-icon name="plus" color="#fff" size="24rpx"></up-icon>
-                    <view class="c-#fff f-s-22">添加种源关联信息</view>
-                </view>
             </view>
             <view class="pd-24">
                 <up-form class="p-rtv" labelPosition="top" :model="formDate" :rules="rules" labelWidth="auto" ref="upFormRef">
@@ -60,6 +56,7 @@
                             </template>
                         </view>
                     </up-form-item>
+                    <Go_button title="添加种源信息" @click="close" />
                     <up-form-item :borderBottom="false" label="备注/说明" prop="remark">
                         <up-textarea v-model="formDate.remark" placeholder="请输入备注/说明" border="bottom"></up-textarea>
                     </up-form-item>
@@ -77,6 +74,7 @@ import InfoCard from './models/info-card.vue';
 import Souceinfo from './models/souceinfo.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { pt_seed_instore_type } = toRefs<any>(proxy?.useDict('pt_seed_instore_type'));
+import Go_button from '@/components/go-button/Go_button.vue';
 interface SeedItem {
     id: number | string;
     [key: string]: any;
@@ -93,6 +91,7 @@ const formDate = ref({
     useDate: '',
     inputs: [] as any,
     remark: '',
+    parentType: null,
 });
 
 // 自定义inputs校验函数

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

@@ -29,26 +29,35 @@
             </view>
         </view>
         <up-line color="#AFDDBB" style="margin-left: -24rpx; margin-right: -24rpx; width: auto"></up-line>
-        <view class="f-s-28 c-#666 pt-16">本次使用量：</view>
-        <view class="pt-6 pb-6 d-flex a-c">
-            <view class="flex1 mr-10">
-                <up-input v-model="inputsModel.amount" placeholder="请输入本次使用量" border="bottom" style="padding-left: 0" type="number">
-                    <template #suffix>
-                        <view class="c-#333 f-s-28 f-w-5">{{ data?.unit }}</view>
-                    </template>
-                </up-input>
-            </view>
-            <view class="">
-                <up-checkbox label="全部使用" usedAlone v-model:checked="hasChecked" @change="handleUseAllChange"></up-checkbox>
+
+        <up-form-item label="">
+            <view class="">该种源为：</view>
+            <up-radio-group v-model="inputsModel.parentType">
+                <up-radio :customStyle="{ marginRight: '60rpx' }" v-for="(item, index) in pt_parent_type" :key="index" :label="item.label" :name="item.value"></up-radio>
+            </up-radio-group>
+        </up-form-item>
+        <up-form-item label="种源投入量：" required>
+            <view class="pt-6 pb-6 d-flex a-c">
+                <view class="flex1 mr-10">
+                    <up-input v-model="inputsModel.amount" placeholder="请输入本次使用量" border="bottom" style="padding-left: 0" type="number">
+                        <template #suffix>
+                            <view class="c-#333 f-s-28 f-w-5">{{ data?.unit }}</view>
+                        </template>
+                    </up-input>
+                </view>
+                <view class="">
+                    <up-checkbox label="全部使用" usedAlone v-model:checked="hasChecked" @change="handleUseAllChange"></up-checkbox>
+                </view>
             </view>
-        </view>
+        </up-form-item>
     </view>
 </template>
 <script setup lang="ts">
 import { ref, watch, computed, nextTick } from 'vue';
 import { getStorageRoomNames } from '@/utils/common';
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { pt_seed_instore_type, pt_seed_type, pt_fungus_code_type } = toRefs<any>(proxy?.useDict('pt_seed_instore_type', 'pt_seed_type', 'pt_fungus_code_type'));
+const { pt_seed_type, pt_parent_type } = toRefs<any>(proxy?.useDict('pt_seed_type', 'pt_parent_type'));
 // 从外部获取数据
 const props = defineProps<{
     showClose?: boolean;