fix: 农事信息

src/components/popup/priceSheetPopup.vue

@@ -77,7 +77,7 @@
                     <div class="service-cost-section">
                         <div class="section-header">
                             <div class="section-title">服务费用</div>
-                            <div class="section-total">{{ priceData?.farmWorkServiceCost || '--' }}<span class="unit-text">元</span></div>
+                            <div class="section-total">{{ priceData?.farmWorkServiceCost ? getServiceCost(priceData.farmWorkServiceCost, quotationData.area) : '--' }}<span class="unit-text">元</span></div>
                         </div>
                         <div class="service-details">
                             <div class="detail-item">
@@ -197,6 +197,11 @@ function formatArea(val) {
     return Number.isInteger(num) ? num : num.toFixed(2);
 }
 
+function getServiceCost(cost, area) {
+    if (!cost || !area) return '--';
+    return (parseFloat(cost) * parseFloat(area)).toFixed(2);
+}
+
 const handleShowPopup = (data) => {
     if (data) {
         quotationData.value = data;

src/views/old_mini/modify_work/completedWork.vue

@@ -103,10 +103,10 @@
                 <div class="box-wrap farm-photo farm-info" v-if="(curRole == 2 && currentStep == 2 && detailData?.executeEvidence?.length) || (curRole == 0 && detailData?.flowStatus === 4 && detailData?.executeEvidence?.length)">
                     <div class="info-title">
                         <div class="card-title">执行照片</div>
-                        <div class="info-more">
+                        <!-- <div class="info-more">
                             点击查看更多
                             <el-icon><ArrowRight /></el-icon>
-                        </div>
+                        </div> -->
                     </div>
                     <div class="photo-list pt-10">
                         <!-- <div class="img-item" v-for="(item, index) in detailData.executeEvidence" :key="index">
@@ -148,7 +148,7 @@
                                 </photo-consumer>
                         </photo-provider>
                     </div>
-                    <div class="list-text">点击查看更多</div>
+                    <!-- <div class="list-text">点击查看更多</div> -->
                 </div>
 
                 <div class="box-wrap farm-data">
@@ -587,6 +587,8 @@ function getCurrentStep(flowStatus) {
         return 1;
     } else if (flowStatus === 4) {
         return 2;
+    } else if (flowStatus ===5) {
+        return 3;
     } else {
         return 0;
     }

src/views/old_mini/modify_work/index.vue

@@ -28,7 +28,7 @@
                                 </photo-consumer>
                         </photo-provider>
                     </div>
-                    <div class="list-text">点击查看更多</div>
+                    <!-- <div class="list-text">点击查看更多</div> -->
                 </div>
             </div>
             <el-form
@@ -214,12 +214,16 @@
                                                     <div class="main-name">亩兑水量</div>
                                                     <div class="sub-name">(药剂:兑水量)</div>
                                                 </div>
-                                                <div class="form-r input-box text-center">
-                                                    <el-input
+                                                <div class="form-r input-box text-center input-unit">
+                                                    <!-- <el-input
                                                         v-model="domain.ratio"
                                                         style="width: 100%"
                                                         placeholder="请输入"
-                                                    />
+                                                    /> -->
+
+                                                    <el-input v-model.number="domain.ratio" placeholder="请输入">
+                                                        <template #append>{{ domain.unit }}</template>
+                                                    </el-input>
                                                 </div>
                                             </div>
                                             <!-- <div class="box-item sub-item">
@@ -245,11 +249,14 @@
                                                     <div class="sub-name">(亩数:药剂)</div>
                                                 </div>
                                                 <div class="form-r input-box text-center">
-                                                    <el-input
+                                                    <!-- <el-input
                                                         v-model="domain.muUsage"
                                                         style="width: 100%"
                                                         placeholder="请输入"
-                                                    />
+                                                    /> -->
+                                                    <el-input v-model.number="domain.muUsage" placeholder="请输入">
+                                                        <template #append>{{ domain.unit }}</template>
+                                                    </el-input>
                                                 </div>
                                             </div>
                                             <div v-if="dynamicValidateForm.usageMode === '叶面施'">
@@ -260,11 +267,14 @@
                                                         <div class="sub-name">(药剂:兑水量)</div>
                                                     </div>
                                                     <div class="form-r input-box text-center">
-                                                        <el-input
+                                                        <!-- <el-input
                                                             v-model="domain.ratio2"
                                                             style="width: 100%"
                                                             placeholder="请输入"
-                                                        />
+                                                        /> -->
+                                                        <el-input v-model.number="domain.ratio2" placeholder="请输入">
+                                                            <template #append>{{ domain.unit }}</template>
+                                                        </el-input>
                                                     </div>
                                                 </div>
                                                 <div class="box-item sub-item">
@@ -273,11 +283,14 @@
                                                         <div class="sub-name">(亩数:药剂)</div>
                                                     </div>
                                                     <div class="form-r input-box text-center">
-                                                        <el-input
+                                                        <!-- <el-input
                                                             v-model="domain.muUsage2"
                                                             style="width: 100%"
                                                             placeholder="请输入"
-                                                        />
+                                                        /> -->
+                                                        <el-input v-model.number="domain.muUsage2" placeholder="请输入">
+                                                            <template #append>{{ domain.unit }}</template>
+                                                        </el-input>
                                                     </div>
                                                 </div>
                                             </div>
@@ -1326,6 +1339,38 @@ const handleExpertDiagnosis = () => {
                     padding: 8px 0 12px 0;
                 }
             }
+
+            
+            // .input-unit {
+            //     ::v-deep {
+            //         .el-input {
+            //             border: 1px solid #dcdfe6;
+            //             border-radius: 5px;
+            //             height: 32px;
+            //             box-sizing: border-box;
+            //         }
+            //         .el-input__wrapper {
+            //             padding: 0 2px 0 10px;
+            //             height: 30px;
+            //             line-height: 30px;
+            //             min-height: 30px;
+            //             box-shadow: none;
+            //         }
+            //         .el-input__inner {
+            //             --el-input-inner-height: 30px;
+            //             height: 30px;
+            //             line-height: 30px;
+            //             min-height: 30px;
+            //             color: #606266;
+            //             --el-input-placeholder-color: #a8abb2;
+            //         }
+            //         .el-input-group__append {
+            //             box-shadow: none;
+            //             border: none;
+            //             background: none;
+            //         }
+            //     }
+            // }
             .text-center {
                 ::v-deep {
                     .el-input__inner {

src/views/old_mini/modify_work/reviewWork.vue

@@ -294,6 +294,7 @@ onActivated(() => {
     curRole.value = localStorage.getItem("SET_USER_CUR_ROLE");
     paramsPage.value = route.query.json ? JSON.parse(route.query.json) : {};
     getDetail();
+    getTriggerImg(paramsPage.value.id);
 });
 
 const getDetail = () => {
@@ -301,7 +302,6 @@ const getDetail = () => {
     loading.value = true;
     VE_API.z_farm_work_record.getDetail({ id: paramsPage.value.id }).then(({ data }) => {
         workItem.value = data[0];
-        getTriggerImg(workItem.value.id);
     }).finally(() => {
         loading.value = false;
     });

src/views/old_mini/offer_price/component/fertilizerPrice.vue

@@ -13,9 +13,9 @@
             </div>
         </div>
         <div class="fertilizer-list">
-            <div class="fertilizer-card" @click.stop="handleEdit(item)" v-for="(item, index) in 4" :key="index">
+            <div class="fertilizer-card" @click.stop="handleEdit(item)" v-for="(item, index) in priceList" :key="index">
                 <div class="card-header">
-                    <div class="title">乙烯利乙烯利乙烯利</div>
+                    <div class="title">{{ item.name }}</div>
                     <div class="action-btn">
                         <el-icon @click.stop="handleEdit(item)" color="#2199F8" size="18"><Edit /></el-icon>
                         <!-- <el-icon @click.stop="openDelete" color="#E04C4C" size="18"><Delete /></el-icon> -->
@@ -24,31 +24,30 @@
                 <div class="info">
                     <div class="row">
                         <span class="label">药物品牌</span>
-                        <span class="value">国光国光国光</span>
+                        <span class="value">{{ item.brand }}</span>
                     </div>
                     <div class="row">
                         <span class="label">药费类型</span>
-                        <span class="value">农药类/杀虫剂/胃毒性</span>
+                        <span class="value">{{ item.typeName }}</span>
                     </div>
                     <div class="row">
                         <span class="label">施用方式</span>
-                        <span class="value">叶面施</span>
+                        <span class="value">{{ item.useMode }}</span>
                     </div>
                     <transition name="collapse">
                         <div class="extra-info" v-show="isExpanded(index)">
                             <div class="row">
                                 <span class="label">计量单位</span>
-                                <span class="value">克</span>
+                                <span class="value">{{ item.unit }}</span>
                             </div>
                             <div class="row">
                                 <span class="label">单位兑水量</span>
-                                <span class="value">1000ml-2000ml</span>
+                                <span class="value">{{ item.unitUsage }}</span>
                             </div>
                             <div class="row">
                                 <span class="label">适用品类</span>
                                 <span class="value tag-group">
-                                    <span class="tag-item">荔枝</span>
-                                    <span class="tag-item">龙眼</span>
+                                    <span class="tag-item">{{ item.unitWaterAmount }}</span>
                                 </span>
                             </div>
                         </div>
@@ -60,15 +59,15 @@
                 </div>
                 <div class="stats">
                     <div class="col">
-                        <div class="num">1258<span class="unit"> 元/克</span></div>
+                        <div class="num">{{ item.price }}<span class="unit"> 元/{{ item.unit }}</span></div>
                         <div class="desc">成本</div>
                     </div>
                     <div class="col">
-                        <div class="num">1258<span class="unit"> 元/克</span></div>
+                        <div class="num">{{ item.cost }}<span class="unit"> 元/{{ item.unit }}</span></div>
                         <div class="desc">报价</div>
                     </div>
                     <div class="col">
-                        <div class="num">12222<span class="unit"> 克</span></div>
+                        <div class="num">{{ item.stock }}<span class="unit"> {{ item.unit }}</span></div>
                         <div class="desc">库存</div>
                     </div>
                 </div>
@@ -94,6 +93,15 @@ const activePlanIndex = ref(0);
 // 记录已展开卡片索引的集合
 const expandedSet = ref(new Set());
 
+const priceList = ref([
+    { name: "46%尿素", brand: "东巨", typeName: "农药类/杀虫剂/胃毒性", useMode: "根部施", unit: "克", unitUsage: "5-7.5公斤", unitWaterAmount: "水稻", price: "0.02", cost: '0.007', stock: "43015" },
+    { name: "硫酸铵", brand: "东巨", typeName: "农药类/杀虫剂/胃毒性", useMode: "根部施", unit: "克", unitUsage: "5-7.5公斤", unitWaterAmount: "水稻", price: "0.01", cost: '0.005', stock: "33426" },
+    { name: "磷酸钙", brand: "兴发", typeName: "农药类/杀虫剂/胃毒性", useMode: "根部施", unit: "千克", unitUsage: "10-15公斤", unitWaterAmount: "水稻", price: "1.6", cost: '1.2', stock: "6745" },
+    { name: "0.2%磷酸二氢钾溶液", brand: "亚泰", typeName: "农药类/杀虫剂/胃毒性", useMode: "叶面施", unit: "克", unitUsage: "50-100克", unitWaterAmount: "水稻", price: "0.04", cost: '0.01', stock: "17236" },
+    { name: "0.15%-0.25%矮壮素", brand: "瑞普生", price: "0.03", cost: '0.01', stock: "2542", unit: "毫升", unitUsage: "按使用说明", typeName: "农药类/杀虫剂/胃毒性", useMode: "叶面施", unitWaterAmount: "水稻" },
+    { name: "20%氯虫苯甲酰胺悬浮剂", brand: "立占", price: "0.08", cost: '0.02', stock: "3125", unit: "克", unitUsage: "10-15毫升", typeName: "农药类/杀虫剂/胃毒性", useMode: "叶面施", unitWaterAmount: "水稻" },
+]);
+
 const handlePlanClick = (index) => {
     activePlanIndex.value = index;
 };

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

@@ -110,7 +110,7 @@ const onSelect = async ({type}) => {
                 url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=priceSheet`,
             });
         } else if (farmData.value.type === 'remindUser') {
-            const query = { askInfo: {title: "提醒拍照", content: "是否分享该提示给好友"}, shareText: " 请您尽快执行" + farmData.value.farmWorkName + "农事", id: farmData.value.id, farmWorkOrderId: farmData.value.orderId, postImg: triggerImg.value.length ? base_img_url2 + triggerImg.value[triggerImg.value.length - 1].cloudFilename : '' }
+            const query = { askInfo: {title: "提醒拍照", content: "是否分享该提示给好友"}, shareText: " 请您尽快完成复核", id: farmData.value.id, farmWorkOrderId: farmData.value.orderId, postImg: triggerImg.value.length ? base_img_url2 + triggerImg.value[triggerImg.value.length - 1].cloudFilename : '' }
             // reviewWork跳转到农事复核
             wx.miniProgram.navigateTo({
                 url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=reviewWork`,