fix: 默认报价

src/components/popup/priceSheetPopup.vue

@@ -81,11 +81,11 @@
                         </div>
                         <div class="service-details">
                             <div class="detail-item">
-                                <div class="detail-value">{{ priceData?.executionMethodName || '--' }}</div>
+                                <div class="detail-value">{{ priceData?.executionMethodName || '人工' }}</div>
                                 <div class="detail-label">执行方式</div>
                             </div>
                             <div class="detail-item">
-                                <div class="detail-value">{{ (priceData?.farmWorkServiceCost ? priceData.farmWorkServiceCost + '元/亩' : '--') }}</div>
+                                <div class="detail-value">{{ (priceData?.farmWorkServiceCost || priceData?.manualServicePrice ? (priceData.farmWorkServiceCost || priceData.manualServicePrice) + '元/亩' : '--') }}</div>
                                 <div class="detail-label">亩单价</div>
                             </div>
                             <div class="detail-item">

src/views/old_mini/modify_work/completedWork.vue

@@ -96,13 +96,13 @@
                                             <div class="price-info">
                                                 <div class="info-l">
                                                     执行方式<span class="main-text">{{
-                                                        quotationData.executionMethodName || "--"
+                                                        quotationData.executionMethodName || "人工"
                                                     }}</span>
                                                 </div>
                                                 <div class="info-c">
                                                     亩单价<span class="main-text">{{
-                                                        quotationData.farmWorkServiceCost
-                                                            ? quotationData.farmWorkServiceCost + "元/亩"
+                                                        quotationData.farmWorkServiceCost || manualServicePrice
+                                                            ? (quotationData.farmWorkServiceCost || manualServicePrice) + "元/亩"
                                                             : "--"
                                                     }}</span>
                                                 </div>

src/views/old_mini/task_condition/components/task.vue

@@ -206,14 +206,16 @@ const handleUploadSuccess = async () => {
     });
 };
 
+const cityCode = ref("");
 //根据城市的坐标返回区县列表
 const districtList = ref([]);
 function getDistrictListByCity() {
     VE_API.z_farm_work_record.getDistrictListByCity({ point: mapPoint.value }).then(({ data }) => {
         districtList.value = data || [];
-        const cityCode = data[0].code.slice(0, -2);
-        districtList.value.unshift({ code: cityCode, name: "全部" });
-        selectParma.value.districtCode = cityCode;
+        // cityCode.value = data[0].code.slice(0, -2);
+        cityCode.value = "";
+        districtList.value.unshift({ code: cityCode.value, name: "全部" });
+        selectParma.value.districtCode = cityCode.value;
         getSimpleList();
     });
 }
@@ -324,6 +326,7 @@ function getSimpleList() {
             }else{
                 noData.value = true;
                 taskList.value = [];
+                taskCounts.value[activeIndex.value] = 0;
             }
         })
         .catch((error) => {
@@ -377,6 +380,8 @@ const handleDateSelect = (date) => {
 function handleActiveFilter(i) {
     activeIndex.value = i;
     // watch 会自动处理清除日期筛选和日历选中状态
+    selectParma.value.districtCode = cityCode.value
+    selectParma.value.farmWorkTypeId = null
 }
 
 function toPage(item) {