huangxw 2 долоо хоног өмнө
parent
commit
dbee6314db

+ 36 - 285
src/plant/base/gap-base-info-detail/index.vue

@@ -2,306 +2,64 @@
     <view class="ksqulc">
         <z-paging ref="paging" bgColor="#F7F7F7" safe-area-inset-bottom paging-class="paging-btm-shadow" refresher-only @onRefresh="onRefresh" scroll-with-animation>
             <template #top>
-                <ut-navbar title="基地详情" :fixed="false" border></ut-navbar>
-                <view class="bg-fff mb-20">
-                    <view class="pd-5"></view>
-                    <ut-tabs v-model="activeTab" :tabs="tabs" mode="btw" @change="changeActiveTab"></ut-tabs>
-                </view>
+                <ut-navbar leftText="GAP基地获评信息详情" :fixed="false" border></ut-navbar>
             </template>
             <view class="p-rtv">
                 <!-- 基本信息 -->
-                <view ref="baseRef" class="pd-24" id="base12345">
-                    <view class="startline-title">基本信息</view>
-                </view>
+
                 <view class="pd-24 bg-#fff mb-10">
                     <view class="f-s-30 pd2-16-0 info-border-bottom">
                         <span class="c-#666">基地类型:</span>
-                        <span class="c-#333">{{ selectDictLabel(pt_base_type, form?.baseInfo?.baseType) || '-' }}</span>
+                        <span class="c-#333">{{ selectDictLabel(pt_base_type, form?.gapBaseType) || '-' }}</span>
                     </view>
                     <view class="f-s-30 pd2-16-0 info-border-bottom">
                         <span class="c-#666">基地名称:</span>
-                        <span class="c-#333">{{ form?.baseInfo?.baseName || '-' }}</span>
-                    </view>
-                    <view class="f-s-30 pd2-16-0 info-border-bottom">
-                        <span class="c-#666">基地编号:</span>
-                        <span class="c-#333">{{ form?.baseInfo?.baseCode || '-' }}</span>
-                    </view>
-                    <view class="f-s-30 pd2-16-0 info-border-bottom">
-                        <span class="c-#666">建设时间:</span>
-                        <span class="c-#333">{{ form?.baseInfo?.buildDate || '-' }}</span>
-                    </view>
-                    <view class="f-s-30 pd2-16-0 info-border-bottom">
-                        <span class="c-#666">基地组织方式:</span>
-                        <span class="c-#333">{{ selectDictLabel(pt_org_type, form?.baseInfo?.orgType) || '-' }}</span>
+                        <span class="c-#333">{{ form?.gapBaseName || '-' }}</span>
                     </view>
                     <view class="f-s-30 pd2-16-0 info-border-bottom">
-                        <span class="c-#666">基地负责人:</span>
-                        <span class="c-#333">{{ form?.baseInfo?.contactName || '-' }}</span>
+                        <span class="c-#666">获评品种:</span>
+                        <span class="c-#333">{{ form?.medicineName || '-' }}</span>
                     </view>
                     <view class="f-s-30 pd2-16-0 info-border-bottom">
-                        <span class="c-#666">联系电话:</span>
-                        <span class="c-#333">{{ form?.baseInfo?.contactTel || '-' }}</span>
+                        <span class="c-#666">获评时间:</span>
+                        <span class="c-#333">{{ form?.ratedDate || '-' }}</span>
                     </view>
