yangjun
/
nursing_unit_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

改名：employess改为employees，包括类名，页面名，接口名，参数名

This commit is contained in:
曹磊 2026-02-03 10:21:37 +08:00
parent e51cb4fcc0
commit 43e62042fd
9 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/biz/bizEmployeesInfo/BizEmployeesInfo.api.ts
View File

@ -11,16 +11,16 @@ enum Api {
deleteBatch = '/admin/bizEmployeesInfo/bizEmployeesInfo/deleteBatch',
importExcel = '/admin/bizEmployeesInfo/bizEmployeesInfo/importExcel',
exportXls = '/admin/bizEmployeesInfo/bizEmployeesInfo/exportXls',
getEmployeesList = '/services/serviceTag/serviceTag/getEmployeesList',
queryTagsById = '/services/serviceTag/serviceTag/queryById',
checkTags='/bizEmployeesInfo/nuBizEmployeesServcieTags/add',
removeTags = '/bizEmployeesInfo/nuBizEmployeesServcieTags/delete',
getEmployessServiceTags = '/services/serviceTag/serviceTag/getEmployessServiceTags',
queryTreeListForRole = '/employessPermission/nuAppEmployessPermission/queryTreeList',
queryRolePermission = '/employessPermission/nuAppEmployessPermission/queryEmployessPermission',
saveRolePermissionList = '/employessPermission/nuAppEmployessPermission/saveRolePermissionList',
queryDataRule = '/employessPermission/nuAppEmployessPermission/queryDataRule',
getEmployeesServiceTags = '/services/serviceTag/serviceTag/getEmployeesServiceTags',
queryTreeListForRole = '/employeesPermission/nuAppEmployeesPermission/queryTreeList',
queryRolePermission = '/employeesPermission/nuAppEmployeesPermission/queryEmployeesPermission',
saveRolePermissionList = '/employeesPermission/nuAppEmployeesPermission/saveRolePermissionList',
queryDataRule = '/employeesPermission/nuAppEmployeesPermission/queryDataRule',
qyList = '/nuBaseInfo/nuBaseInfo/qyPemissionList',
}
@ -42,7 +42,7 @@ export const getImportUrl = Api.importExcel;
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
export const qyList = (params) => defHttp.get({ url: Api.qyList, params });
export const getEmployessServiceTags = (params) => defHttp.get({ url: Api.getEmployessServiceTags, params });
export const getEmployeesServiceTags = (params) => defHttp.get({ url: Api.getEmployeesServiceTags, params });
export const getEmployeesList = (params) => defHttp.get({ url: Api.getEmployeesList, params });
export const queryTagsById = (params) => defHttp.get({ url: Api.queryTagsById, params });
@ -119,4 +119,4 @@ export const queryDataRule = (params) =>
/**
* 保存角色数据规则
*/
export const saveDataRule = (params) => defHttp.post({ url: Api.queryDataRule, params });
export const saveDataRule = (params) => defHttp.post({ url: Api.queryDataRule, params });

4
src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
View File

