diff --git a/src/apis/modules/serviceStaffList.js b/src/apis/modules/serviceStaffList.js index fe2b4bb..18425d2 100644 --- a/src/apis/modules/serviceStaffList.js +++ b/src/apis/modules/serviceStaffList.js @@ -9,7 +9,7 @@ export const getItem = (id) => request.basic.get(`/api/v1/service-people/${id}`) // 添加条目 export const createItem = (params) => request.basic.post('/api/v1/service-people', params) // 更新role -export const updateItem = (id, params) => request.basic.put(`/api/v1/service-people/${id}`, params) +export const updateItem = (params) => request.basic.put(`/api/v1/service-people/${params.id}`, params) // 删除数据 export const delItem = (id) => request.basic.delete(`/api/v1/service-people/${id}`) diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index dc55722..cf7d2d8 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -121,7 +121,7 @@ import BasicSide from './components/BasicSide.vue' import Brand from './components/Brand.vue' import MultiTab from './components/MultiTab.vue' import ConfigDialog from './components/ConfigDialog.vue' - +import storage from '@/utils/storage' defineOptions({ name: 'BasicLayout', }) @@ -132,6 +132,7 @@ const appStore = useAppStore() const dicsStore = useDicsStore() initData() async function initData() { + storage.local.setItem('companyId','C001') await dicsStore.loadProvinces() // 加载省份数据 await dicsStore.loadAllDictData() // 加载字典数据 await dicsStore.loadOrgTree() diff --git a/src/layouts/components/BasicHeader.vue b/src/layouts/components/BasicHeader.vue index 0e7b385..10c5150 100644 --- a/src/layouts/components/BasicHeader.vue +++ b/src/layouts/components/BasicHeader.vue @@ -75,7 +75,7 @@ import { theme as antTheme } from 'ant-design-vue' import { config as conf } from '@/config' import { useI18n } from 'vue-i18n' import storage from '@/utils/storage' - +import useMultiTab from '@/store/modules/multiTab' const { locale, t } = useI18n() defineOptions({ name: 'BasicHeader', @@ -157,6 +157,8 @@ function handleLogout() { */ function handleOpen() { + const multiTab = useMultiTab() + multiTab.$reset() router.replace({path:'/platForm'}) } diff --git a/src/locales/lang/zh-CN/menu.js b/src/locales/lang/zh-CN/menu.js index 3a14886..045e4fe 100644 --- a/src/locales/lang/zh-CN/menu.js +++ b/src/locales/lang/zh-CN/menu.js @@ -35,7 +35,7 @@ export default { dict: '字典管理', 'dict-detail': '字典数据', serverObj: '服务对象管理', - serverObjYunying: '服务对象管理', + yunYingServerObj: '服务对象管理', serverList: '服务对象列表', workorderMenu: '工单管理', mineWorderOrder: '我下的工单', @@ -61,4 +61,5 @@ export default { assessor:'评估员列表', baseSet:'基础配置', serverProjectManage:'服务项目管理', + serviceStaffyuying:'服务人员' } diff --git a/src/router/routes/index.js b/src/router/routes/index.js index b45696c..6bf0a03 100644 --- a/src/router/routes/index.js +++ b/src/router/routes/index.js @@ -16,7 +16,8 @@ import workorder from './workorder' import service from './service' import serviceStaff from './serviceStaff' import serverSet from './serverSet' -import severObjYunying from './severObjYunying' +import yunYingServerObj from './yunyingServerObj' +import serviceStaffYunYing from './serviceStaffYunYing' export default [ ...home, // ...form, @@ -36,5 +37,6 @@ export default [ ...service, ...serviceStaff, ...serverSet, - ...severObjYunying + ...yunYingServerObj, + ...serviceStaffYunYing ] diff --git a/src/router/routes/serviceStaffYunYing.js b/src/router/routes/serviceStaffYunYing.js new file mode 100644 index 0000000..de857d7 --- /dev/null +++ b/src/router/routes/serviceStaffYunYing.js @@ -0,0 +1,29 @@ +import { DollarOutlined } from '@ant-design/icons-vue' + +export default [ + { + path: 'serviceStaffyuying', + name: 'serviceStaffyuying', + component: 'RouteViewLayout', + meta: { + icon: DollarOutlined, + title: '服务人员', + isMenu: true, + keepAlive: true, + permission: '*', + }, + children: [ + { + path: 'serviceStaffList', + name: 'serviceStaffList', + component: 'serviceStaff/serviceStaffList/index.vue', + meta: { + title: '服务人员', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + ], + }, +] diff --git a/src/router/routes/severObjYunying.js b/src/router/routes/severObjYunying.js deleted file mode 100644 index d950c6e..0000000 --- a/src/router/routes/severObjYunying.js +++ /dev/null @@ -1,107 +0,0 @@ -import { DollarOutlined } from '@ant-design/icons-vue' - -export default [ - { - path: 'serverObjYunying', - name: 'serverObjYunying', - component: 'RouteViewLayout', - meta: { - icon: DollarOutlined, - title: '服务对象管理', - isMenu: true, - keepAlive: true, - permission: '*', - }, - children: [ - { - path: 'serverList', - name: 'serverList', - component: 'serverObjYunying/serverList/index.vue', - meta: { - title: '服务对象列表', - isMenu: true, - keepAlive: true, - permission: '*', - }, - }, - { - path: 'allocation', - name: 'allocation', - component: 'serverObjYunying/allocation/index.vue', - meta: { - title: '服务对象分配', - isMenu: true, - keepAlive: true, - permission: '*', - }, - }, - { - path: 'domicile', - name: 'domicile', - component: 'serverObjYunying/domicile/index.vue', - meta: { - title: '户籍对象列表', - isMenu: true, - keepAlive: true, - permission: '*', - }, - }, - { - path: 'institution', - name: 'institution', - component: 'serverObjYunying/institution/index.vue', - meta: { - title: '机构服务对象列表', - isMenu: true, - keepAlive: true, - permission: '*', - }, - }, - { - path: 'toBeInstitution', - name: 'toBeInstitution', - component: 'serverObjYunying/toBeInstitution/index.vue', - meta: { - title: '待完善对象列表', - isMenu: true, - keepAlive: true, - permission: '*', - }, - }, - { - path: 'carePhone', - name: 'carePhone', - component: 'serverObjYunying/carePhone/index.vue', - meta: { - title: '电话关爱对象', - isMenu: true, - keepAlive: true, - permission: '*', - }, - }, - { - path: 'serverSearch', - name: 'serverSearch', - component: 'serverObjYunying/serverSearch/index.vue', - meta: { - title: '服务对象查询', - isMenu: true, - keepAlive: true, - permission: '*', - }, - }, - { - path: 'existence', - name: 'existence', - component: 'serverObjYunying/existence/index.vue', - meta: { - title: '生存状态管理', - isMenu: true, - keepAlive: true, - permission: '*', - }, - } - - ], - }, -] diff --git a/src/router/routes/yunyingServerObj.js b/src/router/routes/yunyingServerObj.js new file mode 100644 index 0000000..8ba8677 --- /dev/null +++ b/src/router/routes/yunyingServerObj.js @@ -0,0 +1,30 @@ +import { DollarOutlined } from '@ant-design/icons-vue' + +export default [ + { + path: 'yunYingServerObj', + name: 'yunYingServerObj', + component: 'RouteViewLayout', + meta: { + icon: DollarOutlined, + title: '服务对象管理', + isMenu: true, + keepAlive: true, + permission: '*', + }, + children: [ + { + path: 'yunYingServerList', + name: 'yunYingServerList', + component: 'yunYingServerObj/yunYingServerList/index.vue', + meta: { + title: '服务对象列表', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + + ], + }, +] diff --git a/src/views/serverObj/serverList/components/EditDialog.vue b/src/views/serverObj/serverList/components/EditDialog.vue index c088eca..ab2c1ea 100644 --- a/src/views/serverObj/serverList/components/EditDialog.vue +++ b/src/views/serverObj/serverList/components/EditDialog.vue @@ -2,484 +2,492 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - 男 - 女 - - - + + + + + 男 + 女 + + + - - - - - - + + + + + + {{ item.introduction }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.introduction }} - - - - + + - - - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - + + + + + {{ + item.introduction }} + + + - - - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - + + + + + + {{ item.introduction }} + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + - - - - - - + - - - - - - {{ item.introduction }} - - - - + + + + + + + + + - - - - - - {{ item.introduction }} - - - - + + + + + + + + - - - - - {{ - item.introduction }} - - - + - - - - - - {{ item.introduction }} - - - - + + + + + + + + + {{ item.introduction }} + + + + - - - - - - {{ item.introduction }} - - - - - - - - - - - - - - - - + + + + + + {{ item.introduction }} + + + + - + + + + + + {{ item.introduction }} + + + + - - - - - - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - - - + + + + + + {{ item.introduction }} + + + + - + + + + + + {{ item.introduction }} + + + + - - - - - - - - - {{ item.introduction }} - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - {{ item.introduction }} - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - {{ item.introduction }} - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - {{ item.introduction }} - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - {{ item.introduction }} - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - {{ item.introduction }} - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - {{ item.introduction }} - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - {{ item.introduction }} - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - {{ item.introduction }} - - - - + + + + + + {{ item.introduction }} + + + + - - - - - - {{ item.introduction }} - - - - + + + + + + {{ item.introduction }} + + + + + + + + {{ + item.introduction }} + + + + + + + + + + - - - - - - {{ item.introduction }} - - - - + + + + + + - - - - - - {{ item.introduction }} - - - - - - - - - - - {{ item.introduction }} - - - - - - - - - - - {{ item.introduction }} - - - - - - - - - - - {{ item.introduction }} - - - - - - - - - - - {{ item.introduction }} - - - - - - - - {{ - item.introduction }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/views/yunYingServerObj/yunYingServerList/index.vue b/src/views/yunYingServerObj/yunYingServerList/index.vue new file mode 100644 index 0000000..233a996 --- /dev/null +++ b/src/views/yunYingServerObj/yunYingServerList/index.vue @@ -0,0 +1,726 @@ + + + + +