diff --git a/acupuncture-后台/src/layout/components/Sidebar/Logo.vue b/acupuncture-后台/src/layout/components/Sidebar/Logo.vue index dbb97b7a..52e3bb7a 100644 --- a/acupuncture-后台/src/layout/components/Sidebar/Logo.vue +++ b/acupuncture-后台/src/layout/components/Sidebar/Logo.vue @@ -104,7 +104,7 @@ export default { width: 32px; height: 32px; vertical-align: middle; - margin-right: 12px; + margin-right: 2px; } & .sidebar-title { diff --git a/acupuncture-后台/src/views/followFile/index.vue b/acupuncture-后台/src/views/followFile/index.vue index e10fbf52..59990016 100644 --- a/acupuncture-后台/src/views/followFile/index.vue +++ b/acupuncture-后台/src/views/followFile/index.vue @@ -16,6 +16,21 @@ @keyup.enter.native="handleQuery" /> + + + + + { + this.tenantsListData = res.data.list; + }); + }, /** cron表达式按钮操作 */ handleShowCron() { this.expression = this.form.cronExpression; @@ -424,6 +452,7 @@ export default { pageSize: 10, param: { name: "", + tenantId: "", }, }; this.handleQuery(); diff --git a/acupuncture-后台/src/views/followFile/subjects.vue b/acupuncture-后台/src/views/followFile/subjects.vue index 69988899..0d100d59 100644 --- a/acupuncture-后台/src/views/followFile/subjects.vue +++ b/acupuncture-后台/src/views/followFile/subjects.vue @@ -1,326 +1,484 @@ - - - - - - - - - - - 未参加队列人员 - - - - 搜索 - - 重置 - - - + + + + + + + + + + + + + + + + 未参加队列人员 + + + + 搜索 + + 重置 + + + + + + - - - + + + + + + 男 + 女 + + - - - - - - 男 - 女 - - - - - - {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }} - - - - - - - - {{ idCardTypeValue[scope.row.idCardType] }} - - - - - - - {{ scope.row.queueList.map((i) => i.queueName).join(",") }} - - - - - - {{ scope.row.createBy }} - {{ + + + {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }} + + + + + + + + {{ idCardTypeValue[scope.row.idCardType] }} + + + + + + + {{ scope.row.queueList.map((i) => i.queueName).join(",") }} + + + + + + + {{ scope.row.createBy }} + {{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}") }} - - - - - - 患者档案 - 诊疗档案 - - - + 患者档案 + 诊疗档案 + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + +