Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5

src/components/album_compoents/detailDailog.vue

@@ -29,7 +29,7 @@
                                 <div class="item-name">药物处方</div>
                                 <div class="item-table">
                                     <el-table :data="pesticideFertilizers" style="width: 100%" :header-cell-style="{background: '#F5F5F5'}">
-                                        <el-table-column prop="pesticideFertilizerCode" label="功效" width="62">
+                                        <el-table-column prop="pesticideFertilizerCode" label="类型" width="62">
                                             <template #default="scope">
                                                 {{scope.row.typeName}}
                                             </template>

src/components/detailDialog.vue

@@ -39,7 +39,7 @@
                                 <div class="item-table" v-if="hasPrescription">
                                     <div class="table">
                                         <div class="th">
-                                            <div class="td">功效</div>
+                                            <div class="td">类型</div>
                                             <div class="td width">名称</div>
                                             <div class="td">配比</div>
                                             <div class="td">方式</div>

src/components/popup/priceSheetPopup.vue

@@ -51,7 +51,7 @@
                         </div>
                         <div class="cost-table">
                             <div class="table-header">
-                                <div class="col-1">功效</div>
+                                <div class="col-1">类型</div>
                                 <div class="col-2">名称</div>
                                 <div class="col-3">品牌</div>
                                 <div class="col-4">单价</div>
@@ -112,12 +112,12 @@
                         </div>
                         <span class="btn-label">微信</span>
                     </div>
-                    <div class="action-btn orange-btn">
+                    <!-- <div class="action-btn orange-btn">
                         <div class="icon-circle">
                             <el-icon :size="24"><Download /></el-icon>
                         </div>
                         <span class="btn-label">保存图片</span>
-                    </div>
+                    </div> -->
                 </div>
                 <div class="cancel-btn" @click="handleCancel">取消</div>
             </div>

src/components/recordItem.vue

@@ -97,7 +97,7 @@
                 <div class="info-table">
                     <div class="table">
                         <div class="th">
-                            <div class="td">功效</div>
+                            <div class="td">类型</div>
                             <div class="td width">名称</div>
                             <div class="td">配比</div>
                             <div class="td">方式</div>

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

@@ -9,7 +9,7 @@
         </div>
         <div class="new-wrap">
             <div class="new-title">
-                <div class="title-1"><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-3"><div class="table-name">执行方式</div></div>
                 <div class="title-4"><div class="table-name">亩兑水量</div></div>

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

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

src/views/old_mini/modify_work/completedWork.vue

@@ -252,7 +252,7 @@
                     </div>
                     <div class="new-wrap">
                         <div class="new-title">
-                            <div class="title-1"><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-3"><div class="table-name">执行方式</div></div>
                             <div class="title-4"><div class="table-name">亩兑水量</div></div>
@@ -270,7 +270,7 @@
                             >
                                 <div class="new-table">
                                     <div class="line-l">
-                                        <div class="line-1 title-1">{{ prescriptionItem.name }}</div>
+                                        <div class="line-1 title-1">{{ subP.typeName }}</div>
                                         <div class="line-2">{{ subP.defaultName || subP.pesticideFertilizerName }}</div>
                                     </div>
                                     <div class="line-r" :class="{ 'has-border': detailData?.usageMode === '叶面施' }">

src/views/old_mini/modify_work/index.vue

@@ -179,7 +179,7 @@
                                         <div class="form-box">
                                             <div class="form-index">{{ formatIndex(index) }}</div>
                                             <div class="box-item" v-if="domain.typeName">
-                                                <div class="form-l">使用功效</div>
+                                                <div class="form-l">药肥类型</div>
                                                 <div class="form-r r-text">
                                                     {{ domain.typeName }}
                                                     <!-- <el-select

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

@@ -84,7 +84,7 @@
                                         <div class="form-box">
                                             <div class="form-index">{{ formatIndex(index) }}</div>
                                             <div class="box-item" v-if="domain.typeName">
-                                                <div class="form-l">使用功效</div>
+                                                <div class="form-l">药肥类型</div>
                                                 <div class="form-r r-text">
                                                     {{ domain.typeName }}
                                                     <!-- <el-select