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

src/plant/models/pack-card.vue

@@ -3,7 +3,7 @@
         <view class="d-flex j-sb a-c pr-24">
             <view class="f-s-20 f-w-5 item-left-tag" :class="{[`bg-pack-${ item?.refType }`]: true }">{{ selectDictLabel(pt_pack_ref_type, item?.refType) }}</view>
             <view class="f-s-22 c-#666">
-                {{ getDateRangeFrt(item?.packagingDateStart, item?.packagingDateStart) }}
+                {{ getDateRangeFrt(item?.packagingDateStart, item?.packagingDateEnd) }}
                 <span>包装</span>
             </view>
         </view>

src/plant/models/warehouseCard/fresh-goods-card.vue

@@ -1,7 +1,10 @@
 <template>
     <view class="d-flex j-sb a-c li-item-head">
         <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ selectDictLabel(pt_fresh_instore_type, item?.instoreType) }}</view>
-        <view v-if="isInstoreDate" class="f-s-22 c-#666 mr-30">{{ item?.instoreBizInfo?.instoreDate }}</view>
+        <template v-if="isInstoreDate">
+            <view v-if="item?.instoreType != '3'" class="f-s-22 c-#666 mr-24">{{ item?.instoreBizInfo?.instoreDate }}</view>
+            <view v-else class="f-s-22 c-#666 mr-24">{{ getDateRangeFrt(item?.harvestInfo?.harvestDate, item?.harvestInfo?.harvestDateEnd) }}采收</view>
+        </template>
     </view>
     <view class="pd-20">
         <view class="d-flex flex1 mb-10">

src/plant/models/warehouseCard/seed-source-card.vue

@@ -3,7 +3,7 @@
         <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ selectDictLabel(pt_seed_instore_type, item?.instoreType) }}</view>
         <template v-if="isInstoreDate">
             <view v-if="item?.instoreType != '3'" class="f-s-22 c-#666 mr-24">{{ item?.instoreBizInfo?.instoreDate }}</view>
-            <view v-else class="f-s-22 c-#666 mr-24">{{ item?.instoreBizInfo?.instoreDate }}</view>
+            <view v-else class="f-s-22 c-#666 mr-24">{{ getDateRangeFrt(item?.harvestInfo?.harvestDate, item?.harvestInfo?.harvestDateEnd) }}采收</view>
         </template>
         
     </view>

src/plant/packaging/batch-link/index.vue

@@ -266,7 +266,9 @@ const batchLinkCodes = async () => {
         });
         uni.$emit('refreshPackTaskList');
         uni.$emit('refreshPackTaskDetail');
-    
+        uni.navigateBack({
+            delta: 1,
+        });
     } catch (error) {
         console.error('批量关联失败:', error);
         uni.hideLoading();