-                    <template v-if="['1', '2'].includes(form?.baseInfo?.baseType)">
-                        <view class="f-s-30 pd2-16-0 info-border-bottom">
-                            <span class="c-#666">是否为GAP基地:</span>
-                            <span class="c-#333">{{ selectDictLabel(yes_no, form?.baseInfo?.gapFlag) || '-' }}</span>
-                        </view>
-                        <view v-if="form?.baseInfo?.gapId" class="f-s-30 pd2-16-0 info-border-bottom">
-                            <view class="c-#666 mb-10">关联GAP信息:</view>
-                            <view class="bg-#FBFDFB pd-24 p-rtv flex1 radius-10 gap-info-card">
-                                <view class="f-s-32 f-w-500 c-#333">{{ form?.baseInfo?.gapInfo?.gapBaseName || '-' }}</view>
-                                <view class="f-s-24 c-#ccc mb-10">{{ form?.baseInfo?.gapInfo?.ratedDate }}获评</view>
-                                <view class="d-flex gap-10 flex-wrap">
-                                    <view class="w-330 f-s-28">
-                                        <span class="c-#666">申报品种:</span>
-                                        <span class="c-#333 f-w-500">{{ form?.baseInfo?.gapInfo?.medicineName }}</span>
-                                    </view>
-                                    <view class="w-290 f-s-28">
-                                        <span class="c-#666">基地面积:</span>
-                                        <span class="c-#333 f-w-500">{{ form?.baseInfo?.gapInfo?.area }}{{ form?.baseInfo?.gapInfo?.areaUnit }}</span>
-                                    </view>
-                                    <view class="f-s-28">
-                                        <span class="c-#666">基地地址:</span>
-                                        <span class="c-#333 f-w-500">{{ form?.baseInfo?.gapInfo?.adcodeName }} {{ form?.baseInfo?.gapInfo?.address || '-' }}</span>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                    </template>
                     <view class="f-s-30 pd2-16-0 info-border-bottom">
                         <span class="c-#666">基地所在地区:</span>
-                        <span class="c-#333">{{ form?.baseInfo?.gapInfo?.adcodeName || '-' }}</span>
+                        <span class="c-#333">{{ form?.adcodeName || '-' }}</span>
                     </view>
                     <view class="f-s-30 pd2-16-0 info-border-bottom">
                         <span class="c-#666">详细地址:</span>
-                        <span class="c-#333">{{ form?.baseInfo?.gapInfo?.address || '-' }}</span>
+                        <span class="c-#333">{{ form?.address || '-' }}</span>
                     </view>
                     <view class="f-s-30 pd2-16-0 info-border-bottom">
                         <view class="f-s-30 c-#666 mb-10">基地范围:</view>
                         <view class="bg-#f7f7f7 d-flex ov-hd p-rtv">
-                            <image @click="previewImage([form?.baseInfo?.gapInfo?.basePic])" class="w-full" v-if="form?.baseInfo?.gapInfo?.basePic" preview :src="form?.baseInfo?.gapInfo?.basePic" mode="'widthFix'"></image>
+                            <image class="w-full" v-if="form?.basePic" :src="form?.basePic" mode="widthFix" @click="previewBasePic"></image>
                             <view v-else class="w-full h-120 d-flex a-c j-c c-999">暂无基地范围</view>
                         </view>
                     </view>
                     <view class="f-s-30 pd2-16-0 info-border-bottom">
                         <span class="c-#666">基地面积:</span>
-                        <span class="c-#333">{{ form?.baseInfo?.gapInfo?.area || '-' }}{{ form?.baseInfo?.gapInfo?.areaUnit || mapUnitByBaseType[form?.baseInfo?.baseType || '1'] }}</span>
+                        <span class="c-#333">{{ form?.area || '-' }}{{ form?.areaUnit || '亩' }}</span>
                     </view>
                     <view class="f-s-30 pd2-16-0 info-border-bottom">
                         <span class="c-#666">基地经纬度:</span>
-                        <span class="c-#333">E{{ form?.baseInfo?.gapInfo?.lng || '-' }}, N{{ form?.baseInfo?.gapInfo?.lat || '-' }}</span>
+                        <span class="c-#333">E{{ form?.lng || '-' }}, N{{ form?.lat || '-' }}</span>
                     </view>
