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

This commit is contained in:
shidongli 2024-03-05 17:20:45 +08:00
commit c1c968ff3e
14 changed files with 1106 additions and 381 deletions

View File

@ -0,0 +1,10 @@
import request from '@/utils/request'
//续约界面查询签约详情
export function getByRecordId(patientSignRecordId) {
return request({
url: `/manage/signRecord/getByRecordId/${patientSignRecordId}`,
method: 'get',
})
}

View File

@ -0,0 +1,10 @@
import request from '@/utils/request'
// 签约
export function addsign(data) {
return request({
url: '/manage/signRecord/sign',
method: 'post',
data
})
}

View File

@ -42,3 +42,12 @@ export function delSignRecord(id) {
method: 'delete'
})
}
//解约
export function updateSignStatus(data) {
return request({
url: '/manage/signRecord/updateSignStatus',
method: 'post',
data: data
})
}

View File

@ -135,15 +135,14 @@
</el-select>
</el-form-item>
<el-form-item label="补充说明" prop="supplementIllustrateId">
<el-select v-model="form.supplementIllustrateId" filterable placeholder="请输入异常原因" style="width:380px"
clearable>
<el-select v-model="form.supplementIllustrateId" filterable placeholder="请输入异常原因" style="width:380px" clearable>
<el-option v-for="item in supplementIllustratelist" :key="item.id" :label="item.abnormalCauseValue"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="功能限制" prop="functionLimitation">
<el-input v-model="form.functionLimitation" placeholder="请输入功能限制" />
<el-input v-model="form.functionLimitation" placeholder="终止所有服务" disabled />
</el-form-item>
<!-- <el-form-item label="来源" prop="blacklistSource">
<el-select v-model="form.blacklistSource" placeholder="请选择来源">
@ -281,7 +280,7 @@ export default {
abnormalCauseValue: null,
supplementIllustrateId: null,
supplementIllustrateValue: null,
functionLimitation: null,
functionLimitation: '终止所有服务',
blacklistSource: null,
createBy: null,
createTime: null,

View File

@ -52,7 +52,6 @@
</el-descriptions>
<el-descriptions title="其他材料" style="margin-top: 20px;" class="descriptions">
<el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
</div>

View File

@ -20,7 +20,6 @@
</span>
<span style="margin-left: 10px;">
{{ item.createBy }}
赵明
</span>
</div>
<el-tag v-if="item.visitType == 'BE_HOSPITALIZED'" class="type" size="mini">住院</el-tag>

View File

@ -0,0 +1,293 @@
<template>
<div class="app-container">
<div class="interval">
<div class="package-item">
<div class="time">{{ list.signTime }}
</div>
<div class="name">
{{ list.packageName }}
</div>
<el-tag v-if="list.serviceStatus == 'INTENTIONAL_SIGNING'" class="type" size="mini">意向签约</el-tag>
<el-tag v-if="list.serviceStatus == 'SERVICE_CENTER'" class="type" size="mini">服务中</el-tag>
<el-tag v-if="list.serviceStatus == 'SERVICE_END'" class="type" size="mini">服务结束</el-tag>
</div>
</div>
<div class="header">
<div class="btns">
<el-button @click="goback">取消</el-button>
<el-button type="primary" @click="signupload">签约</el-button>
</div>
<el-descriptions title="服务包续约详情" class="descriptions">
</el-descriptions>
<el-descriptions title="患者信息" style="padding:0 30px">
<el-descriptions-item label="患者姓名">{{ list.patientName }}</el-descriptions-item>
<el-descriptions-item label="性别">{{ list.sex == 'MALE' ? '男' : '' }}{{
list.sex == 'FEMALE' ? '女' : '' }}</el-descriptions-item>
<el-descriptions-item label="年龄">{{ list.age }}</el-descriptions-item>
<el-descriptions-item label="电话">{{ list.patientPhone }}</el-descriptions-item>
<el-descriptions-item label="就诊方式">{{
list.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : list.visitMethod ==
'BE_IN_HOSPITAL' ?
'住院' : ''
}}
</el-descriptions-item>
<el-descriptions-item label="诊断">{{ list.signDiagnosis }}</el-descriptions-item>
<el-descriptions-item label="住院/门诊号">{{ list.inHospitalNumber }}</el-descriptions-item>
<el-descriptions-item label="医院">{{ list.hospitalAgencyName }}</el-descriptions-item>
<el-descriptions-item label="科室">{{ list.departmentName }}</el-descriptions-item>
<el-descriptions-item label="服务包缴费状态">{{ list.packagePaymentStatus == 'PAID' ? '已缴费' : '' }}
{{ list.packagePaymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
</el-descriptions-item>
<!-- <el-descriptions-item label="出院/门诊时间">{{ list.patientName }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="注册时间">{{ list.patientName }}</el-descriptions-item> -->
</el-descriptions>
<el-descriptions title="服务包信息" style="padding:20px 30px 10px" class="descriptions">
</el-descriptions>
<el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="100px" class="demo-ruleForm"
:inline="true" style="padding-left:40px">
<el-form-item label="选择服务包" prop="packageName">
<el-input v-model="signPackage.packageName" style="width:300px"></el-input>
</el-form-item>
</el-form>
<el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="80px" class="demo-ruleForm"
:inline="true" style="padding-left:40px">
<el-form-item label="签约月数(月)" prop="" label-width="100px">
<el-input v-model="signPackage.serviceCycle" style="width:200px"></el-input>
</el-form-item>
<el-form-item label="服务时长" prop="packageName">
<el-input v-model="signPackage.serviceStartTime" style="width:120px"></el-input>
<el-input v-model="signPackage.serviceEndTime" style="width:120px"></el-input>
</el-form-item>
<el-form-item label="服务包价格(元)" prop="" label-width="120px">
<el-input v-model="signPackage.packagePrice" style="width:200px"></el-input>
</el-form-item>
</el-form>
<el-descriptions title="硬件信息" style="padding:20px 30px 10px" class="descriptions">
</el-descriptions>
<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm" :inline="true"
style="padding-left:40px">
<div v-for="(item, index) in form.devices" :key="index">
<el-form-item label="硬件类型" :prop="`devices[${index}].hardwareType`"
:rules="rules.devices.hardwareType">
<el-select v-model="item.hardwareType" placeholder="请选择硬件类型" clearable style="width:200px">
<el-option v-for="dict in dict.type.hardware_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="SN码" :prop="`devices[${index}].snCode`" :rules="rules.devices.snCode">
<el-input v-model="item.snCode" placeholder="请输入设备SN码" style="width:200px"></el-input>
</el-form-item>
<el-form-item>
<el-button size="mini" @click="delhardware(index)">删除</el-button>
</el-form-item>
</div>
<el-button class="addbtn" type="primary" size="mini" @click="addhardware">新增硬件</el-button>
</el-form>
<el-descriptions title="知情同意书" style="padding:20px 30px 10px" class="descriptions">
</el-descriptions>
<el-upload :action="upload.url" style="margin-left:70px" :data="upload.data" ref="upload"
:on-preview="handlePictureCardPreview" :on-remove="handleRemove" :headers="upload.headers"
:on-success="handleSuccess" :auto-upload="false" list-type="picture-card">
<i class="el-icon-plus"></i>
</el-upload>
</div>
</div>
</template>
<script>
import {
getByRecordId
} from '@/api/manage/continueSigning.js'
import {
addsign
} from '@/api/manage/newSigning.js'
import { getAge } from "@/utils/age";
import { getToken } from '@/utils/auth'
export default {
dicts: ['hardware_type'],
name: "newSigning",
data() {
return {
list: {},
signPackage: {
packageName: undefined
},
form: {
record: {
patientId: undefined,
patientPhone: undefined,
},
devices: [
{
snCode: undefined,
hardwareType: undefined,
}
],
informeds: []
},
rules: {
packageName: [
{ required: true, message: '请选择服务包', trigger: 'change' }
],
devices: {
snCode: [
{ required: true, message: '请输入SN码', trigger: 'change' }
],
hardwareType: [
{ required: true, message: '请选择硬件类型', trigger: 'change' }
],
},
},
upload: {
data: {
type: 'signInformedFileUrl'
},
headers: {
Authorization: 'Bearer ' + getToken(),
},
url: process.env.VUE_APP_BASE_API + '/manage/file/uploadFile'
},
};
},
created() {
this.info();
},
methods: {
//
info() {
getByRecordId(this.$route.query.patientSignRecordId).then(res => {
this.list = res.data
this.signPackage.packageName = this.list.packageName
this.signPackage.serviceCycle = this.list.serviceCycle
this.signPackage.serviceStartTime = this.list.serviceStartTime
this.signPackage.serviceEndTime = this.list.serviceEndTime
this.signPackage.packagePrice = this.list.packagePrice
this.form.devices = this.list.signDevices
this.form.record = this.list
this.list.age = this.list.birthDate ? getAge(this.list.birthDate) : ''
})
},
//
signupload() {
this.$refs.upload.submit();
},
//
handleSuccess(response, file, fileList) {
this.form.informeds = []
fileList.forEach(e => {
this.form.informeds.push({
informedFilePath: e.response.imgUrl,
})
})
this.form.signPackage = this.signPackage
addsign(this.form).then(res => {
this.$confirm('签约成功, 是否返回上一页?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'success'
}).then(() => {
this.$router.go(-1);
}).catch(() => {
this.$modal.msgSuccess("签约成功");
});
})
},
//
addhardware() {
this.form.devices.push({
snCode: '',
hardwareType: '',
})
},
delhardware(index) {
this.form.devices.splice(index, 1);
},
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePictureCardPreview(file) { },
goback() {
this.$router.go(-1);
},
}
};
</script>
<style lang="scss" scoped>
.app-container {
padding: 14px 0 0;
background-color: #F2F3F5 !important;
width: 100%;
display: flex;
justify-content: center;
.descriptions {
padding: 20px 20px 10px;
}
.descriptions {
::v-deep .el-descriptions-item__label.has-colon::after {
display: none;
}
}
.interval {
width: 20%;
background-color: #fff;
border-radius: 8px 0 0 8px;
border-right: 1px solid #e5e5e5;
.package-item {
border-left: 2px solid #1890ff;
background-color: #D2E9FC;
width: 100%;
height: 120px;
position: relative;
padding: 25px 14px;
.type {
position: absolute;
right: 10px;
top: 20px;
font-size: 12px;
}
.name {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 40px;
line-height: 40px;
font-size: 18px;
font-weight: 600;
}
.time {
line-height: 20px;
height: 20px;
font-size: 14px;
}
}
}
.header {
background-color: #fff;
width: 78%;
border-radius: 0 8px 8px 0;
position: relative;
}
.btns {
position: absolute;
top: 30px;
right: 30px;
}
.addbtn {
margin-right: 100px;
float: right;
transform: translateY(-200%);
}
}
</style>

View File

@ -1,44 +1,175 @@
<template>
<div class="app-container">
<div class="header">
<div class="btns">
<el-button @click="goback">取消</el-button>
<el-button type="primary" @click="signupload">签约</el-button>
</div>
<el-descriptions title="签约详情" class="descriptions">
</el-descriptions>
<el-descriptions title="患者信息" style="padding:0 30px">
<el-descriptions-item label="患者姓名">kooriookami</el-descriptions-item>
<el-descriptions-item label="性别">kooriookami</el-descriptions-item>
<el-descriptions-item label="年龄">kooriookami</el-descriptions-item>
<el-descriptions-item label="电话">kooriookami</el-descriptions-item>
<el-descriptions-item label="就诊方式">kooriookami</el-descriptions-item>
<el-descriptions-item label="诊断">kooriookami</el-descriptions-item>
<el-descriptions-item label="住院/门诊号">kooriookami</el-descriptions-item>
<el-descriptions-item label="医院">kooriookami</el-descriptions-item>
<el-descriptions-item label="科室">kooriookami</el-descriptions-item>
<el-descriptions-item label="服务包缴费状态">18100000000</el-descriptions-item>
<el-descriptions-item label="出院/门诊时间">苏州市</el-descriptions-item>
<el-descriptions-item label="注册时间"></el-descriptions-item>
<el-descriptions-item label="患者姓名">{{ $route.query.patientName }}</el-descriptions-item>
<el-descriptions-item label="性别">{{ $route.query.sex == 'MALE' ? '男' : '' }}{{
$route.query.sex == 'FEMALE' ? '女' : '' }}</el-descriptions-item>
<el-descriptions-item label="年龄">{{ $route.query.age }}</el-descriptions-item>
<el-descriptions-item label="电话">{{ $route.query.patientPhone }}</el-descriptions-item>
<el-descriptions-item label="就诊方式">{{
$route.query.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : $route.query.visitMethod ==
'BE_IN_HOSPITAL' ?
'住院' : ''
}}
</el-descriptions-item>
<el-descriptions-item label="诊断">{{ $route.query.reviewDiagnosis }}</el-descriptions-item>
<el-descriptions-item label="住院/门诊号">{{ $route.query.inHospitalNumber }}</el-descriptions-item>
<el-descriptions-item label="医院">{{ $route.query.hospitalAgencyName }}</el-descriptions-item>
<el-descriptions-item label="科室">{{ $route.query.departmentName }}</el-descriptions-item>
<el-descriptions-item label="服务包缴费状态">{{ $route.query.paymentStatus == 'PAID' ? '已缴费' : '' }}
{{ $route.query.paymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
</el-descriptions-item>
<!-- <el-descriptions-item label="出院/门诊时间">{{ $route.query.patientName }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="注册时间">{{ $route.query.patientName }}</el-descriptions-item> -->
</el-descriptions>
<el-descriptions title="服务包信息" style="padding:0 30px">
<el-descriptions-item label="选择服务包"></el-descriptions-item>
<el-descriptions title="服务包信息" style="padding:20px 30px 10px" class="descriptions">
</el-descriptions>
<el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="100px" class="demo-ruleForm"
:inline="true" style="padding-left:40px">
<el-form-item label="选择服务包" prop="packageName">
<el-input v-model="signPackage.packageName"></el-input>
</el-form-item>
</el-form>
<el-descriptions title="硬件信息" style="padding:20px 30px 10px" class="descriptions">
</el-descriptions>
<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm" :inline="true"
style="padding-left:40px">
<div v-for="(item, index) in form.devices" :key="index">
<el-form-item label="硬件类型" :prop="`devices[${index}].hardwareType`"
:rules="rules.devices.hardwareType">
<el-select v-model="item.hardwareType" placeholder="请选择硬件类型" clearable style="width:208px">
<el-option v-for="dict in dict.type.hardware_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="SN码" :prop="`devices[${index}].snCode`" :rules="rules.devices.snCode">
<el-input v-model="item.snCode" placeholder="请输入设备SN码"></el-input>
</el-form-item>
<el-form-item>
<el-button size="mini" @click="delhardware(index)">删除</el-button>
</el-form-item>
</div>
<el-button class="addbtn" type="primary" size="mini" @click="addhardware">新增硬件</el-button>
</el-form>
<el-descriptions title="知情同意书" style="padding:20px 30px 10px" class="descriptions">
</el-descriptions>
<el-upload :action="upload.url" list-type="picture-card" style="margin-left:70px" :data="upload.data"
ref="upload" :on-preview="handlePictureCardPreview" :on-remove="handleRemove" :headers="upload.headers"
:on-success="handleSuccess" :auto-upload="false">
<i class="el-icon-plus"></i>
</el-upload>
</div>
</div>
</template>
<script>
import {
addsign
} from '@/api/manage/newSigning.js'
import { getToken } from '@/utils/auth'
export default {
dicts: ['hardware_type'],
name: "newSigning",
data() {
return {
signPackage: {
packageName: undefined
},
form: {
record: {
patientId: undefined,
patientPhone: undefined,
},
devices: [
{
snCode: undefined,
hardwareType: undefined,
}
],
informeds: []
},
rules: {
packageName: [
{ required: true, message: '请选择服务包', trigger: 'change' }
],
devices: {
snCode: [
{ required: true, message: '请输入SN码', trigger: 'change' }
],
hardwareType: [
{ required: true, message: '请选择硬件类型', trigger: 'change' }
],
},
},
upload: {
data: {
type: 'signInformedFileUrl'
},
headers: {
Authorization: 'Bearer ' + getToken(),
},
url: process.env.VUE_APP_BASE_API + '/manage/file/uploadFile'
}
};
},
created() {
this.form.record = this.$route.query
},
methods: {
//
signupload() {
this.$refs.upload.submit();
},
//
handleSuccess(response, file, fileList) {
this.form.informeds = []
fileList.forEach(e => {
this.form.informeds.push({
informedFilePath: e.response.imgUrl,
})
})
this.form.signPackage = this.signPackage
addsign(this.form).then(res => {
this.$confirm('签约成功, 是否返回上一页?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'success'
}).then(() => {
this.$router.go(-1);
}).catch(() => {
this.$modal.msgSuccess("签约成功");
});
})
},
//
addhardware() {
this.form.devices.push({
snCode: '',
hardwareType: '',
})
},
delhardware(index) {
this.form.devices.splice(index, 1);
},
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePictureCardPreview(file) {
},
goback() {
this.$router.go(-1);
},
}
};
</script>
<style lang="scss" scoped>
.app-container {
padding: 14px 0 0;
@ -61,6 +192,17 @@ export default {
margin: 0 auto;
border-radius: 8px;
}
.btns {
position: absolute;
top: 30px;
right: 30px;
}
.addbtn {
margin-right: 100px;
float: right;
transform: translateY(-200%);
}
}
</style>

View File

@ -70,7 +70,7 @@
</el-form-item> -->
<!-- 微信小程序WE_CHAT_APPLET微信公众号WE_CHAT_OFFICIAL_ACCOUNT管理端MANAGE_END -->
<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:200px">
<el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>

View File

@ -89,7 +89,7 @@
</el-form-item> -->
<!-- 微信小程序WE_CHAT_APPLET微信公众号WE_CHAT_OFFICIAL_ACCOUNT管理端MANAGE_END -->
<!-- <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:200px">
<el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item> -->

View File

@ -103,10 +103,10 @@
size="mini"
@click="handleAdd"
v-hasPermi="['manage:servicewaycontent:add']"
>新增</el-button
>新增服务内容配置</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="success"
plain
@ -117,7 +117,7 @@
v-hasPermi="['manage:servicewaycontent:edit']"
>修改</el-button
>
</el-col>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="danger"
@ -227,7 +227,70 @@
prop="serviceWayFrequencyList"
>
<template slot-scope="scope">
<div v-for="(item, index) in scope.row.serviceWayFrequencyList" :key="index">
<!-- <div
v-for="(itemx, index) in scope.row.serviceWayFrequencyList"
:key="index"
> -->
<div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'TEXT'">
<el-select
size="mini"
@click="getSuppliers()"
@change="blurInputs(scope.row.serviceFrequencyText)"
v-model="scope.row.serviceFrequencyText"
clearable
placeholder="请选择"
>
<el-option
v-for="item in scope.row.serviceWayFrequencyList"
:key="item.id"
:label="item.serviceFrequencyText"
:value="item.id"
>
</el-option>
</el-select>
</div>
<div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'DIGIT'">
<!-- itemx.serviceFrequencyStart +
'~' +
itemx.serviceFrequencyEnd
-->
<!-- 对吗我看看 -->
<el-select
size="mini"
@click="getSuppliers()"
@change="blurInput(scope.row.serviceFrequencyText)"
v-model="scope.row.serviceFrequencyText"
clearable
placeholder="请选择"
>
<!-- @change="blurInput(itemx)" -->
<!-- 你看一下 整理一下代码 label里面就是展示的值 value是选中的 因为你这的value是拼接的 所以上面的v-mode里面存的就是拼劲明白了我自己改改 -->
<el-option
v-for="item in scope.row.serviceWayFrequencyList"
:key="item.id"
:label=" JSON.parse(item.serviceFrequencyStart) +
'~' +
JSON.parse(item.serviceFrequencyEnd)"
:value="
item.id
"
>
</el-option>
</el-select>
</div>
<!-- </div> -->
</template>
<!-- </div> -->
<!-- </template> -->
<!-- <template slot-scope="scope">
<div
v-for="(item, index) in scope.row.serviceWayFrequencyList"
:key="index"
>
<div v-if="item.serviceFrequencyType == 'DIGIT'">
{{ item.serviceFrequencyStart }}~{{
item.serviceFrequencyEnd
@ -237,8 +300,7 @@
{{ item.serviceFrequencyText }}
</div>
</div>
</template>
</template> -->
</el-table-column>
<el-table-column
@ -297,12 +359,12 @@
v-model="form.serviceContent"
/>
</el-form-item>
<!-- <el-form-item label="所属服务内容id" prop="serviceContentId">
<el-input v-model="form.serviceContentId" placeholder="请输入所属服务内容id" />
</el-form-item> -->
<el-form-item label="服务频次">
<el-form-item
label="服务频次"
prop="serviceFrequencyType"
label-width="80px"
>
<el-checkbox v-model="DIGIT" @change="DIGITlist">数字</el-checkbox>
<div style="display: flex; margin: -32px 34px 0 66px">
<el-form-item label="" prop="serviceFrequencyStart" label-width="">
<el-input
@ -324,7 +386,6 @@
<div style="position: relative; top: 12px">
<el-checkbox v-model="TEXT" @change="textlist">文本</el-checkbox>
</div>
<!-- </el-form-item> -->
<div style="margin: -23px 45px 0px 74px">
<el-form-item label="" prop="serviceFrequencyText" label-width="">
<el-input
@ -337,21 +398,6 @@
</div>
</div>
</el-form-item>
<!-- </> -->
<!-- <el-form-item
label=""
prop="serviceFrequencyText"
label-width="90x"
> -->
<!-- <el-form-item label="排序" prop="serviceSort">
<el-input v-model="form.serviceSort" placeholder="请输入排序" />
</el-form-item>
<el-form-item label="备注" prop="serviceRemark">
<el-input v-model="form.serviceRemark" placeholder="请输入备注" />
</el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
@ -462,7 +508,11 @@ export default {
//
form: {},
//
rules: {},
rules: {
serviceFrequencyType: [
{ required: true, message: "请选中服务频次", trigger: "blur" },
],
},
itemname: null,
querydepartmen: {
serviceWayName: "",
@ -470,11 +520,11 @@ export default {
disabled: true,
disabledb: false,
disableda: false,
valuePlus:'',
};
},
watch: {
name(val) {
// console.log(val,'55')
this.querydepartmen.serviceWayName = val;
this.mentlist();
},
@ -482,12 +532,18 @@ export default {
created() {
this.getList();
this.mentlist();
// listMessage(this.queryParams).then(response => {
// this.count = response.total;
// });
},
methods: {
getSuppliers(e) {
console.log(e);
},
blurInput(val) {
console.log(val, "555");
},
blurInputs(val) {
console.log(val, "666");
this.form.id = val;
},
textlist(e) {
if (e == true) {
this.disableda = true;
@ -575,6 +631,10 @@ export default {
this.loading = true;
listServicewaycontent(this.queryParams).then((response) => {
this.servicewaycontentList = response.rows;
this.servicewaycontentList.forEach((e) => {
this.serviceFrequencyType = e.serviceFrequencyType;
});
this.total = response.total;
this.loading = false;
});
@ -632,19 +692,37 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
// this.reset();
console.log(row);
this.reset();
console.log(row,'99999');
// const id = row.id
// --------------
if(!this.form.id){
row.serviceWayFrequencyList.forEach((e) => {
this.form.id = e.id;
});
}
getServicewaycontent(this.form.id).then((response) => {
this.form = response.data;
this.form.id = response.data.serviceFrequencyId;
// ----------
if (response.data.serviceFrequencyType == "DIGIT") {
this.DIGIT = true;
this.TEXT = false;
}else{
this.TEXT=true
this.DIGIT = false;
}
// ---------------
this.open = true;
this.title = "修改服务方式内容";
});
// -----------
},
/** 提交按钮 */
submitForm() {
@ -787,4 +865,7 @@ export default {
top: 16px;
left: 12px;
}
.el-button--success.is-plain {
font-size: 10px;
}
</style>

View File

@ -4,7 +4,7 @@
<el-tab-pane label="意向签约" name="INTENTIONAL_SIGNING"></el-tab-pane>
<el-tab-pane label="服务中" name="SERVICE_CENTER"></el-tab-pane>
<el-tab-pane label="服务结束" name="SERVICE_END"></el-tab-pane>
<el-tab-pane label="待续签" name="WAIT_CONTINUOUS_SIGN"></el-tab-pane>
<!-- <el-tab-pane label="待续签" name="WAIT_CONTINUOUS_SIGN"></el-tab-pane> -->
</el-tabs>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
<el-form-item label="加入意向时间" prop="intentionalTimeStart" label-width="110px"
@ -23,11 +23,11 @@
style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="提交时间" prop="submissionTimeStart" v-if="queryParams.serviceStatus == 'WAIT_CONTINUOUS_SIGN'">
<!-- <el-form-item label="提交时间" prop="submissionTimeStart" v-if="queryParams.serviceStatus == 'WAIT_CONTINUOUS_SIGN'">
<el-date-picker v-model="submissionTime" type="daterange" range-separator="" start-placeholder="开始日期"
style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-form-item> -->
<el-form-item label="医院" prop="hospitalAgencyId">
<el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
@clear="clearhospitalAgency" @change="changehospitalAgency">
@ -113,7 +113,7 @@
<el-table-column label="姓名" align="center" prop="patientName" />
<el-table-column label="电话" align="center" prop="patientPhone" width="130" />
<el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="130" />
<el-table-column label="诊断" align="center" prop="mainDiagnosis" />
<el-table-column label="诊断" align="center" prop="signDiagnosis" />
<el-table-column label="医院" align="center" prop="hospitalAgencyName" width="130" />
<el-table-column label="院区" align="center" prop="campusAgencyName" />
<el-table-column label="科室" align="center" prop="departmentName" />
@ -128,12 +128,14 @@
<el-table-column label="患者来源" align="center" prop="intentionalSource" v-else />
<el-table-column label="签约时间" align="center" prop="signTime" width="180"
v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">
<template slot-scope="scope">
<span>{{ formatDate(scope.row.signTime) }}</span>
</template>
</el-table-column>
<el-table-column label="加入意向时间" align="center" prop="intentionalTime" width="180"
v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">
<template slot-scope="scope">
<span>{{ formatDate(scope.row.intentionalTime) }}</span>
</template>
@ -144,6 +146,7 @@
<el-table-column label="开单医生" align="center" prop="billingDoctorName" />
<el-table-column label="金额" align="center" prop="price" />
<el-table-column label="缴费状态" align="center" prop="paymentStatus">
<template slot-scope="scope">
<span>{{ scope.row.paymentStatus == 'PAID' ? '已缴费' : '' }}
{{ scope.row.paymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
@ -152,6 +155,7 @@
</el-table-column>
</div>
<el-table-column label="签约时长" align="center" prop="serviceCycle">
<template slot-scope="scope">
<span>{{ scope.row.serviceCycle }}</span>
</template>
@ -160,17 +164,23 @@
prop="serviceStatus" >
意向签约INTENTIONAL_SIGNING服务中SERVICE_CENTER服务结束SERVICE_END
</el-table-column> -->
<el-table-column label="签约状态" align="center" prop="signStatus" v-if="queryParams.serviceStatus == 'SERVICE_END'">
<template slot-scope="scope">
{{ scope.row.signStatus == 'SEPARATE_SIGN' ? '取消签约' : '' }}
{{ scope.row.signStatus == 'EXPIRE_SIGN' ? '过期' : '' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handlenewsign(scope.row)"
v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">签约</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">忽略</el-button>
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
<el-button size="mini" type="text" @click="handleAuthRole(scope.row)"
v-if="queryParams.serviceStatus == 'SERVICE_CENTER' || queryParams.serviceStatus == 'SERVICE_END'">详情</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">取消签约</el-button>
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
<el-button size="mini" type="text" @click="handleContinue(scope.row)"
v-if="queryParams.serviceStatus == 'SERVICE_CENTER' || queryParams.serviceStatus == 'SERVICE_END'">续约</el-button>
</template>
</el-table-column>
@ -182,7 +192,7 @@
<script>
import { getAge } from "@/utils/age";
import { listSignRecord, getSignRecord, delSignRecord, addSignRecord, updateSignRecord } from "@/api/manage/signRecord";
import { listSignRecord, getSignRecord, delSignRecord, addSignRecord, updateSignRecord, updateSignStatus } from "@/api/manage/signRecord";
import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
export default {
@ -365,15 +375,25 @@ export default {
this.form = response.data;
});
},
/** 删除按钮操作 */
/** 解约按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除签约记录编号为"' + ids + '"的数据项?').then(function () {
return delSignRecord(ids);
}).then(() => {
// const ids = row.id || this.ids;
this.$prompt('原因', '取消签约', {
confirmButtonText: '确定',
cancelButtonText: '取消',
}).then(({ value }) => {
const query = {
id: row.id,
patientId: row.patientId,
signStatus: 'SEPARATE_SIGN',
separateReason: value,
serviceStatus: 'SERVICE_END',
}
updateSignStatus(query).then(res => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => { });
this.$modal.msgSuccess("取消签约成功");
})
})
},
/** 导出按钮操作 */
handleExport() {
@ -413,9 +433,10 @@ export default {
patientName: row.patientName,
patientPhone: row.patientPhone,
visitMethod: row.visitMethod,
mainDiagnosis: row.mainDiagnosis,
signDiagnosis: row.signDiagnosis,
visitSerialNumber: row.visitSerialNumber,
hospitalAgencyName: row.hospitalAgencyName,
inHospitalNumber: row.inHospitalNumber,
departmentName: row.departmentName,
paymentStatus: row.paymentStatus,
sex: row.sex,
@ -492,6 +513,34 @@ export default {
cleardepartment() {
this.queryParams.wardId = null
},
//
handleContinue(row) {
this.$router.push({
path: "/patient/continueSigning",
query: {
patientSignRecordId: row.id,
},
});
},
/** 详情操作 */
handleAuthRole(row) {
this.$router.push({
path: "/patient/patientdetails",
query: {
patientId: row.id,
cardNo: row.cardNo,
patientName: row.patientName,
patientPhone: row.patientPhone,
sex: row.sex,
birthDate: row.birthDate,
familyMemberPhone: row.familyMemberPhone,
address: row.address,
patientSource: row.patientSource,
createTime: row.createTime,
age: row.birthDate ? getAge(row.birthDate) : '',
},
});
},
}
};
</script>

File diff suppressed because it is too large Load Diff

View File

@ -46,6 +46,7 @@
</el-table-column>
<el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:question:edit']">编辑</el-button>
@ -54,8 +55,8 @@
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
</el-col>
</el-row>
</div>
@ -156,6 +157,12 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
this.$router.push({
path: "/question/addQuestionnaire",
query: {
id: row.id,
},
});
},
/** 删除按钮操作 */
handleDelete(row) {