From 34e65ad2fb36b0249046665d126db9681615c7d3 Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Tue, 29 Aug 2023 15:08:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 25 +-- src/views/Home.vue | 203 +++++++++++++----- .../basic-dictionary/SampleContainer.vue | 7 +- src/views/doctorCheck/personnelBatch.vue | 2 +- src/views/doctorCheck/positiveresults.vue | 101 +++++++++ .../doctorCheck/unitphysicalexamination.vue | 124 +++++++++++ src/views/fee-settings/diseaseStatistics.vue | 101 +++++++++ 7 files changed, 479 insertions(+), 84 deletions(-) create mode 100644 src/views/doctorCheck/positiveresults.vue create mode 100644 src/views/doctorCheck/unitphysicalexamination.vue create mode 100644 src/views/fee-settings/diseaseStatistics.vue diff --git a/src/router/index.js b/src/router/index.js index 3448c43..72aaa05 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -276,30 +276,9 @@ const routes = [ path: "/sumDoctorCheck", name: "总检医生诊台", component: () => import("../views/doctorCheck/sumDoctorCheck.vue"), - }, - //---------------------- 体 检 end ---------------------- - //---------------------- 体检查询 start ---------------------- - { - path: "/report", - name: "体检报告", - component: () => import("../views/report/report.vue"), - }, - { - path: "/checkStatus", - name: "组合项目检查状态", - component: () => import("../views/report/checkStatus.vue"), }, - { - path: "/chargeAsbitem", - name: "人员费用组合项目", - component: () => import("../views/report/chargeAsbitem.vue"), - }, - { - path: "/unCheckAsbitem", - name: "人员未检组合项目", - component: () => import("../views/report/unCheckAsbitem.vue"), - }, - //---------------------- 体检查询 end ---------------------- + + //---------------------- 体 检 end ---------------------- ], }, ]; diff --git a/src/views/Home.vue b/src/views/Home.vue index 0bfbb18..b0715a8 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -8,10 +8,16 @@ 用户权限管理 - 组织架构 + 组织架构 角色管理 - 用户管理 - 安全日志 + 用户管理 + 安全日志 @@ -20,27 +26,61 @@ 基础字典 - 导引类别 - 体检报告类别 + 导引类别 + 体检报告类别 性别 - 婚姻状况 + 婚姻状况 民族 籍贯 - 结果状态 - 体检类别 - 人员类别 - 仪器类别 - 标本类型 + 结果状态 + 体检类别 + 人员类别 + 仪器类别 + 标本类型 计量单位 - 诊断后缀 - 体检结论类别 - 体检结论 - 标本容器 - 常用字符类别 - 常用字符 - 客户单位类别 - 项目默认结果 - 诊断级别 + 诊断后缀 + 体检结论类别 + 体检结论 + 标本容器 + 常用字符类别 + 常用字符 + 客户单位类别 + 项目默认结果 + 诊断级别 @@ -49,7 +89,9 @@ 收费设置 - 发票项目类别 + 发票项目类别 支付方式 会员卡类别 会员卡登记 @@ -62,10 +104,14 @@ 常用设置 - 项目类别 + 项目类别 项目设置 组合项目 - 条码分组 + 条码分组 诊断 - 诊断模板 - 项目结果模板 - 项目结果匹配 - 项目模板 - 套餐 - 系统参数 + 诊断模板 + 项目结果模板 + 项目结果匹配 + 项目模板 + 套餐 + 系统参数 @@ -91,13 +149,27 @@ 体检登记 - 体检单位设置 - 单位分组设置 - 体检人员登记 - 人员批量登记 - 体检人员签到 - 体检表回收 - 弃检登记 + 体检单位设置 + 单位分组设置 + 体检人员登记 + 人员批量登记 + 体检人员签到 + 体检表回收 + 弃检登记 体检收费 @@ -109,22 +181,12 @@ 体检医生诊台 总检医生诊台 + - -
- - 体检查询 - - 体检报告 - 组合项目检查状态 - 人员费用组合项目 - 人员未检组合项目 - 回收表格查询 - - -
+ +
当前用户{{ user }} @@ -133,24 +195,51 @@ 操作 - 退出登录 - 修改密码 + 退出登录 + 修改密码
- - + + - + - + - + @@ -413,7 +502,7 @@ export default { handleCommand(command) { if (this.router.path != command) { this.router.path = command; - this.$router.push({ path: command }).catch(() => { }) + this.$router.push({ path: command }).catch(() => {}); } }, //确定修改密码按钮 diff --git a/src/views/basic-dictionary/SampleContainer.vue b/src/views/basic-dictionary/SampleContainer.vue index b86f75b..320a1c6 100644 --- a/src/views/basic-dictionary/SampleContainer.vue +++ b/src/views/basic-dictionary/SampleContainer.vue @@ -203,6 +203,7 @@ import { specimentopbottom, specimensort, } from "../../request/systemapi"; +import { lognis } from "@/request/ruquset"; export default { data() { return { @@ -234,7 +235,7 @@ export default { containerColor: 1089274, containerRemark: "", }, - color16: "#409EFF", + color16: "", curRow: {}, }; }, @@ -259,7 +260,6 @@ export default { hexColor = hexColor.substring(1); // 转换为十进制 this.form.containerColor = parseInt(hexColor, 16); - console.log(this.form.containerColor); // this.form.containerColor = parseInt(v) // console.log(this.form.containerColor); @@ -297,7 +297,6 @@ export default { Sortable.create(tbody, { handle: ".move", animation: 300, - onEnd({ newIndex, oldIndex }) { _this.isshow = false; const currRow = _this.tableData.splice(oldIndex, 1)[0]; @@ -382,6 +381,8 @@ export default { }, //点击列表通过id查询 rowick(row) { + this.inputcontainerColor(this.form.containerColor); + console.log(this.form.containerColor); Containerid(row.id).then((res) => { this.curRow = { ...res.data }; // console.log(res); diff --git a/src/views/doctorCheck/personnelBatch.vue b/src/views/doctorCheck/personnelBatch.vue index 0379b90..f3b0691 100644 --- a/src/views/doctorCheck/personnelBatch.vue +++ b/src/views/doctorCheck/personnelBatch.vue @@ -342,7 +342,7 @@ export default { //数据列没有绑定 async submitBatch() { let res = null, - confirm = null; + confirm = null; for (let i = 0; i < this.tableData.length; i++) { this.tableData[i].isAutoCreateDepartment = this.form.isAutoCreateDepartment; diff --git a/src/views/doctorCheck/positiveresults.vue b/src/views/doctorCheck/positiveresults.vue new file mode 100644 index 0000000..8708365 --- /dev/null +++ b/src/views/doctorCheck/positiveresults.vue @@ -0,0 +1,101 @@ + + + \ No newline at end of file diff --git a/src/views/doctorCheck/unitphysicalexamination.vue b/src/views/doctorCheck/unitphysicalexamination.vue new file mode 100644 index 0000000..46706c7 --- /dev/null +++ b/src/views/doctorCheck/unitphysicalexamination.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/src/views/fee-settings/diseaseStatistics.vue b/src/views/fee-settings/diseaseStatistics.vue new file mode 100644 index 0000000..fb44822 --- /dev/null +++ b/src/views/fee-settings/diseaseStatistics.vue @@ -0,0 +1,101 @@ + + + \ No newline at end of file From d71f8a5b82b642f82937ccbb70b591229fa7c3ad Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Tue, 29 Aug 2023 15:15:16 +0800 Subject: [PATCH 2/4] 1 --- src/views/basic-dictionary/MaritalStatus.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/basic-dictionary/MaritalStatus.vue b/src/views/basic-dictionary/MaritalStatus.vue index 7d472dd..4b16e0e 100644 --- a/src/views/basic-dictionary/MaritalStatus.vue +++ b/src/views/basic-dictionary/MaritalStatus.vue @@ -32,7 +32,12 @@
- + From 1a8c0ca94658d46debc870d69fab8abe20ec82dc Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Tue, 29 Aug 2023 15:15:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 44 +++++++++++++++++++++++++++++++++++++++- src/views/Home.vue | 49 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/src/router/index.js b/src/router/index.js index 72aaa05..c6c0bd5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -276,9 +276,51 @@ const routes = [ path: "/sumDoctorCheck", name: "总检医生诊台", component: () => import("../views/doctorCheck/sumDoctorCheck.vue"), + + }, + //---------------------- 体 检 end ---------------------- + //---------------------- 体检查询 start ---------------------- + { + path: "/report", + name: "体检报告", + component: () => import("../views/report/report.vue"), }, - + { + path: "/checkStatus", + name: "组合项目检查状态", + component: () => import("../views/report/checkStatus.vue"), + }, + { + path: "/chargeAsbitem", + name: "人员费用组合项目", + component: () => import("../views/report/chargeAsbitem.vue"), + }, + { + path: "/unCheckAsbitem", + name: "人员未检组合项目", + component: () => import("../views/report/unCheckAsbitem.vue"), + }, + //---------------------- 体检查询 end ---------------------- + + //---------------------- 体 检 end ---------------------- + //---------------------- 疾病人数登记 ---------------------- + { + path: "/diseaseStatistics", + name: "疾病人数统计", + component: () => import("../views/fee-settings/diseaseStatistics.vue"), + }, + { + path: "/positiveresults", + name: "阳性结果清单", + component: () => import("../views/doctorCheck/positiveresults.vue"), + }, + { + path: "/unitphysicalexamination", + name: "单位体检报表", + component: () => import("../views/doctorCheck/unitphysicalexamination.vue"), + }, + ], }, ]; diff --git a/src/views/Home.vue b/src/views/Home.vue index b0715a8..07e017d 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -179,9 +179,58 @@ 体检 + 体检医生诊台 总检医生诊台 + + + + +
+ + 体检查询 + + 体检报告 + 组合项目检查状态 + 人员费用组合项目 + 人员未检组合项目 + 回收表格查询 + 体检医生诊台 + 总检医生诊台 + + + +
+ +
+ + 客户报表 + + 疾病人数统计 + 阳性结果人员 + 单位体检报表 + + +
+ +
+ + 工作量统计 + + 疾病人数统计
From fb26c510e16ace895110c45602d8cef5f5f88b30 Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Tue, 29 Aug 2023 16:51:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E9=87=8F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 21 +++++---- src/views/Home.vue | 44 +++++++++++++------ src/views/workload/registrar.vue | 74 ++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 22 deletions(-) create mode 100644 src/views/workload/registrar.vue diff --git a/src/router/index.js b/src/router/index.js index c6c0bd5..8cd16eb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -136,24 +136,24 @@ const routes = [ { path: "/invoice-item-type", component: () => import("../views/fee-settings/InvoiceItemType.vue"), - }, + }, { path: "/pay-mode", component: () => import("../views/fee-settings/PayMode.vue"), }, { path: "/cardType", - name:"会员卡类别", + name: "会员卡类别", component: () => import("../views/fee-settings/cardType.vue"), }, { path: "/cardRegister", - name:"会员卡登记", + name: "会员卡登记", component: () => import("../views/fee-settings/cardRegister.vue"), }, { path: "/cardBill", - name:"会员卡记账", + name: "会员卡记账", component: () => import("../views/fee-settings/cardBill.vue"), }, //---------------------- 收费设置 start ---------------------- @@ -277,7 +277,7 @@ const routes = [ name: "总检医生诊台", component: () => import("../views/doctorCheck/sumDoctorCheck.vue"), - }, + }, //---------------------- 体 检 end ---------------------- //---------------------- 体检查询 start ---------------------- { @@ -294,12 +294,12 @@ const routes = [ path: "/chargeAsbitem", name: "人员费用组合项目", component: () => import("../views/report/chargeAsbitem.vue"), - }, + }, { path: "/unCheckAsbitem", name: "人员未检组合项目", component: () => import("../views/report/unCheckAsbitem.vue"), - }, + }, //---------------------- 体检查询 end ---------------------- @@ -320,7 +320,12 @@ const routes = [ name: "单位体检报表", component: () => import("../views/doctorCheck/unitphysicalexamination.vue"), }, - + //---------------------- 工作量登记 ---------------------- + { + path: "/registrar", + name: "登记员工作量", + component: () => import("../views/workload/registrar.vue"), + } ], }, ]; diff --git a/src/views/Home.vue b/src/views/Home.vue index 07e017d..4e6c451 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -93,9 +93,15 @@ >发票项目类别 支付方式 - 会员卡类别 - 会员卡登记 - 会员卡记账 + 会员卡类别 + 会员卡登记 + 会员卡记账 @@ -179,9 +185,12 @@ 体检 - - 体检医生诊台 - 总检医生诊台 + 体检医生诊台 + 总检医生诊台 @@ -189,12 +198,20 @@
体检查询 - + 体检报告 - 组合项目检查状态 - 人员费用组合项目 - 人员未检组合项目 - 回收表格查询 + 组合项目检查状态 + 人员费用组合项目 + 人员未检组合项目 + 回收表格查询 体检医生诊台总检医生诊台 -
@@ -228,8 +244,8 @@ 工作量统计 - 疾病人数统计登记员工作量 diff --git a/src/views/workload/registrar.vue b/src/views/workload/registrar.vue new file mode 100644 index 0000000..1e7ec98 --- /dev/null +++ b/src/views/workload/registrar.vue @@ -0,0 +1,74 @@ + + + \ No newline at end of file