Browse Source

feat:对接过往农事内容显示

wangsisi 5 days ago
parent
commit
fbd292f070
1 changed files with 39 additions and 11 deletions
  1. 39 11
      src/components/recordItem.vue

+ 39 - 11
src/components/recordItem.vue

@@ -6,7 +6,7 @@
                 <div class="title-l">
                     {{ recordItemData.farmWorkName || recordItemData.name }}
                     <span class="parent-text" v-if="recordItemData.type || recordItemData.farmWorkType">
-                        {{ getFarmTypeText(recordItemData.type || recordItemData.farmWorkType) }}
+                        {{ farmWorkType[recordItemData.type || recordItemData.farmWorkType] }}
                     </span>
                 </div>
                 <!-- 按钮样式 -->
@@ -32,19 +32,33 @@
                 <div class="info-line">
                     药物处方:<span class="info-val">{{ getPrescriptionInfo(recordItemData) }}</span>
                 </div>
-                <div class="review-image" v-if="showFarmImage && recordItemData.executeEvidence?.length || recordItemData.executeEvidenceList?.length">
+                <div
+                    class="review-image"
+                    v-if="
+                        (showFarmImage && recordItemData.executeEvidence?.length) ||
+                        recordItemData.executeEvidenceList?.length
+                    "
+                >
                     <!-- <div class="image-wrapper" v-if="currentImageUrl">
                         <span class="image-label">执行照片</span>
                         <img :src="currentImageUrl" alt="" />
                     </div> -->
                     <div class="image-wrapper">
                         <span class="image-label">执行照片</span>
-                        <img v-if="recordItemData.executeEvidence?.[0]" :src="base_img_url2 + recordItemData.executeEvidence?.[0]" alt="" />
+                        <img
+                            v-if="recordItemData.executeEvidence?.[0]"
+                            :src="base_img_url2 + recordItemData.executeEvidence?.[0]"
+                            alt=""
+                        />
                         <img v-else :src="base_img_url2 + recordItemData.executeEvidenceList?.[0]" alt="" />
                     </div>
                     <div class="image-wrapper">
                         <span class="image-label">执行照片</span>
-                        <img v-if="recordItemData.executeEvidence?.[1]" :src="base_img_url2 + recordItemData.executeEvidence?.[1]" alt="" />
+                        <img
+                            v-if="recordItemData.executeEvidence?.[1]"
+                            :src="base_img_url2 + recordItemData.executeEvidence?.[1]"
+                            alt=""
+                        />
                         <img v-else :src="base_img_url2 + recordItemData.executeEvidenceList?.[1]" alt="" />
                     </div>
                 </div>
@@ -56,7 +70,7 @@
         <div class="record-content" v-else>
             <div class="info-item">
                 推荐时间:
-                <span class="info-val">{{ recordItemData?.executeDate || "--" }}</span>
+                <span class="info-val">{{ recordItemData?.executeDate || recordItemData?.recommendDate || "--" }}</span>
             </div>
             <div
                 class="info-item recipe-name"
@@ -80,6 +94,21 @@
                 </div>
             </div>
             <div
+                class="info-item recipe-name"
+                v-if="onlyRecipeName && recordItemData?.prescription && recordItemData?.prescription?.id != null"
+            >
+                <span class="name-text">药物处方:</span>
+                <div class="rescription info-val">
+                    <span
+                        v-for="(pest, pestI) in recordItemData.prescription.pesticideFertilizerList"
+                        :key="'sub' + pestI"
+                    >
+                        {{ pest.name }}
+                        <span v-if="pestI !== recordItemData.prescription.pesticideFertilizerList.length - 1"> + </span>
+                    </span>
+                </div>
+            </div>
+            <div
                 class="info-item"
                 v-if="
                     !onlyRecipeName &&
@@ -199,12 +228,11 @@ const getPrescriptionInfo = (section) => {
     return "";
 };
 
-const getFarmTypeText = (type) => {
-    const value = typeof type === "string" ? type.trim() : type;
-    if (value === 0 || value === "0") return "预警农事";
-    if (value === 1 || value === "1") return "标准农事";
-    if (value === 2 || value === "2") return "建议农事";
-    return "";
+const farmWorkType = {
+    0: "预警农事",
+    1: "标准农事",
+    2: "建议农事",
+    3: "自建农事",
 };
 
 // 使用响应式对象存储图片 URL