fix: 药费信息

src/components/popup/priceSheetPopup.vue

@@ -64,7 +64,7 @@
                                 :key="index"
                             >
                                 <div class="col-1">{{ item.typeName || '--' }}</div>
-                                <div class="col-2">{{ item.defaultName || '--' }}</div>
+                                <div class="col-2">{{ item.defaultName || item.pesticideFertilizerName || '--' }}</div>
                                 <div class="col-3">{{ item.brand || '--' }}</div>
                                 <div class="col-4">{{ item.price || '--' }}</div>
                                 <div class="col-5">{{ item.usageDisplay || '--' }}</div>
@@ -174,7 +174,7 @@ const processedPrescriptionList = computed(() => {
                 const unit = item.unit || '';
 
                 result.push({
-                    typeName: item.typeName || '--',
+                    typeName: item.typeName || item.pesticideFertilizerTypeName || '--',
                     defaultName: item.defaultName || item.pesticideFertilizerName || '--',
                     brand: brand,
                     price: price ? `${price}元` : '--',

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

@@ -21,8 +21,8 @@
                 >
                     <div class="new-table">
                         <div class="line-l">
-                            <div class="line-1 title-1">{{ subP.typeName }}</div>
-                            <div class="line-2">{{ subP.defaultName }}</div>
+                            <div class="line-1 title-1">{{ prescriptionItem.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>

src/views/old_mini/modify_work/completedWork.vue

@@ -368,8 +368,8 @@
                 <div class="fixed-btn" @click="showPriceSheetPopup">生成报价单</div>
             </div>
             <!-- 农资，步骤：农资已执行，请求确认 -->
-            <div class="fixed-btn-wrap" v-if="curRole == 2 && currentStep == 2">
-                <div class="fixed-btn second" @click="handleShare">转发给客户</div>
+            <div class="fixed-btn-wrap center" v-if="curRole == 2 && currentStep == 2">
+                <!-- <div class="fixed-btn second" @click="handleShare">转发给客户</div> -->
                 <div class="fixed-btn" @click="showUploadExecutePopup">请求确认</div>
             </div>
         </div>

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

@@ -15,12 +15,12 @@
 
                 <el-form-item label="药肥类型" required prop="typeId">
                     <div class="row-3-selects">
-                        <el-cascader
+                        <cascader
                             v-model="form.typeId"
                             style="width: 100%"
+                             title="请选择药肥类型"
                             :options="typeOptions"
-                            :props="cascaderProps"
-                            :show-all-levels="false"
+                            :field-names="cascaderProps"
                             />
                     </div>
                 </el-form-item>
@@ -95,6 +95,7 @@ import customHeader from "@/components/customHeader.vue";
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter, useRoute } from "vue-router";
 import { ref, reactive, onMounted, onActivated } from 'vue'
+import { Cascader } from 'vant';
 
 const router = useRouter();
 const route = useRoute();
@@ -175,7 +176,7 @@ const cascaderProps = {
   checkStrictly: true,
   emitPath: false,
   value: 'id',
-  label: 'name',
+  text: 'name',
   children: 'children'
 };
 

src/views/old_mini/price_detail/index.vue

@@ -166,6 +166,9 @@ onActivated(() => {
     // 从 priceData 中匹配价格和品牌到对应的药肥
     if (priceData.value.itemsList && detailData.value.prescriptionList) {
         executionMethod.value = priceData.value.executionMethod;
+        if (detailData.value.usageMode === "根部施") {
+            executionMethod.value = 2;
+        }
         detailData.value.prescriptionList.forEach(prescription => {
             if (prescription.pesticideFertilizerList) {
                 prescription.pesticideFertilizerList.forEach(pesticide => {