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

This commit is contained in:
闫晓茹 2024-08-01 17:59:28 +08:00
commit d6d2ce6cf9
7 changed files with 204 additions and 390 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

BIN
src/assets/images/right.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 305 B

View File

@ -203,6 +203,7 @@
<div class="tabtexts"> <div class="tabtexts">
<div class="tabtitle"> <div class="tabtitle">
{{ item.taskTypeName }}-{{ item.taskPartitionDictName }} {{ item.taskTypeName }}-{{ item.taskPartitionDictName }}
<span v-if="!item.conditionSatisfyStatus" style="color: red">(不符合条件)</span>
</div> </div>
<div class="tabtext" style="height: 50px;line-height: 30px;"> <div class="tabtext" style="height: 50px;line-height: 30px;">
<div class="lefttext"> <div class="lefttext">
@ -350,7 +351,7 @@ export default {
}, },
methods: { methods: {
changeswitch(e) { changeswitch(e) {
if (e) { if (!e) {
this.routelist = this.allroutelist.filter(item => item.conditionSatisfyStatus); this.routelist = this.allroutelist.filter(item => item.conditionSatisfyStatus);
} else { } else {
this.routelist = this.allroutelist this.routelist = this.allroutelist
@ -396,7 +397,7 @@ export default {
}); });
getRouteNodeInfo(this.$route.query.signRecordId).then(res => { getRouteNodeInfo(this.$route.query.signRecordId).then(res => {
this.allroutelist = res.data this.allroutelist = res.data
this.routelist = res.data this.routelist = this.allroutelist.filter(item => item.conditionSatisfyStatus);
this.tab = 2 this.tab = 2
loading.close(); loading.close();
}).catch(err => { }).catch(err => {

View File

@ -169,329 +169,6 @@ export default {
nodes: [], nodes: [],
edges: [], edges: [],
}, },
// form: {
// nodes: [{
// color
// :
// "#FA8C16",
// id
// :
// "655c5165",
// index
// :
// 0,
// label
// :
// "",
// nodetype
// :
// "startNode",
// shape
// :
// "flow-circle",
// size
// :
// "72*72",
// type
// :
// "node",
// x
// :
// 441.5124969482422,
// y
// :
// 60.79999542236328,
// }, {
// color
// :
// "#1890ff",
// id
// :
// "8660695d",
// index
// :
// 1,
// label
// :
// "",
// size
// :
// "100*50",
// type
// :
// "node",
// x
// :
// 242.5124969482422,
// y
// :
// 183.5999984741211,
// },
// {
// color
// :
// "#1890ff",
// id
// :
// "59c9ceed",
// index
// :
// 2,
// label
// :
// "",
// size
// :
// "100*50",
// type
// :
// "node",
// x
// :
// 606.5124969482422,
// y
// :
// 187.5999984741211,
// }, {
// color
// :
// "#722ED1",
// id
// :
// "16f4c8ba",
// index
// :
// 5,
// label
// :
// "##",
// shape
// :
// "flow-capsule",
// size
// :
// "200*48",
// type
// :
// "node",
// x
// :
// 433.5124969482422,
// y
// :
// 125.5999984741211,
// }, {
// color
// :
// "#722ED1",
// id
// :
// "e4839dcc",
// index
// :
// 6,
// label
// :
// "",
// shape
// :
// "flow-capsule",
// size
// :
// "80*48",
// type
// :
// "node",
// x
// :
// 233.5124969482422,
// y
// :
// 251.5999984741211,
// }, {
// color
// :
// "#1890ff",
// id
// :
// "392ca0b8",
// index
// :
// 7,
// label
// :
// "",
// size
// :
// "100*50",
// type
// :
// "node",
// x
// :
// 55.51249694824219,
// y
// :
// 299.5999984741211
// }, {
// color
// :
// "#1890ff",
// id
// :
// "6bcab22d",
// index
// :
// 8,
// label
// :
// "",
// size
// :
// "100*50",
// type
// :
// "node",
// x
// :
// 384.5124969482422,
// y
// :
// 307.5999984741211
// },
// {
// color
// :
// "#722ED1",
// id
// :
// "dc5de91f",
// index
// :
// 11,
// label
// :
// " ",
// shape
// :
// "flow-capsule",
// size
// :
// "200*48",
// type
// :
// "node",
// x
// :
// 55.51249694824219,
// y
// :
// 366.5
// }],
// edges: [{
// id: "b04d23c7",
// index
// :
// 3,
// label
// :
// "",
// shape
// :
// "flow-polyline-round",
// source
// :
// "655c5165",
// sourceAnchor
// :
// 1,
// target
// :
// "59c9ceed",
// targetAnchor
// :
// 0,
// }, {
// id
// :
// "7894068d",
// index
// :
// 4,
// label
// :
// "",
// shape
// :
// "flow-polyline-round",
// source
// :
// "655c5165",
// sourceAnchor
// :
// 3,
// target
// :
// "8660695d",
// targetAnchor
// :
// 0,
// }, {
// id
// :
// "6aa429cc",
// index
// :
// 9,
// label
// :
// "",
// shape
// :
// "flow-polyline-round",
// source
// :
// "8660695d",
// sourceAnchor
// :
// 3,
// target
// :
// "392ca0b8",
// targetAnchor
// :
// 0,
// },
// {
// id
// :
// "02bfc4d0",
// index
// :
// 10,
// label
// :
// "",
// shape
// :
// "flow-polyline-round",
// source
// :
// "8660695d",
// sourceAnchor
// :
// 1,
// target
// :
// "6bcab22d",
// targetAnchor
// :
// 0
// }
// ]
// },
// //
nodeAttributeForm: { nodeAttributeForm: {
label: "", label: "",

View File

@ -13,7 +13,6 @@
ref="formlist" ref="formlist"
:model="formlist" :model="formlist"
label-width="110px" label-width="110px"
:rules="rulesphone"
> >
<el-form-item label="电话" prop="patientPhone"> <el-form-item label="电话" prop="patientPhone">
<el-input <el-input
@ -91,9 +90,7 @@
<!-- 问卷模板处理 --> <!-- 问卷模板处理 -->
<div <div
class="right" class="right"
v-if=" v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
"
> >
<div <div
class="sport" class="sport"
@ -233,14 +230,19 @@
<!-- 电话外呼 --> <!-- 电话外呼 -->
<div class="right" v-if="$route.query.taskNodeType == 'PHONE_OUTBOUND'"> <div class="right" v-if="$route.query.taskNodeType == 'PHONE_OUTBOUND'">
<div class="sport"> <div class="sport">
<span <img
><hamburger src="@/assets/images/right.jpg"
@toggleClick="toggleSideBar" class="login-code-img"
id="hamburger-container" v-if="isshow == true"
:is-active="sidebar.opened" @click="toggleSideBar"
class="hamburger-container" />
style="display: inline-block" /></span <img
>话术预览 src="@/assets/images/bitton.jpg"
class="login-code-img"
v-if="isshow == false"
@click="toggleSideBar"
/>
话术预览
</div> </div>
<Scriptpreview <Scriptpreview
:phoneNodeContent="formlist.phoneNodeContent" :phoneNodeContent="formlist.phoneNodeContent"
@ -266,10 +268,7 @@
ref="questiondata" ref="questiondata"
v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'" v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
> >
<el-form-item <el-form-item label="任务处理信息" prop="routeHandleRemark">
label="任务处理信息"
prop="routeHandleRemark"
>
<el-input <el-input
type="textarea" type="textarea"
placeholder="请输入任务处理信息" placeholder="请输入任务处理信息"
@ -282,27 +281,20 @@
:inline="true" :inline="true"
class="demo-form-inline" class="demo-form-inline"
:model="formlist" :model="formlist"
:rules="rules" :rules="rulesphone"
ref="formlist" ref="formlist"
v-if="$route.query.taskNodeType == 'PHONE_OUTBOUND'" v-if="$route.query.taskNodeType == 'PHONE_OUTBOUND'"
> >
<el-form-item label="是否接通" prop="phone"> <el-form-item label="是否接通" prop="phone">
<el-radio <el-radio v-model="formlist.phoneConnectStatus" label="CONNECTED"
v-model="formlist.phoneConnectStatus"
label="CONNECTED"
>已接通</el-radio >已接通</el-radio
> >
<el-radio <el-radio v-model="formlist.phoneConnectStatus" label="NOTCONNECTED"
v-model="formlist.phoneConnectStatus"
label="NOTCONNECTED"
>未接通</el-radio >未接通</el-radio
> >
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="任务处理信息" prop="routeHandleRemark">
label="任务处理信息"
prop="routeHandleRemark"
>
<el-input <el-input
type="textarea" type="textarea"
placeholder="请输入任务处理信息" placeholder="请输入任务处理信息"
@ -315,7 +307,6 @@
</div> </div>
</template> </template>
<script> <script>
import { mapGetters } from 'vuex'
import message from "../../system/components/message.vue"; import message from "../../system/components/message.vue";
import Scriptpreview from "../../system/components/Scriptpreviewopen.vue"; import Scriptpreview from "../../system/components/Scriptpreviewopen.vue";
@ -403,12 +394,6 @@ export default {
parentDictCode: "", parentDictCode: "",
}; };
}, },
computed: {
...mapGetters([
'sidebar',
]),
},
created() { created() {
this.id = this.$route.query.manageRouteId; this.id = this.$route.query.manageRouteId;
this.info(); this.info();
@ -443,10 +428,7 @@ export default {
}, },
methods: { methods: {
toggleSideBar() { toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
this.isshow = !this.isshow this.isshow = !this.isshow
console.log(9999999)
}, },
// //
infoleft() { infoleft() {
@ -689,7 +671,6 @@ export default {
(this.form.routeHandleRemark = this.formlist.routeHandleRemark); (this.form.routeHandleRemark = this.formlist.routeHandleRemark);
this.form.phoneConnectStatus = this.formlist.phoneConnectStatus; this.form.phoneConnectStatus = this.formlist.phoneConnectStatus;
this.form.visitRecordId = this.$route.query.visitRecordId; this.form.visitRecordId = this.$route.query.visitRecordId;
this.form.phoneDialMethod = this.formlist.phoneDialMethod this.form.phoneDialMethod = this.formlist.phoneDialMethod
this.form.phoneMessageTemplateCode = this.formlist.phoneMessageTemplateCode this.form.phoneMessageTemplateCode = this.formlist.phoneMessageTemplateCode
this.form.phoneMessageTemplateContent = this.formlist.phoneMessageTemplateContent this.form.phoneMessageTemplateContent = this.formlist.phoneMessageTemplateContent
@ -697,7 +678,7 @@ export default {
this.form.patientPhone = this.formlist.patientPhone this.form.patientPhone = this.formlist.patientPhone
var formlists = JSON.parse(JSON.stringify(this.form)); var formlists = JSON.parse(JSON.stringify(this.form));
console.log(formlists) console.log(formlists)
// return; return;
addPatientQuestionResult(formlists).then((response) => { addPatientQuestionResult(formlists).then((response) => {
this.$confirm("保存成功, 是否返回上一页?", "提示", { this.$confirm("保存成功, 是否返回上一页?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -734,6 +715,12 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep {
#vue-g6-editor #page canvas {
width: 100% !important;
height: 100% !important;
}
}
::v-deep .el-form-item { ::v-deep .el-form-item {
display: inline-block; display: inline-block;
} }
@ -764,7 +751,7 @@ export default {
.tk { .tk {
::v-deep .el-textarea__inner { ::v-deep .el-textarea__inner {
margin: 20px 0 10px 30px; margin: 20px 0 10px 30px;
width: 35% !important; width: 55% !important;
height: 100px; height: 100px;
} }
} }
@ -847,15 +834,9 @@ export default {
padding: 10px 50px 10px 10px; padding: 10px 50px 10px 10px;
font-size: 20px; font-size: 20px;
font-weight: 600; font-weight: 600;
.hamburger-container { .login-code-img {
height: 100%; top: 10px;
cursor: pointer; position: relative;
transition: background 0.3s;
-webkit-tap-highlight-color: transparent;
&:hover {
background: rgba(0, 0, 0, 0.025);
}
} }
} }

View File

@ -3,8 +3,49 @@
<div v-for="item in patientInfoList" :key="item.id"> <div v-for="item in patientInfoList" :key="item.id">
<div class="carditem"> <div class="carditem">
<div class="top"> <div class="top">
<img src="../../../assets/manage/nvtouxiang.png" alt="" class="img" /> <!-- <img src="../../../assets/manage/nvtouxiang.png" alt="" class="img" /> -->
<!-- <img src="../../../assets/manage/touxiang.png" alt="" class="img" /> --> <img src="../../../assets/manage/touxiang.png" alt="" class="img" />
<div class="name">
张三
</div>
<div class="agesex">
<span style="padding: 0 3px;">|</span>
64
<!-- <span class="zy">在院</span> -->
<!-- <span class="cy">出院</span> -->
<span class="yzy">预住院</span>
<!-- <span class="mz">门诊</span> -->
</div>
<div class="diagnosis">
诊断名称
</div>
</div>
<div class="bottom">
<div class="formitem">
医生李四
</div>
<div class="formitem">
科室心血管内科
</div>
<div class="formitem">
就诊时间2024-06-27
</div>
<div class="formitem flex">
<span>
康复计划执行率
</span>
<el-progress :percentage="0" :format="format"></el-progress>
</div>
<div class="formitem flex">
<span>
康复计划完成率
</span>
<el-progress :percentage="100" :format="format"></el-progress>
</div>
<div class="formitem">
下次任务
</div>
</div> </div>
</div> </div>
</div> </div>
@ -29,7 +70,11 @@ export default {
}, },
mounted() { mounted() {
}, },
methods: {}, methods: {
format(percentage) {
return percentage === 100 ? `${percentage}%(3/3)` : `${percentage}%(3/3)`;
}
}
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -46,17 +91,131 @@ export default {
min-height: 200px; min-height: 200px;
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
border-radius: 10px; border-radius: 10px;
font-size: 14px;
font-weight: 600;
.bottom {
height: 160px;
padding: 0 6px;
.formitem {
height: 26px;
line-height: 26px;
font-size: 12px;
color: #756A5E;
font-weight: 550;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
overflow: hidden;
}
.flex {
display: flex;
align-items: center;
::v-deep .el-progress-bar {
flex: 1;
}
::v-deep .el-progress__text {
font-size: 12px !important;
flex: 0.8;
text-align: right;
}
span {
flex: 0.8;
max-width: 50%;
}
::v-deep .el-progress {
flex: 1;
display: flex;
align-items: center;
}
}
}
.top { .top {
height: 80px; height: 100px;
background-color: #F7F8FA; background-color: #F7F8FA;
} position: relative;
border-radius: 10px 10px 0 0;
.img { .img {
margin: 10px 0 0 10px; margin: 10px 0 0 10px;
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
.agesex {
position: absolute;
right: 10px;
top: 16px;
//
.yzy {
background-color: #E8F4EC;
color: #2FB844;
border: 1.5px solid #2FB844;
border-radius: 2px;
padding: 3px 5px;
margin-left: 4px;
}
//
.mz {
background-color: #DFE4F6;
color: #2D56FB;
border: 1.5px solid #2D56FB;
border-radius: 2px;
padding: 3px 5px;
margin-left: 4px;
}
//
.zy {
background-color: #DEEDF4;
color: #1D98C6;
border: 1.5px solid #1D98C6;
border-radius: 2px;
padding: 3px 5px;
margin-left: 4px;
}
//
.cy {
background-color: #DEEFEE;
color: #2A9A82;
border: 1.5px solid #2A9A82;
border-radius: 2px;
padding: 3px 5px;
margin-left: 4px;
}
}
.diagnosis {
position: absolute;
color: #756A5E;
font-weight: 550;
left: 70px;
top: 42px;
font-size: 12px;
height: 48px;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
overflow: hidden;
padding-right: 4px;
}
.name {
position: absolute;
left: 70px;
top: 16px;
}
}
} }
} }
</style> </style>

View File

@ -317,14 +317,10 @@ export default {
}, },
methods: { methods: {
getlist() { getlist() {
// console.log(this.$route.query)
// console.log(this.phoneNodeContent,'this.form = JSON.parse(this.phoneNodeContent)')
// getFlowScheme(this.$route.query.id).then(res => {
// this.form = JSON.parse(this.$route.query.id)
if(this.phoneNodeContent){ if(this.phoneNodeContent){
this.form = JSON.parse(this.phoneNodeContent); this.form = JSON.parse(this.phoneNodeContent);
this.editor.getCurrentPage().read(this.form); this.editor.getCurrentPage().read(this.form);
// })
} }
}, },
// //