diff --git a/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm.vue b/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm.vue index 49cd4fd..a048cc6 100644 --- a/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm.vue +++ b/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm.vue @@ -297,6 +297,25 @@ + + + @@ -359,6 +378,7 @@ const formData = reactive>({ regional: '', serviceTag: '', currentAddress: '', + orderCap: undefined, }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 8 } }); diff --git a/src/views/elder/elderinfo/ElderInfo.api.ts b/src/views/elder/elderinfo/ElderInfo.api.ts index a5c8788..45075e8 100644 --- a/src/views/elder/elderinfo/ElderInfo.api.ts +++ b/src/views/elder/elderinfo/ElderInfo.api.ts @@ -15,6 +15,7 @@ enum Api { getModifyInfo = '/admin/elderInfo/getModifyInfo', guaAudit = '/admin/elderInfo/guaAudit', elderAudit = '/admin/elderInfo/elderAudit', + changeOrderly = '/admin/elderInfo/changeOrderly', } /** @@ -106,3 +107,11 @@ export const guaAudit = (params) => { export const elderAudit = (params) => { return defHttp.post({ url: Api.elderAudit, params }); }; + +/** + * 长者信息变更护理人员 + * @param params + */ +export const changeOrderly = (params) => { + return defHttp.post({ url: Api.changeOrderly, params }); +}; diff --git a/src/views/elder/elderinfo/ElderInfoList.vue b/src/views/elder/elderinfo/ElderInfoList.vue index 5604bec..94e4de4 100644 --- a/src/views/elder/elderinfo/ElderInfoList.vue +++ b/src/views/elder/elderinfo/ElderInfoList.vue @@ -8,9 +8,9 @@ + + + --> @@ -83,7 +83,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ canResize: false, useSearchForm: false, actionColumn: { - width: 120, + width: 260, fixed: 'right', }, beforeFetch: async (params) => { @@ -138,6 +138,11 @@ function handleSuccess() { (selectedRowKeys.value = []) && reload(); } +function handleAssignCaregiver(elderInfo) { + console.log("🌊 ~ handleAssignCaregiver ~ elderInfo:", elderInfo) + registerModal.value.chooseHlry(elderInfo) +} + /** * 操作栏 */ @@ -150,6 +155,10 @@ function getTableAction(record) { { label: '护理流程', onClick: handleHllc.bind(null, record), + }, + { + label: '指派护理人员', + onClick: handleAssignCaregiver.bind(null, record), } ]; } diff --git a/src/views/elder/elderinfo/components/ElderInfoModal.vue b/src/views/elder/elderinfo/components/ElderInfoModal.vue index c7cb294..f30b070 100644 --- a/src/views/elder/elderinfo/components/ElderInfoModal.vue +++ b/src/views/elder/elderinfo/components/ElderInfoModal.vue @@ -38,6 +38,16 @@ + + + + + + diff --git a/src/views/elder/elderinfo/components/EmployeesSelectInfo.api.ts b/src/views/elder/elderinfo/components/EmployeesSelectInfo.api.ts new file mode 100644 index 0000000..e446d28 --- /dev/null +++ b/src/views/elder/elderinfo/components/EmployeesSelectInfo.api.ts @@ -0,0 +1,93 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/admin/bizEmployeesInfo/bizEmployeesInfo/list', + save='/admin/bizEmployeesInfo/bizEmployeesInfo/add', + edit='/admin/bizEmployeesInfo/bizEmployeesInfo/edit', + deleteOne = '/admin/bizEmployeesInfo/bizEmployeesInfo/delete', + 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', + +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +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 getEmployeesList = (params) => defHttp.get({ url: Api.getEmployeesList, params }); + +export const queryTagsById = (params) => defHttp.get({ url: Api.queryTagsById, params }); +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} + + + +export const checkTags = (params) => { + let url = Api.checkTags; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} +export const removeTags = (params) => { + let url = Api.removeTags; + return defHttp.delete({ url: url, params }, {joinParamsToUrl: true}); +} \ No newline at end of file diff --git a/src/views/elder/elderinfo/components/EmployeesSelectList.vue b/src/views/elder/elderinfo/components/EmployeesSelectList.vue new file mode 100644 index 0000000..cf83c78 --- /dev/null +++ b/src/views/elder/elderinfo/components/EmployeesSelectList.vue @@ -0,0 +1,345 @@ + + + + + \ No newline at end of file