Selaa lähdekoodia

fix: 农事规划状态

lxf 9 tuntia sitten
vanhempi
commit
497039cd8a

+ 6 - 6
src/views/old_mini/monitor/subPages/plan.vue

@@ -202,9 +202,9 @@ const handleRowClick = (item) => {
                 id: item.farmWorkRecordId,
             },
         });
-    } else if (item.type !== "term" && item.flowStatus === "default") {
-        detailDialogRef.value.showDialog();
-    } else if (item.flowStatus === 6 || item.flowStatus < 5 && item.flowStatus > 0) {
+    } else if (item.flowStatus === null) {
+        detailDialogRef.value.showDialog(item.farmWorkId);
+    } else if (item.flowStatus === 6 || item.flowStatus < 5 && item.flowStatus >= 0) {
         router.push({
             path: "/completed_work",
             query: {
@@ -318,9 +318,9 @@ const getPhenologyBarStyle = (item) => {
 
 // 农事状态样式映射(0:默认,1-4:正常,5:完成,6:预警)
 const getArrangeStatusClass = (fw) => {
-    const t = fw?.farmWorkType;
-    if (t == null || t === 0) return "status-default";
-    if (t >= 1 && t <= 4) return "status-normal";
+    const t = fw?.flowStatus;
+    if (t == null) return "status-default";
+    if (t >= 0 && t <= 4) return "status-normal";
     if (t === 5) return "status-complete";
     if (t === 6) return "status-warning";
     return "status-default";

+ 3 - 0
src/views/old_mini/task_condition/components/task.vue

@@ -317,6 +317,9 @@ function handlePopupBtn() {
     showTaskPopup.value = false;
     if (taskPopupType.value === 'warning') {
         // 确认忽略
+    } else {
+        // 待确认
+        getTaskCount('1,2,3', 1)
     }
 }
 </script>