Merge branch 'develop' into release-test

@@ -1986,8 +1986,19 @@ onBeforeMount(() => {
         const data = res.data || {}
         const data = res.data || {}
         let { approveVO } = data;
         let { approveVO } = data;
         draftDetailInfo.value = data;
         draftDetailInfo.value = data;
-        deploymentId.value = approveVO?.camundaDeploymentId;
-        processInstanceId.value = approveVO?.camundaInstanceId
+        if (approveVO) {
+          deploymentId.value = approveVO.camundaDeploymentId;
+          processInstanceId.value = approveVO.camundaInstanceId;
+        } else {
+          getCamundaDeploymentId('10017', userData.tenantGuid, userData.staffGuid).then((res: any) => {
+            if (res.code == proxy.$passCode) {
+              deploymentId.value = res.data;
+            } else {
+              ElMessage.error(res.msg);
+            }
+          })
+        }
+
         let coverageArea = '';
         let coverageArea = '';
         let coverageAreas = [];
         let coverageAreas = [];
         let damTypeItem = baseFormItems.value.find(item => item.field == 'damType');
         let damTypeItem = baseFormItems.value.find(item => item.field == 'damType');