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

src/views/old_mini/modify_work/index.vue

@@ -84,6 +84,7 @@
                                 type="date"
                                 :clearable="false"
                                 placeholder="选择日期"
+                                :editable="false"
                             />
                         </el-form-item>
                     </div>
@@ -120,6 +121,7 @@
                                         type="date"
                                         placeholder="请选择执行时间"
                                         style="width: 100%"
+                                        :editable="false"
                                     />
                                 </el-form-item>
                                 <!-- <el-form-item label-width="82px" class="form-item" prop="conditionRate" label="触发条件">
@@ -202,7 +204,7 @@
                                                         <el-option
                                                             v-for="item in pesticideFertilizersOptions"
                                                             :key="item.id"
-                                                            :label="item.defaultName"
+                                                            :label="item.defaultName || item.name"
                                                             :value="item.id"
                                                         />
                                                     </el-select>
@@ -781,6 +783,7 @@ const handlePesticideFertilizerChange = (parentIndex, index) => {
             dynamicValidateForm.prescriptionList[parentIndex].pesticideFertilizerList[index].pesticideFertilizerId ===
             item.id
     )[0];
+    console.log('obj', obj)
     dynamicValidateForm.prescriptionList[parentIndex].pesticideFertilizerList[index] = {
         ...dynamicValidateForm.prescriptionList[parentIndex].pesticideFertilizerList[index],
         typeName: obj.typeName,

src/views/old_mini/modify_work/reviewWork.vue

@@ -253,6 +253,7 @@
 
             <div
                 class="fixed-btn-wrap center"
+                 v-if="curRole == '2'"
             >
             <div class="fixed-btn excute" @click="handleShare" v-if="workItem.reviewImage && workItem.reviewImage.length">分享成果</div>
                 <div class="fixed-btn second" @click="handleRemindUser" v-else>提醒农户拍照</div>
@@ -289,6 +290,7 @@ const curRole = ref("");
 const isPlan = ref(false);
 const loading = ref(false);
 
+
 const diffInDays = (date, type = "minus") => {
     const targetDate = new Date(date);
     const currentDate = new Date(); // 获取当前系统时间

src/views/old_mini/price_detail/index.vue

@@ -14,6 +14,7 @@
                             type="date"
                             :clearable="false"
                             placeholder="选择日期"
+                            :editable="false"
                         />
                     </div>
                 </div>

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

@@ -35,8 +35,8 @@
             <!-- <div class="task-content-loading" v-if="loading && noData" v-loading="loading">
             </div> -->
             <div class="task-content" v-loading="loading">
-                <div class="task-item" v-for="item in taskList" :key="item.id || item.workRecordId">
-                    <task-item :status="activeIndex === 3 ? 1 : 0" :item-data="item" @handleUploadSuccess="handleUploadSuccess" ref="taskItemRef">
+                <div class="task-item" v-for="(item, index) in taskList" :key="item.id || item.workRecordId">
+                    <task-item :key="activeIndex + '-' + index" :status="activeIndex === 3 ? 1 : 0" :item-data="item" @handleUploadSuccess="handleUploadSuccess" ref="taskItemRef">
                         <template #footer>
                             <div class="item-footer" v-if="activeIndex === 0 || activeIndex === 2">
                                 <div class="footer-l" @click="toDetail(item)">