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

src/views/old_mini/modify_work/addWork.vue

@@ -129,7 +129,6 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item
-                        v-if="dynamicValidateForm.usageMode === '叶面施'"
                         label-width="82px"
                         class="form-item"
                         prop="executeStyle"
@@ -150,17 +149,7 @@
                         </el-select>
                     </el-form-item>
 
-                    <el-form-item
-                        v-if="dynamicValidateForm.usageMode === '根部施'"
-                        label-width="82px"
-                        class="form-item"
-                        prop="executeStyle"
-                        label="执行方式"
-                    >
-                        <div class="info-text">人工</div>
-                    </el-form-item>
-
-                    <div v-if="dynamicValidateForm.usageMode !== '人工农事'">
+                    <div v-if="dynamicValidateForm.usageMode !== '人工'">
                         <el-form-item
                             v-for="(domain, index) in dynamicValidateForm.prescription.pesticideFertilizerList"
                             :key="index"
@@ -458,6 +447,7 @@ const cancelEdit = () => {
 const modeList = ref([
     { name: "无人机", value: 1 },
     { name: "人工", value: 2 },
+    { name: "无人机+人工", value: 3 },
 ]);
 
 const handleExecutionMethodChange = (index, val) => {
@@ -539,7 +529,7 @@ VE_API.z_farm_work_order.pesticideFertilizersList().then(({ data }) => {
     pesticideFertilizersOptions.value = data;
 });
 
-const allUsageModeList = ["叶面施", "根部施", "人工农事"];
+const allUsageModeList = ["树冠+内膛", "地面喷施", "树冠喷施", "根部施", "叶面施", "内膛喷施", "人工"];
 
 /**
  * 选择药肥的时候修改订单中药肥pesticideFertilizerId 以外其他数据

src/views/old_mini/modify_work/detailWork.vue

@@ -177,7 +177,7 @@
                         </div>
                         <div class="form-item">
                             <div class="item-name">执行方式</div>
-                            <div class="item-text">{{ detailData?.prescription?.pesticideFertilizerList[0]?.executeStyle === 1 ? '无人机' : '人工' }}</div>
+                            <div class="item-text">{{ detailData?.prescription?.pesticideFertilizerList[0]?.executeStyle === 1 ? '无人机' : detailData?.prescription?.pesticideFertilizerList[0]?.executeStyle === 2 ? '人工' : '无人机+人工' }}</div>
                         </div>
                     </div>
                     <div class="new-wrap" v-if="detailData?.prescription?.pesticideFertilizerList?.length">

src/views/old_mini/modify_work/modify.vue

@@ -173,7 +173,7 @@
                                 />
                             </el-select>
                         </el-form-item>
-                        <el-form-item v-if="dynamicValidateForm.prescription.usageMode === '叶面施'" label-width="82px" class="form-item" prop="executeStyle" label="执行方式">
+                        <el-form-item label-width="82px" class="form-item" prop="executeStyle" label="执行方式">
                             <el-select
                                     class="select-item"
                                     v-model="dynamicValidateForm.executeStyle"
@@ -188,12 +188,8 @@
                                     />
                                 </el-select>
                         </el-form-item>
-
-                        <el-form-item v-if="dynamicValidateForm.prescription.usageMode === '根部施'" label-width="82px" class="form-item" prop="executeStyle" label="执行方式">
-                            <div class="info-text">人工</div>
-                        </el-form-item>
                         
-                        <div v-if="dynamicValidateForm.prescription.usageMode !== '人工农事'">
+                        <div v-if="dynamicValidateForm.prescription.usageMode !== '人工'">
                             <el-form-item
                                 v-for="(domain, index) in dynamicValidateForm.prescription.pesticideFertilizerList"
                                 :key="index"
@@ -379,7 +375,7 @@
                             <div class="form-item">
                                 <div class="item-name">执行方式</div>
                                 <div class="item-text">
-                                    {{ dynamicValidateForm?.prescription?.pesticideFertilizerList[0]?.executeStyle === 1 ? '无人机' : '人工' }}
+                                    {{ dynamicValidateForm?.prescription?.pesticideFertilizerList[0]?.executeStyle === 1 ? '无人机' : dynamicValidateForm?.prescription?.pesticideFertilizerList[0]?.executeStyle === 2 ? '人工' : '无人机+人工' }}
                                 </div>
                             </div>
                         </div>
@@ -951,6 +947,7 @@ const cancelEdit = () => {
 const modeList = ref([
     { name: "无人机", value: 1 },
     { name: "人工", value: 2 },
+    { name: "无人机+人工", value: 3 },
 ]);
 
 const handleExecutionMethodChange = (index, val) => {
@@ -1045,7 +1042,7 @@ VE_API.z_farm_work_order.pesticideFertilizersList().then(({ data }) => {
     pesticideFertilizersOptions.value = data;
 });
 
-const allUsageModeList = ["叶面施", "根部施", "人工农事"];
+const allUsageModeList = ["树冠+内膛", "地面喷施", "树冠喷施", "根部施", "叶面施", "内膛喷施", "人工"];
 
 /**
  * 选择药肥的时候修改订单中药肥pesticideFertilizerId 以外其他数据