合同段

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240927174353"
+  "value": "20241008175630"
 }

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

@@ -86,6 +86,10 @@ const props = defineProps({
         type: [String, Number],
         default: '',
     },
+    flowContractId: {
+        type: [String, Number],
+        default: '',
+    },
     classifyType: {
         type: [String, Number],
         default: '',
@@ -137,6 +141,7 @@ const emit = defineEmits(['hide', 'finish', 'tagClose'])
 const isShow = ref(props.show)
 const projectId = ref(props.projectId)
 const contractId = ref(props.contractId)
+const flowContractId = ref(props.flowContractId)
 const classifyType = ref(props.classifyType)
 const tableOwner = ref(props.tableOwner)
 const ApiUrl = ref(props.url)
@@ -195,7 +200,8 @@ watch(() => [
     props.datas,
     props.trialSelfInspectionRecordId,
     props.nodeId,
-], ([val, pid, cid, cla, tab, name, ids, url, addition, type, typeData, datas, trialSelfInspectionRecordId, nodeid]) => {
+    props.flowContractId,
+], ([val, pid, cid, cla, tab, name, ids, url, addition, type, typeData, datas, trialSelfInspectionRecordId, nodeid, flowCid]) => {
     isShow.value = val
     projectId.value = pid
     contractId.value = cid
@@ -219,6 +225,7 @@ watch(() => [
     isTypes.value = type
     typeDatas.value = typeData
     reportDatas.value = datas
+    flowContractId.value = flowCid
     if (val) {
         getProcessDatasApi()
     }
@@ -260,13 +267,12 @@ const getProcessData = async (type, datas) => {
     infoIds.value = arrToId(reportDatas.value)
     const { error, code, data } = await queryFixedFlow1({
         projectId: projectId.value,
-        contractId: contractId.value,
+        contractId: flowContractId.value ?? contractId.value,
         nodeId:nodeId.value,
         classifyType:classifyType.value,
         tableOwner:tableOwner.value,
         infoIds:infoIds.value,
         ...flowJson,
-
     })
     if (!error && code === 200) {
         const arr = getArrValue(data['records'])
@@ -290,7 +296,7 @@ const queryFixedFlowApi = async (type, datas) => {
     linkUserJoinString.value = ''
     const { error, code, data, msg } = await queryFixedFlow({
         projectId: projectId.value,
-        contractId: contractId.value,
+        contractId: flowContractId.value ?? contractId.value,
         ...flowJson,
         nodeId:formModel.value.ids,
         classifyType:classifyType.value,

src/views/data-fill/wbs.vue

@@ -461,6 +461,7 @@
         <hc-report-modal
             :addition="reportAddition"
             :contract-id="contractInfo?.contractType == 2 ? nodeDataInfo?.contractIdRelation : contractId"
+            :flow-contract-id="contractId"
             :ids="reportIds"
             :table-owner="authBtnTabKey"
             :classify-type="classType"