xinyilu/postdischarge-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	src/views/system/followupsee/index.vue
This commit is contained in:
闫晓茹 2024-06-17 18:20:31 +08:00
commit 4f44d60b48
5 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/manage/manualReview/index.vue
View File

@ -71,30 +71,30 @@
<div ref="table"> <div ref="table">
<el-table :max-height="maxTableHeight" v-loading="loading" :data="patientInfoList"> <el-table :max-height="maxTableHeight" v-loading="loading" :data="patientInfoList">
<el-table-column label="序号" type="index" width="50" align="center" /> <el-table-column label="序号" type="index" width="50" align="center" />
<el-table-column label="患者姓名" align="center" prop="patientName" /> <el-table-column label="患者姓名" align="center" prop="patientName" width="80"/>
<el-table-column label="患者电话" align="center" prop="patientPhone" width='120' /> <el-table-column label="患者电话" align="center" prop="patientPhone" width='120' />
<el-table-column label="性别" align="center" prop="sex"> <el-table-column label="性别" align="center" prop="sex" width='50'>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.sex == 'MALE' ? '男' : '' }} {{ scope.row.sex == 'MALE' ? '男' : '' }}
{{ scope.row.sex == 'FEMALE' ? '女' : '' }} {{ scope.row.sex == 'FEMALE' ? '女' : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="年龄" align="center" prop="age" /> <el-table-column label="年龄" align="center" prop="age" width='50'/>
<el-table-column label="出生日期" align="center" prop="birthDate" width='130' /> <el-table-column label="出生日期" align="center" prop="birthDate" width='100' />
<el-table-column label="医院" align="center" prop="hospitalAgencyName" /> <el-table-column label="医院" align="center" prop="hospitalAgencyName" :show-overflow-tooltip="true"/>
<el-table-column label="院区" align="center" prop="campusAgencyName" /> <el-table-column label="院区" align="center" prop="campusAgencyName" :show-overflow-tooltip="true"/>
<el-table-column label="科室名称" align="center" prop="departmentName" /> <el-table-column label="科室名称" align="center" prop="departmentName" :show-overflow-tooltip="true"/>
<el-table-column label="病区名称" align="center" prop="wardName" /> <el-table-column label="病区名称" align="center" prop="wardName" />
<el-table-column label="住院/门诊号" align="center" prop="inHospitalNumber" width='130' /> <el-table-column label="住院/门诊号" align="center" prop="inHospitalNumber" width='105' :show-overflow-tooltip="true" />
<el-table-column label="患者来源" align="center" prop="patientSource"> <el-table-column label="患者来源" align="center" prop="patientSource" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.patient_source" :value="scope.row.patientSource" /> <dict-tag :options="dict.type.patient_source" :value="scope.row.patientSource" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="医生" align="center" prop="attendingPhysicianName" /> <el-table-column label="医生" align="center" prop="attendingPhysicianName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="诊断" align="center" prop="mainDiagnosis" /> <el-table-column label="诊断" align="center" prop="mainDiagnosis" :show-overflow-tooltip="true" width='100'/>
<el-table-column label="手术名称" align="center" prop="surgicalName" /> <el-table-column label="手术名称" align="center" prop="surgicalName" />
<el-table-column label="出院/就诊时间" align="center" prop="dischargeTime" width='130'> <el-table-column label="出院/就诊时间" align="center" prop="dischargeTime" width="105">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.dischargeTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.dischargeTime, '{y}-{m}-{d}') }}</span>
</template> </template>

1
src/views/system/followup/index.vue
View File

