Merge branch 'master' of gitee.com:lab1024/smart-admin into master

Signed-off-by: 大熊 <daxiongren@foxmail.com>

smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue

@@ -6,11 +6,12 @@
   * @Copyright  1024创新实验室
 -->
 <template>
-  <a-modal title="更新日志" width="700px" :open="visibleFlag" @cancel="onClose" >
-
+  <a-modal title="更新日志" width="700px" :open="visibleFlag" @cancel="onClose">
     <div>
       <pre>{{ content }}</pre>
-      <div v-if="link">链接：<a :href="link" target="_blank">{{ link }}</a></div>
+      <div v-if="link">
+        链接：<a :href="link" target="_blank">{{ link }}</a>
+      </div>
     </div>
 
     <template #footer>
@@ -18,7 +19,6 @@
         <a-button type="primary" @click="onClose">关闭</a-button>
       </a-space>
     </template>
-
   </a-modal>
 </template>
 <script setup>

smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/department/components/employee-form-modal/index.vue

@@ -16,6 +16,8 @@
     @close="onClose"
     destroyOnClose
   >
+    <a-alert message="超管需要直接在数据库表 t_employee修改哦" type="error" closable />
+    <br />
     <a-form ref="formRef" :model="form" :rules="rules" layout="vertical">
       <a-form-item label="姓名" name="actualName">
         <a-input v-model:value.trim="form.actualName" placeholder="请输入姓名" />
@@ -63,7 +65,7 @@
   import { GENDER_ENUM } from '/@/constants/common-const';
   import { regular } from '/@/constants/regular-const';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '/@/lib/smart-sentry';
   // ----------------------- 以下是字段定义 emits props ---------------------
   const departmentTreeSelect = ref();
   // emit

smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/department/components/employee-list/index.vue

@@ -57,6 +57,9 @@
       bordered
     >
       <template #bodyCell="{ text, record, index, column }">
+        <template v-if="column.dataIndex === 'administratorFlag'">
+          <a-tag color="error" v-if="text">超管</a-tag>
+        </template>
         <template v-if="column.dataIndex === 'disabledFlag'">
           <a-tag :color="text ? 'error' : 'processing'">{{ text ? '禁用' : '启用' }}</a-tag>
         </template>
@@ -152,6 +155,11 @@
       dataIndex: 'loginName',
       width: 100,
     },
+    {
+      title: '超管',
+      dataIndex: 'administratorFlag',
+      width: 60,
+    },
     {
       title: '状态',
       dataIndex: 'disabledFlag',

smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/role/components/role-data-scope/index.vue

@@ -12,7 +12,7 @@
   <div>
     <div class="btn-group">
       <a-button class="button-style" type="primary" @click="updateDataScope" v-privilege="'system:role:dataScope:update'"> 保存 </a-button>
-      <a-button class="button-style" @click="getDataScope" > 刷新 </a-button>
+      <a-button class="button-style" @click="getDataScope"> 刷新 </a-button>
     </div>
     <a-row class="header">
       <a-col class="tab-margin" :span="4">业务单据</a-col>
@@ -107,7 +107,7 @@
         roleId: selectRoleId.value,
         dataScopeItemList: selectedDataScopeList.value.filter((e) => !_.isUndefined(e.viewType)),
       };
-      await roleApi.updateRoleDataScopeList(data);
+      await roleApi.updateDataScope(data);
       message.success('保存成功');
       getDataScope();
     } catch (e) {