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

# Conflicts:
#	src/views/system/specialDiseaseNode/index.vue
This commit is contained in:
闫晓茹 2024-07-04 10:38:19 +08:00
commit 3a8c5486f2
5 changed files with 90 additions and 156 deletions

View File

@ -412,6 +412,9 @@ export default {
this.queryParams.departmentId = null this.queryParams.departmentId = null
this.queryParams.wardId = null this.queryParams.wardId = null
this.queryParams.attendingPhysicianId = null this.queryParams.attendingPhysicianId = null
setTimeout(() => {
this.attendingPhysicianlist = []
}, 1000);
}, },
// //
clearcampusAgency() { clearcampusAgency() {

View File

@ -83,8 +83,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="开证医生" prop="certificateIssuingDoctor"> <el-form-item label="开证医生" prop="certificateIssuingDoctorId">
<el-select v-model="queryParams.certificateIssuingDoctorId" filterable placeholder="请选择主治医生" <el-select v-model="queryParams.certificateIssuingDoctorId" filterable placeholder="请选择开证医生"
style="width: 200px" clearable> style="width: 200px" clearable>
<el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName" <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
:value="item.userId"> :value="item.userId">
@ -262,8 +262,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="开证医生" prop="certificateIssuingDoctor" v-if="form.hospitalAgencyId"> <el-form-item label="开证医生" prop="certificateIssuingDoctorId" v-if="form.hospitalAgencyId">
<el-select v-model="form.certificateIssuingDoctorId" filterable placeholder="请选择主治医生" style="width: 200px" <el-select v-model="form.certificateIssuingDoctorId" filterable placeholder="请选择开证医生" style="width: 200px"
clearable> clearable>
<el-option v-for="item in form_attendingPhysicianlist" :key="item.userId" :label="item.nickName" <el-option v-for="item in form_attendingPhysicianlist" :key="item.userId" :label="item.nickName"
:value="item.userId"> :value="item.userId">
@ -523,6 +523,7 @@ export default {
// //
appointmentDate: [], appointmentDate: [],
queryParams: { queryParams: {
certificateIssuingDoctorId: undefined,
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
appointmentDateStart: '', appointmentDateStart: '',
@ -708,7 +709,7 @@ export default {
sex: null, sex: null,
address: null, address: null,
patientType: 'PRE_HOSPITALIZED_PATIENT', patientType: 'PRE_HOSPITALIZED_PATIENT',
certificateIssuingDoctor: null, certificateIssuingDoctorId: null,
mainDiagnosis: null, mainDiagnosis: null,
hospitalAgencyId: null, hospitalAgencyId: null,
campusAgencyId: null, campusAgencyId: null,
@ -725,6 +726,7 @@ export default {
}, },
resetHospital() { resetHospital() {
this.formHospital = { this.formHospital = {
attendingPhysicianId: undefined,
patientName: null, patientName: null,
patientPhone: null, patientPhone: null,
familyMemberPhone: null, familyMemberPhone: null,
@ -737,7 +739,6 @@ export default {
certificateIssuingDoctor: null, certificateIssuingDoctor: null,
visitMethod: 'BE_IN_HOSPITAL', visitMethod: 'BE_IN_HOSPITAL',
mainDiagnosis: null, mainDiagnosis: null,
attendingPhysicianId: null,
hospitalAgencyId: null, hospitalAgencyId: null,
campusAgencyId: null, campusAgencyId: null,
departmentId: null, departmentId: null,
@ -1013,8 +1014,6 @@ export default {
// } // }
// getDepartmentList(query).then(res => { // getDepartmentList(query).then(res => {
if (type) { if (type) {
if (!typetwo) { if (!typetwo) {
this.formHospital.departmentId = null this.formHospital.departmentId = null
this.formHospital.wardId = null this.formHospital.wardId = null
@ -1036,8 +1035,6 @@ export default {
// } // }
// getDepartmentList(query).then(res => { // getDepartmentList(query).then(res => {
if (type) { if (type) {
if (!typetwo) { if (!typetwo) {
this.formHospital.wardId = null this.formHospital.wardId = null
this.form.wardId = null this.form.wardId = null
@ -1053,13 +1050,19 @@ export default {
this.form.campusAgencyId = null this.form.campusAgencyId = null
this.form.departmentId = null this.form.departmentId = null
this.form.wardId = null this.form.wardId = null
this.form.attendingPhysicianId = null
this.formHospital.campusAgencyId = null this.formHospital.campusAgencyId = null
this.formHospital.departmentId = null this.formHospital.departmentId = null
this.formHospital.wardId = null this.formHospital.wardId = null
this.formHospital.attendingPhysicianId = null
} else { } else {
this.queryParams.campusAgencyId = null this.queryParams.campusAgencyId = null
this.queryParams.departmentId = null this.queryParams.departmentId = null
this.queryParams.wardId = null this.queryParams.wardId = null
this.queryParams.attendingPhysicianId = null
setTimeout(() => {
this.attendingPhysicianlist = []
}, 1000);
} }
}, },
// //
@ -1137,6 +1140,10 @@ export default {
window.removeEventListener('resize', this.getMaxTableHeight, true) window.removeEventListener('resize', this.getMaxTableHeight, true)
}) })
}, },
changecertificateIssuingDoctor(e) {
console.log(e)
console.log(this.queryParams)
},
} }
}; };
</script> </script>

View File

@ -92,7 +92,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="主治医生" prop="attendingPhysician"> <el-form-item label="主治医生" prop="attendingPhysicianId">
<el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width: 200px" <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width: 200px"
clearable> clearable>
<el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName" <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
@ -1089,13 +1089,19 @@ export default {
this.form.campusAgencyId = null this.form.campusAgencyId = null
this.form.departmentId = null this.form.departmentId = null
this.form.wardId = null this.form.wardId = null
this.form.attendingPhysicianId = null
this.formHospital.campusAgencyId = null this.formHospital.campusAgencyId = null
this.formHospital.departmentId = null this.formHospital.departmentId = null
this.formHospital.wardId = null this.formHospital.wardId = null
this.formHospital.attendingPhysicianId = null
} else { } else {
this.queryParams.campusAgencyId = null this.queryParams.campusAgencyId = null
this.queryParams.departmentId = null this.queryParams.departmentId = null
this.queryParams.wardId = null this.queryParams.wardId = null
this.queryParams.attendingPhysicianId = null
setTimeout(() => {
this.attendingPhysicianlist = []
}, 1000);
} }
}, },
// //

View File

@ -69,7 +69,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="主治医生" prop="attendingPhysician"> <el-form-item label="主治医生" prop="attendingPhysicianId">
<el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width:200px" <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width:200px"
clearable> clearable>
<el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName" <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
@ -1003,10 +1003,15 @@ export default {
this.form.campusAgencyId = null this.form.campusAgencyId = null
this.form.departmentId = null this.form.departmentId = null
this.form.wardId = null this.form.wardId = null
this.form.attendingPhysicianId = null
} else { } else {
this.queryParams.campusAgencyId = null this.queryParams.campusAgencyId = null
this.queryParams.departmentId = null this.queryParams.departmentId = null
this.queryParams.wardId = null this.queryParams.wardId = null
this.queryParams.attendingPhysicianId = null
setTimeout(() => {
this.attendingPhysicianlist = []
}, 1000);
} }
}, },
// //

View File

@ -8,17 +8,8 @@
</div> </div>
<div class="select"> <div class="select">
<span> 适用范围 </span> <span> 适用范围 </span>
<el-select <el-select v-model="updata.suitRange" placeholder="请选择" @change="changeoptions">
v-model="updata.suitRange" <el-option v-for="item in options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
placeholder="请选择"
@change="changeoptions"
>
<el-option
v-for="item in options"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
@ -30,59 +21,30 @@
<i class="el-icon-circle-plus-outline" @click="addlist"></i> <i class="el-icon-circle-plus-outline" @click="addlist"></i>
</div> </div>
<el-timeline> <el-timeline>
<el-timeline-item <el-timeline-item v-for="(item, index) in lists" :key="index" :color="listindex == index ? '#409EFF' : ''">
v-for="(item, index) in lists"
:key="index"
:color="listindex == index ? '#409EFF' : ''"
>
<div class="top"> <div class="top">
<div class="toptop"> <div class="toptop">
<el-select v-model="item.routeNodeName" style="width: 100px"> <el-select v-model="item.routeNodeName" style="width: 100px">
<el-option <el-option v-for="item in parentDictCodelist" :key="item.dictValue" :label="item.dictLabel"
v-for="item in parentDictCodelist" :value="item.dictValue">
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
</el-option> </el-option>
</el-select> </el-select>
<el-input <el-input v-model="item.routeNodeDay" type="number" style="width:70px" :min="0"></el-input>
v-model="item.routeNodeDay"
style="width: 70px"
type="number"
:min="0"
></el-input>
<span></span> <span></span>
</div> </div>
<div> <div>
<i class="el-icon-delete" @click="delitem(item, index)"></i> <i class="el-icon-delete" @click="delitem(item, index)"></i>
<i <i class="el-icon-circle-plus-outline" @click="additem(item)"></i>
class="el-icon-circle-plus-outline"
@click="additem(item)"
></i>
</div> </div>
</div> </div>
<el-card <el-card v-for="(uitem, uindex) in item.list" :key="uitem.id"
v-for="(uitem, uindex) in item.list" @click.native="bottomclickevent(uitem, index, uindex, item)"
:key="uitem.id" :class="listindex == index && itemindex == uindex ? 'cards' : ''">
@click.native="bottomclickevent(uitem, index, uindex)"
:class="listindex == index && itemindex == uindex ? 'cards' : ''"
>
<h3 style="height: 20px">{{ uitem.taskTypeName }}</h3> <h3 style="height: 20px">{{ uitem.taskTypeName }}</h3>
<el-tag <el-tag v-if="uitem.routeCheckStatus == 'AGREE'" class="routeCheckStatus">已审核</el-tag>
v-if="uitem.routeCheckStatus == 'AGREE'" <el-tag v-else-if="uitem.routeCheckStatus == 'DISAGREE'" type="danger"
class="routeCheckStatus" class="routeCheckStatus">不同意</el-tag>
>已审核</el-tag <el-tag v-else type="warning" class="routeCheckStatus">未审核</el-tag>
>
<el-tag
v-else-if="uitem.routeCheckStatus == 'DISAGREE'"
type="danger"
class="routeCheckStatus"
>不同意</el-tag
>
<el-tag v-else type="warning" class="routeCheckStatus"
>未审核</el-tag
>
<p style="height: 16px">{{ uitem.taskSubdivisionName }}</p> <p style="height: 16px">{{ uitem.taskSubdivisionName }}</p>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
@ -92,52 +54,28 @@
<div class="topform"> <div class="topform">
<el-form ref="form" :inline="true" :model="form" class="form"> <el-form ref="form" :inline="true" :model="form" class="form">
<el-form-item label="任务类型" prop=""> <el-form-item label="任务类型" prop="">
<el-select <el-select v-model="form.taskType" style="width: 110px" @change="changeTaskType">
v-model="form.taskType" <el-option v-for="item in selectTaskTypeList" :key="item.taskTypeCode" :label="item.taskTypeName"
style="width: 110px" :value="item.taskTypeCode">
@change="changeTaskType"
>
<el-option
v-for="item in selectTaskTypeList"
:key="item.taskTypeCode"
:label="item.taskTypeName"
:value="item.taskTypeCode"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="任务细分" prop=""> <el-form-item label="任务细分" prop="">
<el-select <el-select v-model="form.taskSubdivision" style="width: 110px" @change="changetaskSubdivision">
v-model="form.taskSubdivision" <el-option v-for="item in taskPartitionList" :key="item.taskPartitionCode"
style="width: 110px" :label="item.taskPartitionName" :value="item.taskPartitionCode">
@change="changetaskSubdivision"
>
<el-option
v-for="item in taskPartitionList"
:key="item.taskPartitionCode"
:label="item.taskPartitionName"
:value="item.taskPartitionCode"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="任务状态" prop=""> <el-form-item label="任务状态" prop="">
<el-select v-model="form.taskStatus" style="width: 110px"> <el-select v-model="form.taskStatus" style="width: 110px">
<el-option <el-option v-for="item in taskStatusDictList" :key="item.id" :label="item.taskStatusName"
v-for="item in taskStatusDictList" :value="item.taskStatusCode">
:key="item.id"
:label="item.taskStatusName"
:value="item.taskStatusCode"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="二级分类描述" prop=""> <el-form-item label="二级分类描述" prop="">
<el-input <el-input v-model="form.secondClassifyDescribe" style="width: 110px" disabled></el-input>
v-model="form.secondClassifyDescribe"
style="width: 110px"
disabled
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="执行时间" prop=""> <el-form-item label="执行时间" prop="">
<el-time-select <el-time-select
@ -402,12 +340,6 @@
:templateName="form.templateName" :templateName="form.templateName"
></question> ></question>
</span> </span>
<span
style="display: inline-block; width: 10px"
v-if="form.templateId"
>
<el-button @click="lookquestion">预览</el-button>
</span>
</div> </div>
<!-- <div class="pushMethod"> <!-- <div class="pushMethod">
<el-switch <el-switch
@ -622,7 +554,6 @@ export default {
baseUrl: process.env.VUE_APP_BASE_API, baseUrl: process.env.VUE_APP_BASE_API,
showquestion: false, showquestion: false,
phoneNodeContent: "", phoneNodeContent: "",
optionslist: [], optionslist: [],
optionslistS: [], optionslistS: [],
value: "", value: "",
@ -684,7 +615,7 @@ export default {
this.infolistword(); this.infolistword();
this.infolistMESSAGE(); this.infolistMESSAGE();
}, },
beforeDestroy() {}, beforeDestroy() { },
watch: { watch: {
"form.phoneMessageRemind": { "form.phoneMessageRemind": {
handler(newValue, oldValue) { handler(newValue, oldValue) {
@ -706,7 +637,7 @@ export default {
// phoneTemplateId // phoneTemplateId
}, },
}, },
mounted() {}, mounted() { },
methods: { methods: {
// //
looklist() { looklist() {
@ -722,7 +653,6 @@ export default {
}, },
// //
changephoneDialMethod(e) { changephoneDialMethod(e) {
console.log(e);
if (e == "AI") { if (e == "AI") {
// this.form.templateId='' // this.form.templateId=''
// id // id
@ -733,10 +663,8 @@ export default {
this.lookitemnew = ""; this.lookitemnew = "";
} else if (e == "COMMON") { } else if (e == "COMMON") {
// idid // idid
this.form.templateId = ""; this.form.templateId = "";
this.form.templateName = ""; this.form.templateName = "";
this.form.phoneTemplateId = ""; this.form.phoneTemplateId = "";
this.form.phoneTemplateName = ""; this.form.phoneTemplateName = "";
// //
@ -758,7 +686,6 @@ export default {
// this.taskinfo(); // this.taskinfo();
}); });
}, },
changeoptions(e) { changeoptions(e) {
this.parentDictCode = this.options.find( this.parentDictCode = this.options.find(
(el) => el.dictValue == e (el) => el.dictValue == e
@ -800,7 +727,6 @@ export default {
res.data.specialDiseaseNodeList.forEach((e) => { res.data.specialDiseaseNodeList.forEach((e) => {
if (e.templateType == "SCRIPT" && e.flowScheme) { if (e.templateType == "SCRIPT" && e.flowScheme) {
this.phoneNodeContent = e.flowScheme; this.phoneNodeContent = e.flowScheme;
console.log(this.phoneNodeContent, "this.phoneNodeContent");
} }
if (e.messagePushSign) { if (e.messagePushSign) {
e.messagePushSign = "" + e.messagePushSign; e.messagePushSign = "" + e.messagePushSign;
@ -821,20 +747,12 @@ export default {
"routeNodeName" "routeNodeName"
); );
this.form = this.lists[0].list[0]; this.form = this.lists[0].list[0];
console.log(this.form, "this,form");
// //
if (this.form.templateType == "PROPAGANDA" && this.form.templateId) { if (this.form.templateType == "PROPAGANDA" && this.form.templateId) {
getPropaganda(this.form.templateId).then((response) => { getPropaganda(this.form.templateId).then((response) => {
console.log(response, " this.formview ");
this.formview = response.data; this.formview = response.data;
}); });
} else if ( } else if (this.form.templateType == "QUESTIONNAIRE" || this.form.templateType == "SCRIPT" && this.form.templateId) {
this.form.templateType == "QUESTIONNAIRE" ||
(this.form.templateType == "SCRIPT" && this.form.templateId)
) {
console.log(this.form.templateId, "this.form.templateId5555555555");
// //
questionname(this.form.templateId).then((res) => { questionname(this.form.templateId).then((res) => {
this.lookitemnew = res.data; this.lookitemnew = res.data;
@ -978,25 +896,25 @@ export default {
this.lists.forEach((e) => { this.lists.forEach((e) => {
e.list.length > 0 e.list.length > 0
? e.list.forEach((el) => { ? e.list.forEach((el) => {
el.routeNodeDay = e.routeNodeDay; el.routeNodeDay = e.routeNodeDay;
el.routeNodeName = e.routeNodeName; el.routeNodeName = e.routeNodeName;
if (el.phoneDialMethod == "COMMON" && el.templateId) { if (el.phoneDialMethod == "COMMON" && el.templateId) {
el.phonePushSign = "1"; el.phonePushSign = "1";
el.templateType = "QUESTIONNAIRE"; el.templateType = "QUESTIONNAIRE";
} else if ( } else if (
el.phoneDialMethod == "COMMON" && el.phoneDialMethod == "COMMON" &&
el.phoneTemplateId el.phoneTemplateId
) { ) {
el.phonePushSign = "1"; el.phonePushSign = "1";
el.templateType = "SCRIPT"; el.templateType = "SCRIPT";
} else if (el.phoneDialMethod == "AI" && el.phoneTemplateId) { } else if (el.phoneDialMethod == "AI" && el.phoneTemplateId) {
el.templateType = "SCRIPT"; el.templateType = "SCRIPT";
el.phonePushSign = "1"; el.phonePushSign = "1";
} }
this.updata.specialDiseaseNodeList.push(el); this.updata.specialDiseaseNodeList.push(el);
}) })
: ""; : "";
}); });
// this.updata.specialDiseaseNodeList = // this.updata.specialDiseaseNodeList =
@ -1008,7 +926,6 @@ export default {
// !e.taskSubdivision && // !e.taskSubdivision &&
// !e.taskStatus // !e.taskStatus
// ); // );
// console.log(this.updata,'this.updata')
// return // return
specialDiseaseNode(this.updata).then((res) => { specialDiseaseNode(this.updata).then((res) => {
this.info(); this.info();
@ -1022,19 +939,21 @@ export default {
}, },
// //
questionontemplate(item) { questionontemplate(item) {
console.log(item, "iten");
this.form.templateId = item.templateId; this.form.templateId = item.templateId;
this.form.templateName = item.templateName; this.form.templateName = item.templateName;
this.lookitemnew = item.lookitemnew; this.lookitemnew = item.lookitemnew;
}, },
// //
propagandaontemplate(item) { propagandaontemplate(item) {
console.log(item, "iten");
this.form.templateId = item.templateId; this.form.templateId = item.templateId;
this.form.templateName = item.templateName; this.form.templateName = item.templateName;
this.formview = item.formview; this.formview = item.formview;
}, },
//
dialogVisibletrue() {
this.form.routeNodeDay = Number(this.lists[this.listindex].routeNodeDay)
this.dialogVisible = true
},
// //
bottomclickevent(uitem, index, uindex) { bottomclickevent(uitem, index, uindex) {
// this.phoneNodeContent = ""; // this.phoneNodeContent = "";
@ -1047,27 +966,17 @@ export default {
} }
setTimeout(() => { setTimeout(() => {
this.form = uitem; this.form = uitem;
if (this.form.templateType == "PROPAGANDA" && this.form.templateId) { if (this.form.templateType == "PROPAGANDA" && this.form.templateId) {
// getPropaganda(this.form.templateId).then((response) => { //
getPropaganda(this.form.templateId).then((response) => {
this.formview = response.data; this.formview = response.data;
}); });
} else if ( } else if (this.form.templateType == "QUESTIONNAIRE" && this.form.templateId) {
this.form.templateType == "QUESTIONNAIRE" && questionname(this.form.templateId).then((res) => { //
this.form.templateId
) {
console.log(this.form.templateId, "this.form.templateId");
questionname(this.form.templateId).then((res) => {
//
console.log(res, "res");
this.lookitemnew = res.data; this.lookitemnew = res.data;
}); });
// this.loading=true
} else if (this.form.templateType == "SCRIPT" && this.form.flowScheme) { } else if (this.form.templateType == "SCRIPT" && this.form.flowScheme) {
// //
this.phoneNodeContent = this.form.flowScheme; this.phoneNodeContent = this.form.flowScheme;
console.log(this.phoneNodeContent, "this.phoneNodeContent11");
} }
this.taskPartitionList = []; this.taskPartitionList = [];
if (this.form.taskType) { if (this.form.taskType) {
@ -1221,7 +1130,7 @@ export default {
spinner: "el-icon-loading", spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)", background: "rgba(0, 0, 0, 0.7)",
}); });
if (!this.form.routeNodeDay) { if (Number(this.form.routeNodeDay) != 0 && Number(this.form.routeNodeDay) < 0) {
this.$message.error("请输入节点时间段天数"); this.$message.error("请输入节点时间段天数");
return loading.close(); return loading.close();
} }
@ -1266,18 +1175,21 @@ export default {
border: 1.5px solid #c7c7c7; border: 1.5px solid #c7c7c7;
border-radius: 5px; border-radius: 5px;
} }
::v-deep iframe { ::v-deep iframe {
width: 100%; width: 100%;
height: 500px; height: 500px;
} }
.imageScriptpreview { .imageScriptpreview {
// background: red;
width: 100%; width: 100%;
margin-top: 20px; margin-top: 20px;
} }
.imageScriptpreviews { .imageScriptpreviews {
margin: 0 auto; margin: 0 auto;
width: 90%; width: 90%;
// height: 300px; // height: 300px;
.titletop { .titletop {
font-size: 16px; font-size: 16px;
@ -1319,6 +1231,7 @@ export default {
} }
} }
} }
::v-deep .el-input.is-disabled .el-input__inner { ::v-deep .el-input.is-disabled .el-input__inner {
background-color: #fff !important; background-color: #fff !important;
color: #606266 !important; color: #606266 !important;