lxf 1 settimana fa
parent
commit
47c544328f

+ 4 - 0
src/api/modules/container_farm_work_arrange.js

@@ -14,4 +14,8 @@ module.exports = {
         url: url + "/toggleFollow",
         type: "get",
     },
+    getArrangeDetail: {
+        url: url + "/get",
+        type: "get",
+    },
 }

+ 1 - 1
src/components/pageComponents/AgriculturalInteractionCard.vue

@@ -115,7 +115,7 @@ const toDetail = (timelineItem, item) => {
     console.log(timelineItem, item);
     router.push({
         path: "/detail_work",
-        query: { miniJson: JSON.stringify({ id: timelineItem.farmWorkId, farmId: item.farmId, }), },
+        query: { miniJson: JSON.stringify({ id: timelineItem.farmWorkId, arrangeId: timelineItem.arrangeId, farmId: item.farmId, }), },
     });
 };
 

+ 15 - 3
src/views/old_mini/modify_work/detailWork.vue

@@ -129,7 +129,7 @@
                             <div class="point"></div>
                             <span>2区</span>
                         </div> -->
-                        <div class="tag-text" v-if="detailData?.isFollow">{{ statusMap[detailData?.isFollow] }}</div>
+                        <div class="tag-text" v-if="arrangeDetail?.isFollow !== undefined">{{ statusMap[arrangeDetail?.isFollow] }}</div>
                     </div>
                     <div class="data-content">
                         <div class="form-item">
@@ -435,13 +435,12 @@ const serviceCostTotal = computed(() => {
 
 
 const getDetail = async () => {
-    console.log("query.value", query.value);
     const { data } = await VE_API.farm.getFarmWorkLib({ id: query.value.id, farmId: query.value.farmId, agriculturalId: userInfo?.agriculturalId });
     if (data) {
         detailData.value = data;
         const pesticideFertilizerCodes = data?.prescription?.pesticideFertilizerList.map(item => item.code);
         getPriceList(data.schemeId, pesticideFertilizerCodes);
-        console.log("detailData.value", detailData.value.executeDeadlineDate);
+        getArrangeDetail(query.value.arrangeId);
         // maxDate.value = new Date(detailData.value.executeDate);
         parmasPage.value = {
             ...detailData.value,
@@ -451,6 +450,19 @@ const getDetail = async () => {
         };
     }
 };
+const statusMap = ref({
+    0: "取消关注",
+    1: "特别关注",
+    2: "托管农事",
+});
+
+const arrangeDetail = ref({});
+const getArrangeDetail = async (id) => {
+    const { data } = await VE_API.container_farm_work_arrange.getArrangeDetail({ id });
+    if (data) {
+        arrangeDetail.value = data;
+    }
+};
 
 
 const getPriceList = async (schemeId, pesticideFertilizerCodes) => {

+ 6 - 4
src/views/old_mini/modify_work/modify.vue

@@ -40,12 +40,12 @@
                                 {{ detailData?.code }}
                             </div>
                         </el-form-item>
-                        <el-form-item label-width="70px" class="form-item text-item" label="服务亩数">
+                        <el-form-item v-if="!noPrice" label-width="70px" class="form-item text-item" label="服务亩数">
                             <div class="info-text">
                                 {{ detailData?.farm?.mianji ? formatArea(detailData?.farm?.mianji) + "亩" : "--" }}
                             </div>
                         </el-form-item>
-                        <el-form-item label-width="70px" class="form-item text-item" label="服务区域">
+                        <el-form-item v-if="!noPrice" label-width="70px" class="form-item text-item" label="服务区域">
                             <div class="info-text">
                                 {{ detailData?.farm?.address || "--" }}
                             </div>
@@ -277,7 +277,7 @@
 
                                                     
 
-                                                    <div class="medicine-item">
+                                                    <div v-if="!noPrice" class="medicine-item">
                                                         <div class="item-total">总计:</div>
                                                         <div class="item-price">
                                                             {{ getPesticideTotal(domain) }}<span class="item-unit">元</span>
@@ -334,7 +334,7 @@
                                             </el-input>
                                         </div>
                                     </div>
-                                    <div class="medicine-item">
+                                    <div v-if="!noPrice" class="medicine-item">
                                         <div class="item-total">总计:</div>
                                         <div class="item-price">
                                             {{ getServiceTotal() }}<span class="item-unit">元</span>
@@ -587,10 +587,12 @@ const phenologyList = ref([]);
 
 const isEdit = ref(false);
 const onlyPrice = ref(false);
+const noPrice = ref(false);
 
 onActivated(() => {
     isEdit.value = route.query.isEdit ? true : false;
     onlyPrice.value = route.query.onlyPrice ? true : false;
+    noPrice.value = route.query.noPrice ? true : false;
     if (route.query.farmWorkId) {
         getDetail();
     }

+ 1 - 0
src/views/old_mini/monitor/subPages/plan.vue

@@ -338,6 +338,7 @@ const handleRowClick = (item) => {
         path: "/modify",
         query: {
             id: item.id,
+            noPrice: true,
             farmId: route.query.farmId,
             farmWorkId: item.farmWorkId,
             containerSpaceTimeId: item.containerSpaceTimeId,