-                </view>
-                <view class="h-1" id="plot12345"></view>
-                <!-- 地块/圈舍/组培架信息 -->
-                <view ref="plotRef" class="pd-24">
-                    <view class="startline-title" v-if="form?.baseInfo?.baseType == '1'">地块信息</view>
-                    <view class="startline-title" v-else-if="form?.baseInfo?.baseType == '2'">圈舍信息</view>
-                    <view class="startline-title" v-else-if="form?.baseInfo?.baseType == '3'">组培架信息</view>
-                </view>
-                <view class="pd-24 bg-#fff mb-10">
-                    <template v-if="Array.isArray(form?.landInfoList) && form.landInfoList.length">
-                        <view v-for="(item, index) in form.landInfoList" :key="index" class="plot-item pd-24 mb-20">
-                            <view class="d-flex mb-16">
-                                <view class="f-s-32 f-w-5 c-#333 flex1 mr-10">{{ item?.landName || '-' }}</view>
-                                <view v-if="item?.contactName" class="f-s-24 c-#333">负责人:{{ item?.contactName }}</view>
-                            </view>
-                            <template v-if="form?.baseInfo?.baseType == '3'">
-                                <view class="d-flex flex-wrap gap-10">
-                                    <view class="f-s-28 c-#666 w-310">
-                                        <span>层数:</span>
-                                        <span class="c-#333 f-w-5">{{ item?.layers || '-' }}</span>
-                                    </view>
-                                    <view class="f-s-28 c-#666 w-310">
-                                        <span>每层容量:</span>
-                                        <span class="c-#333 f-w-5">{{ item?.capacityAmount || '-' }}{{ item?.capacityUnit || '-' }}</span>
-                                    </view>
-                                    <view class="f-s-28 c-#666 w-310">
-                                        <span>总容量:</span>
-                                        <span class="c-#333 f-w-5">{{ (item?.capacityAmount || 0) * (item?.layers || 0) || '-' }}{{ item?.capacityUnit || '-' }}</span>
-                                    </view>
-                                    <view class="f-s-28 c-#666 w-310">
-                                        <span v-if="item?.lightType" class="mr-10">{{ selectDictLabel(pt_light_type, item?.lightType) }}</span>
-                                        <span v-if="item?.tempeStatus">{{ +item?.tempeStatus ? '有独立温控' : '无独立温控' }}</span>
-                                    </view>
-                                </view>
-                            </template>
-                            <template v-else>
-                                <view class="f-s-28 c-#666">
-                                    <span>面积:</span>
-                                    <span class="c-#333 f-w-5">{{ item?.area || '-' }}{{ item?.areaUnit || '-' }}</span>
-                                </view>
-                            </template>
-                        </view>
-                    </template>
-                    <view v-else class="c-999 f-s-28">暂无信息</view>
-                </view>
-                <!-- 选址依据及环境信息 -->
-                <view  class="pd-24">
-                    <view class="startline-title">选址依据及环境信息</view>
-                </view>
-                <view class="h-1" id="environment12345"></view>
-                <!-- 基地类型 1:种植基地 -->
-                <template v-if="form?.baseInfo?.baseType == '1'">
-                    <view class="pd-24 bg-#fff mb-10">
-                        <view class="f-s-32 c-#333 f-w-600">选址依据</view>
-                        <view class="f-s-30 pd2-16-0 info-border-bottom">
-                            <span class="c-#666">是否道地产区:</span>
-                            <span class="c-#333">{{ selectDictLabel(yes_no, form?.environmentInfo?.daoStatus) || '-' }}</span>
-                        </view>
-                        <view v-if="form?.environmentInfo?.adaptFile?.length" class="f-s-30 pd2-16-0 info-border-bottom">
-                            <view class="c-#666 mb-10">基地选址依据/标准:</view>
-                            <ut-album :urls="form?.environmentInfo?.adaptFile"></ut-album>
-                        </view>
-                        <view v-if="form?.environmentInfo?.accordFile?.length" class="f-s-30 pd2-16-0 info-border-bottom">
-                            <view class="c-#666 mb-10">适应性证明材料:</view>
-                            <ut-album :urls="form?.environmentInfo?.accordFile"></ut-album>
-                        </view>
+                    <view v-if="form?.certFile?.length" class="f-s-30 pd2-16-0 info-border-bottom">
+                        <view class="f-s-30 c-#666 mb-10">官方公示证明材料</view>
+                        <ut-album :model-value="form?.certFile" :max-count="9"></ut-album>
                     </view>
