Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
ac08908c73
@ -1,18 +1,18 @@
|
||||
<template>
|
||||
<div class="app-container" ref="layout">
|
||||
<div ref="topform" class="form">
|
||||
<SearchFilter :labelWidths="280" style="width: calc(100% - 80px);" size="mini" @search="handleQuery"
|
||||
<SearchFilter labelWidth="90px" :labelWidths="310" size="small" @search="handleQuery"
|
||||
@reset="resetQuery" @minShowCtrol="getMaxTableHeight">
|
||||
<el-form-item label="姓名" prop="patientName">
|
||||
<el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable
|
||||
<el-input style="width: 220px" v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="电话" prop="patientPhone">
|
||||
<el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable
|
||||
<el-input style="width: 220px" v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="异常原因" prop="abnormalCauseValue">
|
||||
<el-select v-model="queryParams.abnormalCauseValue" filterable placeholder="请输入异常原因" style="width:200px"
|
||||
<el-select v-model="queryParams.abnormalCauseValue" filterable placeholder="请输入异常原因" style="width:220px"
|
||||
clearable>
|
||||
<el-option v-for="item in abnormalCauselist" :key="item.id" :label="item.abnormalCauseValue"
|
||||
:value="item.id">
|
||||
@ -20,21 +20,21 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="医院" prop="hospitalAgencyId">
|
||||
<el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
|
||||
<el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:220px" clearable
|
||||
@clear="clearhospitalAgency" @change="changehospitalAgency">
|
||||
<el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="院区" prop="campusAgencyId">
|
||||
<el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
|
||||
<el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:220px" clearable
|
||||
@clear="clearcampusAgency" @change="changecampusAgency">
|
||||
<el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="科室" prop="departmentId">
|
||||
<el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable>
|
||||
<el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:220px" clearable>
|
||||
<el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
|
||||
@ -3,15 +3,15 @@
|
||||
<div v-for="item in patientInfoList" :key="item.id">
|
||||
<div class="carditem">
|
||||
<div class="top">
|
||||
<!-- <img src="../../../assets/manage/nvtouxiang.png" alt="" class="img" /> -->
|
||||
<img src="../../../assets/manage/touxiang.png" alt="" class="img" />
|
||||
<img v-if="item.sex == 'FEMALE'" src="../../../assets/manage/nvtouxiang.png" alt="" class="img" />
|
||||
<img v-if="item.sex == 'MALE'" src="../../../assets/manage/touxiang.png" alt="" class="img" />
|
||||
<div class="name">
|
||||
{{ item.patientName }}
|
||||
</div>
|
||||
<div class="agesex">
|
||||
{{ item.sex == 'MALE' ? '男' : "" }}
|
||||
{{ item.sex == 'FEMALE' ? '女' : "" }}
|
||||
<span style="padding: 0 3px;">|</span>
|
||||
<span style="padding: 0 1px;">|</span>
|
||||
<span v-if="item.age">
|
||||
{{ item.age }}岁
|
||||
</span>
|
||||
@ -40,14 +40,14 @@
|
||||
康复计划执行率:
|
||||
</span>
|
||||
<el-progress :percentage="item.taskExecuteRate"></el-progress>
|
||||
<span style="flex:0.1">({{ item.taskExecuteNum }} / {{ item.taskNum }})</span>
|
||||
<span style="flex:0.1">({{ item.taskExecuteNum }}/{{ item.taskNum }})</span>
|
||||
</div>
|
||||
<div class="formitem flex">
|
||||
<span>
|
||||
康复计划完成率:
|
||||
</span>
|
||||
<el-progress :percentage="item.taskFinishRate"></el-progress>
|
||||
<span style="flex:0.1">({{ item.taskFinishNum }} / {{ item.taskNum }})</span>
|
||||
<span style="flex:0.1">({{ item.taskFinishNum }}/{{ item.taskNum }})</span>
|
||||
</div>
|
||||
<div class="formitem">
|
||||
下次任务:
|
||||
|
||||
@ -6,54 +6,54 @@
|
||||
<el-tab-pane label="已忽略" name="DISAGREE"></el-tab-pane>
|
||||
</el-tabs>
|
||||
<div ref="topform" class="form">
|
||||
<SearchFilter :labelWidths="280" style="width: calc(100% - 80px);" size="mini" @search="handleQuery"
|
||||
<SearchFilter labelWidth="90px" :labelWidths="310" size="small" @search="handleQuery"
|
||||
@reset="resetQuery" @minShowCtrol="getMaxTableHeight">
|
||||
<el-form-item label="患者姓名" prop="patientName">
|
||||
<el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
|
||||
style="width: 200px" />
|
||||
style="width: 220px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="患者电话" prop="patientPhone">
|
||||
<el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
|
||||
style="width: 200px" />
|
||||
style="width: 220px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="签约时间" prop="signTimeStart">
|
||||
<el-date-picker v-model="signTime" type="daterange" range-separator="至" start-placeholder="开始日期"
|
||||
style="width: 300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
|
||||
style="width: 220px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="诊断" prop="mainDiagnosis">
|
||||
<el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width: 200px"
|
||||
<el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width: 220px"
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="患者来源" prop="patientSource">
|
||||
<el-select v-model="queryParams.patientSource" placeholder="请选择患者来源" clearable style="width: 200px">
|
||||
<el-select v-model="queryParams.patientSource" placeholder="请选择患者来源" clearable style="width: 220px">
|
||||
<el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="医院" prop="hospitalAgencyId">
|
||||
<el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px"
|
||||
<el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 220px"
|
||||
clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
|
||||
<el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="院区" prop="campusAgencyId">
|
||||
<el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 200px" clearable
|
||||
<el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 220px" clearable
|
||||
@clear="clearcampusAgency" @change="changecampusAgency">
|
||||
<el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="科室" prop="departmentId">
|
||||
<el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 200px" clearable
|
||||
<el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 220px" clearable
|
||||
@clear="cleardepartment" @change="changedepartment">
|
||||
<el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="病区" prop="wardId">
|
||||
<el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
|
||||
<el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 220px" clearable>
|
||||
<el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<el-tab-pane label="已执行" name="EXECUTED"></el-tab-pane>
|
||||
</el-tabs>
|
||||
<div ref="topform" class="form">
|
||||
<SearchFilter :labelWidths="280" style="width: calc(100% - 80px);" size="mini" @search="handleQuery"
|
||||
<SearchFilter labelWidth="90px" :labelWidths="310" size="small" @search="handleQuery"
|
||||
@reset="resetQuery" @minShowCtrol="getMaxTableHeight">
|
||||
<el-form-item label="执行时间" prop="startDate">
|
||||
<el-date-picker
|
||||
@ -17,7 +17,7 @@
|
||||
type="daterange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
style="width: 300px"
|
||||
style="width: 220px"
|
||||
value-format="yyyy-MM-dd"
|
||||
end-placeholder="结束日期"
|
||||
@change="chooseTime"
|
||||
@ -26,6 +26,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="姓名" prop="patientName">
|
||||
<el-input
|
||||
style="width: 220px"
|
||||
v-model="queryParams.patientName"
|
||||
placeholder="请输入姓名"
|
||||
clearable
|
||||
@ -34,6 +35,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="电话" prop="patientPhone">
|
||||
<el-input
|
||||
style="width: 220px"
|
||||
v-model="queryParams.patientPhone"
|
||||
placeholder="请输入电话"
|
||||
clearable
|
||||
@ -45,7 +47,7 @@
|
||||
v-model="queryParams.hospitalAgencyId"
|
||||
filterable
|
||||
placeholder="请选择医院"
|
||||
style="width: 200px"
|
||||
style="width: 220px"
|
||||
clearable
|
||||
@clear="clearhospitalAgency"
|
||||
@change="changehospitalAgency"
|
||||
@ -61,6 +63,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="就诊方式" prop="visitMethod">
|
||||
<el-select
|
||||
style="width: 220px"
|
||||
v-model="queryParams.visitMethod"
|
||||
placeholder="请选择就诊方式"
|
||||
clearable
|
||||
@ -81,6 +84,7 @@
|
||||
</el-form-item> -->
|
||||
<el-form-item label="就诊流水号" prop="visitSerialNumber">
|
||||
<el-input
|
||||
style="width: 220px"
|
||||
v-model="queryParams.visitSerialNumber"
|
||||
placeholder="请输入就诊流水号"
|
||||
clearable
|
||||
@ -99,6 +103,7 @@
|
||||
</el-form-item> -->
|
||||
<el-form-item label="诊断" prop="mainDiagnosis">
|
||||
<el-input
|
||||
style="width: 220px"
|
||||
v-model="queryParams.mainDiagnosis"
|
||||
placeholder="请选择诊断"
|
||||
clearable
|
||||
@ -110,7 +115,7 @@
|
||||
v-model="queryParams.campusAgencyId"
|
||||
filterable
|
||||
placeholder="请选择院区"
|
||||
style="width: 200px"
|
||||
style="width: 220px"
|
||||
clearable
|
||||
@clear="clearcampusAgency"
|
||||
@change="changecampusAgency"
|
||||
@ -129,7 +134,7 @@
|
||||
v-model="queryParams.departmentId"
|
||||
filterable
|
||||
placeholder="请选择科室"
|
||||
style="width: 200px"
|
||||
style="width: 220px"
|
||||
clearable
|
||||
@clear="cleardepartment"
|
||||
@change="changedepartment"
|
||||
@ -148,7 +153,7 @@
|
||||
v-model="queryParams.wardId"
|
||||
filterable
|
||||
placeholder="请选择病区"
|
||||
style="width: 200px"
|
||||
style="width: 220px"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
@ -163,7 +168,7 @@
|
||||
<el-form-item label="主治医生" prop="attendingPhysicianId">
|
||||
<el-select
|
||||
v-model="queryParams.attendingPhysicianId"
|
||||
style="width: 200px"
|
||||
style="width: 220px"
|
||||
filterable
|
||||
placeholder="请选择主治医生"
|
||||
clearable
|
||||
@ -182,7 +187,7 @@
|
||||
v-model="queryParams.manageRouteName"
|
||||
placeholder="请输入任务名称"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
style="width: 220px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
<template>
|
||||
<div class="app-container" ref="layout">
|
||||
<div ref="topform" class="form">
|
||||
<SearchFilter :labelWidths="280" style="width: calc(100% - 80px);" size="mini" @search="handleQuery"
|
||||
<SearchFilter labelWidth="90px" :labelWidths="310" size="small" @search="handleQuery"
|
||||
@reset="resetQuery" @minShowCtrol="getMaxTableHeight">
|
||||
<el-form-item label="执行时间" prop="startDate" label-width="110px">
|
||||
<el-form-item label="执行时间" prop="startDate">
|
||||
<el-date-picker v-model="intentionalTime" @change="pickerChangeFn" type="daterange" range-separator="至"
|
||||
start-placeholder="开始日期" style="width: 300px" value-format="yyyy-MM-dd" clearable end-placeholder="结束日期">
|
||||
start-placeholder="开始日期" style="width: 220px" value-format="yyyy-MM-dd" clearable end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="医院" prop="hospitalAgencyId">
|
||||
<el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px"
|
||||
<el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 220px"
|
||||
clearable>
|
||||
<!-- @clear="clearhospitalAgency" -->
|
||||
<el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
|
||||
@ -17,20 +17,20 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="就诊方式" prop="visitMethod">
|
||||
<el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable>
|
||||
<el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable style="width: 220px">
|
||||
<el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="就诊流水号" prop="visitSerialNumber">
|
||||
<el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" clearable
|
||||
@keyup.enter.native="handleQuery" />
|
||||
@keyup.enter.native="handleQuery" style="width: 220px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="患者姓名" prop="patientName">
|
||||
<el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable style="width: 200px"
|
||||
<el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable style="width: 220px"
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务名称" prop="manageRouteName">
|
||||
<el-input v-model="queryParams.manageRouteName" placeholder="请输入任务名称" clearable style="width: 200px"
|
||||
<el-input v-model="queryParams.manageRouteName" placeholder="请输入任务名称" clearable style="width: 220px"
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
</SearchFilter>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user