|
|
@@ -552,6 +552,7 @@ const handleConfirmComplete = () => {
|
|
|
|
|
|
const handleRemindExecute = () => {
|
|
|
onlyShare.value = true;
|
|
|
+ parmasPage.value.farmMiniUserId = orderObj.value.agriculturalUserId;
|
|
|
setTimeout(() => {
|
|
|
uploadExecuteRef.value.showPopup({ ...parmasPage.value, type: "remindExecute" });
|
|
|
}, 10);
|
|
|
@@ -583,7 +584,10 @@ const showUploadExecutePopup = () => {
|
|
|
onlyShare.value = false;
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- uploadExecuteRef.value.showPopup(parmasPage.value);
|
|
|
+ console.log('parmasPage.value', parmasPage.value);
|
|
|
+ if(parmasPage.value.farmMiniUserId){
|
|
|
+ uploadExecuteRef.value.showPopup(parmasPage.value);
|
|
|
+ }
|
|
|
}, 10);
|
|
|
};
|
|
|
|
|
|
@@ -599,6 +603,8 @@ const toList = (val) => {
|
|
|
if (!val) return [];
|
|
|
return JSON.parse(val);
|
|
|
};
|
|
|
+const orderObj = ref({});
|
|
|
+
|
|
|
const speciesList = computed(() => toList(quotationData.value.serviceSpecies));
|
|
|
const equipmentList = computed(() => toList(quotationData.value.serviceEquipment));
|
|
|
onActivated(async () => {
|
|
|
@@ -613,7 +619,6 @@ onActivated(async () => {
|
|
|
}
|
|
|
parmasPage.value = {
|
|
|
farmMiniUserId: curRole.value == 2 ? detailData.value.farmMiniUserId : detailData.value.users[0]?.userId,
|
|
|
- farmMiniUserName: curRole.value == 2 ? detailData.value.farmMiniUserName : detailData.value.expertUserName,
|
|
|
farmWorkOrderId: detailData.value.orderId,
|
|
|
farmId: detailData.value.farmId,
|
|
|
executeEvidence: JSON.stringify(detailData.value.executeEvidence),
|
|
|
@@ -631,6 +636,7 @@ onActivated(async () => {
|
|
|
} else {
|
|
|
const { data } = await VE_API.z_farm_work_record_cost.listByOrderId({ farmWorkOrderId });
|
|
|
priceDataObj = data[0];
|
|
|
+ orderObj.value = data[0];
|
|
|
}
|
|
|
if (priceDataObj && Object.keys(priceDataObj).length > 0) {
|
|
|
// 合并外层字段
|