-                    <view class="pd-24 bg-#fff mb-10">
-                        <view class="f-s-32 c-#333 f-w-600">环境信息</view>
-                        <view class="f-s-30 pd2-16-0 info-border-bottom">
-                            <span class="c-#666">土壤类型:</span>
-                            <span class="c-#333">{{ selectDictLabel(pt_soil_type, form?.environmentInfo?.soilType) || '-' }}</span>
-                        </view>
-                        <view class="f-s-30 pd2-16-0 info-border-bottom">
-                            <span class="c-#666">土壤质地:</span>
-                            <span class="c-#333">{{ selectDictLabel(pt_soil_texture, form?.environmentInfo?.soilTexture) || '-' }}</span>
-                        </view>
-                        <view class="f-s-30 pd2-16-0 info-border-bottom">
-                            <span class="c-#666">有机质含量:</span>
-                            <span class="c-#333">{{ form?.environmentInfo?.organic || '-' }}</span>
-                        </view>
-                        <view class="f-s-30 pd2-16-0 info-border-bottom">
-                            <span class="c-#666">土壤PH值:</span>
-                            <span class="c-#333">{{ form?.environmentInfo?.soilPh || '-' }}</span>
-                        </view>
-                        <view class="f-s-30 pd2-16-0 info-border-bottom">
-                            <span class="c-#666">水源类型:</span>
-                            <span class="c-#333">{{ selectDictLabel(pt_water_type, form?.environmentInfo?.waterType) || '-' }}</span>
-                        </view>
-                        <view class="f-s-30 pd2-16-0 info-border-bottom">
-                            <span class="c-#666">无霜期:</span><span class="c-#333">{{ form?.environmentInfo?.notFrost || '-' }}<text v-if="form?.environmentInfo?.notFrost">天</text></span>
-                        </view>
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">年降水量:</span><span class="c-#333">{{ form?.environmentInfo?.precipitation || '-' }}<text v-if="form?.environmentInfo?.precipitation">mm</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">年平均气温:</span><span class="c-#333">{{ form?.environmentInfo?.avgTem || '-' }}<text v-if="form?.environmentInfo?.avgTem">℃</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">年绝对最高气温:</span><span class="c-#333">{{ form?.environmentInfo?.maxTem || '-' }}<text v-if="form?.environmentInfo?.maxTem">℃</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">年绝对最低气温:</span><span class="c-#333">{{ form?.environmentInfo?.minTem || '-' }}<text v-if="form?.environmentInfo?.minTem">℃</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">年日照时数:</span><span class="c-#333">{{ form?.environmentInfo?.sunshineHours || '-' }}<text v-if="form?.environmentInfo?.sunshineHours">小时</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">海拔:</span><span class="c-#333">{{ form?.environmentInfo?.altitude || '-' }}<text v-if="form?.environmentInfo?.altitude">米</text></span></view
-                        >
-                        <view v-if="form?.environmentInfo?.report?.length" class="f-s-30 pd2-16-0 info-border-bottom">
-                            <view class="c-#666 mb-10">水、土壤、大气等环评报告:</view>
-                            <ut-album :urls="form?.environmentInfo?.report"></ut-album>
-                        </view>
-                        <view v-if="form?.environmentInfo?.basePic" class="f-s-30 pd2-16-0 info-border-bottom">
-                            <view class="c-#666 mb-10">基地图片:</view>
-                            <ut-album :urls="form?.environmentInfo?.basePic"></ut-album>
-                        </view>
-                        <view v-if="form?.environmentInfo?.baseVoice?.length" class="f-s-30 pd2-16-0 info-border-bottom">
-                            <view class="c-#666 mb-10">基地视频:</view>
-                            <ut-album :urls="form?.environmentInfo?.baseVoice"></ut-album>
-                        </view>
-                    </view>
-                </template>
-
-                <!-- 基地类型 2:养殖基地 -->
-                <template v-else-if="form?.baseInfo?.baseType == '2'">
-                    <view class="pd-24 bg-#fff mb-10">
-                        <view class="f-s-32 c-#333 f-w-600">选址依据</view>
-                        <view class="f-s-30 pd2-16-0 info-border-bottom">
-                            <span class="c-#666">是否道地产区:</span>
-                            <span class="c-#333">{{ selectDictLabel(yes_no, form?.environmentInfo?.daoStatus) || '-' }}</span>
-                        </view>
-                        <view v-if="form?.environmentInfo?.adaptFile?.length" class="f-s-30 pd2-16-0 info-border-bottom">
-                            <view class="c-#666 mb-10">基地选址依据/标准:</view>
-                            <ut-album :urls="form?.environmentInfo?.adaptFile"></ut-album>
-                        </view>
-                        <view v-if="form?.environmentInfo?.accordFile?.length" class="f-s-30 pd2-16-0 info-border-bottom">
-                            <view class="c-#666 mb-10">适应性证明材料:</view>
-                            <ut-album :urls="form?.environmentInfo?.accordFile"></ut-album>
-                        </view>
+                    <view v-if="form?.url" class="f-s-30 pd2-16-0 info-border-bottom">
+                        <span class="c-#666">官方公示网址:</span>
+                        <span class="c-#333">{{ form?.url || '-' }}</span>
                     </view>
