Merge remote-tracking branch 'origin/master'

src/api/bpm/model/index.ts

@@ -34,7 +34,7 @@ export const getModelPage = async (params) => {
 }
 
 export const getModel = async (id: number) => {
-  return await request.get({ url: '/bpm/model/get?id=' + id })
+  return await request.get({ url: '/bpm/model/getmodel?id=' + id })
 }
 
 export const updateModel = async (data: ModelVO) => {

src/views/Home/kqnr/qjgl/qjsq/QjglCreate.vue

@@ -133,6 +133,7 @@ import ProcessInstanceSimpleViewer
   from "@/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue";
 import ProcessInstanceBpmnViewer
   from "@/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue";
+import * as ProcessInstanceApi from "@/api/bpm/processInstance";
 /** 请假管理 表单 */
 defineOptions({ name: 'QjglCreate' })
 
@@ -189,7 +190,19 @@ function formatDateHour(dat: number|Date) {
   const date = new Date(dat)
   return date.getHours();
 }
+const getProcessModelView = async () => {
+  if (BpmModelType.BPMN === processDefinition.value?.modelType) {
+    // 重置，解决 BPMN 流程图刷新不会重新渲染问题
+    processModelView.value = {
+      bpmnXml: ''
+    }
+  }
 
+  const data = await ProcessInstanceApi.getProcessInstanceBpmnModelView(processInstanceid)
+  if (data) {
+    processModelView.value = data
+  }
+}
 //获取天数数据模型
 const queryParamsDate = reactive({
   pageNo: 1,
@@ -439,7 +452,7 @@ onMounted(async () => {
       undefined,
       processKey
   )
-
+console.log(processDefinitionDetail,"processDefinitionDetail")
   if (!processDefinitionDetail) {
     message.error('OA 请假的流程模型未配置，请检查！')
     return
@@ -463,6 +476,7 @@ onMounted(async () => {
     //console.log(userList.value ,"userList.value")
   }
   await getNjglData()
+  await getProcessModelView()
 })
 
 </script>

src/views/bpm/model/index.vue

@@ -68,6 +68,13 @@
           </el-button>
         </template>
       </el-table-column>
+      <el-table-column label="流程名称2" align="center" prop="name" width="200">
+        <template #default="scope">
+          <el-button type="primary" link @click="handleBpmnDetail(scope.row)">
+            <span>{{ scope.row.name }}</span>
+          </el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="流程图标" align="center" prop="icon" >
         <template #default="scope">
           <el-image :src="scope.row.icon" class="w-32px h-32px" />
@@ -405,6 +412,7 @@ const bpmnControlForm = ref({
 })
 const handleBpmnDetail = async (row) => {
   const data = await ModelApi.getModel(row.id)
+  console.log(data,"data-----")
   bpmnXML.value = data.bpmnXml || ''
   bpmnDetailVisible.value = true
 }