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

src/pages/plant/port/index.vue

@@ -32,13 +32,13 @@
         </view>
         <template #empty v-if="form?.status == '1'">
             <view class="d-flex flex-cln a-c" style="margin-top: -200rpx">
-                <ut-empty class="mg-at" color="#ccc" size="28rpx" image="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/noEmptyBase.png">暂无进行中的养殖任务</ut-empty>
+                <ut-empty class="mg-at" color="#ccc" size="28rpx" image="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/noEmpty.png">暂无进行中的养殖任务</ut-empty>
                 <text class="c-#ccc f-s-28">点击下方按钮去添加吧～</text>
             </view>
         </template>
         <template #empty v-if="form?.status == '9'">
             <view class="d-flex flex-cln a-c" style="margin-top: -200rpx">
-                <ut-empty class="mg-at" color="#ccc" size="28rpx" image="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/noEmptyBase.png">暂无已经结束的养殖任务</ut-empty>
+                <ut-empty class="mg-at" color="#ccc" size="28rpx" image="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/noEmpty.png">暂无已经结束的养殖任务</ut-empty>
             </view>
         </template>
         <template #bottom>

src/plant/port/port-harvest-detail/index.vue

@@ -132,7 +132,7 @@
                     </view>
                 </view>
                 <view class="pd3-20-40-0">
-                    <up-button type="primary" :customStyle="{ background: '#ebf6ee', borderColor: '#3FAD5B' }" style="color: #3fad5b">去库房查看详细信息{{ '>' }}</up-button>
+                    <up-button @click="gotostorage" type="primary" :customStyle="{ background: '#ebf6ee', borderColor: '#3FAD5B' }" style="color: #3fad5b">去库房查看详细信息{{ '>' }}</up-button>
                 </view>
             </view>
         </template>
@@ -157,6 +157,7 @@ const storageInfo = ref<any>({
     unit: '',
     usedQuantity: '',
     remainingQuantity: '',
+    id: '',
 });
 
 const landIdsTitle = ref('地块');
@@ -239,7 +240,25 @@ const goStorageDetail = () => {
         });
     }
 };
-
+const gotostorage = () => {
+    if (form.value.outputType == '1') {
+        uni.$u.route({
+            type: 'navigateTo',
+            url: '/plant/storage/seed-source/detail/index',
+            params: {
+                id: storageInfo.value.id,
+            },
+        });
+    } else if (form.value.outputType == '2') {
+        uni.$u.route({
+            type: 'navigateTo',
+            url: '/plant/storage/fresh-goods/detail/index',
+            params: {
+                id: storageInfo.value.id,
+            },
+        });
+    }
+};
 onLoad((options: any) => {
     recordId.value = options?.id || '';
     if (recordId.value) {

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

@@ -5,8 +5,8 @@
         </template>
         <view class="pd-24">
             <Task_card :data="taskDate" />
-            <view class="d-flex a-c j-sb pt-20 pb-20">
-                <view class="startline-title mb-16">采收入库记录</view>
+            <view class="d-flex a-c j-sb pt-40 pb-40">
+                <view class="startline-title">采收入库记录</view>
                 <view class="d-flex a-c gap-10">
                     <view class="bg-#37A954 radius-10 pd4-10-20-10-20 d-flex a-c" style="width: max-content" @click="addManagementRecord()">
                         <up-icon name="plus" color="#fff" size="24rpx"></up-icon>
@@ -19,7 +19,7 @@
                     <view class="bg-#fff b-radius pd-24" @click="gotoDetail(item)">
                         <view class="d-flex a-c j-sb">
                             <view class="d-flex a-c">
-                                <view class="f-s-34 f-w-5 pb-10 mr-10">采收{{ selectDictLabel(pt_seed_type, item?.seedType) || '药材' }}</view>
+                                <view class="f-s-34 f-w-5 pb-10 mr-10">{{ item?.title }}</view>
                             </view>
                             <view class="d-flex a-c">
                                 <view class="f-s-22 c-#666">{{ item?.updateTime || item?.createTime }}</view>

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

@@ -5,8 +5,8 @@
         </template>
         <view class="pd-24">
             <Task_card :data="taskDate" />
-            <view class="d-flex a-c j-sb pt-20 pb-20">
-                <view class="startline-title mb-16">种源信息</view>
+            <view class="d-flex a-c j-sb pt-40 pb-40">
+                <view class="startline-title">种源信息</view>
                 <view class="d-flex a-c gap-10">
                     <view class="bg-#37A954 radius-10 pd4-10-20-10-20 d-flex a-c" style="width: max-content" @click="addManagementRecord()">
                         <up-icon name="plus" color="#fff" size="24rpx"></up-icon>

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

@@ -5,8 +5,8 @@
         </template>
         <view class="pd-24">
             <Task_card :data="taskDate" />
-            <view class="d-flex a-c j-sb pt-20 pb-20">
-                <view class="startline-title mb-16">管理记录</view>
+            <view class="d-flex a-c j-sb pt-40 pb-40">
+                <view class="startline-title">管理记录</view>
                 <view class="d-flex a-c gap-10">
                     <view v-if="taskDate?.taskType == '2' || taskDate?.taskType == '21'" class="bg-#18BECA radius-10 pd4-10-20-10-20 d-flex a-c" style="width: max-content" @click="addInputMaterialRecord()">
                         <up-icon name="plus" color="#fff" size="24rpx"></up-icon>