-                    <view class="pd-24 bg-#fff mb-10">
-                        <view class="f-s-32 c-#333 f-w-600">环境信息</view>
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">水源类型:</span><span class="c-#333">{{ selectDictLabel(pt_water_type, form?.environmentInfo?.waterType) || '-' }}</span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">无霜期:</span><span class="c-#333">{{ form?.environmentInfo?.notFrost || '-' }}<text v-if="form?.environmentInfo?.notFrost">天</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">年降水量:</span><span class="c-#333">{{ form?.environmentInfo?.precipitation || '-' }}<text v-if="form?.environmentInfo?.precipitation">mm</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">年平均气温:</span><span class="c-#333">{{ form?.environmentInfo?.avgTem || '-' }}<text v-if="form?.environmentInfo?.avgTem">℃</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">年绝对最高气温:</span><span class="c-#333">{{ form?.environmentInfo?.maxTem || '-' }}<text v-if="form?.environmentInfo?.maxTem">℃</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">年绝对最低气温:</span><span class="c-#333">{{ form?.environmentInfo?.minTem || '-' }}<text v-if="form?.environmentInfo?.minTem">℃</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">年日照时数:</span><span class="c-#333">{{ form?.environmentInfo?.sunshineHours || '-' }}<text v-if="form?.environmentInfo?.sunshineHours">小时</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">海拔:</span><span class="c-#333">{{ form?.environmentInfo?.altitude || '-' }}<text v-if="form?.environmentInfo?.altitude">米</text></span></view
-                        >
-                        <view v-if="form?.environmentInfo?.report?.length" class="f-s-30 pd2-16-0 info-border-bottom">
-                            <view class="c-#666 mb-10">水、大气等环评报告:</view>
-                            <ut-album :urls="form?.environmentInfo?.report"></ut-album>
-                        </view>
-                        <view v-if="form?.environmentInfo?.basePic" class="f-s-30 pd2-16-0 info-border-bottom">
-                            <view class="c-#666 mb-10">基地图片:</view>
-                            <ut-album :urls="form?.environmentInfo?.basePic"></ut-album>
-                        </view>
-                        <view v-if="form?.environmentInfo?.baseVoice?.length" class="f-s-30 pd2-16-0 info-border-bottom">
-                            <view class="c-#666 mb-10">基地视频:</view>
-                            <ut-album :urls="form?.environmentInfo?.baseVoice"></ut-album>
-                        </view>
-                    </view>
-                </template>
-                <!-- 基地类型 3:组培基地 -->
-                <template v-else-if="form?.baseInfo?.baseType == '3'">
-                    <view class="pd-24 bg-#fff mb-10">
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">温度:</span><span class="c-#333">{{ form?.environmentInfo?.avgTem || '-' }}<text v-if="form?.environmentInfo?.avgTem">℃</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">湿度:</span><span class="c-#333">{{ form?.environmentInfo?.humidity || '-' }}<text v-if="form?.environmentInfo?.humidity">%</text></span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">洁净度:</span><span class="c-#333">{{ form?.environmentInfo?.clean || '-' }}</span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">光照:</span><span class="c-#333">{{ form?.environmentInfo?.light || '-' }}</span></view
-                        >
-                        <view class="f-s-30 pd2-16-0 info-border-bottom"
-                            ><span class="c-#666">光照周期:</span><span class="c-#333">{{ form?.environmentInfo?.lightCycle || '-' }}</span></view
-                        >
-                    </view>
-                </template>
-           
+                </view>
             </view>
-            <template #bottom>
+            <template v-if="form.res == '2'" #bottom>
                 <view class="pd-20 d-flex">
-                    <template v-if="!+form.baseInfo?.tempFlag">
-                        <up-button class="mr-20" color="#18BECA">去标记为三无一全基地{{ '>' }}</up-button>
-                    </template>
-                    <up-button @click="$u.route({ type: 'redirect', url: '/plant/base/base-edit/index', params: { id: did } })" type="primary">修改</up-button>
+                    <up-button @click="$u.route({ type: 'redirect', url: '/plant/base/gap-base-info-edit/index', params: { id: did } })" type="primary">修改</up-button>
                 </view>
             </template>
         </z-paging>
