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

src/plant/port/port-create/index.vue

@@ -8,7 +8,7 @@
             <template v-if="form.taskType == 2">
                 <up-form class="p-rtv" labelPosition="top" :model="form" :rules="rules" labelWidth="auto" ref="upFormRef">
                     <view class="startline-title pl-24 ml-24 mb-16">基地信息</view>
-                    <view class="bg-#fff pd-24">
+                    <view class="bg-#fff pd-24 pb-0">
                         <view class="b-radius bg-#EBF6EE c-primary f-s-24 pd-24 pb-16"> 注意：关联时请确保已添加到地块；关联时必须选到地块/圈舍/培养架。</view>
                     </view>
                     <view class="bg-#fff pd-24 mb-20 pt-0">
@@ -21,11 +21,9 @@
                     </view>
                     <view class="startline-title pl-24 ml-24 mb-16">种养殖信息</view>
                     <view class="bg-#fff pd-24 mb-20">
-                        <ut-action-sheet v-model="form.taskType" :tabs="pt_task_type" title="选择任务类型">
-                            <up-form-item borderBottom label="任务类型" required prop="taskType" id="taskTypepppp">
-                                <view class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_type, form.taskType) }}</view>
-                            </up-form-item>
-                        </ut-action-sheet>
+                        <up-form-item borderBottom label="任务类型" required prop="taskType" id="taskTypepppp">
+                            <view class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_type, form.taskType) }}</view>
+                        </up-form-item>
                         <ut-action-sheet v-model="form.mgMethod" :tabs="pt_mg_method" title="选择溯源级别">
                             <up-form-item borderBottom label="溯源级别" required prop="mgMethod" id="mgMethodpppp">
                                 <view v-if="form.mgMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mg_method, form.mgMethod) }}</view>
@@ -129,7 +127,7 @@
             <template v-if="form.taskType == 21">
                 <up-form class="p-rtv" labelPosition="top" :model="form" :rules="rules1" labelWidth="auto" ref="upFormRef">
                     <view class="startline-title pl-24 ml-24 mb-16">基地信息</view>
-                    <view class="bg-#fff pd-24">
+                    <view class="bg-#fff pd-24 pb-0">
                         <view class="b-radius bg-#EBF6EE c-primary f-s-24 pd-24 pb-16"> 注意：关联时请确保已添加到地块；关联时必须选到地块/圈舍/培养架。</view>
                     </view>
                     <view class="bg-#fff pd-24 mb-20 pt-0">
@@ -142,11 +140,9 @@
                     </view>
                     <view class="startline-title pl-24 ml-24 mb-16">种养殖信息</view>
                     <view class="bg-#fff pd-24 mb-20">
-                        <ut-action-sheet v-model="form.taskType" :tabs="pt_task_type" title="选择任务类型">
-                            <up-form-item borderBottom label="任务类型" required prop="taskType" id="taskTypepppp">
-                                <view class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_type, form.taskType) }}</view>
-                            </up-form-item>
-                        </ut-action-sheet>
+                        <up-form-item borderBottom label="任务类型" required prop="taskType" id="taskTypepppp">
+                            <view class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_type, form.taskType) }}</view>
+                        </up-form-item>
                         <up-form-item borderBottom label="是否代繁育" required prop="delegateFlag" id="delegateFlagFlagpppp">
                             <up-radio-group v-model="form.delegateFlag">
                                 <up-radio :customStyle="{ marginRight: '60rpx' }" v-for="(item, index) in yes_no" :key="index" :label="item.label" :name="item.value"></up-radio>
@@ -266,7 +262,7 @@
             <template v-if="form.taskType == 1">
                 <up-form class="p-rtv" labelPosition="top" :model="form" :rules="rules2" labelWidth="auto" ref="upFormRef">
                     <view class="startline-title pl-24 ml-24 mb-16">基地信息</view>
-                    <view class="bg-#fff pd-24">
+                    <view class="bg-#fff pd-24 pb-0">
                         <view class="b-radius bg-#EBF6EE c-primary f-s-24 pd-24 pb-16"> 注意：关联时请确保已添加到地块；关联时必须选到地块/圈舍/培养架。</view>
                     </view>
                     <view class="bg-#fff pd-24 mb-20 pt-0">
@@ -279,11 +275,9 @@
                     </view>
                     <view class="startline-title pl-24 ml-24 mb-16">种养殖信息</view>
                     <view class="bg-#fff pd-24 mb-20">
