合同段

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20241009134359"
+  "value": "20241009172648"
 }

src/global/components/hc-report-modal/index.vue

@@ -59,7 +59,7 @@
 import { onMounted, ref, watch } from 'vue'
 //import tasksFlowApi from '~api/tasks/flow'
 import { ApprovalApi, queryFixedFlow, queryFixedFlow1, queryFixedFlow3 } from '~api/other'
-import { arrIndex, arrToId, formValidate, getArrValue } from 'js-fast-way'
+import { arrIndex, arrToId, formValidate, getArrValue, isNullES } from 'js-fast-way'
 
 const props = defineProps({
     show: {
@@ -265,9 +265,10 @@ const getProcessData = async (type, datas) => {
     }
 
     infoIds.value = arrToId(reportDatas.value)
+    const cid = isNullES(flowContractId.value) ? contractId.value : flowContractId.value
     const { error, code, data } = await queryFixedFlow1({
         projectId: projectId.value,
-        contractId: flowContractId.value ?? contractId.value,
+        contractId: cid,
         nodeId:nodeId.value,
         classifyType:classifyType.value,
         tableOwner:tableOwner.value,
@@ -294,9 +295,10 @@ const queryFixedFlowApi = async (type, datas) => {
     }
     //请求数据
     linkUserJoinString.value = ''
+    const cid = isNullES(flowContractId.value) ? contractId.value : flowContractId.value
     const { error, code, data, msg } = await queryFixedFlow({
         projectId: projectId.value,
-        contractId: flowContractId.value ?? contractId.value,
+        contractId: cid,
         ...flowJson,
         nodeId:formModel.value.ids,
         classifyType:classifyType.value,
@@ -323,9 +325,10 @@ const queryFixedFlowApi3 = async (type, datas) => {
     }
     //请求数据
     linkUserJoinString.value = ''
+    const cid = isNullES(flowContractId.value) ? contractId.value : flowContractId.value
     const { error, code, data, msg } = await queryFixedFlow3({
         projectId: projectId.value,
-        contractId: flowContractId.value ?? contractId.value,
+        contractId: cid,
         ...flowJson,
         // nodeId:formModel.value.ids,
         classifyType:classifyType.value,