Browse Source

fix: 待执行农事跳转

lxf 1 day ago
parent
commit
10958acefb

+ 37 - 8
src/views/old_mini/growth_report/index.vue

@@ -32,7 +32,12 @@
                             <div class="box-title warning">今日巡园重点</div>
                             <div class="box-text w-100">
                                 <div class="row">
-                                    <div v-for="(card, cardI) in todayPatrolFocus" :key="cardI" class="status-card" :class="card.type"
+                                    <div
+                                        v-for="(card, cardI) in todayPatrolFocus"
+                                        :key="cardI"
+                                        class="status-card"
+                                        :class="card.type"
+                                        @click="handleTodayPatrolFocusClick(card)"
                                         >
                                         <!-- <badge class="status-badge" dot 
                                             :offset="[80, -10]">
@@ -40,10 +45,7 @@
                                         <div class="status-title">
                                             {{ card.title }}
                                         </div>
-                                        <div class="status-sub" v-if="card.source === 'NEXT_PHENOLOGY'">
-                                            预计{{card.daysUntilNext}}天后进入
-                                        </div>
-                                        <div class="status-sub" v-else>
+                                        <div class="status-sub">
                                             {{ card.description }}
                                         </div>
                                     </div>
@@ -55,17 +57,23 @@
                             <div class="box-title warning">待执行农事</div>
                             <div class="box-text w-100">
                                 <div class="row">
-                                    <div v-for="(card, cardI) in pendingFarmWork" :key="cardI" class="status-card pending-card" :style="{ background: card.purposeColor }" :class="card.type"
+                                    <div
+                                        v-for="(card, cardI) in pendingFarmWork"
+                                        :key="cardI"
+                                        class="status-card pending-card"
+                                        :style="{ background: card.purposeColor }"
+                                        :class="card.type"
+                                        @click="handlePendingFarmWorkClick(card)"
                                         >
                                         <!-- <badge class="status-badge" dot 
                                             :offset="[80, -10]">
                                         </badge> -->
-                                        <!-- <div class="tag-name" :style="{ borderColor: card.purposeColor, color: card.purposeColor }">限时 3 天</div> -->
+                                        <div v-if="card.executionLimitDays || card.executionLimitDays === 0" class="tag-name" :style="{ borderColor: card.purposeColor, color: card.purposeColor }">限时 {{ card.executionLimitDays }} 天</div>
                                         <div class="status-title">
                                             {{ card.name }}
                                         </div>
                                         <div class="status-sub pending-sub">
-                                            {{ card.status }}
+                                            {{ card.purposeName }}
                                         </div>
                                     </div>
                                 </div>
@@ -261,6 +269,26 @@ const handleAddFarm = () => {
 
 const todayPatrolFocus = ref([]);
 const pendingFarmWork = ref([]);
+const handlePendingFarmWorkClick = (card) => {
+    router.push({
+        path: "/work_detail",
+        query: {
+            miniJson: JSON.stringify({
+                paramsPage: JSON.stringify({
+                    farmId: paramsPage.value.farmId,
+                    farmWorkLibId: card?.farmWorkLibId,
+                    recordId: card?.recordId,
+                    typeId: regionsData.value[currentIndex.value].typeId
+                }),
+            }),
+        },
+    });
+}
+// 点击今日巡园重点
+const handleTodayPatrolFocusClick = (card) => {
+    router.push(`/interaction_list?farmId=${paramsPage.value.farmId}&regionId=${paramsPage.value.regionId}&interactionTypeId=${card.interactionTypeId || 1}`);
+}
+
 const getTodayPatrolFocus = () => {
     VE_API.report.todayPatrolFocus({ farmId: paramsPage.value.farmId, regionId:paramsPage.value.regionId }).then(({ data }) => {
         todayPatrolFocus.value = data || [];
@@ -772,6 +800,7 @@ linear-gradient(0deg, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2));
                     .status-sub {
                         font-size: 10px;
                         color: rgba(32, 32, 32, 0.4);
+                        line-height: 15px;
 
                         &.pending-sub {
                             color: #fff;

+ 1 - 1
src/views/old_mini/work_detail/index.vue

@@ -29,7 +29,7 @@
 
             <div class="work-wrap" :class="{ 'has-bottom': info?.appType === 2 || (info?.appType === 1 && detail?.flowStatus === 3) }">
                 <!-- 农事组信息 -->
-                <div class="box-wrap group-info group-box" v-if="detail?.executionLimitDays && detail?.flowStatus !== 5">
+                <div class="box-wrap group-info group-box" v-if="(detail?.executionLimitDays || detail?.executionLimitDays === 0) && detail?.flowStatus !== 5">
                     <div class="group-name">
                         该农事为 <span class="light-text">标准防治溯源农事</span> ,请在<span v-if="detail?.flowStatus !== 3">触发后</span> <span class="light-text">{{detail?.executionLimitDays}}天内</span>
                         完成溯源认证上传,如果逾期未认证,该农事将不可溯源认证,且不计入飞鸟有味平台