Selaa lähdekoodia

feat:修改bug

wangsisi 5 päivää sitten
vanhempi
commit
6cf411ca36

+ 18 - 3
src/components/pageComponents/ArchivesFarmTimeLine.vue

@@ -1034,6 +1034,15 @@ const agriRecordHasPendingAuthInPhenology = (phenology) => {
     );
 };
 
+// 单行生育期下是否有待认证农事(仅农事记录页)
+const reproductiveHasPendingAuthFarmWork = (reproductive) => {
+    if (props.pageType !== "agri_record") return false;
+    return (Array.isArray(reproductive?.farmWorkArrangeList) ? reproductive.farmWorkArrangeList : []).some((fw) => {
+        const s = fw?.flowStatus;
+        return s === 3 || s === "3";
+    });
+};
+
 // 物候期底色/节气规则(不含「农事卡片日期」「待认证」扩展)
 const shouldShowBlueBase = (phenology) => {
     // 优先使用物候期真实日期判断:未来日期不应显示蓝色
@@ -1093,11 +1102,17 @@ const shouldShowBlue = (phenology) => {
     return shouldShowBlueBase(phenology);
 };
 
-// 左侧生育期/物候期文案:农事记录下物候期内有待认证则该段内所有生育期/物候期名称均蓝;否则本行农事≤今天或节气规则
+// 左侧生育期/物候期文案:
+// 1) 本行有农事<=今天:蓝;
+// 2) 本行全部有效日期农事均为未来且本行无待认证:灰(与右侧 future-card 一致);
+// 3) 农事记录下物候期内有待认证:蓝;
+// 4) 其余走节气/日期底色规则。
 const shouldShowBlueLeft = (phenology, reproductive) => {
-    if (agriRecordHasPendingAuthInPhenology(phenology)) return true;
     if (reproductiveHasFarmWorkOnOrBeforeToday(reproductive)) return true;
-    if (reproductiveAllDatedFarmWorksStrictlyFuture(reproductive)) return false;
+    if (reproductiveAllDatedFarmWorksStrictlyFuture(reproductive) && !reproductiveHasPendingAuthFarmWork(reproductive)) {
+        return false;
+    }
+    if (agriRecordHasPendingAuthInPhenology(phenology)) return true;
     return shouldShowBlueBase(phenology);
 };
 

+ 11 - 3
src/views/old_mini/interactionList/index.vue

@@ -38,8 +38,8 @@
                 <!-- 未上传状态内容 -->
                 <div class="uploaded-content" v-show="item.questionStatus === 3 || item.expanded">
                     <div class="content-wrapper">
-                        <span>{{ item.remark }}</span>
-                        <text-ellipsis class="item-desc" rows="0" :content="item.reason" expand-text="展开"
+                        <span>{{ item.reason }}</span>
+                        <text-ellipsis class="item-desc" rows="0" :content="item.remark" expand-text="展开"
                             collapse-text="收起" />
                         <div class="tip-box">如果不确定是否发生,直接上传照片即可</div>
                         <div class="example-wrapper">
@@ -118,7 +118,8 @@
                         <div class="draw-region-btn" v-if="item.rangeWkt && item.questionStatus !== 3"
                             @click="handleViewRegion(item)">
                             查看发生区域</div>
-                    </div>
+
+                        </div>
 
                     <!-- 输入框 -->
                     <div class="input-wrapper" v-if="item.questionStatus === 3 || item.replyText">
@@ -126,6 +127,8 @@
                             clearable />
                     </div>
 
+                    <div class="cancel-text" v-if="item.isConfirmed && item.questionStatus === 2">{{ item.cancelButtonName }}</div>
+
                     <!-- 按钮区域 -->
                     <div class="button-group" v-show="item.questionStatus === 3">
                         <div
@@ -1145,6 +1148,11 @@ const handleSubmitAll = () => {
                 margin: 12px 0;
             }
 
+            .cancel-text{
+                color: #969696;
+                margin-top: 8px;
+            }
+
             .button-group {
                 display: flex;
                 gap: 12px;