From e80a60d41117c215a9e17669ee75f902b9733bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=B9=E6=9E=AD666?= <1403867969@qq.com> Date: Sat, 14 Sep 2024 14:10:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8E=92=E7=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 5 + package.json | 1 + src/api/elderLeave/index.ts | 101 +++ src/api/elderLeave/types.ts | 165 ++++ src/api/handover/index.ts | 63 ++ src/api/handover/types.ts | 131 +++ src/api/handoverTemplate/index.ts | 63 ++ src/api/handoverTemplate/types.ts | 81 ++ src/api/nursingMember/index.ts | 63 ++ src/api/nursingMember/types.ts | 196 +++++ src/api/timingPatrolling/patrolPlan/index.ts | 63 ++ src/api/timingPatrolling/patrolPlan/types.ts | 161 ++++ .../timingPatrolling/patrolProject/index.ts | 63 ++ .../timingPatrolling/patrolProject/types.ts | 116 +++ .../timingPatrolling/patrolRecords/index.ts | 63 ++ .../timingPatrolling/patrolRecords/types.ts | 251 ++++++ src/components/bx/picker/picker.vue | 313 +++++++ src/pages.json | 59 +- src/pages/work.vue | 14 +- src/pages_jiaojieban/pages/add - 副本.vue | 302 +++++++ src/pages_jiaojieban/pages/add.vue | 394 +++++++++ src/pages_jiaojieban/pages/detail.vue | 201 +++++ src/pages_jiaojieban/pages/edit.vue | 356 ++++++++ src/pages_jiaojieban/pages/index.vue | 344 ++++++++ src/pages_paibanplan/pages/index.vue | 5 +- src/pages_xungeng/pages/add.vue | 400 +++++++++ src/pages_xungeng/pages/detail.vue | 211 +++++ src/pages_xungeng/pages/edit.vue | 392 +++++++++ src/pages_xungeng/pages/index.vue | 349 ++++++++ src/uni_modules/piaoyi-editor/changelog.md | 10 + .../components/piaoyi-editor/color-picker.vue | 784 ++++++++++++++++++ .../components/piaoyi-editor/iconfont.css | 123 +++ .../components/piaoyi-editor/iconfont.ttf | Bin 0 -> 6564 bytes .../components/piaoyi-editor/iconfont.woff | Bin 0 -> 4076 bytes .../components/piaoyi-editor/iconfont.woff2 | Bin 0 -> 3296 bytes .../piaoyi-editor/piaoyi-editor.vue | 418 ++++++++++ src/uni_modules/piaoyi-editor/package.json | 15 + src/uni_modules/piaoyi-editor/readme.md | 101 +++ .../uni-datetime-picker/changelog.md | 123 ++- .../uni-datetime-picker/calendar-item.vue | 16 +- .../uni-datetime-picker/calendar.vue | 263 +++--- .../uni-datetime-picker/i18n/en.json | 2 +- .../uni-datetime-picker/time-picker.vue | 54 +- .../uni-datetime-picker.vue | 674 ++++++++------- .../components/uni-datetime-picker/util.js | 405 ++++----- .../uni-datetime-picker/package.json | 5 +- src/uni_modules/uni-icons/changelog.md | 20 + .../components/uni-icons/uni-icons.uvue | 91 ++ .../components/uni-icons/uni-icons.vue | 48 +- .../components/uni-icons/uniicons.css | 65 +- .../components/uni-icons/uniicons.ttf | Bin 35760 -> 35824 bytes .../components/uni-icons/uniicons_file.ts | 664 +++++++++++++++ .../components/uni-icons/uniicons_file_vue.js | 649 +++++++++++++++ src/uni_modules/uni-icons/package.json | 29 +- 54 files changed, 8702 insertions(+), 783 deletions(-) create mode 100644 src/api/elderLeave/index.ts create mode 100644 src/api/elderLeave/types.ts create mode 100644 src/api/handover/index.ts create mode 100644 src/api/handover/types.ts create mode 100644 src/api/handoverTemplate/index.ts create mode 100644 src/api/handoverTemplate/types.ts create mode 100644 src/api/nursingMember/index.ts create mode 100644 src/api/nursingMember/types.ts create mode 100644 src/api/timingPatrolling/patrolPlan/index.ts create mode 100644 src/api/timingPatrolling/patrolPlan/types.ts create mode 100644 src/api/timingPatrolling/patrolProject/index.ts create mode 100644 src/api/timingPatrolling/patrolProject/types.ts create mode 100644 src/api/timingPatrolling/patrolRecords/index.ts create mode 100644 src/api/timingPatrolling/patrolRecords/types.ts create mode 100644 src/components/bx/picker/picker.vue create mode 100644 src/pages_jiaojieban/pages/add - 副本.vue create mode 100644 src/pages_jiaojieban/pages/add.vue create mode 100644 src/pages_jiaojieban/pages/detail.vue create mode 100644 src/pages_jiaojieban/pages/edit.vue create mode 100644 src/pages_jiaojieban/pages/index.vue create mode 100644 src/pages_xungeng/pages/add.vue create mode 100644 src/pages_xungeng/pages/detail.vue create mode 100644 src/pages_xungeng/pages/edit.vue create mode 100644 src/pages_xungeng/pages/index.vue create mode 100644 src/uni_modules/piaoyi-editor/changelog.md create mode 100644 src/uni_modules/piaoyi-editor/components/piaoyi-editor/color-picker.vue create mode 100644 src/uni_modules/piaoyi-editor/components/piaoyi-editor/iconfont.css create mode 100644 src/uni_modules/piaoyi-editor/components/piaoyi-editor/iconfont.ttf create mode 100644 src/uni_modules/piaoyi-editor/components/piaoyi-editor/iconfont.woff create mode 100644 src/uni_modules/piaoyi-editor/components/piaoyi-editor/iconfont.woff2 create mode 100644 src/uni_modules/piaoyi-editor/components/piaoyi-editor/piaoyi-editor.vue create mode 100644 src/uni_modules/piaoyi-editor/package.json create mode 100644 src/uni_modules/piaoyi-editor/readme.md create mode 100644 src/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue create mode 100644 src/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts create mode 100644 src/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js diff --git a/package-lock.json b/package-lock.json index 53e70af..d3e5272 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4824,6 +4824,11 @@ "resolved": "https://registry.npmmirror.com/tinycolor2/-/tinycolor2-1.6.0.tgz", "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==" }, + "tinymce": { + "version": "7.3.0", + "resolved": "https://registry.npmmirror.com/tinymce/-/tinymce-7.3.0.tgz", + "integrity": "sha512-Ls4PgYlpk73XAxBSBqbVmSl8Mb3DuNfgF01GZ0lY6/MOEVRl3IL+VxC1Oe6165e8WqbqVsxO3Qj/PmoYNvQKGQ==" + }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz", diff --git a/package.json b/package.json index 61898ae..c12b44d 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "@ttou/uview-typings": "^2.0.5", "clipboard": "^2.0.11", "dayjs": "^1.11.9", + "tinymce": "^7.3.0", "uview-plus": "^3.1.36", "vue": "^3.2.47", "vue-i18n": "^9.2.2", diff --git a/src/api/elderLeave/index.ts b/src/api/elderLeave/index.ts new file mode 100644 index 0000000..dd5b481 --- /dev/null +++ b/src/api/elderLeave/index.ts @@ -0,0 +1,101 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { ElderLeaveVO, ElderLeaveForm, ElderLeaveQuery } from '@/api/residenceService/elderLeave/types'; + +/** + * 查询在住老人请假列表 + * @param query + * @returns {*} + */ + +export const listElderLeave = (query?: ElderLeaveQuery): AxiosPromise => { + return request({ + url: '/residential/elderLeave/list', + method: 'get', + params: query + }); +}; + +/** + * 查询在住老人请假详细 + * @param id + */ +export const getElderLeave = (id: string | number): AxiosPromise => { + return request({ + url: '/residential/elderLeave/' + id, + method: 'get' + }); +}; + +/** + * 新增在住老人请假 + * @param data + */ +export const addElderLeave = (data: ElderLeaveForm) => { + return request({ + url: '/residential/elderLeave', + method: 'post', + data: data + }); +}; + +/** + * 修改在住老人请假 + * @param data + */ +export const updateElderLeave = (data: ElderLeaveForm) => { + return request({ + url: '/residential/elderLeave', + method: 'put', + data: data + }); +}; + +export const updateActualReturnApi = (data: ElderLeaveForm) => { + return request({ + url: '/residential/elderLeave/actual-return', + method: 'post', + data: data + }); +}; + +export const confirmActualReturnApi = (data: ElderLeaveForm) => { + return request({ + url: '/residential/elderLeave/actual-return', + method: 'put', + data: data + }); +}; + +/** + * 删除在住老人请假 + * @param id + */ +export const delElderLeave = (id: string | number | Array) => { + return request({ + url: '/residential/elderLeave/' + id, + method: 'delete' + }); +}; + +/** + * 审批通过 + */ +export const approveElderLeaveApi = (id: string) => { + return request({ + url: '/residential/elderLeave/approve', + method: 'put', + data: { id } + }); +}; + +/** + * 审批驳回 + */ +export const rejectElderLeaveApi = (id: string) => { + return request({ + url: '/residential/elderLeave/reject', + method: 'put', + data: { id } + }); +} diff --git a/src/api/elderLeave/types.ts b/src/api/elderLeave/types.ts new file mode 100644 index 0000000..4965f9a --- /dev/null +++ b/src/api/elderLeave/types.ts @@ -0,0 +1,165 @@ +export interface ElderLeaveVO { + /** + * 主键 + */ + id: string | number; + + /** + * 创建时间 + */ + createTime: string; + + /** + * 老人姓名 + */ + elderName: string; + + /** + * 老人编号 + */ + elderSn: string; + + /** + * 外出时间 + */ + leaveTime: string; + + /** + * 预计返回时间 + */ + expectedReturnTime: string; + + /** + * 回院状态, dict: inst_return_status + */ + returnStatus: number; + + /** + * 实际返回时间 + */ + actualReturnTime: string; + + /** + * 外出事由 + */ + leaveReason: string; + + /** + * 审批人 + */ + approver: number; + + /** + * 审批状态, dict_type: inst_approval_status + */ + approvalStatus: number; + + /** + * 回院状态确认人 + */ + returnStatusRecognizer: number; + +} + +export interface ElderLeaveForm extends BaseEntity { + /** + * 主键 + */ + id?: string | number; + + /** + * 老人姓名 + */ + elderName?: string; + + /** + * 老人编号 + */ + elderSn?: string; + + /** + * 外出时间 + */ + leaveTime?: string; + + /** + * 预计返回时间 + */ + expectedReturnTime?: string; + + /** + * 实际返回时间 + */ + actualReturnTime?: string; + + /** + * 外出事由 + */ + leaveReason?: string; + + /** + * 回院状态确认人 + */ + returnStatusRecognizer?: number; + + /** + * 是否自动审批 + */ + autoApprove?: boolean; +} + +export interface ElderLeaveQuery extends PageQuery { + + /** + * 老人姓名 + */ + elderName?: string; + + /** + * 老人编号 + */ + elderSn?: string; + + /** + * 外出时间 + */ + leaveTime?: string; + + /** + * 预计返回时间 + */ + expectedReturnTime?: string; + + /** + * 回院状态, dict: inst_return_status + */ + returnStatus?: number; + + /** + * 实际返回时间 + */ + actualReturnTime?: string; + + /** + * 审批人 + */ + approver?: number; + + /** + * 审批状态, dict_type: inst_approval_status + */ + approvalStatus?: number; + + /** + * 回院状态确认人 + */ + returnStatusRecognizer?: number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/handover/index.ts b/src/api/handover/index.ts new file mode 100644 index 0000000..f2aa3bb --- /dev/null +++ b/src/api/handover/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { HandoverVO, HandoverForm, HandoverQuery } from '@/api/residenceService/handover/types'; + +/** + * 查询交接班列表 + * @param query + * @returns {*} + */ + +export const listHandover = (query?: HandoverQuery): AxiosPromise => { + return request({ + url: '/residential/handover/list', + method: 'get', + params: query + }); +}; + +/** + * 查询交接班详细 + * @param id + */ +export const getHandover = (id: string | number): AxiosPromise => { + return request({ + url: '/residential/handover/' + id, + method: 'get' + }); +}; + +/** + * 新增交接班 + * @param data + */ +export const addHandover = (data: HandoverForm) => { + return request({ + url: '/residential/handover', + method: 'post', + data + }); +}; + +/** + * 修改交接班 + * @param data + */ +export const updateHandover = (data: HandoverForm) => { + return request({ + url: '/residential/handover', + method: 'put', + data: data + }); +}; + +/** + * 删除交接班 + * @param id + */ +export const delHandover = (id: string | number | Array) => { + return request({ + url: '/residential/handover/' + id, + method: 'delete' + }); +}; diff --git a/src/api/handover/types.ts b/src/api/handover/types.ts new file mode 100644 index 0000000..c5d064d --- /dev/null +++ b/src/api/handover/types.ts @@ -0,0 +1,131 @@ +export interface HandoverVO { + /** + * 主键 + */ + id: string | number; + + /** + * 操作人 + */ + userId: string | number; + + /** + * 创建时间 + */ + createTime: string; + + /** + * 更新时间 + */ + updateTime: string; + + /** + * 更新操作人 + */ + updateBy: number; + + /** + * 交班员 + */ + handoverInitiator: number; + + /** + * 接收时间 + */ + receiveTime: string; + + /** + * 接班员 + */ + handoverRecipient: number; + + /** + * 备注 + */ + remark: string; + + /** + * 交班开始时间 + */ + startTime: string; + + /** + * 交班结束时间 + */ + endTime: string; + +} + +export interface HandoverForm extends BaseEntity { + /** + * 主键 + */ + id?: string | number; + + /** + * 交班员 + */ + handoverInitiator?: number; + + /** + * 接收时间 + */ + receiveTime?: string; + + /** + * 接班员 + */ + handoverRecipient?: number; + + /** + * 备注 + */ + remark?: string; + + /** + * 交班开始时间 + */ + startTime?: string; + + /** + * 交班结束时间 + */ + endTime?: string; + +} + +export interface HandoverQuery extends PageQuery { + + /** + * 交班员 + */ + handoverInitiator?: number; + + /** + * 接收时间 + */ + receiveTime?: string; + + /** + * 接班员 + */ + handoverRecipient?: number; + + /** + * 交班开始时间 + */ + startTime?: string; + + /** + * 交班结束时间 + */ + endTime?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/handoverTemplate/index.ts b/src/api/handoverTemplate/index.ts new file mode 100644 index 0000000..6656987 --- /dev/null +++ b/src/api/handoverTemplate/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { HandoverTemplateVO, HandoverTemplateForm, HandoverTemplateQuery } from '@/api/residential/handoverTemplate/types'; + +/** + * 查询交接班模板列表 + * @param query + * @returns {*} + */ + +export const listHandoverTemplate = (query?: HandoverTemplateQuery): AxiosPromise => { + return request({ + url: '/residential/handoverTemplate/list', + method: 'get', + params: query + }); +}; + +/** + * 查询交接班模板详细 + * @param id + */ +export const getHandoverTemplate = (id: string | number): AxiosPromise => { + return request({ + url: '/residential/handoverTemplate/' + id, + method: 'get' + }); +}; + +/** + * 新增交接班模板 + * @param data + */ +export const addHandoverTemplate = (data: HandoverTemplateForm) => { + return request({ + url: '/residential/handoverTemplate', + method: 'post', + data: data + }); +}; + +/** + * 修改交接班模板 + * @param data + */ +export const updateHandoverTemplate = (data: HandoverTemplateForm) => { + return request({ + url: '/residential/handoverTemplate', + method: 'put', + data: data + }); +}; + +/** + * 删除交接班模板 + * @param id + */ +export const delHandoverTemplate = (id: string | number | Array) => { + return request({ + url: '/residential/handoverTemplate/' + id, + method: 'delete' + }); +}; diff --git a/src/api/handoverTemplate/types.ts b/src/api/handoverTemplate/types.ts new file mode 100644 index 0000000..1f7b503 --- /dev/null +++ b/src/api/handoverTemplate/types.ts @@ -0,0 +1,81 @@ +export interface HandoverTemplateVO { + /** + * 主键 + */ + id: string | number; + + /** + * 创建时间 + */ + createTime: string; + + /** + * 更新时间 + */ + updateTime: string; + + /** + * 更新操作人 + */ + updateBy: number; + + /** + * 模板名称 + */ + name: string; + + /** + * 交接内容 + */ + content: string; + + /** + * 状态 + */ + status: number; + +} + +export interface HandoverTemplateForm extends BaseEntity { + /** + * 主键 + */ + id?: string | number; + + /** + * 模板名称 + */ + name?: string; + + /** + * 交接内容 + */ + content?: string; + + /** + * 状态 + */ + status?: number; + +} + +export interface HandoverTemplateQuery extends PageQuery { + + /** + * 模板名称 + */ + name?: string; + + /** + * 状态 + */ + status?: number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/nursingMember/index.ts b/src/api/nursingMember/index.ts new file mode 100644 index 0000000..3c7f54e --- /dev/null +++ b/src/api/nursingMember/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { NursingMemberVO, NursingMemberForm, NursingMemberQuery } from '@/api/residenceService/nursingMember/types'; + +/** + * 查询护理成员列表 + * @param query + * @returns {*} + */ + +export const listNursingMember = (query?: NursingMemberQuery): AxiosPromise => { + return request({ + url: '/residential/nursingMember/list', + method: 'get', + params: query + }); +}; + +/** + * 查询护理成员详细 + * @param id + */ +export const getNursingMember = (id: string | number): AxiosPromise => { + return request({ + url: '/residential/nursingMember/' + id, + method: 'get' + }); +}; + +/** + * 新增护理成员 + * @param data + */ +export const addNursingMember = (data: NursingMemberForm) => { + return request({ + url: '/residential/nursingMember', + method: 'post', + data: data + }); +}; + +/** + * 修改护理成员 + * @param data + */ +export const updateNursingMember = (data: NursingMemberForm) => { + return request({ + url: '/residential/nursingMember', + method: 'put', + data: data + }); +}; + +/** + * 删除护理成员 + * @param id + */ +export const delNursingMember = (id: string | number | Array) => { + return request({ + url: '/residential/nursingMember/' + id, + method: 'delete' + }); +}; diff --git a/src/api/nursingMember/types.ts b/src/api/nursingMember/types.ts new file mode 100644 index 0000000..bd8169d --- /dev/null +++ b/src/api/nursingMember/types.ts @@ -0,0 +1,196 @@ +export interface NursingMemberVO { + /** + * 主键 + */ + id: string | number; + + /** + * 编号 + */ + sn: string; + + /** + * 姓名 + */ + name: string; + + /** + * 性别: sys_user_sex + */ + gender: number; + + /** + * 年龄 + */ + age: number; + + /** + * 联系方式 + */ + contact: string; + + /** + * 身份证号 + */ + idNumber: string | number; + + /** + * 民族, dict: inst_ethnic_group + */ + ethnicGroup: number; + + /** + * 文化程度, dict: inst_edu_attainment + */ + eduAttainment: number; + + /** + * 家庭住址 + */ + homeAddress: string; + + /** + * 入职日期 + */ + entryDate: string; + + /** + * 头像url + */ + avatarUrl: string; + +} + +export interface NursingMemberForm extends BaseEntity { + /** + * 主键 + */ + id?: string | number; + + /** + * 操作单位 + */ + deptId?: string | number; + + /** + * 操作人 + */ + userId?: string | number; + + /** + * 编号 + */ + sn?: string; + + /** + * 姓名 + */ + name?: string; + + /** + * 性别: sys_user_sex + */ + gender?: number; + + /** + * 年龄 + */ + age?: number; + + /** + * 联系方式 + */ + contact?: string; + + /** + * 身份证号 + */ + idNumber?: string | number; + + /** + * 民族, dict: inst_ethnic_group + */ + ethnicGroup?: number; + + /** + * 文化程度, dict: inst_edu_attainment + */ + eduAttainment?: number; + + /** + * 家庭住址 + */ + homeAddress?: string; + + /** + * 入职日期 + */ + entryDate?: string; + + /** + * 头像url + */ + avatarUrl?: string; + +} + +export interface NursingMemberQuery extends PageQuery { + + /** + * 操作单位 + */ + deptId?: string | number; + + /** + * 操作人 + */ + userId?: string | number; + + /** + * 编号 + */ + sn?: string; + + /** + * 姓名 + */ + name?: string; + + /** + * 性别: sys_user_sex + */ + gender?: number; + + /** + * 年龄 + */ + age?: number; + + /** + * 联系方式 + */ + contact?: string; + + /** + * 身份证号 + */ + idNumber?: string | number; + + /** + * 民族, dict: inst_ethnic_group + */ + ethnicGroup?: number; + + /** + * 文化程度, dict: inst_edu_attainment + */ + eduAttainment?: number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/timingPatrolling/patrolPlan/index.ts b/src/api/timingPatrolling/patrolPlan/index.ts new file mode 100644 index 0000000..717b608 --- /dev/null +++ b/src/api/timingPatrolling/patrolPlan/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { PatrolPlanVO, PatrolPlanForm, PatrolPlanQuery } from '@/api/elder/patrolPlan/types'; + +/** + * 查询巡更计划列表 + * @param query + * @returns {*} + */ + +export const listPatrolPlan = (query?: PatrolPlanQuery): AxiosPromise => { + return request({ + url: '/elder/patrolPlan/list', + method: 'get', + params: query + }); +}; + +/** + * 查询巡更计划详细 + * @param id + */ +export const getPatrolPlan = (id: string | number): AxiosPromise => { + return request({ + url: '/elder/patrolPlan/' + id, + method: 'get' + }); +}; + +/** + * 新增巡更计划 + * @param data + */ +export const addPatrolPlan = (data: PatrolPlanForm) => { + return request({ + url: '/elder/patrolPlan', + method: 'post', + data: data + }); +}; + +/** + * 修改巡更计划 + * @param data + */ +export const updatePatrolPlan = (data: PatrolPlanForm) => { + return request({ + url: '/elder/patrolPlan', + method: 'put', + data: data + }); +}; + +/** + * 删除巡更计划 + * @param id + */ +export const delPatrolPlan = (id: string | number | Array) => { + return request({ + url: '/elder/patrolPlan/' + id, + method: 'delete' + }); +}; diff --git a/src/api/timingPatrolling/patrolPlan/types.ts b/src/api/timingPatrolling/patrolPlan/types.ts new file mode 100644 index 0000000..9a2ab65 --- /dev/null +++ b/src/api/timingPatrolling/patrolPlan/types.ts @@ -0,0 +1,161 @@ +export interface PatrolPlanVO { + /** + * 记录ID + */ + id: string | number; + + /** + * 巡更日期 + */ + patrolDate: string; + + /** + * 巡更类型 + */ + patrolType: string; + + /** + * 巡更项目 + */ + patrolItem: string; + + /** + * 巡更时段 + */ + patrolPeriod: string; + + /** + * 执行区域 + */ + executionArea: string; + + /** + * 巡更人员 + */ + patrolPersonnel: string; + + /** + * 备注 + */ + remarks: string; + + /** + * 用户ID + */ + userId: string | number; + + /** + * 部门ID + */ + deptId: string | number; + +} + +export interface PatrolPlanForm extends BaseEntity { + /** + * 记录ID + */ + id?: string | number; + + /** + * 巡更日期 + */ + patrolDate?: string; + + /** + * 巡更类型 + */ + patrolType?: string; + + /** + * 巡更项目 + */ + patrolItem?: string; + + /** + * 巡更时段 + */ + patrolPeriod?: string; + + /** + * 执行区域 + */ + executionArea?: string; + + /** + * 巡更人员 + */ + patrolPersonnel?: string; + + /** + * 备注 + */ + remarks?: string; + + /** + * 用户ID + */ + userId?: string | number; + + /** + * 部门ID + */ + deptId?: string | number; + +} + +export interface PatrolPlanQuery extends PageQuery { + + /** + * 巡更日期 + */ + patrolDate?: string; + + /** + * 巡更类型 + */ + patrolType?: string; + + /** + * 巡更项目 + */ + patrolItem?: string; + + /** + * 巡更时段 + */ + patrolPeriod?: string; + + /** + * 执行区域 + */ + executionArea?: string; + + /** + * 巡更人员 + */ + patrolPersonnel?: string; + + /** + * 备注 + */ + remarks?: string; + + /** + * 用户ID + */ + userId?: string | number; + + /** + * 部门ID + */ + deptId?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/timingPatrolling/patrolProject/index.ts b/src/api/timingPatrolling/patrolProject/index.ts new file mode 100644 index 0000000..484c31d --- /dev/null +++ b/src/api/timingPatrolling/patrolProject/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { PatrolProjectVO, PatrolProjectForm, PatrolProjectQuery } from '@/api/elder/patrolProject/types'; + +/** + * 查询巡更项目列表 + * @param query + * @returns {*} + */ + +export const listPatrolProject = (query?: PatrolProjectQuery): AxiosPromise => { + return request({ + url: '/elder/patrolProject/list', + method: 'get', + params: query + }); +}; + +/** + * 查询巡更项目详细 + * @param id + */ +export const getPatrolProject = (id: string | number): AxiosPromise => { + return request({ + url: '/elder/patrolProject/' + id, + method: 'get' + }); +}; + +/** + * 新增巡更项目 + * @param data + */ +export const addPatrolProject = (data: PatrolProjectForm) => { + return request({ + url: '/elder/patrolProject', + method: 'post', + data: data + }); +}; + +/** + * 修改巡更项目 + * @param data + */ +export const updatePatrolProject = (data: PatrolProjectForm) => { + return request({ + url: '/elder/patrolProject', + method: 'put', + data: data + }); +}; + +/** + * 删除巡更项目 + * @param id + */ +export const delPatrolProject = (id: string | number | Array) => { + return request({ + url: '/elder/patrolProject/' + id, + method: 'delete' + }); +}; diff --git a/src/api/timingPatrolling/patrolProject/types.ts b/src/api/timingPatrolling/patrolProject/types.ts new file mode 100644 index 0000000..f6141aa --- /dev/null +++ b/src/api/timingPatrolling/patrolProject/types.ts @@ -0,0 +1,116 @@ +export interface PatrolProjectVO { + /** + * 记录ID + */ + id: string | number; + + /** + * 巡更类型 + */ + patrolType: string; + + /** + * 巡更项目 + */ + patrolItem: string; + + /** + * 创建人ID + */ + createdBy: number; + + /** + * 创建时间 + */ + createdTime: string; + + /** + * 用户ID + */ + userId: string | number; + + /** + * 部门ID + */ + deptId: string | number; + +} + +export interface PatrolProjectForm extends BaseEntity { + /** + * 记录ID + */ + id?: string | number; + + /** + * 巡更类型 + */ + patrolType?: string; + + /** + * 巡更项目 + */ + patrolItem?: string; + + /** + * 创建人ID + */ + createdBy?: number; + + /** + * 创建时间 + */ + createdTime?: string; + + /** + * 用户ID + */ + userId?: string | number; + + /** + * 部门ID + */ + deptId?: string | number; + +} + +export interface PatrolProjectQuery extends PageQuery { + + /** + * 巡更类型 + */ + patrolType?: string; + + /** + * 巡更项目 + */ + patrolItem?: string; + + /** + * 创建人ID + */ + createdBy?: number; + + /** + * 创建时间 + */ + createdTime?: string; + + /** + * 用户ID + */ + userId?: string | number; + + /** + * 部门ID + */ + deptId?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/timingPatrolling/patrolRecords/index.ts b/src/api/timingPatrolling/patrolRecords/index.ts new file mode 100644 index 0000000..3ca8237 --- /dev/null +++ b/src/api/timingPatrolling/patrolRecords/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { PatrolRecordsVO, PatrolRecordsForm, PatrolRecordsQuery } from '@/api/elder/patrolRecords/types'; + +/** + * 查询巡更记录列表 + * @param query + * @returns {*} + */ + +export const listPatrolRecords = (query?: PatrolRecordsQuery): AxiosPromise => { + return request({ + url: '/elder/patrolRecords/list', + method: 'get', + params: query + }); +}; + +/** + * 查询巡更记录详细 + * @param id + */ +export const getPatrolRecords = (id: string | number): AxiosPromise => { + return request({ + url: '/elder/patrolRecords/' + id, + method: 'get' + }); +}; + +/** + * 新增巡更记录 + * @param data + */ +export const addPatrolRecords = (data: PatrolRecordsForm) => { + return request({ + url: '/elder/patrolRecords', + method: 'post', + data: data + }); +}; + +/** + * 修改巡更记录 + * @param data + */ +export const updatePatrolRecords = (data: PatrolRecordsForm) => { + return request({ + url: '/elder/patrolRecords', + method: 'put', + data: data + }); +}; + +/** + * 删除巡更记录 + * @param id + */ +export const delPatrolRecords = (id: string | number | Array) => { + return request({ + url: '/elder/patrolRecords/' + id, + method: 'delete' + }); +}; diff --git a/src/api/timingPatrolling/patrolRecords/types.ts b/src/api/timingPatrolling/patrolRecords/types.ts new file mode 100644 index 0000000..267ab8a --- /dev/null +++ b/src/api/timingPatrolling/patrolRecords/types.ts @@ -0,0 +1,251 @@ +export interface PatrolRecordsVO { + /** + * 记录ID + */ + id: string | number; + + /** + * 巡更日期 + */ + patrolDate: string; + + /** + * 巡更类型 + */ + patrolType: string; + + /** + * 巡更项目 + */ + patrolItem: string; + + /** + * 巡更时段 + */ + patrolPeriod: string; + + /** + * 巡更人员 + */ + patrolPersonnel: string; + + /** + * 巡更状态 + */ + patrolStatus: string; + + /** + * 操作类型 + */ + operationType: string; + + /** + * 异常时间 + */ + exceptionTime: string; + + /** + * 异常描述 + */ + exceptionDescription: string; + + /** + * 处理措施 + */ + correctiveAction: string; + + /** + * 结束时间 + */ + endTime: string; + + /** + * 结束描述 + */ + endDescription: string; + + /** + * 备注 + */ + remarks: string; + + /** + * 用户ID + */ + userId: string | number; + + /** + * 部门ID + */ + deptId: string | number; + +} + +export interface PatrolRecordsForm extends BaseEntity { + /** + * 记录ID + */ + id?: string | number; + + /** + * 巡更日期 + */ + patrolDate?: string; + + /** + * 巡更类型 + */ + patrolType?: string; + + /** + * 巡更项目 + */ + patrolItem?: string; + + /** + * 巡更时段 + */ + patrolPeriod?: string; + + /** + * 巡更人员 + */ + patrolPersonnel?: string; + + /** + * 巡更状态 + */ + patrolStatus?: string; + + /** + * 操作类型 + */ + operationType?: string; + + /** + * 异常时间 + */ + exceptionTime?: string; + + /** + * 异常描述 + */ + exceptionDescription?: string; + + /** + * 处理措施 + */ + correctiveAction?: string; + + /** + * 结束时间 + */ + endTime?: string; + + /** + * 结束描述 + */ + endDescription?: string; + + /** + * 备注 + */ + remarks?: string; + + /** + * 用户ID + */ + userId?: string | number; + + /** + * 部门ID + */ + deptId?: string | number; + +} + +export interface PatrolRecordsQuery extends PageQuery { + + /** + * 巡更日期 + */ + patrolDate?: string; + + /** + * 巡更类型 + */ + patrolType?: string; + + /** + * 巡更项目 + */ + patrolItem?: string; + + /** + * 巡更时段 + */ + patrolPeriod?: string; + + /** + * 巡更人员 + */ + patrolPersonnel?: string; + + /** + * 巡更状态 + */ + patrolStatus?: string; + + /** + * 操作类型 + */ + operationType?: string; + + /** + * 异常时间 + */ + exceptionTime?: string; + + /** + * 异常描述 + */ + exceptionDescription?: string; + + /** + * 处理措施 + */ + correctiveAction?: string; + + /** + * 结束时间 + */ + endTime?: string; + + /** + * 结束描述 + */ + endDescription?: string; + + /** + * 备注 + */ + remarks?: string; + + /** + * 用户ID + */ + userId?: string | number; + + /** + * 部门ID + */ + deptId?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/components/bx/picker/picker.vue b/src/components/bx/picker/picker.vue new file mode 100644 index 0000000..dc9221e --- /dev/null +++ b/src/components/bx/picker/picker.vue @@ -0,0 +1,313 @@ + + + + + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 908246a..4e785ed 100644 --- a/src/pages.json +++ b/src/pages.json @@ -245,7 +245,7 @@ { "path": "index", "style": { - "navigationBarTitleText": "老人信息" + "navigationBarTitleText": "老人档案" } }, { @@ -314,11 +314,64 @@ "root": "pages_jiaojieban/pages", "pages": [ { - "path": "rizhi", + "path": "index", + "style": { + "navigationBarTitleText": "交接班列表" + } + }, + { + "path": "rizhi", "style": { "navigationBarTitleText": "交接班日志" } - } + }, + { + "path": "detail", + "style": { + "navigationBarTitleText": "交接班详情" + } + }, + { + "path": "edit", + "style": { + "navigationBarTitleText": "修改" + } + }, + { + "path": "add", + "style": { + "navigationBarTitleText": "新增" + } + } + ] + }, + { + "root": "pages_xungeng/pages", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "巡更列表" + } + }, + { + "path": "detail", + "style": { + "navigationBarTitleText": "详情" + } + }, + { + "path": "edit", + "style": { + "navigationBarTitleText": "修改" + } + }, + { + "path": "add", + "style": { + "navigationBarTitleText": "新增" + } + } ] }, { diff --git a/src/pages/work.vue b/src/pages/work.vue index 5a70774..8876dfb 100644 --- a/src/pages/work.vue +++ b/src/pages/work.vue @@ -72,7 +72,7 @@ - 老人信息 + 老人档案 @@ -100,9 +100,15 @@ - + - 交接班日志 + 交接班管理 + + + + + + 巡更管理 @@ -162,7 +168,7 @@ display: flex; flex-direction: column; box-sizing: border-box; - background-color: #fff; + background-color: #f5f5f5; min-height: 100%; height: auto; } diff --git a/src/pages_jiaojieban/pages/add - 副本.vue b/src/pages_jiaojieban/pages/add - 副本.vue new file mode 100644 index 0000000..9b93827 --- /dev/null +++ b/src/pages_jiaojieban/pages/add - 副本.vue @@ -0,0 +1,302 @@ + + + + + + \ No newline at end of file diff --git a/src/pages_jiaojieban/pages/add.vue b/src/pages_jiaojieban/pages/add.vue new file mode 100644 index 0000000..c8507cb --- /dev/null +++ b/src/pages_jiaojieban/pages/add.vue @@ -0,0 +1,394 @@ + + + + + + \ No newline at end of file diff --git a/src/pages_jiaojieban/pages/detail.vue b/src/pages_jiaojieban/pages/detail.vue new file mode 100644 index 0000000..6ae0365 --- /dev/null +++ b/src/pages_jiaojieban/pages/detail.vue @@ -0,0 +1,201 @@ + + + + + + \ No newline at end of file diff --git a/src/pages_jiaojieban/pages/edit.vue b/src/pages_jiaojieban/pages/edit.vue new file mode 100644 index 0000000..053e307 --- /dev/null +++ b/src/pages_jiaojieban/pages/edit.vue @@ -0,0 +1,356 @@ + + + + + + \ No newline at end of file diff --git a/src/pages_jiaojieban/pages/index.vue b/src/pages_jiaojieban/pages/index.vue new file mode 100644 index 0000000..a1b75ce --- /dev/null +++ b/src/pages_jiaojieban/pages/index.vue @@ -0,0 +1,344 @@ + + + + + + \ No newline at end of file diff --git a/src/pages_paibanplan/pages/index.vue b/src/pages_paibanplan/pages/index.vue index 02a22b8..85fec5a 100644 --- a/src/pages_paibanplan/pages/index.vue +++ b/src/pages_paibanplan/pages/index.vue @@ -173,10 +173,11 @@ const dates = []; let currentDate = new Date(); for (let i = 0; i < 7; i++) { + // currentDate.setDate(currentDate.getDate()-1); currentDate.setDate(currentDate.getDate() + 1); dates.push({ - // day: currentDate.toLocaleDateString(), - name: getWeekday(currentDate), + name: currentDate.toLocaleDateString(), + // name: getWeekday(currentDate), }); } nextWeekDates.value = dates; diff --git a/src/pages_xungeng/pages/add.vue b/src/pages_xungeng/pages/add.vue new file mode 100644 index 0000000..35bd8f1 --- /dev/null +++ b/src/pages_xungeng/pages/add.vue @@ -0,0 +1,400 @@ +