Explorar el Código

fix: 农事操作

lxf hace 9 horas
padre
commit
3503135384

+ 13 - 28
src/views/old_mini/home/components/AgriculturalDynamics.vue

@@ -3,7 +3,7 @@
         <!-- 任务列表 -->
         <div class="task-list">
             <div v-for="(task, index) in taskList" :key="index" class="task-item">
-                <div class="task-content">
+                <div class="task-content" @click="handleTaskAction(task)">
                     <div class="task-header">
                         <div class="task-status-tag">待完成</div>
                         <div class="task-title">{{ task.farmWorkName }}</div>
@@ -11,7 +11,7 @@
                     <div class="task-time" v-if="task.expectedExecuteDate">执行时间 {{ task.expectedExecuteDate }}</div>
                     <div class="task-time deadline" v-else>截止时间 {{ task.executeDeadlineDate }}</div>
                 </div>
-                <div v-if="task.expectedExecuteDate" class="task-action" @click="handleTaskAction(task)">
+                <div v-if="task.expectedExecuteDate" class="task-action" @click="showOfferPopup(task)">
                     上传照片
                 </div>
                 <div v-else class="task-action orange" @click="selectExecuteTime(task)">
@@ -73,33 +73,16 @@ import { formatDate } from "@/common/commonFun";
 // 任务列表数据
 const taskList = ref([]);
 
-const offerPopupRef = ref(null);
 const handleTaskAction = (item) => {
-    const data = {
-        address: "岭南印象园东南",
-        executeDate: "2025-11-19",
-        executeEvidence: '["birdseye-look-mini/91754/1763544788985.jpg"]',
-        farmArea: "50.089606952166854",
-        farmId: 93684,
-        farmMiniUserId: 91429,
-        farmMiniUserName: "丝丝1",
-        farmName: "17ss籼稻农场",
-        farmWorkArrangeId: "124",
-        farmWorkLibId: "2220005",
-        farmWorkName: "蘖末防治",
-        id: "276567",
-        isFollow: null,
-        isIgnored: 0,
-        isPublic: 0,
-        mapInfo: "11.19  蘖末防治",
-        orderId: "778948195706212352",
-        point: "POINT(113.407189 23.032344)",
-        quoteCount: "1",
-        solarTerm: null,
-        typeId: "223",
-        typeName: "丝苗米",
-    };
-    offerPopupRef.value.openPopup(data);
+    router.push({
+        path: "/completed_work",
+        query: { miniJson: JSON.stringify({ id: item.id }) },
+    });
+};
+
+const offerPopupRef = ref(null);
+const showOfferPopup = (item) => {
+    offerPopupRef.value.openPopup(item);
 };
 
 const showCalendar = ref(false);
@@ -198,6 +181,7 @@ const getFutureFarmWorkWarning = async (item) => {
             }
 
             .task-content {
+                flex: 1;
                 .task-header {
                     display: flex;
                     align-items: center;
@@ -229,6 +213,7 @@ const getFutureFarmWorkWarning = async (item) => {
             }
 
             .task-action {
+                flex: none;
                 background-color: rgba(33, 153, 248, 0.1);
                 color: #2199f8;
                 border-radius: 25px;

+ 1 - 1
src/views/old_mini/task_condition/components/interact.vue

@@ -42,7 +42,7 @@
             >
                 <div class="task-content" v-loading="loading && taskList.length === 0">
                     <div class="task-item" v-for="(item, index) in taskList" :key="item.id || index">
-                        <div class="img-text-wrap" @click.stop="toDetail(item)">
+                        <div class="img-text-wrap">
                             <div class="left-wrap">
                                 <div class="left-img">
                                     <img src="@/assets/img/home/farm.png" alt="" />