@ -602,6 +602,7 @@ export default {
taskType: row.taskType, taskType: row.taskType,
templateId: row.templateId, templateId: row.templateId,
manageRouteId: row.manageRouteId, manageRouteId: row.manageRouteId,
manageRouteNodeId: row.manageRouteNodeId,
visitRecordId: row.visitRecordId, visitRecordId: row.visitRecordId,
taskExecuteRecordId: row.taskExecuteRecordId, taskExecuteRecordId: row.taskExecuteRecordId,

19
src/views/system/followupdetails/index.vue
View File

@ -428,7 +428,7 @@
<el-form-item label="短信模板：" prop="phone"> <el-form-item label="短信模板：" prop="phone">
<span class="spanname"> <span class="spanname">
<message <message
style="width: 200px" style="width: 200px;height:100px"
@on-template="messageontemplateMESSAGE" @on-template="messageontemplateMESSAGE"
:templateId="formlist.phoneMessageTemplateId" :templateId="formlist.phoneMessageTemplateId"
:templateName="formlist.phoneMessageTemplateName" :templateName="formlist.phoneMessageTemplateName"
@ -444,10 +444,10 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
import message from "../components/message.vue";
import { selectFollowPatientInfo, question, addPatientQuestionResult, selectPhonePush, } from "@/api/system/followupsee"; import { selectFollowPatientInfo, question, addPatientQuestionResult, selectPhonePush, } from "@/api/system/followupsee";
import { import {
selectPatientQuestionSubmit, selectPatientQuestionSubmit,
@ -468,6 +468,7 @@ export default {
checked: false, checked: false,
formlist: {}, formlist: {},
optionslistS:[], optionslistS:[],
optionslist:[],
rules: { rules: {
routeHandleRemark: [ routeHandleRemark: [
{ required: true, message: '请输入任务处理信息', trigger: 'change' } { required: true, message: '请输入任务处理信息', trigger: 'change' }
@ -653,6 +654,8 @@ export default {
font-size: 13px; font-size: 13px;
color: #64666a; color: #64666a;
.spanname { .spanname {
width: 100%;
pointer-events: none; pointer-events: none;
} }
} }
@ -740,12 +743,12 @@ export default {
} }
.bottomheader { .bottomheader {
overflow: scroll; overflow-y: scroll;
width: 99%; width: 99%;
height: 100vh; height: 67vh;
background-color: #fff; background-color: #fff;
margin: 10px auto; margin: 10px auto;
padding: 10px 20px; padding: 10px 20px;
.sport { .sport {
padding: 10px 50px 10px 10px; padding: 10px 50px 10px 10px;
font-size: 20px; font-size: 20px;

33
src/views/system/followupsee/index.vue
View File

@ -366,11 +366,20 @@
/> --> /> -->
</el-form-item> </el-form-item>
<br /> <br />
<div class="pushMethod">
<el-form-item label="话术图" prop="phone">
<img
:src="formlist.scriptFilePath"
style="width: 250px; height: 200px"
/>
</el-form-item>
<br />
<el-form-item label="短信模板：" prop="phone"> <el-form-item label="短信模板：" prop="phone">
<span class="spanname"> <span class="spanname">
<message <message
style="width: 200px" style="width: 200px;height:100px"
@on-template="messageontemplateMESSAGE" @on-template="messageontemplateMESSAGE"
:templateId="formlist.phoneMessageTemplateId" :templateId="formlist.phoneMessageTemplateId"
:templateName="formlist.phoneMessageTemplateName" :templateName="formlist.phoneMessageTemplateName"
@ -736,23 +745,13 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.pushMethod {
height: 30px;
// margin-top: 30px;
line-height: 30px;
font-size: 13px;
color: #64666a;
.spanname {
pointer-events: none;
}
}
::v-deep .el-input.is-disabled .el-input__inner { ::v-deep .el-input.is-disabled .el-input__inner {
background: #fff !important; background: #fff !important;
color: #606266; color: #606266;
} }
// .spanname { .spanname {
// pointer-events: none; pointer-events: none;
// } }
::v-deep .el-textarea.is-disabled .el-textarea__inner { ::v-deep .el-textarea.is-disabled .el-textarea__inner {
color: #606266; color: #606266;
background: #fff; background: #fff;
@ -833,9 +832,9 @@ export default {
} }
.bottomheader { .bottomheader {
overflow: scroll; overflow-y: scroll;
width: 99%; width: 99%;
height: 100vh; height: 67vh;
background-color: #fff; background-color: #fff;
margin: 10px auto; margin: 10px auto;
padding: 10px 20px; padding: 10px 20px;

20
src/views/system/taskExecuteRecord/index.vue
View File

@ -45,12 +45,12 @@
<el-table-column type="selection" align="center" /> <el-table-column type="selection" align="center" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> --> <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<!-- <el-table-column label="患者表id" align="center" prop="patientId" /> --> <!-- <el-table-column label="患者表id" align="center" prop="patientId" /> -->
<el-table-column label="患者姓名" align="center" prop="patientName" /> <el-table-column label="患者姓名" align="center" prop="patientName" width="80"/>
<el-table-column label="电话" align="center" prop="patientPhone" /> <el-table-column label="电话" align="center" prop="patientPhone" width="120"/>
<el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" /> <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="120" :show-overflow-tooltip="true" />
<el-table-column label="医院" align="center" prop="hospitalAgencyName" /> <el-table-column label="医院" align="center" prop="hospitalAgencyName" width="105" :show-overflow-tooltip="true"/>
<el-table-column label="院区" align="center" prop="campusAgencyName" /> <el-table-column label="院区" align="center" prop="campusAgencyName" :show-overflow-tooltip="true"/>
<el-table-column label="科室名称" align="center" prop="departmentName" /> <el-table-column label="科室名称" align="center" prop="departmentName" :show-overflow-tooltip="true"/>
<el-table-column label="病区名称" align="center" prop="wardName" /> <el-table-column label="病区名称" align="center" prop="wardName" />
<!-- <el-table-column label="门诊/住院号" align="center" prop="patientName" /> <!-- <el-table-column label="门诊/住院号" align="center" prop="patientName" />
<el-table-column label="手术名称" align="center" prop="patientName" /> --> <el-table-column label="手术名称" align="center" prop="patientName" /> -->
@ -67,14 +67,14 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="管理任务名称" align="center" prop="manageRouteName"> <el-table-column label="管理任务名称" align="center" prop="manageRouteName" width="110">
</el-table-column> </el-table-column>
<el-table-column label="入院时间" align="center" prop="admissionTime" > <el-table-column label="入院时间" align="center" prop="admissionTime" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.admissionTime, "{y}-{m}-{d}") }}</span> <span>{{ parseTime(scope.row.admissionTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="出院时间" align="center" prop="dischargeTime"> <el-table-column label="出院时间" align="center" prop="dischargeTime" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.dischargeTime, "{y}-{m}-{d}") }}</span> <span>{{ parseTime(scope.row.dischargeTime, "{y}-{m}-{d}") }}</span>
</template> </template>
@ -91,7 +91,7 @@
<span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span> <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="任务内容" align="center" prop="taskContent"> <el-table-column label="任务内容" align="center" prop="taskContent" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span> <span>
{{ scope.row.taskContent == "PHONE_OUTBOUND" ? "电话外呼" : "" }} {{ scope.row.taskContent == "PHONE_OUTBOUND" ? "电话外呼" : "" }}