From c63421421328b47db0a2b7a35a5aad300c0de993 Mon Sep 17 00:00:00 2001
From: gexinzhineng/gxzn27 <1348660141@qq.com>
Date: Mon, 13 Mar 2023 09:53:43 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B0=83=E5=BA=A6=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=AF=A6=E6=83=85=E6=97=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=202=E3=80=81id=E6=98=BE=E7=A4=BA=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=B7=E9=97=AE=E9=A2=98=203=E3=80=81=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9=E4=B8=AD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=90=8D=E7=A7=B0=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/designer/ProcessDesigner.vue                    | 1 -
 src/views/infra/job/JobLog.vue                              | 2 +-
 src/views/infra/job/job.data.ts                             | 2 +-
 src/views/infra/job/jobLog.data.ts                          | 2 +-
 src/views/system/tenant/tenant.data.ts                      | 6 ++++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue b/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
index 60430c25..a14b0b60 100644
--- a/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
+++ b/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
@@ -166,7 +166,6 @@
           @click="processSave"
           :type="props.headerButtonType"
           :disabled="simulationStatus"
-
         />
       </template>
       <!-- 用于打开本地文件-->
diff --git a/src/views/infra/job/JobLog.vue b/src/views/infra/job/JobLog.vue
index 7f860cec..1bf9d745 100644
--- a/src/views/infra/job/JobLog.vue
+++ b/src/views/infra/job/JobLog.vue
@@ -70,7 +70,7 @@ const detailData = ref() // 详情 Ref
 // 详情操作
 const handleDetail = async (row: JobLogApi.JobLogVO) => {
   // 设置数据
-  const res = JobLogApi.getJobLogApi(row.id)
+  const res = await JobLogApi.getJobLogApi(row.id)
   detailData.value = res
   dialogTitle.value = t('action.detail')
   dialogVisible.value = true
diff --git a/src/views/infra/job/job.data.ts b/src/views/infra/job/job.data.ts
index a0fc3bec..38761cd7 100644
--- a/src/views/infra/job/job.data.ts
+++ b/src/views/infra/job/job.data.ts
@@ -11,7 +11,7 @@ export const rules = reactive({
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({
   primaryKey: 'id',
-  primaryType: 'seq',
+  primaryType: 'id',
   primaryTitle: '任务编号',
   action: true,
   actionWidth: '280px',
diff --git a/src/views/infra/job/jobLog.data.ts b/src/views/infra/job/jobLog.data.ts
index ac6e39f2..ccca3d08 100644
--- a/src/views/infra/job/jobLog.data.ts
+++ b/src/views/infra/job/jobLog.data.ts
@@ -4,7 +4,7 @@ const { t } = useI18n()
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({
   primaryKey: 'id',
-  primaryType: 'seq',
+  primaryType: 'id',
   primaryTitle: '日志编号',
   action: true,
   columns: [
diff --git a/src/views/system/tenant/tenant.data.ts b/src/views/system/tenant/tenant.data.ts
index 1137b44a..adda1807 100644
--- a/src/views/system/tenant/tenant.data.ts
+++ b/src/views/system/tenant/tenant.data.ts
@@ -123,7 +123,8 @@ const crudSchemas = reactive<VxeCrudSchema>({
       title: '用户名称',
       field: 'username',
       isTable: false,
-      isDetail: false
+      isDetail: false,
+      isForm: false
     },
     {
       title: '用户密码',
@@ -132,7 +133,8 @@ const crudSchemas = reactive<VxeCrudSchema>({
       isDetail: false,
       form: {
         component: 'InputPassword'
-      }
+      },
+      isForm: false
     },
     {
       title: '账号额度',