fix: 农事信息

src/views/old_mini/modify_work/completedWork.vue

@@ -92,10 +92,10 @@
                                 </price-table>
                             </div>
                         </div>
-                        <div class="contact-buttons">
+                        <!-- <div class="contact-buttons">
                             <button class="contact-btn">电话联系</button>
                             <button class="contact-btn">在线联系</button>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
             </div>

src/views/old_mini/modify_work/reviewWork.vue

@@ -286,7 +286,7 @@ const diffInDays = (date, type = "minus") => {
 };
 
 const paramsPage = ref({});
-onMounted(() => {
+onActivated(() => {
     window.scrollTo(0, 0);
     curRole.value = localStorage.getItem("SET_USER_CUR_ROLE");
     paramsPage.value = route.query.json ? JSON.parse(route.query.json) : {};

src/views/old_mini/price_detail/index.vue

@@ -56,8 +56,7 @@
                                     <el-input-number 
                                         style="width: 132px" 
                                         v-model="pesticide.price" 
-                                        :min="0"
-                                        :precision="2"
+                                        :min="0.0000000001"
                                     />
                                     <!-- <span class="price-unit">元/{{ pesticide.unit }}</span> -->
                                 </div>
@@ -68,7 +67,7 @@
                             </div>
                             <div class="medicine-item">
                                 <div class="item-name">亩数</div>
-                                <div class="item-val">{{ detailData?.area }}亩</div>
+                                <div class="item-val">{{ formatArea(detailData?.area) }}亩</div>
                             </div>
                             <div class="medicine-item">
                                 <div class="item-total">总计：</div>
@@ -114,7 +113,7 @@
                         </div>
                         <div class="medicine-item">
                             <div class="item-name">亩数</div>
-                            <div class="item-val">{{ detailData?.area }}亩</div>
+                            <div class="item-val">{{ formatArea(detailData?.area) }}亩</div>
                         </div>
                         <div class="medicine-item">
                             <div class="item-total">总计：</div>
@@ -138,6 +137,7 @@ import customHeader from "@/components/customHeader.vue";
 import { ElMessage } from "element-plus";
 import { ref, onMounted, onActivated, onBeforeUnmount, onDeactivated } from "vue";
 import { useRoute, useRouter } from "vue-router";
+import { formatArea } from "@/common/commonFun";
 
 const router = useRouter();
 const executeDate = ref(null);
@@ -145,7 +145,7 @@ let query = useRoute().query;
 const detailData = ref(JSON.parse(query.data));
 const priceData = ref({});
 
-const servicePricePerMu = ref(0);
+const servicePricePerMu = ref(null);
 const executionMethod = ref(null);
 const modeList = ref([
     {name: "无人机", value: 1},

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

@@ -33,21 +33,21 @@
                             </div>
                         </div>
                     </div>
-                </div>
 
-                <div class="bottom-info">
-                    <div class="bottom-l">
-                        <div class="l-img">
-                            <img src="@/assets/img/home/bird.png" alt="" />
+                    <div class="bottom-info">
+                        <div class="bottom-l">
+                            <div class="l-img">
+                                <img src="@/assets/img/home/bird.png" alt="" />
+                            </div>
+                            <div class="l-text">
+                                <div class="l-text-title">飞鸟管家</div>
+                                <div class="l-text-time">扫描二维码，查看更多详情</div>
+                            </div>
                         </div>
-                        <div class="l-text">
-                            <div class="l-text-title">飞鸟管家</div>
-                            <div class="l-text-time">扫描二维码，查看更多详情</div>
+                        <div class="bottom-r">
+                            <img src="@/assets/img/home/qrcode.png" alt="" />
                         </div>
                     </div>
-                    <div class="bottom-r">
-                        <img src="@/assets/img/home/qrcode.png" alt="" />
-                    </div>
                 </div>
             </div>
 
@@ -226,7 +226,7 @@ defineExpose({
 <style lang="scss" scoped>
 .price-sheet-popup {
     width: 90%;
-    max-height: 82vh;
+    max-height: 84vh;
     background: none;
     border-radius: 12px;
     overflow: hidden;
@@ -247,7 +247,7 @@ defineExpose({
 .price-sheet-content {
     display: flex;
     flex-direction: column;
-    max-height: 82vh;
+    max-height: 84vh;
     // height: 95vh;
     .price-sheet-content-inner {
         background: #fff;
@@ -260,14 +260,14 @@ defineExpose({
 }
 
 .sheet-content {
-    padding: 16px 16px 10px 16px;
+    padding: 12px 12px 10px 12px;
     flex: 1;
     overflow-y: auto;
     overflow-x: hidden;
     position: relative;
 }
 .bottom-info {
-    padding: 20px 16px 26px 16px;
+    padding: 16px 16px 16px 16px;
     border-top: 1px dotted rgba(0, 0, 0, 0.3);
     display: flex;
     align-items: center;
@@ -349,7 +349,7 @@ defineExpose({
     }
 
     .info-item {
-        font-size: 16px;
+        font-size: 14px;
         color: #000;
         margin-bottom: 8px;
 

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

@@ -43,8 +43,8 @@
                                     查看详情
                                 </div>
                                 <div class="footer-r">
-                                    <div class="btn second" @click="handleAction(item)">
-                                        {{ activeIndex === 0 ? "忽略" : "转发给客户" }}
+                                    <div v-if="activeIndex === 0" class="btn second" @click="handleAction(item)">
+                                        忽略
                                     </div>
                                     <div class="btn primary" @click="toPage(item)">
                                         {{ activeIndex === 0 ? "下发农事" : "请求确认" }}
@@ -56,9 +56,9 @@
                                     查看详情
                                 </div>
                                 <div class="footer-r">
-                                    <div class="btn second" @click="handleForward(item)">
+                                    <!-- <div class="btn second" @click="handleForward(item)">
                                         转发给客户
-                                    </div>
+                                    </div> -->
                                     <div class="btn primary" @click="showPriceSheetPopup(item)">
                                         生成报价单
                                     </div>
@@ -249,7 +249,7 @@ function toPage(item) {
             onlyShare.value = false;
         }
         setTimeout(() => {
-            uploadExecuteRef.value.showPopup(item,'share-sheet');
+            uploadExecuteRef.value.showPopup({...item, type: 'confirmExecute'},'share-sheet');
         }, 10);
        
     } else {

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

@@ -64,17 +64,18 @@ function handleConfirm() {
     };
     VE_API.z_farm_work_record.addExecuteImg(params).then((res) => {
         if (res.code === 0) {
-            ElMessage.success('请求确认成功');
+            // ElMessage.success('请求确认成功');
             show.value = false;
             VE_API.z_farm_work_record.getDetail({ id: farmData.value.id }).then(({ data }) => {
+                const dataItem = data[0];
                 farmData.value = {
-                    farmMiniUserId:data.users[0]?.userId,
-                    farmMiniUserName:data.expertUserName,
-                    farmWorkOrderId:data.orderId,
-                    farmId:data.farmId,
-                    executeEvidence:JSON.stringify(data.executeEvidence),
-                    farmWorkName:data.farmWorkName,
-                    id:data.id,
+                    farmMiniUserId: dataItem.users && dataItem.users.length > 0 ? dataItem.users[0]?.userId : null,
+                    farmMiniUserName: dataItem.expertUserName,
+                    farmWorkOrderId: dataItem.orderId,
+                    farmId: dataItem.farmId,
+                    executeEvidence:JSON.stringify(dataItem.executeEvidence),
+                    farmWorkName: dataItem.farmWorkName,
+                    id: dataItem.id,
                 }
                 farmData.value.type = 'confirmExecute'
                 showShare.value = true;