@@ -311,44 +69,37 @@
 import { useClientRequest } from '@/utils/request';
 import { getUrlParams, recursiveDecodeURIComponent } from '@/utils/ruoyi';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { yes_no, pt_org_type, pt_base_type, pt_water_type, pt_soil_type, pt_soil_texture, pt_light_type, pt_capacity_unit } = toRefs<any>(proxy?.useDict('yes_no', 'pt_org_type', 'pt_base_type', 'pt_water_type', 'pt_soil_type', 'pt_soil_texture', 'pt_light_type', 'pt_capacity_unit'));
-const tabs = reactive([
-    { label: '基本信息', value: 'base' },
-    { label: '地块信息', value: 'plot' },
-    { label: '选址依据及环境信息', value: 'environment' },
-]);
-const activeTab = ref('base');
+const { pt_base_type } = toRefs<any>(proxy?.useDict('pt_base_type'));
 const paging = ref<any>(null);
-const mapUnitByBaseType: any = {
-    '1': '亩',
-    '2': '平方米',
-    '3': '平方米',
-};
 const form = ref<any>({});
-
-const changeActiveTab = (value: any) => {
-    const v = typeof value === 'string' ? value : value?.value;
-    const id = `${v}12345`;
-    paging.value?.scrollIntoViewById(id, 30, true);
-};
 const did = ref('');
-// 根据id获取基地详情
+
+// 获取详情(GAP获评信息)
 const getDetailById = async (id: string) => {
-    const res = await useClientRequest.get(`/plt-api/app/base/getInfoAllById/${id}`);
+    if (!id) return;
+    const res = await useClientRequest.get(`/plt-api/app/gapCertificationInfo/getInfoById/${id}`);
     if (res && res.code === 200) {
         form.value = res.data || {};
     }
 };
+
 const onRefresh = () => {
     getDetailById(did.value);
     paging.value?.complete();
 };
-// 判断节点是否在可视区域内如果在则切换tab createIntersectionObserver
 
+// 页面入参解析并加载
 onLoad((options: any) => {
     did.value = options?.id || getUrlParams(recursiveDecodeURIComponent(options?.q))?.id || '';
     getDetailById(did.value);
 });
