fix: 处方表格

src/components/popup/activeUploadPopup.vue

@@ -270,6 +270,24 @@ defineExpose({
 
 function handleClosed() {
     eventBus.emit("upload:reset");
+    // 清除所有数据
+    images.value = [];
+    uploadDate.value = "";
+    executorId.value = null;
+    needReview.value = false;
+    reviewDay.value = null;
+    currentPhenologyId.value = null;
+    gardenId.value = null;
+    problemTitle.value = "请选择问题";
+    type.value = null;
+    arrangeId.value = null;
+    executorList.value = [];
+    imgDesc.value = null;
+    needExecutor.value = false;
+    selectCurrentPhenology.value = false;
+    phenologyList.value = [];
+    isUploading.value = false;
+    successShow.value = false;
 }
 
 onUnmounted(() => {

src/components/popup/priceSheetPopup.vue

@@ -43,10 +43,10 @@
                         </div>
                     </div>
     
-                    <!-- 肥药费用区域 -->
+                    <!-- 药肥费用区域 -->
                     <div class="fertilizer-cost-section">
                         <div class="section-header">
-                            <div class="section-title">肥药费用</div>
+                            <div class="section-title">药肥费用</div>
                             <div class="section-total">{{ pesticideCostTotal ? formatArea(pesticideCostTotal) : "--" }}<span class="unit-text">元</span></div>
                         </div>
                         <div class="cost-table">
@@ -556,7 +556,7 @@ defineExpose({
     }
 }
 
-// 肥药费用区域
+// 药肥费用区域
 .fertilizer-cost-section {
     margin-bottom: 10px;
 

src/views/old_mini/agri_work/components/prescriptionTable.vue

@@ -10,7 +10,7 @@
         <div class="new-wrap">
             <div class="new-title">
                 <div class="title-1"><div class="table-name">药肥类型</div></div>
-                <div class="title-2"><div class="table-name">肥药名称</div></div>
+                <div class="title-2"><div class="table-name">药肥名称</div></div>
                 <div class="title-3"><div class="table-name">执行方式</div></div>
                 <div class="title-4"><div class="table-name">亩兑水量</div></div>
                 <div class="title-5"><div class="table-name">单亩用量</div></div>

src/views/old_mini/agri_work/components/priceTable.vue

@@ -2,12 +2,11 @@
     <div class="farm-table">
         <div class="new-wrap">
             <div class="new-title">
-                <div class="title-1"><div class="table-name">类型</div></div>
-                <div class="title-2"><div class="table-name">名称</div></div>
-                <div class="title-3"><div class="table-name">品牌</div></div>
-                <div class="title-4"><div class="table-name">单价</div></div>
-                <div class="title-5"><div class="table-name">用量</div></div>
-                <div class="title-6"><div class="table-name">总价</div></div>
+                <div class="title-2"><div class="table-name">药肥名称</div></div>
+                <div class="title-3"><div class="table-name">药肥品牌</div></div>
+                <div class="title-4"><div class="table-name">药肥单价</div></div>
+                <div class="title-5"><div class="table-name">单亩用量</div></div>
+                <div class="title-6" v-if="area"><div class="table-name">总价</div></div>
             </div>
             
             <template v-if="isArrList">
@@ -23,12 +22,11 @@
                 >
                     <div class="new-table">
                         <div class="line-l">
-                            <div class="line-1 title-1">{{ subP.typeName }}</div>
                             <div class="line-2">{{ subP.defaultName || subP.pesticideFertilizerName }}</div>
                             <div class="title-3">{{ subP.brand }}</div>
                             <div class="title-4">{{ subP.price }}</div>
                             <div class="title-5">{{ subP.dosage }}</div>
-                            <div class="title-6">{{ subP.total }}元</div>
+                            <div class="title-6" v-if="area">￥{{ subP.total }}</div>
                         </div>
                     </div>
                 </div>
@@ -42,12 +40,11 @@
                 >
                     <div class="new-table">
                         <div class="line-l">
-                            <div class="line-1 title-1">{{ subP.typeName }}</div>
                             <div class="line-2">{{ subP.name || subP.defaultName || subP.pesticideFertilizerName }}</div>
                             <div class="title-3">{{ subP.brand }}</div>
-                            <div class="title-4">{{ subP.price }}</div>
-                            <div class="title-5">{{ subP.dosage }}</div>
-                            <div class="title-6">{{ getTotal(subP) }}元</div>
+                            <div class="title-4">{{ subP.price }}{{ '元/' + subP.unit }}</div>
+                            <div class="title-5">{{ subP.dosage }}{{ subP.unit }}</div>
+                            <div class="title-6" v-if="area">￥{{ getTotal(subP) }}</div>
                         </div>
                     </div>
                 </div>
@@ -59,6 +56,7 @@
 </template>
 
 <script setup>
+
 const props = defineProps({
     prescriptionData: {
         default: () => ({}),
@@ -144,7 +142,7 @@ const getTotal = (item) => {
         display: flex;
         color: #767676;
         // justify-content: space-around;
-        padding: 5px 6px;
+        padding: 3px 0px;
         font-size: 12px;
         .table-name {
             width: 24px;
@@ -163,7 +161,7 @@ const getTotal = (item) => {
         width: 52px;
     }
     .title-4 {
-        width: 56px;
+        width: 66px;
     }
     .title-5 {
         width: 52px;

src/views/old_mini/agri_work/servicesIndex.vue

@@ -21,7 +21,7 @@
             <div class="work-wrap">
                 <div class="box-wrap farm-info">
                     <div class="info-title">
-                        <div class="sub-title">肥药费用</div>
+                        <div class="sub-title">药肥费用</div>
                         <div class="info-more">1582<span class="unit-text">元</span></div>
                     </div>
                     <div class="info-content">

src/views/old_mini/modify_work/completedWork.vue

@@ -64,13 +64,13 @@
                         </div>
                         <div class="farm-info">
                             <div class="info-title-wrap">
-                                <div class="sub-title">肥药费用</div>
+                                <div class="sub-title">药肥费用</div>
                                 <div class="info-more">
                                     {{ quotationData.pesticideFertilizerCost ? formatArea(quotationData.pesticideFertilizerCost) : "--" }}<span class="unit-text">元</span>
                                 </div>
                             </div>
                             <div class="info-content-wrap">
-                                <price-table :prescriptionData="quotationData.prescriptionList" :isArrList="true">
+                                <price-table :prescriptionData="quotationData.prescriptionList" :area="quotationData?.area" :isArrList="true">
                                     <template #bottomContent>
                                         <div class="price-bottom">
                                             <div class="info-title-wrap">
@@ -175,7 +175,7 @@
                     <div class="new-wrap">
                         <div class="new-title">
                             <div class="title-1"><div class="table-name">药肥类型</div></div>
-                            <div class="title-2"><div class="table-name">肥药名称</div></div>
+                            <div class="title-2"><div class="table-name">药肥名称</div></div>
                             <div class="title-3"><div class="table-name">执行方式</div></div>
                             <div class="title-4"><div class="table-name">亩兑水量</div></div>
                             <div class="title-5"><div class="table-name">单亩用量</div></div>

src/views/old_mini/modify_work/detailWork.vue

@@ -59,7 +59,7 @@
                         </div>
                         <div class="farm-info">
                             <div class="info-title-wrap">
-                                <div class="sub-title">肥药费用</div>
+                                <div class="sub-title">药肥费用</div>
                                 <div class="info-more">
                                     {{ pesticideCostTotal ? formatArea(pesticideCostTotal) : "--" }}<span class="unit-text">元</span>
                                 </div>

src/views/old_mini/modify_work/index.vue

@@ -162,7 +162,7 @@
                                                 </div>
                                             </div>
                                             <div class="box-item">
-                                                <div class="form-l">肥药名称</div>
+                                                <div class="form-l">药肥名称</div>
                                                 <div class="form-r">
                                                     <el-select
                                                         filterable

src/views/old_mini/modify_work/modify.vue

@@ -421,14 +421,19 @@
                         <div class="table-item">
                             <div class="form-item">
                                 <div class="item-name">施用方式</div>
-                                <div class="item-text">{{ detailData?.usageMode }}</div>
+                                <div class="item-text">{{ dynamicValidateForm?.usageMode }}</div>
+                            </div>
+                            <div class="form-item">
+                                <div class="item-name">执行方式</div>
+                                <div class="item-text">
+                                    {{ dynamicValidateForm?.prescription?.pesticideFertilizerList[0]?.executeStyle === 1 ? '无人机' : '人工' }}
+                                </div>
                             </div>
                         </div>
                         <div class="new-wrap">
                             <div class="new-title">
-                                <div class="title-1"><div class="table-name">药肥类型</div></div>
-                                <div class="title-2"><div class="table-name">肥药名称</div></div>
-                                <div class="title-3"><div class="table-name">执行方式</div></div>
+                                <div class="title-1"><div class="table-name">使用功效</div></div>
+                                <div class="title-2"><div class="table-name">药肥名称</div></div>
                                 <div class="title-4"><div class="table-name">亩兑水量</div></div>
                                 <div class="title-5"><div class="table-name">单亩用量</div></div>
                             </div>
@@ -451,8 +456,7 @@
                                         </div>
                                         <div class="line-r">
                                             <div class="line-3">
-                                                <div class="sub-line title-3">人工</div>
-                                                <div class="sub-line title-4">{{ subP.ratio }}ML</div>
+                                                <div class="sub-line title-4">{{ subP.ratio }}{{ subP.unit }}</div>
                                                 <div class="sub-line title-5">{{ subP.dosage }}{{ subP.unit }}</div>
                                             </div>
                                         </div>
@@ -1466,7 +1470,7 @@ const handleDeleteInteract = () => {
             display: flex;
             color: #767676;
             // justify-content: space-around;
-            padding: 5px 6px;
+            padding: 3px 0px;
             font-size: 12px;
             .table-name {
                 width: 24px;

src/views/old_mini/modify_work/reviewWork.vue

@@ -26,7 +26,7 @@
                             <div class="info-value">{{ workItem.executeDate || "--" }}</div>
                         </div>
                         <div class="info-item line-item">
-                            <div class="info-name">肥药处方：</div>
+                            <div class="info-name">药肥处方：</div>
                             <div class="info-value">
                                 <div class="rescription" v-if="workItem?.prescriptionList">
                                     <span

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

@@ -1,6 +1,6 @@
 <template>
     <div class="fertilizer-price">
-        <search v-model="searchVal" clearable @clear="handleClear" @change="handleChange" placeholder="搜索肥药" />
+        <search v-model="searchVal" clearable @clear="handleClear" @change="handleChange" placeholder="搜索药肥" />
         <div class="record-filter">
             <div
                 class="filter-item"

src/views/old_mini/offer_price/index.vue

@@ -2,7 +2,7 @@
     <div class="agri-services">
         <custom-header name="报价维护"></custom-header>
         <tabs v-model:active="active" class="tabs">
-            <tab title="肥药报价">
+            <tab title="药肥报价">
                 <fertilizer-price />
             </tab>
             <tab title="服务报价">

src/views/old_mini/plan/components/modifyPlan.vue

@@ -97,7 +97,7 @@
                                                 </div>
                                             </div>
                                             <div class="box-item">
-                                                <div class="form-l">肥药名称</div>
+                                                <div class="form-l">药肥名称</div>
                                                 <div class="form-r">
                                                     <el-select
                                                         filterable

src/views/old_mini/price_detail/index.vue

@@ -87,20 +87,20 @@
                         v-for="(pesticide, mIndex) in prescription.pesticideFertilizerList"
                         :key="mIndex"
                     >
-                        <div class="item-title">肥药{{ mIndex + 1 }}</div>
+                        <div class="item-title">药肥{{ mIndex + 1 }}</div>
                         <div class="box-wrap">
                             <div class="medicine-item">
-                                <div class="item-name">肥药名称</div>
+                                <div class="item-name">药肥名称</div>
                                 <div class="item-val">{{ pesticide.pesticideFertilizerName }}</div>
                             </div>
                             <div class="medicine-item">
-                                <div class="item-name">肥药品牌</div>
+                                <div class="item-name">药肥品牌</div>
                                 <div class="item-val">
-                                    <el-input v-model="pesticide.brand" placeholder="肥药品牌" style="width: 132px" />
+                                    <el-input v-model="pesticide.brand" placeholder="药肥品牌" style="width: 132px" />
                                     <!-- <el-select
                                         class="select-item"
                                         v-model="pesticide.brand"
-                                        placeholder="肥药品牌"
+                                        placeholder="药肥品牌"
                                         style="width: 132px"
                                     >
                                         <el-option
@@ -113,7 +113,7 @@
                                 </div>
                             </div>
                             <div class="medicine-item mt-8">
-                                <div class="item-name">肥药单价</div>
+                                <div class="item-name">药肥单价</div>
                                 <div class="item-val">
                                     <!-- <el-input-number
                                         style="width: 132px"

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

@@ -34,7 +34,7 @@
                         </div> -->
 
                         <div class="info-item flex-wrap">
-                            <div class="info-label">肥药处方</div>
+                            <div class="info-label">药肥处方</div>
                             <div class="info-value">
                                 <div class="rescription" v-if="quotationData?.prescriptionList">
                                     <span
@@ -431,7 +431,7 @@ defineExpose({
     }
 }
 
-// 肥药费用区域
+// 药肥费用区域
 .fertilizer-cost-section {
     margin-bottom: 10px;