@ -191,10 +191,10 @@ function handleHeadPath(headPath) {
// 分配账号
function handleFpzh(item) {
defHttp.get({ url: '/sys/user/queryByEmployessId', params: { employessId: item.id } }).then(res => {
defHttp.get({ url: '/sys/user/queryByEmployeesId', params: { employeesId: item.id } }).then(res => {
console.log("🚀 ~ handleFpzh ~ res:", res)
if (res == null) {
var record = { employessId: item.id, phone: item.tel, realname: item.name, sex: item.sex ? parseInt(item.sex) : '' }
var record = { employeesId: item.id, phone: item.tel, realname: item.name, sex: item.sex ? parseInt(item.sex) : '' }
console.log("🚀 ~ defHttp.get ~ record:", record)
openDrawer(true, {
record,

14
src/views/biz/bizEmployeesInfo/components/RolePermissionDrawer.vue
View File

@ -1,6 +1,6 @@
<template>
<BasicDrawer v-bind="$attrs" @register="registerDrawer" width="650px" destroyOnClose showFooter>
<template #title>
@ -19,7 +19,7 @@
<a-tag color="purple" v-if="itemNu.areaFlag==4">{{itemNu.areaFlag_dictText}}</a-tag>
</template>
<a-card title="基础功能" bodyStyle="padding: 14px;" headStyle="min-height: 40px;">
<template v-for="(item,index) in treeData" :key="index">
<template v-for="(item,index) in treeData" :key="index">
<template v-if="item.code === 'hldy' && itemNu.areaFlag == 1">
<template v-for="itemOne in item.children">
<a-checkbox :checked="true" disabled style="margin-top:10px;">{{ itemOne.slotTitle }}</a-checkbox>
@ -34,7 +34,7 @@
</a-card>
<a-card title="扩展功能" style="margin-top: 10px;" headStyle="min-height: 40px;" bodyStyle="padding: 14px;">
<template v-for="(item,index) in treeData" :key="index">
<template v-for="(item,index) in treeData" :key="index">
<template v-if="item.code === 'kzgn'">
<a-checkbox-group v-model:value="itemNu.permissionIds" style="margin-top: -10px;">
<template v-for="itemOne in item.children">
@ -46,7 +46,7 @@
</a-card>
</a-card>
</div>
@ -112,8 +112,8 @@ const formData = reactive<Record<string, any>>({
}
// update-end--author:liaozhiyang---date:20240531---for：【TV360X-590】角色授权弹窗操作缓存
//初始化角色菜单数据
const permResult = await queryRolePermission({ employessId: unref(roleId) });
var nuList = await qyList({ employessId: unref(roleId) });
const permResult = await queryRolePermission({ employeesId: unref(roleId) });
var nuList = await qyList({ employeesId: unref(roleId) });
for(var i=0;i<nuList.records.length;i++){
var nu = nuList.records[i];
//主要用于防止checkbox选中时清除原来的数据
@ -190,7 +190,7 @@ const formData = reactive<Record<string, any>>({
defaultCheckedKeys.value = permResult;
}
}
// VUE角色授权重复保存 #352
async function doSave(params) {
console.log("🚀 ~ doSave ~ params:", params)

20
src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue
View File

@ -50,7 +50,7 @@
</a-col>
</a-row>
</div>
</template>
<script lang="ts" name="bizEmployeesInfo-nuBizEmployeesServcieTags" setup>
@ -59,7 +59,7 @@
import {useModal} from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage'
import { serviceTagcolumns ,employeesTagcolumns } from '../BizEmployeesInfo.data';
import { getEmployeesList,queryTagsById,checkTags,removeTags,getEmployessServiceTags } from '../BizEmployeesInfo.api';
import { getEmployeesList,queryTagsById,checkTags,removeTags,getEmployeesServiceTags } from '../BizEmployeesInfo.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import { useUserStore } from '/@/store/modules/user';
import { number } from 'vue-types';
@ -114,7 +114,7 @@ import { defHttp } from '/@/utils/http/axios';
})
.finally(() => {
reload();
getEmployessServiceTagsList();
getEmployeesServiceTagsList();
});
}
/**
@ -126,7 +126,7 @@ import { defHttp } from '/@/utils/http/axios';
})
.finally(() => {
reload();
getEmployessServiceTagsList();
getEmployeesServiceTagsList();
});
}
@ -138,7 +138,7 @@ import { defHttp } from '/@/utils/http/axios';
console.log(record);
rowA.value = 18;
rowB.value = 6;
queryTagsById({ id: record.employeesTagsId }).then(item => {
console.log(item);
tagsDetailData.value = item.directives;
@ -151,7 +151,7 @@ import { defHttp } from '/@/utils/http/axios';
rowA.value = 18;
rowB.value = 6;
console.log(record);
queryTagsById({ id: record.id }).then(item => {
console.log(item);
tagsDetailData.value = item.directives;
@ -176,9 +176,9 @@ import { defHttp } from '/@/utils/http/axios';
}
//获取员工已获取的指令标签
function getEmployessServiceTagsList(){
function getEmployeesServiceTagsList(){
const model = {employeesId:employeesInfo.value.id};
getEmployessServiceTags(model).then(item => {
getEmployeesServiceTags(model).then(item => {
employeesDataSource.value = item;
});
}
@ -190,7 +190,7 @@ import { defHttp } from '/@/utils/http/axios';
rowA.value = 24;
rowB.value = 0;
reload();
getEmployessServiceTagsList();
getEmployeesServiceTagsList();
}
function submitForm(){
emit('ok');
@ -212,4 +212,4 @@ import { defHttp } from '/@/utils/http/axios';
// background-image: url(../../../../../public/resource/img/titleBackground1.jpg);
// width: 100px;
}
</style>
</style>

8
src/views/elder/elderinfo/components/EmployeesSelectInfo.api.ts
View File

@ -11,12 +11,12 @@ enum Api {
deleteBatch = '/admin/bizEmployeesInfo/bizEmployeesInfo/deleteBatch',
importExcel = '/admin/bizEmployeesInfo/bizEmployeesInfo/importExcel',
exportXls = '/admin/bizEmployeesInfo/bizEmployeesInfo/exportXls',
getEmployeesList = '/services/serviceTag/serviceTag/getEmployeesList',
queryTagsById = '/services/serviceTag/serviceTag/queryById',
checkTags='/bizEmployeesInfo/nuBizEmployeesServcieTags/add',
removeTags = '/bizEmployeesInfo/nuBizEmployeesServcieTags/delete',
getEmployessServiceTags = '/services/serviceTag/serviceTag/getEmployessServiceTags',
getEmployeesServiceTags = '/services/serviceTag/serviceTag/getEmployeesServiceTags',
}
@ -36,7 +36,7 @@ export const getImportUrl = Api.importExcel;
* @param params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
export const getEmployessServiceTags = (params) => defHttp.get({ url: Api.getEmployessServiceTags, params });
export const getEmployeesServiceTags = (params) => defHttp.get({ url: Api.getEmployeesServiceTags, params });
export const getEmployeesList = (params) => defHttp.get({ url: Api.getEmployeesList, params });
export const queryTagsById = (params) => defHttp.get({ url: Api.queryTagsById, params });
@ -90,4 +90,4 @@ export const checkTags = (params) => {
export const removeTags = (params) => {
let url = Api.removeTags;
return defHttp.delete({ url: url, params }, {joinParamsToUrl: true});
}
}

14
src/views/elder/elderinfo/components/EmployeesSelectList.vue
View File

@ -131,7 +131,7 @@ const isEmployeeSelected = (employeeId: string) => {
// 修改：处理卡片点击事件（多选功能）
const handleCardClick = (employee: any) => {
const index = selectedEmployees.value.findIndex(emp => emp.id === employee.id);
if (index > -1) {
// 如果已选中，则取消选中
selectedEmployees.value.splice(index, 1);
@ -152,10 +152,10 @@ function handleHeadPath(headPath) {
// 分配账号
function handleFpzh(item) {
defHttp.get({ url: '/sys/user/queryByEmployessId', params: { employessId: item.id } }).then(res => {
defHttp.get({ url: '/sys/user/queryByEmployeesId', params: { employeesId: item.id } }).then(res => {
console.log("🚀 ~ handleFpzh ~ res:", res)
if (res == null) {
var record = { employessId: item.id, phone: item.tel, realname: item.name, sex: item.sex ? parseInt(item.sex) : '' }
var record = { employeesId: item.id, phone: item.tel, realname: item.name, sex: item.sex ? parseInt(item.sex) : '' }
console.log("🚀 ~ defHttp.get ~ record:", record)
openDrawer(true, {
record,
@ -221,11 +221,11 @@ onMounted(() => {
function show(elderInfo_) {
elderInfo.value = elderInfo_;
selectedEmployees.value = [];
// 修改：解析逗号分隔的orderly字段
if (elderInfo_.orderly) {
const orderlyIds = elderInfo_.orderly.split(',').map(id => id.trim()).filter(id => id);
// 在数据加载完成后设置选中状态
setTimeout(() => {
orderlyIds.forEach(id => {
@ -256,7 +256,7 @@ function hlryConfirm() {
// 修改：将选中的员工ID用逗号拼接
const orderlyIds = selectedEmployees.value.map(emp => emp.id).join(',');
let params = { id: elderInfo.value.id, orderly: orderlyIds }
changeOrderly(params).then(res => {
emit('success')
})
@ -365,4 +365,4 @@ defineExpose({
width: 70px;
font-size: 12px;
}
</style>
</style>

2
src/views/system/user/user.data.ts
View File

@ -131,7 +131,7 @@ export const formSchema: FormSchema[] = [
},
{
label: '员工id',
field: 'employessId',
field: 'employeesId',
component: 'Input',
show: false,
},

8
src/views/test/index copy.vue
View File

@ -708,12 +708,12 @@ const getOnlineUsers = () => {
const updateOnlineUsers = (users) => {
console.log("🌊 ~ updateOnlineUsers ~ users:", users)
const userList = users.map(user => {
// 如果是对象格式（有employessId和realname）
// 如果是对象格式（有employeesId和realname）
if (user && typeof user === 'object') {
return {
userId: user.employessId || user.userId || user.id || '',
userId: user.employeesId || user.userId || user.id || '',
userName: user.realname || user.username || user.userName || user.userId || '',
checked: selectedUsers.value.includes(user.employessId || user.userId || user.id || ''),
checked: selectedUsers.value.includes(user.employeesId || user.userId || user.id || ''),
// 保持原有字段
...user
};
@ -1514,4 +1514,4 @@ onMounted(() => {
border-top: 1px solid #f0f0f0;
text-align: right;
}
</style>
</style>

6
src/views/test/index.vue
View File

@ -930,9 +930,9 @@ const getOnlineUsers = () => {
const updateOnlineUsers = (users) => {
console.log("🌊 ~ updateOnlineUsers ~ users:", users)
const userList = users.map(user => {
// 如果是对象格式（有employessId和realname）
// 如果是对象格式（有employeesId和realname）
if (user && typeof user === 'object') {
const userId = user.employessId || user.userId || user.id || '';
const userId = user.employeesId || user.userId || user.id || '';
const realname = user.realname || '';
// 缓存用户真实姓名
@ -1926,4 +1926,4 @@ onMounted(async () => {
border-top: 1px solid #f0f0f0;
text-align: right;
}
</style>
</style>