|
@@ -240,7 +240,6 @@
|
|
|
<div class="fixed-btn expert excute" v-if="detailData?.flowStatus == 2 && query?.farmWorkOrderId && curRole == 0" @click="handleConfirmExecute">确认对方执行</div>
|
|
<div class="fixed-btn expert excute" v-if="detailData?.flowStatus == 2 && query?.farmWorkOrderId && curRole == 0" @click="handleConfirmExecute">确认对方执行</div>
|
|
|
<div class="fixed-btn expert" v-if="detailData?.flowStatus == 5 && curRole == 0">确认对方完成</div>
|
|
<div class="fixed-btn expert" v-if="detailData?.flowStatus == 5 && curRole == 0">确认对方完成</div>
|
|
|
<div class="fixed-btn expert" v-if="detailData?.flowStatus == 4 && curRole == 0">提醒对方执行</div>
|
|
<div class="fixed-btn expert" v-if="detailData?.flowStatus == 4 && curRole == 0">提醒对方执行</div>
|
|
|
- <div class="fixed-btn expert" v-if="currentStep == 2 && curRole == 2">请求确认</div>
|
|
|
|
|
<div class="fixed-btn orange" v-if="detailData?.flowStatus == 1 && curRole == 0" @click="handleDemand">发起需求</div>
|
|
<div class="fixed-btn orange" v-if="detailData?.flowStatus == 1 && curRole == 0" @click="handleDemand">发起需求</div>
|
|
|
<div class="fixed-btn orange" v-if="detailData?.flowStatus == 2 && !(query?.farmWorkOrderId) && curRole == 0" @click="cancelDemand">取消发起</div>
|
|
<div class="fixed-btn orange" v-if="detailData?.flowStatus == 2 && !(query?.farmWorkOrderId) && curRole == 0" @click="cancelDemand">取消发起</div>
|
|
|
<div class="fixed-btn" v-if="detailData?.flowStatus == 1 && curRole == 0" @click="handleOk">我已完成</div>
|
|
<div class="fixed-btn" v-if="detailData?.flowStatus == 1 && curRole == 0" @click="handleOk">我已完成</div>
|
|
@@ -254,6 +253,14 @@
|
|
|
<div class="fixed-btn second">转发给客户</div>
|
|
<div class="fixed-btn second">转发给客户</div>
|
|
|
<div class="fixed-btn" @click="showPriceSheetPopup">生成报价单</div>
|
|
<div class="fixed-btn" @click="showPriceSheetPopup">生成报价单</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <!-- 农资,步骤:农资已执行,请求确认 -->
|
|
|
|
|
+ <div
|
|
|
|
|
+ class="fixed-btn-wrap"
|
|
|
|
|
+ v-if="curRole == 2 && currentStep == 2"
|
|
|
|
|
+ >
|
|
|
|
|
+ <div class="fixed-btn second">转发给客户</div>
|
|
|
|
|
+ <div class="fixed-btn" @click="showUploadExecutePopup">请求确认</div>
|
|
|
|
|
+ </div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<!-- 报价弹窗 -->
|
|
<!-- 报价弹窗 -->
|
|
@@ -274,6 +281,9 @@
|
|
|
</template>
|
|
</template>
|
|
|
<div class="create-farm-btn" @click="handlePopupBtn">{{ taskPopupType === 'warning' ? '确认' : '我知道了' }}</div>
|
|
<div class="create-farm-btn" @click="handlePopupBtn">{{ taskPopupType === 'warning' ? '确认' : '我知道了' }}</div>
|
|
|
</popup>
|
|
</popup>
|
|
|
|
|
+
|
|
|
|
|
+ <!-- 上传执行照片 -->
|
|
|
|
|
+ <upload-execute ref="uploadExecuteRef" />
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<script setup>
|
|
<script setup>
|
|
@@ -287,7 +297,7 @@ import { useRouter, useRoute } from "vue-router";
|
|
|
import farmSteps from "@/components/farmSteps.vue";
|
|
import farmSteps from "@/components/farmSteps.vue";
|
|
|
import priceTable from "../agri_work/components/priceTable.vue";
|
|
import priceTable from "../agri_work/components/priceTable.vue";
|
|
|
import priceSheetPopup from "@/components/popup/priceSheetPopup.vue";
|
|
import priceSheetPopup from "@/components/popup/priceSheetPopup.vue";
|
|
|
-import { ElMessage } from "element-plus";
|
|
|
|
|
|
|
+import uploadExecute from "@/views/old_mini/task_condition/components/uploadExecute.vue";
|
|
|
|
|
|
|
|
const router = useRouter();
|
|
const router = useRouter();
|
|
|
const store = useStore();
|
|
const store = useStore();
|
|
@@ -305,6 +315,7 @@ const curRole = ref(localStorage.getItem("SET_USER_CUR_ROLE"));
|
|
|
const status = ref(0);
|
|
const status = ref(0);
|
|
|
const showPopup = ref(false);
|
|
const showPopup = ref(false);
|
|
|
const executionData = ref({});
|
|
const executionData = ref({});
|
|
|
|
|
+const uploadExecuteRef = ref(null);
|
|
|
|
|
|
|
|
// 我已完成
|
|
// 我已完成
|
|
|
const handleOk = () => {
|
|
const handleOk = () => {
|
|
@@ -364,6 +375,10 @@ const handleConfirmExecute = () => {
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
};
|
|
};
|
|
|
|
|
+
|
|
|
|
|
+const showUploadExecutePopup = () => {
|
|
|
|
|
+ uploadExecuteRef.value.showPopup();
|
|
|
|
|
+};
|
|
|
// 地图
|
|
// 地图
|
|
|
// const areaRef = ref(null);
|
|
// const areaRef = ref(null);
|
|
|
// let newFarmMap = new NewFarmMap();
|
|
// let newFarmMap = new NewFarmMap();
|