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

src/views/old_mini/modify_work/completedWork.vue

@@ -371,9 +371,9 @@
             </div>
 
             <!-- 农资，步骤：农事已确认 -->
-            <div class="fixed-btn-wrap center" v-if="curRole == 2 && currentStep == 1">
+            <div class="fixed-btn-wrap center" v-if="curRole == 2 && currentStep == 0">
                 <!-- <div class="fixed-btn second" @click="handleForward">转发给客户</div> -->
-                <div class="fixed-btn" @click="showPriceSheetPopup">生成报价单</div>
+                <div class="fixed-btn" @click="showPriceSheetPopup">确认并报价</div>
             </div>
             <!-- 农资，步骤：农资已执行，请求确认 -->
             <div class="fixed-btn-wrap center" v-if="curRole == 2 && currentStep == 2">
@@ -802,8 +802,8 @@ const getDetail = async (id) => {
 };
 
 function getCurrentStep(flowStatus) {
-    if (flowStatus === 1 || flowStatus === 2 || flowStatus === 3) {
-        return 1;
+    if (flowStatus === 0) {
+        return 0;
     } else if (flowStatus === 4) {
         return 2;
     } else if (flowStatus === 5) {

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

@@ -69,7 +69,7 @@
                                     <!-- <div class="btn second" @click="handleForward(item)">
                                         转发给客户
                                     </div> -->
-                                    <div class="btn primary" @click="showPriceSheetPopup(item)">生成报价单</div>
+                                    <div class="btn primary" @click="showPriceSheetPopup(item)">确认并报价</div>
                                 </div>
                             </div>
                         </template>