From f90c9a0c775e587a56ba9604152697ee3f07a286 Mon Sep 17 00:00:00 2001
From: gexinzhineng/gxzn27 <1348660141@qq.com>
Date: Tue, 28 Feb 2023 09:59:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=81=E7=A8=8B=E5=9B=BE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E4=BB=BB=E5=8A=A1=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=88=E4=BC=A0=E9=80=92id=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=EF=BC=89=203.=E6=B5=81=E7=A8=8B=E5=88=86=E7=B1=BB=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/definition/definition.data.ts |  9 +++++++--
 src/views/bpm/definition/index.vue          | 10 ++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/bpm/definition/definition.data.ts b/src/views/bpm/definition/definition.data.ts
index 919cbd9c..5e940ab0 100644
--- a/src/views/bpm/definition/definition.data.ts
+++ b/src/views/bpm/definition/definition.data.ts
@@ -26,8 +26,13 @@ const crudSchemas = reactive<VxeCrudSchema>({
     {
       title: '流程分类',
       field: 'category',
-      dictType: DICT_TYPE.BPM_MODEL_CATEGORY,
-      dictClass: 'number'
+      // dictType: DICT_TYPE.BPM_MODEL_CATEGORY,
+      // dictClass: 'string'
+      table: {
+        slots: {
+          default: 'category_default'
+        }
+      }
     },
     {
       title: '表单信息',
diff --git a/src/views/bpm/definition/index.vue b/src/views/bpm/definition/index.vue
index 742be5eb..f2ef640c 100644
--- a/src/views/bpm/definition/index.vue
+++ b/src/views/bpm/definition/index.vue
@@ -6,6 +6,10 @@
       <template #name_default="{ row }">
         <XTextButton :title="row.name" @click="handleBpmnDetail(row.id)" />
       </template>
+      <!-- 流程分类 -->
+      <template #category_default="{ row }">
+        <DictTag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="Number(row?.category)" />
+      </template>
       <!-- 表单信息 -->
       <template #formId_default="{ row }">
         <XTextButton
@@ -61,6 +65,8 @@ import * as DefinitionApi from '@/api/bpm/definition'
 // import * as ModelApi from '@/api/bpm/model'
 import { allSchemas } from './definition.data'
 import { setConfAndFields2 } from '@/utils/formCreate'
+import { DICT_TYPE } from '@/utils/dict'
+
 const bpmnXML = ref(null)
 const showBpmnOpen = ref(false)
 const bpmnControlForm = ref({
@@ -105,7 +111,7 @@ const handleBpmnDetail = (row) => {
   console.log(row)
   DefinitionApi.getProcessDefinitionBpmnXMLApi(row).then((response) => {
     console.log(response, 'response')
-    bpmnXML.value = response.bpmnXml
+    bpmnXML.value = response
     // 弹窗打开
     showBpmnOpen.value = true
   })
@@ -117,7 +123,7 @@ const handleAssignRule = (row) => {
   router.push({
     name: 'BpmTaskAssignRuleList',
     query: {
-      modelId: row.id
+      processDefinitionId: row.id
     }
   })
 }