From be7079404889568585e36d46165bb5486cece2da Mon Sep 17 00:00:00 2001
From: gitadmin <xx@qq.com>
Date: Thu, 10 Apr 2025 16:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/position/edit.vue | 8 ++++----
 src/views/tool/generator/index.vue | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/system/position/edit.vue b/src/views/system/position/edit.vue
index d5189e2..3c94a6f 100644
--- a/src/views/system/position/edit.vue
+++ b/src/views/system/position/edit.vue
@@ -15,13 +15,13 @@
         label-width="85px"
       >
         <n-form-item
-          label="职级名称"
+          label="岗位名称"
           path="name"
-          :rule="{ required: true, message: '请输入职级名称', trigger: 'blur' }"
+          :rule="{ required: true, message: '请输入岗位名称', trigger: 'blur' }"
         >
-          <n-input v-model:value="formData.name" placeholder="请输入职级名称" clearable />
+          <n-input v-model:value="formData.name" placeholder="请输入岗位名称" clearable />
         </n-form-item>
-        <n-form-item label="职级状态" path="code">
+        <n-form-item label="岗位状态" path="code">
           <n-radio-group v-model:value="formData.status" name="status">
             <n-radio :value="1">正常</n-radio>
             <n-radio :value="2">停用</n-radio>
diff --git a/src/views/tool/generator/index.vue b/src/views/tool/generator/index.vue
index a515329..1e51a68 100644
--- a/src/views/tool/generator/index.vue
+++ b/src/views/tool/generator/index.vue
@@ -11,7 +11,7 @@
       <BasicTable
         :columns="columns"
         :request="loadDataTable"
-        :row-key="(row) => row.tableName"
+        :row-key="(row) => row.tableName + '|' + row.tableComment"
         ref="basicTableRef"
         :actionColumn="actionColumn"
         @update:checked-row-keys="onCheckedRow"
@@ -166,8 +166,10 @@
       negativeText: '取消',
       onPositiveClick: async () => {
         record.tableName
-          ? await generator({ tableNames: [record.tableName] })
-          : await batchGenerator({ tableNames: rowKeys.value });
+          ? await generator({ tableNames: [record.tableName + '|' + record.tableComment] })
+          : await batchGenerator({
+              tableNames: rowKeys.value,
+            });
         message.success('生成成功');
         reloadTable();
       },