-                        <ut-action-sheet v-model="form.taskType" :tabs="pt_task_type" title="选择任务类型">
-                            <up-form-item borderBottom label="任务类型" required prop="taskType" id="taskTypepppp">
-                                <view class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_type, form.taskType) }}</view>
-                            </up-form-item>
-                        </ut-action-sheet>
+                        <up-form-item borderBottom label="任务类型" required prop="taskType" id="taskTypepppp">
+                            <view class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_type, form.taskType) }}</view>
+                        </up-form-item>
                         <ut-action-sheet v-model="form.gapFlag" :tabs="pt_task_gap_flag" title="选择符合要求">
                             <up-form-item borderBottom label="符合要求" required prop="gapFlag" id="gapFlagpppp">
                                 <view v-if="form.gapFlag" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_gap_flag, form.gapFlag) }}</view>
@@ -295,7 +289,7 @@
                         </ut-action-sheet>
                         <up-form-item borderBottom label="植物名称" required prop="varietyId" id="varietyIdpppp">
                             <Go_button v-if="!Biological" @click="gotoTorganism(1)" title="请选择种植的植物名称" style="flex: 1" />
-                            <view v-if="Biological" class="pd-24 d-flex flex-cln bg-#FBFDFB border-#37A954 b-radius mb-20 w-100% p-rtv">
+                            <view v-if="Biological" class="pd-24 d-flex flex-cln bg-#FBFDFB border-#37A954 b-radius w-100% p-rtv">
                                 <up-icon @click="Biological = null" size="26rpx" color="red" name="close" style="position: absolute; right: 10rpx; top: 10rpx"></up-icon>
                                 <view class="mb-20">
                                     <text class="c-#333 f-s-34 f-w-5 mr-5">{{ Biological?.varietyName }}</text>
@@ -426,7 +420,7 @@
             <template v-if="form.taskType == 11">
                 <up-form class="p-rtv" labelPosition="top" :model="form" :rules="rules3" labelWidth="auto" ref="upFormRef">
                     <view class="startline-title pl-24 ml-24 mb-16">基地信息</view>
-                    <view class="bg-#fff pd-24">
+                    <view class="bg-#fff pd-24 pb-0">
                         <view class="b-radius bg-#EBF6EE c-primary f-s-24 pd-24 pb-16"> 注意：关联时请确保已添加到地块；关联时必须选到地块/圈舍/培养架。</view>
                     </view>
                     <view class="bg-#fff pd-24 mb-20 pt-0">
@@ -445,11 +439,9 @@
                     </view>
                     <view class="startline-title pl-24 ml-24 mb-16">种养殖信息</view>
                     <view class="bg-#fff pd-24 mb-20">
-                        <ut-action-sheet v-model="form.taskType" :tabs="pt_task_type" title="选择任务类型">
-                            <up-form-item borderBottom label="任务类型" required prop="taskType" id="taskTypepppp">
-                                <view class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_type, form.taskType) }}</view>
-                            </up-form-item>
-                        </ut-action-sheet>
+                        <up-form-item borderBottom label="任务类型" required prop="taskType" id="taskTypepppp">
+                            <view class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_type, form.taskType) }}</view>
+                        </up-form-item>
                         <up-form-item borderBottom label="是否代繁育" required prop="delegateFlag" id="delegateFlagFlagpppp">
                             <up-radio-group v-model="form.delegateFlag">
                                 <up-radio :customStyle="{ marginRight: '60rpx' }" v-for="(item, index) in yes_no" :key="index" :label="item.label" :name="item.value"></up-radio>

src/plant/port/port-create/models/drawer.vue

@@ -1,6 +1,6 @@
 <template>
     <up-popup :show="modelValue" mode="right" @close="handleClose" @open="handleOpen">
-        <ut-navbar :fixed="false" bgColor="transparent">
+        <ut-navbar :fixed="false" bgColor="transparent" :breadcrumb="false">
             <template #left>
                 <view class="c-#333 f-s-34 f-w-5">请选择种养殖所在基地</view>
             </template>
@@ -254,7 +254,7 @@ watch(
             allCheckboxNames.value.push(item.id);
         });
         showtitle.value = true;
-    }
+    },
 );
 onMounted(() => {
     const querys = uni.createSelectorQuery().in(instance?.proxy);

src/tools/por-torganism/index.vue

@@ -15,7 +15,7 @@
                     <spe-lable class="mr-20 mb-20" v-for="(item, index) in speArray" :key="index" :text="item?.medicineName" size="30rpx" :id="item?.id" @click="changeSpe(item?.medicineName)" />
                 </view>
             </template>
-            <template>
+            <template v-if="!speArray.length">
                 <ut-empty text=""></ut-empty>
                 <view class="d-flex flex-cln j-c a-c">
                     <view class="c-#ccc f-s-28">您可以<text class="c-primary">直接搜索，</text>或前往<text class="c-primary">基地－主营品种配置</text>页面进行</view>
@@ -112,7 +112,7 @@ const save = () => {
 const title = ref('选择动植物名称');
 onLoad((options) => {
     console.log(options);
-    
+
     const decodedOptions = recursiveDecodeURIComponentSimple(options);
     if (decodedOptions?.title) {
         title.value = decodedOptions?.title || '选择动植物名称';