刘秀芳 6 дней назад
Родитель
Сommit
d9fe651049

+ 2 - 0
src/views/old_mini/modify_work/completedWork.vue

@@ -787,6 +787,8 @@ onActivated(async () => {
             }
         }
     }
+
+    console.log("quotationData.value", quotationData.value);
     // const point = store.state.home.miniUserLocationPoint;
     // if (areaRef.value) {
     //     newFarmMap.initMap(point, areaRef.value, false);

Разница между файлами не показана из-за своего большого размера
+ 668 - 258
src/views/old_mini/modify_work/modify.vue


+ 3 - 6
src/views/old_mini/task_condition/components/interact.vue

@@ -4,20 +4,17 @@
             <div class="map-container" ref="mapContainer"></div>
         </div>
         <div class="task-list">
-            <div class="list-filter">
+            <!-- <div class="list-filter">
                 <div class="filter-item" :class="{ active: activeIndex === 0 }" @click="handleActiveFilter(0)">
                     待确认({{ taskCounts[0] || 0 }})
                 </div>
-                <!-- <div class="filter-item" :class="{ active: activeIndex === 1 }" @click="handleActiveFilter(1)">
-                    已确认({{ taskCounts[1] || 0 }})
-                </div> -->
                 <div class="filter-item" :class="{ active: activeIndex === 2 }" @click="handleActiveFilter(2)">
                     已确认({{ taskCounts[2] || 0 }})
                 </div>
                 <div class="filter-item" :class="{ active: activeIndex === 3 }" @click="handleActiveFilter(3)">
                     待提醒({{ taskCounts[3] || 0 }})
                 </div>
-            </div>
+            </div> -->
             <div class="select-group">
                 <el-select
                     class="select-item"
@@ -568,7 +565,7 @@ function handleRemindCustomer(item) {
 
     .select-group {
         display: flex;
-        padding: 8px 12px 0 12px;
+        padding: 0px 12px 0 12px;
         .select-item {
             width: 100%;
             ::v-deep {

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

@@ -125,7 +125,7 @@ const loading = ref(false);
 const getStartFlowStatus = (index) => {
     const statusMap = {
         1: "0,1,2,3", // 待完成
-        2: '0,1,4', // 待完成
+        2: '4', // 待完成
         3: 5, // 已完成
     };
     return statusMap[index] ?? 4;

+ 1 - 1
src/views/old_mini/user/farmDetails.vue

@@ -27,7 +27,7 @@
                                 <div class="farm-info-footer-item-value">1450<span class="unit">元</span></div>
                             </div>
                         </div>
-                        <div class="footer-action" @click="handleDetail('plan')">农事规划</div>
+                        <div class="footer-action" @click.stop="handleDetail('plan')">农事规划</div>
                     </div>
                 </template>
             </farm-info-card>

+ 5 - 1
src/views/old_mini/user/index.vue

@@ -64,7 +64,7 @@
                                         <div class="farm-info-footer-item-value">1450<span class="unit">元</span></div>
                                     </div>
                                 </div>
-                                <div class="footer-action" @click="handleDetail('farm_list')">农事规划</div>
+                                <div class="footer-action" @click.stop="handleDetail('plan', ele.id)">农事规划</div>
                             </div>
                         </template>
                     </farm-info-card>
@@ -200,6 +200,10 @@ const handleChat = (data) => {
 const handleItemClick = (data) => {
     router.push(`/farm_details?farmId=${data.id}&agriculturalStoreId=${data.agriculturalStoreId}&receiveUserId=${data.receiveUserId}`);
 };
+
+const handleDetail = (path, farmId) => {
+    router.push(`/${path}?farmId=${farmId}`);
+};
 </script>
 
 <style lang="scss" scoped>

Некоторые файлы не были показаны из-за большого количества измененных файлов