改名:employess改为employees,包括类名,页面名,接口名,参数名
This commit is contained in:
parent
e51cb4fcc0
commit
43e62042fd
|
|
@ -16,11 +16,11 @@ enum Api {
|
|||
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 });
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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选中时清除原来的数据
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
});
|
||||
|
||||
}
|
||||
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ enum Api {
|
|||
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 });
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ export const formSchema: FormSchema[] = [
|
|||
},
|
||||
{
|
||||
label: '员工id',
|
||||
field: 'employessId',
|
||||
field: 'employeesId',
|
||||
component: 'Input',
|
||||
show: false,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 || '';
|
||||
|
||||
// 缓存用户真实姓名
|
||||
|
|
|
|||
Loading…
Reference in New Issue