+
+// 预览基地范围图片
+const previewBasePic = () => {
+    const url = form.value?.basePic;
+    if (!url) return;
+    uni.previewImage({ urls: [url], current: 0 });
+};
 </script>
 <style lang="scss" scoped>
 .z-paging-wrap {

+ 2 - 2
src/plant/base/gap-base-info-edit/index.vue

@@ -29,7 +29,7 @@
                     <!-- 选择获评品种 -->
                     <view class="h-1" id="medicineIdpppp"></view>
                     <up-form-item @click="selectMedicine" borderBottom label="获评品种" required prop="medicineId">
-                        <view v-if="form.medicineId" class="f-s-30 c-333 f-w-5 flex1">{{ form.contactName }}</view>
+                        <view v-if="form.medicineId" class="f-s-30 c-333 f-w-5 flex1">{{ form.medicineName }}</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>
@@ -287,7 +287,7 @@ const mapDrawArea = async () => {
 const selectMedicine = () => {
     uni.$on('medicineSelected', (medicine: any) => {
         form.value.medicineId = medicine.id;
-        form.value.contactName = medicine.medicineName;
+        form.value.medicineName = medicine.medicineName;
         uni.$off('medicineSelected');
     });
     uni.$u.route({

+ 36 - 14
src/plant/base/gap-base-info/index.vue

@@ -4,7 +4,7 @@
             <ut-navbar title="GAP基地信息" :fixed="false" border></ut-navbar>
             <view class="d-flex a-c pd-25">
                 <view class="min-w-170 flex1">
-                    <ut-action-sheet v-model="form.type" :tabs="tabs" @change="onRefresh" title="选择基地类型">
+                    <ut-action-sheet v-model="form.res" :tabs="tabs" @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">{{ '全部' }}</view>
                             <up-icon size="24rpx" color="#333" name="arrow-down-fill" class="mr-5"></up-icon>
@@ -20,8 +20,8 @@
             <template>
                 <view class="pl-25 pr-25">
                     <up-swipe-action>
-                        <up-swipe-action-item v-for="item in list" :name="item?.id" :key="item?.id" :options="optionsAction" @click="clickSwipe" class="mb-20 b-radius">
-                            <view class="b-radius bg-#fff pd-20 p-rtv">
+                        <up-swipe-action-item v-for="item in list" :name="item?.id" :key="item?.id" :disabled="item?.res == '1'" :options="optionsAction" @click="clickSwipe" class="mb-20 b-radius">
+                            <view @click.stop="clickItem(item)" class="b-radius bg-#fff pd-20 p-rtv">
                                 <view class="c-#333 f-s-34 f-w-5 pb-5">{{ item?.gapBaseName }}</view>
                                 <view class="c-#999 f-s-24 pb-20">{{ item?.ratedDate }}获评</view>
                                 <view class="d-flex pb-5">
@@ -36,7 +36,7 @@
                                 </view>
                                 <view class="pb-20">
                                     <text class="c-#666 f-s-28">基地地址:</text>
-                                    <text class="c-#333 f-s-28 f-w-5">{{ item?.address }}</text>
+                                    <text class="c-#333 f-s-28 f-w-5">{{ item?.adcodeName }}{{ item?.address }}</text>
                                 </view>
                                 <view v-if="+item?.res == 2" class="pl-5 pr-5 pt-20 pb-20 border-top-#f7f7f7 c-#FC333F">
                                     <text class="f-s-28">审核不通过原因:</text>
@@ -82,9 +82,9 @@ const list = ref<any[]>([]);
 const placeholder = ref('搜基地名称、品种、基地地址');
 const tabs = ref([
     { label: '全部', value: '' },
-    { label: '有效', value: '0' },
-    { label: '审核不通过', value: '1' },
-    { label: '待审核', value: '2' },
+    { label: '有效', value: '1' },
+    { label: '审核不通过', value: '2' },
+    { label: '待审核', value: '0' },
 ]);
 // 判断是否是云南的企业
 const isYunnanCompany = (): boolean => {
@@ -94,7 +94,7 @@ const isYunnanCompany = (): boolean => {
 const address = computed(() => isYunnanCompany());
 const form = ref({
     keyword: '',
-    type: '',
+    res: '',
 });
 
 const query = async (pageNum: number, pageSize: number) => {
@@ -103,17 +103,14 @@ const query = async (pageNum: number, pageSize: number) => {
         pageSize,
         ...form.value,
     };
-    // const res = await cpyList(params);
-    ///app/gapCertificationInfo/pageList
     const res = await useClientRequest.get<any>('/plt-api/app/gapCertificationInfo/pageList', params);
+    if (!res || res.code !== 200) return;
     const { rows } = res;
     paging.value.complete(rows);
 };
 const onRefresh = () => {
     paging.value.reload();
 };
-// 处理地块数据
-const showAction = ref(false);
 const optionsAction = reactive([
     {
         text: '删除',
@@ -122,8 +119,33 @@ const optionsAction = reactive([
         },
     },
 ]);
-const clickSwipe = (index: object) => {
-    console.log(index);
+const clickSwipe = async (event: object) => {
+    const { name, index } = event as any;
+    if (index === 0) {
+        // 删除
+        const res = await uni.showModal({
+            title: '提示',
+            content: '确定删除该GAP基地信息吗?',
+        });
+        console.log(res);
+        
+        if (res.confirm) {
+            const delRes = await useClientRequest.delete(`/plt-api/app/gapCertificationInfo/delById/${name}`);
+            if (delRes && delRes.code === 200) {
+                uni.showToast({ title: '删除成功', icon: 'none' });
+                onRefresh();
+            }
+        }
+    }
+};
+const clickItem = (item: any) => {
+    uni.$u.route({
+        type: 'navigateTo',
+        url: '/plant/base/gap-base-info-detail/index',
+        params: {
+            id: item?.id,
+        },
+    });
 };
 </script>
 <style lang="scss" scoped>

+ 0 - 0
src/static/images/plant/有效.png → src/static/images/plant/base/gap_res0.png


+ 0 - 0
src/static/images/plant/待审核.png → src/static/images/plant/base/gap_res1.png


+ 0 - 0
src/static/images/plant/未通过.png → src/static/images/plant/base/gap_res2.png