0924xx

src/api/system/system.ts

@@ -162,7 +162,7 @@ export const setRoleStatus = (id: number, status: number) => {
   return defHttp.put({ url: Api.setRoleStatus + id + '/' + status });
 };
 export const saveOrUpdateRoleInfoWithMenu = (params) => {
-  params.parentGid = session.getItem("adminRole").groupid || 'CEEFEC51A38740DBA3657F91C230784B';
+  params.parentGid = session.getItem("adminRole")?.groupid || 'CEEFEC51A38740DBA3657F91C230784B';
   const formData = new FormData();
   Object.keys(params).forEach((key) => formData.append(key, params[key]));
   return new Promise<void>((resolve, reject) => {

src/store/modules/user.ts

@@ -137,9 +137,9 @@ export const useUserStore = defineStore({
       try {
         const { goHome = true, mode, ...loginParams } = params;
         const data = await loginApi(loginParams, mode);
-        if(data.token){
+        if (data.token) {
           return this.process(data, goHome);
-        }else{
+        } else {
           return Promise.reject();
         }
       } catch (error) {
@@ -198,7 +198,7 @@ export const useUserStore = defineStore({
           window.localStorage.setItem('entityId', JSON.stringify(entityId));
           window.sessionStorage.setItem('entityId', JSON.stringify(entityId));
         }
-      } catch {}
+      } catch { }
       return userInfo;
     },
     /**
@@ -223,6 +223,20 @@ export const useUserStore = defineStore({
       goLogin && router.push(PageEnum.BASE_LOGIN);
       window.localStorage.clear();
       window.localStorage.removeItem('updateUserInfo');
+      // if (goLogin) {
+      //   //插入退出日志记录
+      //   let addRecordParam = {
+      //     systemLog: {
+      //       cjrq: moment().format('YYYY-MM-DD HH:mm:ss'),
+      //       czsm: "登录操作",
+      //       opt: "login",
+      //       sfcg: 1,
+      //       userid: u.EMPLOYEE_MIS.EMPLOYEE_ID,
+      //       username: u.EMPLOYEE.NAME
+      //     }
+      //   }
+      //   defHttp.post({ url: Api.AddLoginRecord, params: addRecordParam })
+      // }
     },
 
     async doRefresh() {

src/views/systemAdmin/system/account/index.vue

@@ -81,11 +81,11 @@ export default defineComponent({
         dataIndex: 'LOGIN_NAME',
         align: 'center'
       },
-      {
-        title: '用户ID',
-        dataIndex: 'EMPLOYEE_ID',
-        align: 'center'
-      },
+      // {
+      //   title: '用户ID',
+      //   dataIndex: 'EMPLOYEE_ID',
+      //   align: 'center'
+      // },
       {
         title: '性别',
         dataIndex: 'SEX',

src/views/systemAdmin/system/log/operate/index.vue

@@ -276,12 +276,12 @@ export default defineComponent({
                 dataIndex: 'IP',
                 key: 'IP'
             },
-            // {
-            //     title: '操作说明',
-            //     align: 'center',
-            //     dataIndex: 'CZSM',
-            //     key: 'CZSM'
-            // },
+            {
+                title: '操作说明',
+                align: 'center',
+                dataIndex: 'CZSM',
+                key: 'CZSM'
+            },
             {
                 title: '操作时间',
                 align: 'center',

src/views/systemAdmin/system/role/index.vue

@@ -95,6 +95,7 @@ export default defineComponent({
       editForm.groupName = record.groupName
       editForm.sort = record.sort
       editForm.groupid = record.groupid
+      editForm.checkedKeys = []
       getRoleMenus({
         menusId: true,
         systemId: '1',

src/views/systemAdmin/system/tag/index.vue

@@ -5,7 +5,7 @@
                 <BasicTable @register="registerTableTagType">
                     <!-- <template #toolbar>
                         <Button type="primary" @click="openDialog(null)">
-                            新增标签
+                            新增字典
                         </Button>
                         <Button type="primary" danger :disabled="hasSelected" @click="delAllData">
                             批量删除
@@ -38,7 +38,7 @@
                     </template>
                 </BasicTable>
                 <!-- <div class="body-header">
-                    <div class="item-title">标签类型列表</div>
+                    <div class="item-title">字典类型列表</div>
                     <div class="table-btns">
                         <a-button class="btn" type="primary" @click="openDialog('add', {})">新增</a-button>
                     </div>
@@ -58,13 +58,13 @@
         </div>
         <div class="tag-box">
             <!-- <div class="tag-header">
-                <div class="tag-title">标签管理</div>
+                <div class="tag-title">字典管理</div>
                 <div class="handle-btns">
                     <span class="label">查询类型：</span>
                     <a-select v-model:value="searchType" style="width: 120px">
-                        <a-select-option value="name">标签名称</a-select-option>
-                        <a-select-option value="code">标签编码</a-select-option>
-                        <a-select-option value="type">标签类型</a-select-option>
+                        <a-select-option value="name">字典名称</a-select-option>
+                        <a-select-option value="code">字典编码</a-select-option>
+                        <a-select-option value="type">字典类型</a-select-option>
                         <a-select-option value="time">创建时间</a-select-option>
                     </a-select>
                     <a-input v-model:value="searchValue" placeholder="输入关键字查询" allow-clear />
@@ -74,11 +74,11 @@
             <div class="tag-body">
                 <BasicTable @register="registerTableTag">
                     <template #toolbar>
-                        <span class="label">标签名称：</span>
+                        <span class="label">字典名称：</span>
                         <a-input v-model:value="searchValue" placeholder="输入关键字查询" allow-clear style="width: 280px;" />
                         <a-button class="btn" type="primary" @click="searchTable">查询</a-button>
                         <Button type="primary" @click="openDialog(null)">
-                            新增标签
+                            新增字典
                         </Button>
                         <Button type="primary" danger :disabled="hasSelected" @click="delAllData">
                             批量删除
@@ -140,10 +140,10 @@ export default defineComponent({
                 type: "",
                 px: "",
             },
-            drawerTitle: "新增标签",
+            drawerTitle: "新增字典",
             ifShowDialog: false
         });
-        //获取所有标签
+        //获取所有字典
         const getTagsData = () => {
             return new Promise((resolve, reject) => {
                 let param = {
@@ -159,7 +159,7 @@ export default defineComponent({
                 })
             })
         }
-        //获取所有标签类型
+        //获取所有字典类型
         const getTagsTypeData = () => {
             return new Promise((resolve, reject) => {
                 let param = {
@@ -183,21 +183,21 @@ export default defineComponent({
             const filtered = filteredInfo.value || {};
             return [
                 {
-                    title: '标签名称',
+                    title: '字典名称',
                     dataIndex: 'name',
                     key: 'name',
                     filteredValue: filtered.name || null,
                     onFilter: (value, record) => record.name.includes(value)
                 },
                 {
-                    title: '标签编码',
+                    title: '字典编码',
                     dataIndex: 'code',
                     key: 'code',
                     filteredValue: filtered.code || null,
                     onFilter: (value, record) => record.code.includes(value)
                 },
                 {
-                    title: '标签类型',
+                    title: '字典类型',
                     dataIndex: 'type',
                     key: 'type',
                     filteredValue: filtered.type || null,
@@ -233,7 +233,7 @@ export default defineComponent({
             Modal.confirm({
                 title: '删除提示',
                 icon: createVNode(ExclamationCircleOutlined),
-                content: '确定删除标签？',
+                content: '确定删除字典？',
                 centered: true,
                 okText: '确定',
                 okType: 'danger',
@@ -264,7 +264,7 @@ export default defineComponent({
                     type: "",
                     px: "",
                 }
-                data.drawerTitle = '新增标签'
+                data.drawerTitle = '新增字典'
                 data.ifShowDialog = true
             } else {
                 data.formData = {
@@ -275,7 +275,7 @@ export default defineComponent({
                     type: record.type,
                     px: record.px,
                 }
-                data.drawerTitle = '修改标签'
+                data.drawerTitle = '修改字典'
                 data.ifShowDialog = true
             }
         }
@@ -284,7 +284,7 @@ export default defineComponent({
             Modal.confirm({
                 title: '删除提示',
                 icon: createVNode(ExclamationCircleOutlined),
-                content: '确定删除标签？',
+                content: '确定删除字典？',
                 centered: true,
                 okText: '确定',
                 okType: 'danger',
@@ -319,7 +319,7 @@ export default defineComponent({
             registerTableTag,
             { reload, collapseAll, getRowSelection, getSelectRowKeys, setSelectedRowKeys },
         ] = useTable({
-            title: '标签列表', //'菜单列表'
+            title: '字典列表', //'菜单列表'
             api: getTagsData, //加载数据
             columns: columns,
             useSearchForm: false,     //开启搜索区域
@@ -373,7 +373,7 @@ export default defineComponent({
             registerTableTagType,
             { reload: reloadTagType },
         ] = useTable({
-            title: '标签类型列表', //'菜单列表'
+            title: '字典类型列表', //'菜单列表'
             api: getTagsTypeData, //加载数据
             columns: tagTypeColumns,
             useSearchForm: false,     //开启搜索区域