diff --git a/src/api/system/taskExecuteRecord.js b/src/api/system/taskExecuteRecord.js new file mode 100644 index 0000000..aaa3bbb --- /dev/null +++ b/src/api/system/taskExecuteRecord.js @@ -0,0 +1,50 @@ +import request from '@/utils/request' + +// 查询患者管理任务执行记录列表 +export function listTaskExecuteRecord(query) { + return request({ + url: '/system/taskExecuteRecord/list', + method: 'get', + params: query + }) +} +// 查询患者管理任务执行记录详细 +export function getTaskExecuteRecord(id) { + return request({ + url: '/system/taskExecuteRecord/' + id, + method: 'get' + }) +} + +// 新增患者管理任务执行记录 +export function addTaskExecuteRecord(data) { + return request({ + url: '/system/taskExecuteRecord', + method: 'post', + data: data + }) +} + +// 修改患者管理任务执行记录 +export function updateTaskExecuteRecord(data) { + return request({ + url: '/system/taskExecuteRecord', + method: 'put', + data: data + }) +} + +// 删除患者管理任务执行记录 +export function delTaskExecuteRecord(id) { + return request({ + url: '/system/taskExecuteRecord/' + id, + method: 'delete' + }) +} +// 入院记录 +export function selectVisitRecord(id) { + return request({ + url: `/system/taskExecuteRecord/selectVisitRecord?id=${id}` , + method: 'get' + }) +} diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue index ec1dbe5..68dc563 100644 --- a/src/views/manage/patientInfo/index.vue +++ b/src/views/manage/patientInfo/index.vue @@ -231,6 +231,7 @@ export default { }, /** 详情操作 */ handleAuthRole(row) { + this.$router.push({ path: "/patient/patientdetails", query: { diff --git a/src/views/manage/projectdevice/index.vue b/src/views/manage/projectdevice/index.vue index 75bc0e3..829917c 100644 --- a/src/views/manage/projectdevice/index.vue +++ b/src/views/manage/projectdevice/index.vue @@ -8,14 +8,6 @@ v-show="showSearch" label-width="68px" > - - - - @@ -195,17 +153,7 @@ {{ parseTime(scope.row.deviceBindTime, "{y}-{m}-{d}") }} - + - + @@ -309,28 +261,7 @@ - - + @@ -455,22 +386,6 @@ import { getAgencytype } from "@/api/system/agency"; export default { name: "Projectdevice", data() { - //验证身份证 - var isCardId = (rule, value, callback) => { - console.log(value) - if (value==null) { - callback(new Error("身份证号不能为空！")); - } else { - const reg = - /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/; - const card = reg.test(value); - if (!card) { - callback(new Error("身份证号格式有误！")); - } else { - callback(); - } - } - }; return { options: [], // 遮罩层 @@ -498,6 +413,9 @@ export default { pageSize: 10, // patientId: null, patientName: null, + cardNo: null, + deviceType: null, + deviceCode: null, }, queryParams: { pageNum: 1, @@ -525,7 +443,13 @@ export default { { required: true, message: "患者不能为空", trigger: "blur" }, ], cardNo: [ - { required: true, message: "", validator: isCardId, trigger: "blur" }, + { + required: true, + message: "请输入正确的身份证号", + trigger: "blur", + pattern: + /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, + }, ], deviceCode: [ { required: true, message: "设备编码不能为空", trigger: "blur" }, @@ -552,6 +476,11 @@ export default { this.informationqueryParams = { pageNum: 1, pageSize: 10, + patientName: null, + patientName: null, + cardNo: null, + deviceType: null, + deviceCode: null, }; this.informationInfoinfo(); }, diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue index 67d5be1..c52dd56 100644 --- a/src/views/system/agency/index.vue +++ b/src/views/system/agency/index.vue @@ -94,7 +94,9 @@ {{ agencyList.agencyName }} - {{ agencyList.agencyRemark }} + {{ + agencyList.agencyRemark + }} {{ agencyList.agencyStatus == "ON" ? "启用" : "" }} {{ @@ -131,23 +133,25 @@ {{ agencyList.agencyCategoryName }} - {{ - agencyList.agencyCategoryManageLevel == - "NON_PROFIT_MEDICAL_AGENCY" - ? "非营利性医疗机构" - : "" - }} - {{ - agencyList.agencyCategoryManageLevel == - "FOR_PROFIT_MEDICAL_AGENCY" - ? "营利性医疗机构" - : "" - }} - {{ - agencyList.agencyCategoryManageLevel == "OTHER_HEALTH_AGENCY" - ? "其他卫生机构" - : "" - }} + + {{ + agencyList.agencyCategoryManageLevel == + "NON_PROFIT_MEDICAL_AGENCY" + ? "非营利性医疗机构" + : "" + }} + {{ + agencyList.agencyCategoryManageLevel == + "FOR_PROFIT_MEDICAL_AGENCY" + ? "营利性医疗机构" + : "" + }} + {{ + agencyList.agencyCategoryManageLevel == "OTHER_HEALTH_AGENCY" + ? "其他卫生机构" + : "" + }} {{ agencyList.areaName }} @@ -467,7 +471,7 @@ @@ -719,6 +723,13 @@ export default { areaCode: [ { required: true, message: "行政区划不能为空", trigger: "blur" }, ], + agencyPhone: [ + { + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机码", + trigger: "blur", + }, + ], }, treeOptionsagencyCategoryId: [], treeOptions: [], @@ -1114,20 +1125,19 @@ export default { diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue index 23d7154..6a8502d 100644 --- a/src/views/system/department/index.vue +++ b/src/views/system/department/index.vue @@ -724,6 +724,20 @@ export default { departmentName: [ { required: true, message: "科室名称不能为空", trigger: "blur" }, ], + departmentPhone: [ + { + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机码", + trigger: "blur", + }, + ], + departmentMail: [ + { + type: "email", + message: "请输入正确的邮箱地址", + trigger: ["blur", "change"] + } + ], }, }; }, diff --git a/src/views/system/record/record.vue b/src/views/system/record/record.vue new file mode 100644 index 0000000..2264fb8 --- /dev/null +++ b/src/views/system/record/record.vue @@ -0,0 +1,409 @@ + + + + + \ No newline at end of file diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue new file mode 100644 index 0000000..f5fc938 --- /dev/null +++ b/src/views/system/taskExecuteRecord/index.vue @@ -0,0 +1,675 @@ + + + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 7fd519d..1253719 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -356,9 +356,10 @@ @@ -399,8 +400,9 @@ @@ -1024,6 +1026,14 @@ export default { trigger: "blur", }, ], + userCardNo: [ + { + pattern: + /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, + message: "请输入正确的身份证号", + trigger: "blur", + }, + ], email: [ { type: "email", @@ -1063,9 +1073,8 @@ export default { this.$refs.multipleTabledep.toggleRowSelection(selection.pop()); // 设置选择项 } this.nowSelectDatadep = selection; - if(selection.length>0){ + if (selection.length > 0) { this.formlistdep.departmentId = selection[0].departmentId; - } }, // // 科室右边选中事件 @@ -1089,7 +1098,7 @@ export default { }, // 机构左边选中事件 handleSelectionChangenleft(selection) { - console.log(selection,'55555555') + console.log(selection, "55555555"); this.$nextTick(() => { if (selection.length > 1) { this.$refs.multipleTable.clearSelection(); // 清空所有选择 @@ -1097,10 +1106,9 @@ export default { } }); this.nowSelectData = selection; - if(selection.length>0){ + if (selection.length > 0) { this.formlist.agencyId = selection[0].agencyId; } - }, // 机构右边选中事件