问题

zrch-risk-client-39/src/views/common/FlowHistoryChart.vue

 <template>
   <div class="flowchart-container">
-    <div v-if="loading" class="loading-state">
+    <div v-show="loading" class="loading-state">
       <a-spin tip="加载流程图中..." size="large" />
     </div>
 
-    <div v-else class="bpmn-wrapper">
+    <div v-show="!loading" class="bpmn-wrapper">
       <div class="bpmn-content">
-        <bpmn-viewer 
-          :flowData="flowData" 
-          :procInsId="procInsId" 
-          @loaded="handleLoaded" 
-        />
+        <bpmn-viewer :flow-data="flowData"  :procInsId="procInsId" />
       </div>
     </div>
   </div>
@@ -23,24 +19,21 @@
   import { flowXmlAndNode } from '/@/components/Process/api/definition';
   import BpmnViewer from '/@/components/Process/viewer/index.vue';
 
-  // Props
-  const props = defineProps<{
-    procInsId: string;
-  }>();
-
   // Emits
   const emit = defineEmits(['loaded']);
 
   // 响应式数据
   const loading = ref(false);
   const flowData = ref<any>({});
+  const procInsId = ref('');
 
-  const loadData = async () => {
-    if (!props.procInsId) return;
-    
+  const loadData = async (data) => {
+    procInsId.value = data.procInsId || '';
+    const deployId = data.deployId || '';
     try {
       loading.value = true;
-      const res = await flowXmlAndNode({ procInsId: props.procInsId });
+      const res = await flowXmlAndNode({ procInsId: procInsId.value,deployId: deployId });
+      loading.value = false;
       flowData.value = res;
     } catch (error) {
       console.error('加载流程图失败:', error);
@@ -51,23 +44,11 @@
     }
   };
 
-  const handleLoaded = () => {
-    emit('loaded');
-  };
-
   // 重置数据
   const resetData = () => {
     flowData.value = {};
   };
 
-  // 监听 procInsId 变化，重新加载数据
-  watch(() => props.procInsId, (newVal) => {
-    if (newVal) {
-      loadData();
-    } else {
-      resetData();
-    }
-  });
 
   // 暴露方法给父组件
   defineExpose({
@@ -103,6 +84,7 @@
     align-items: center;
     height: 100%;
     min-height: 300px;
+    margin-top: 20px;
   }
 
   @media (max-width: 768px) {

zrch-risk-client-39/src/views/common/FlowHistoryDrawer.vue

@@ -3,19 +3,23 @@
     @register="registerBasicDrawer"
     :header-style="{ backgroundColor: '#018ffb', borderBottom: '1px solid #e8eef2' }">
     <div class="drawer-content">
-      <FlowHistoryChart :procInsId="procInsId" />
+      <FlowHistoryChart ref="refFlowHistoryChart" />
       <FlowHistoryRecord :procInsId="procInsId" />
     </div>
     </BasicDrawer>
 </template>
 <script lang="ts" setup>
-  import { defineComponent } from 'vue';
+  import { defineComponent,ref } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import FlowHistoryChart from './FlowHistoryChart.vue';
   import FlowHistoryRecord from './FlowHistoryRecord.vue';
 
-  const callback = (data) => {
-   alert(JSON.stringify(data))
+  const procInsId = ref('');
+  const dataId = ref('');
+  const deployId = ref('');
+  const refFlowHistoryChart = ref();
+ const callback = (data) => {
+   refFlowHistoryChart.value.loadData(data);
   }
 
   const [registerBasicDrawer, { closeDrawer, setDrawerProps }] = useDrawerInner(callback);

zrch-risk-client-39/src/views/common/FlowHistoryRecord.vue

@@ -110,9 +110,7 @@
     return finishTime ? 'success' : 'processing';
   };
 
-  const loadData = async () => {
-    if (!props.procInsId) return;
-
+  const loadData = async (data) => {
     try {
       loading.value = true;
       const res = await flowRecord({ procInsId: props.procInsId });
@@ -131,15 +129,6 @@
     flowRecordList.value = [];
   };
 
-  // 监听 procInsId 变化，重新加载数据
-  watch(() => props.procInsId, (newVal) => {
-    if (newVal) {
-      loadData();
-    } else {
-      resetData();
-    }
-  });
-
   // 暴露方法给父组件
   defineExpose({
     loadData,

zrch-risk-client-39/src/views/common/WorkFlowFormDrawer.vue

@@ -84,6 +84,7 @@ interface WorkflowNode {
   formUrl?: string
   formListUrl?: string
   procDefId?: string
+  procInsId?: string
   dataId?: string
   processTime?: string
   processor?: string
@@ -134,6 +135,12 @@ const props = defineProps({
     type: String,
     default: ''
   },
+
+  procInsId: {
+    type: String,
+    default: ''
+  },
+
   dataId: {
     type: String,
     default: ''
@@ -326,8 +333,9 @@ function resetFormData() {
 
   const openHistoryDrawer = () => {
       openDrawer(true,{
-        procInsId: props.deployId,
+        procInsId: props.procInsId,
         dataId: props.dataId,
+        deployId: props.deployId,
       } );
   };
 

zrch-risk-client-39/src/views/flowable/task/myProcess/components/Detail.vue

@@ -206,7 +206,7 @@ if (key === '3') {
         deployId: taskForm.deployId,
       }).then((res) => {
         flowData.value = res
-        console.log("xml",JSON.stringify(res))
+        console.log("xml88888888888888888",JSON.stringify(res))
       })
   }
 }

zrch-risk-client-39/src/views/flowable/task/myProcess/components/Send.vue

@@ -92,6 +92,7 @@ const handleClick = (key: string) => {
     flowXmlAndNode({ deployId: deployId.value }).then(res => {
       flowData.value = res
     })
+    
   }
 }
 

zrch-risk-client-39/src/views/project/plan/StPlanManList.vue

@@ -100,7 +100,7 @@
         class="custom-class"
         root-class-name="root-class-name"
         :root-style="{ color: 'blue' }"
-        title="流程详情111"
+        title="流程详情"
         placement="right"
         width="90%"
         style="margin: 0px; padding: 0px"

zrch-risk-client-39/src/views/project/problemCheck/StProblemArchiveList.vue

@@ -25,7 +25,7 @@
   import { list,problemArchive} from './StProblemCheck.api';
   import StProblemCheckExecuteModal from './components/StProblemCheckExecuteModal.vue';
 
-  const emit = defineEmits(['callback'])
+  const emit = defineEmits(['callback','openMultiForm'])
   
   const props = defineProps({
     beforeFlowNode: {

zrch-risk-client-39/src/views/project/problemCheck/StProblemCheckList.vue

@@ -52,7 +52,7 @@
     }
   })
 
-  const emit = defineEmits(['callback','startWorkFlow','sendWorkFlow'])
+  const emit = defineEmits(['callback','startWorkFlow','sendWorkFlow','openMultiForm'])
 
   //注册model
   const [registerModal, { openModal }] = useModal();
@@ -182,9 +182,21 @@
     })
   }
 
+  async function handleStartUpdate(flowData) {
+    let record = {
+      procInsId: flowData.procInsId,
+      id:flowData.dataId
+    }
+    await saveOrUpdate(record,true).then(res => {
+      handleSuccess(null);
+    })
+  }
+
+
 
   defineExpose({
     handleUpdate,
+    handleStartUpdate
   })
 
 </script>

zrch-risk-client-39/src/views/project/problemCheck/StProblemExecApprovalList.vue

@@ -25,7 +25,7 @@
   import { list, saveOrUpdate } from './StProblemCheck.api';
   import StProblemCheckExecuteModal from './components/StProblemCheckExecuteModal.vue';
 
-  const emit = defineEmits(['callback','sendWorkFlow'])
+  const emit = defineEmits(['callback','sendWorkFlow','openMultiForm'])
   
   const props = defineProps({
     beforeFlowNode: {
@@ -64,7 +64,7 @@
   const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
 
   function handleExecuteApproval(record: Recordable) {
-    emit("callback",record)
+    emit("openMultiForm",record)
   }
  
   function handleSuccess() {

zrch-risk-client-39/src/views/project/problemCheck/StProblemExecList.vue

@@ -25,7 +25,7 @@
   import { list, saveOrUpdate } from './StProblemCheck.api';
   import StProblemCheckExecuteModal from './components/StProblemCheckExecuteModal.vue';
 
-  const emit = defineEmits(['callback','sendWorkFlow'])
+  const emit = defineEmits(['callback','sendWorkFlow','openMultiForm'])
 
   const props = defineProps({
     beforeFlowNode: {
@@ -64,7 +64,7 @@
   const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
 
   function handleExecute(record: Recordable) {
-     emit("callback",record)
+     emit("openMultiForm",record)
   }
  
   function handleSuccess() {

zrch-risk-client-39/src/views/project/problemCheck/StProblemIndex.vue

@@ -11,7 +11,6 @@
             :currentFlowNode="node" 
             :nextFlowNode="workflowNodes[index+1]"
             @open-multi-form="handleOpenMultiForm"
-            @callback="handleCallback"
           />
         </div>
         <div v-else class="no-form">
@@ -26,6 +25,7 @@
       :workflow-nodes="workflowNodes"
       :external-form-data="externalFormData"
       :proc-def-id="currentProcDefId"
+      :proc-ins-id="procInsId"
       :show-history-form-data="true"
       :data-id="dataId"
       :deploy-id="deployId"
@@ -57,6 +57,7 @@
   import { definitionStart, definitionStartByDeployId,addMyTaskFlow } from "/@/components/Process/api/definition";
   import WorkFlowFormDrawer from '/@/views/common/WorkFlowFormDrawer.vue';
   import TaskAssigneeDrawer from '/@/views/common/TaskAssigneeDrawer.vue'
+import { CONNREFUSED } from 'dns';
 
   const formTableName = "st_problem_check";
   const workflowNodes = ref<any[]>([]);
@@ -65,6 +66,7 @@
   const currentNode = ref<any>({});
   const isShowApprovalPanel = ref(true);
   const deployId = ref('');
+  const procInsId = ref('');
   // 改为动态 ref 对象，存储每个节点的组件实例
   const formComponentRefs = ref<Map<number, any>>(new Map());
 
@@ -147,17 +149,18 @@
   }
 
   const handleDefinitionStart = async (data) => {
-    alert(111)
+    
     const formData = { dataId:data.id, dataName: 'id' };
     const deployId = currentNode.value.deployId || '';
     const startResRaw = await definitionStartByDeployId(deployId, formData);
     let myTaskFlow = {}
     if (startResRaw?.procInsId) {
+      procInsId.value = startResRaw.procInsId;
       myTaskFlow["taskId"] = startResRaw.taskId;
       myTaskFlow["deployId"] = startResRaw.deployId;
-      myTaskFlow["procInsId"] = startResRaw.instanceId;
+      myTaskFlow["procInsId"] = startResRaw.procInsId;
       myTaskFlow["executionId"] = startResRaw.executionId;
-      myTaskFlow["procDefId"] = startResRaw.procInsId;
+      myTaskFlow["procDefId"] = startResRaw.instanceId ;
       myTaskFlow["targetId"] = data.id;
       myTaskFlow["taskDefinitionKey"] = currentNode.value.id;
       myTaskFlow["formTableName"] = formTableName;
@@ -172,13 +175,25 @@
         }
       }
       await addMyTaskFlow(myTaskFlow);
-    }
+      const currentFormComponent = getCurrentFormComponent();
+      if (currentFormComponent && typeof currentFormComponent.handleUpdate === 'function') {
+        currentFormComponent.handleStartUpdate({
+          dataId:data.id,
+          procInsId: startResRaw.procInsId,
+        });
+      } else {
+        console.warn('当前组件实例不存在或没有 handleUpdate 方法');
+      }
+      }
   }
 
   const handleDefinitionSend = async (data) => {
     drawerTaskVisible.value = true;
     dataId.value = data.id;
     deployId.value = currentNode.value.deployId || '';
+
+
+
     await setNextNodeUser();
   } 
 
@@ -200,36 +215,37 @@
   }
 
 
-  const handleOpenMultiForm = (params: {
-    nodeIndex?: number;
-    title?: string;
-    procDefId?: string;
-    formData?: Record<string, any>;
-  }) => {
+  // const handleOpenMultiForm = (params: {
+  //   nodeIndex?: number;
+  //   title?: string;
+  //   procDefId?: string;
+  //   formData?: Record<string, any>;
+  // }) => {
   
-    if (params.nodeIndex !== undefined) {
-      currentMultiFormIndex.value = params.nodeIndex;
-    } else {
-      currentMultiFormIndex.value = activeTab.value - 1;
-    }
-    if (params.title) {
-      drawerTitle.value = params.title;
-    } else {
-      const currentNode = workflowNodes.value[currentMultiFormIndex.value];
-      drawerTitle.value = currentNode ? `${currentNode.name} - 历史表单查看` : '表单处理';
-    }
-    if (params.procDefId) {
-      currentProcDefId.value = params.procDefId;
-    } else if (workflowNodes.value[currentMultiFormIndex.value]) {
-      currentProcDefId.value = workflowNodes.value[currentMultiFormIndex.value].procDefId || '';
-    }
-    if (params.formData) {
-      externalFormData.value = params.formData;
-    } else {
-      externalFormData.value = {};
-    }
-    drawerVisible.value = true;
-  };
+  //   if (params.nodeIndex !== undefined) {
+  //     currentMultiFormIndex.value = params.nodeIndex;
+  //   } else {
+  //     currentMultiFormIndex.value = activeTab.value - 1;
+  //   }
+  //   if (params.title) {
+  //     drawerTitle.value = params.title;
+  //   } else {
+  //     const currentNode = workflowNodes.value[currentMultiFormIndex.value];
+  //     drawerTitle.value = currentNode ? `${currentNode.name} - 历史表单查看` : '表单处理';
+  //   }
+  //   if (params.procDefId) {
+  //     currentProcDefId.value = params.procDefId;
+  //   } else if (workflowNodes.value[currentMultiFormIndex.value]) {
+  //     currentProcDefId.value = workflowNodes.value[currentMultiFormIndex.value].procDefId || '';
+  //   }
+  //   if (params.formData) {
+  //     externalFormData.value = params.formData;
+  //   } else {
+  //     externalFormData.value = {};
+  //   }
+  //   drawerVisible.value = true;
+  // };
+
   const handleMultiFormSubmit = async (submitData: {
     nodeId: string;nodeName: string;formData: any;procDefId: string;
   }) => {
@@ -258,7 +274,6 @@
   
 
   function handlSendSuccess(dataId: any) {
-
     const currentFormComponent = getCurrentFormComponent();
     if (currentFormComponent && typeof currentFormComponent.handleUpdate === 'function') {
       currentFormComponent.handleUpdate(dataId);
@@ -272,8 +287,10 @@
   }
 
 
-  async function handleCallback(data: any) {
+  async function handleOpenMultiForm(data: any) {
+    
     deployId.value = currentNode.value.deployId || '';
+    procInsId.value = data.procInsId || '';
     drawerVisible.value = true;
     dataId.value = data.id || '';
     currentNode.value = workflowNodes.value[currentMultiFormIndex.value];

zrch-risk-client-39/src/views/project/problemCheck/StProblemPlanApprovalList.vue

@@ -40,7 +40,7 @@
     }
   })
 
-  const emit = defineEmits(['callback','sendWorkFlow'])
+  const emit = defineEmits(['callback','sendWorkFlow','openMultiForm'])
 
   //注册model
   const [registerExecuteModal, { openModal: openExecuteModal }] = useModal();
@@ -64,7 +64,7 @@
   const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
 
   function handlePlanApproval(record: Recordable) {
-    emit("callback",record)
+    emit("openMultiForm",record)
   }
  
   function handleSuccess() {

zrch-risk-client-39/src/views/project/problemCheck/StProblemPlanList.vue

@@ -25,7 +25,7 @@
   import { list,saveOrUpdate} from './StProblemCheck.api';
   import StProblemCheckExecuteModal from './components/StProblemCheckExecuteModal.vue';
 
-  const emit = defineEmits(['callback','sendWorkFlow'])
+  const emit = defineEmits(['callback','sendWorkFlow','openMultiForm'])
 
   const props = defineProps({
     beforeFlowNode: {
@@ -62,7 +62,7 @@
   const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
 
   function handlePlan(record: Recordable) {
-     emit("callback",record)
+     emit("openMultiForm",record)
   }
 
   async function handleSendNext(record: Recordable) {