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

This commit is contained in:
2024-07-11 17:09:15 +08:00
commit fcabde778a
5 changed files with 54 additions and 55 deletions

View File

@ -173,7 +173,7 @@
v-if="form.taskNodeType == 'QUESTIONNAIRE_SCALE' && form.templateId">
<el-button @click="looklist">预览</el-button>
</span>
<el-form-item label="开启人工随访" label-width="200px" v-if="form.taskNodeType == 'QUESTIONNAIRE_SCALE'">
<el-form-item label="开启人工随访" label-width="200px" v-if="form.taskNodeType == 'QUESTIONNAIRE_SCALE'" class="phoneDialMethod">
<el-switch v-model="form.phoneDialMethod" active-color="#13ce66" active-value="COMMON" inactive-value="">
</el-switch>
</el-form-item>
@ -476,6 +476,9 @@ import indexjs from "./indexjs.js";
export default indexjs;
</script>
<style scoped lang="scss">
.phoneDialMethod{
margin-left: 20px;
}
::v-deep iframe {
width: 100%;
height: 500px;

View File

@ -155,14 +155,14 @@
<span v-if=" scope.row.routeNodeName == 'POSTOPERATIVE'">术后<span v-if="scope.row.routeNodeDay">{{scope.row.routeNodeDay}}</span></span>
</template>
</el-table-column>
<el-table-column label="任务内容" align="center" prop="taskType" :show-overflow-tooltip="true">
<el-table-column label="任务内容" align="center" prop="taskNodeType" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>
{{ scope.row.taskType == "PHONE_OUTBOUND" ? "电话外呼" : "" }}
{{ scope.row.taskType == "QUESTIONNAIRE_SCALE" ? "问卷量表" : "" }}
{{ scope.row.taskType == "PROPAGANDA_ARTICLE" ? "宣教文章" : "" }}
{{ scope.row.taskType == "TEXT_REMIND" ? "文字提醒" : "" }}
{{ scope.row.taskType == "ARTIFICIAL_FOLLOW_UP" ? "人工随访" : "" }}
{{ scope.row.taskNodeType == "PHONE_OUTBOUND" ? "电话外呼" : "" }}
{{ scope.row.taskNodeType == "QUESTIONNAIRE_SCALE" ? "问卷量表" : "" }}
{{ scope.row.taskNodeType == "PROPAGANDA_ARTICLE" ? "宣教文章" : "" }}
{{ scope.row.taskNodeType == "TEXT_REMIND" ? "文字提醒" : "" }}
<!-- {{ scope.row.taskType == "ARTIFICIAL_FOLLOW_UP" ? "人工随访" : "" }} -->
</span>
</template>
</el-table-column>
@ -596,7 +596,7 @@ export default {
query: {
path: "/task/followup",
patientId: row.patientId,
taskType: row.taskType,
taskNodeType: row.taskNodeType,
templateId: row.templateId,
cardNo: row.cardNo,
patientName: row.patientName,
@ -629,7 +629,7 @@ export default {
query: {
path: "/task/followup",
patientId: row.patientId,
taskType: row.taskType,
taskNodeType: row.taskNodeType,
templateId: row.templateId,
manageRouteId: row.manageRouteId,
manageRouteNodeId: row.manageRouteNodeId,

View File

@ -60,15 +60,13 @@
<div
class="right"
v-if="
$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
"
>
<div
class="handle"
v-if="
$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
"
>
<el-form
@ -90,36 +88,35 @@
</div>
<div
class="sport"
v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'"
v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
>
问卷模板: Barthel指数评定问卷
</div>
<div
class="words"
v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'"
v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
>
您好!本问卷用于评估日常生活能力请根据自身日常实际表现选择合适的选项
</div>
<div
<!-- <div
class="sport"
v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'"
v-if="$route.query.taskNodeType == 'ARTIFICIAL_FOLLOW_UP'"
>
人工随访模板: 神经内科人工随访
</div>
<div
class="words"
v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'"
v-if="$route.query.taskNodeType == 'ARTIFICIAL_FOLLOW_UP'"
>
**您好!
</div>
<div
class="words"
v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'"
v-if="$route.query.taskNodeType == 'ARTIFICIAL_FOLLOW_UP'"
>
我是医院的工作人员今天给您打电话想要了解一下您的恢复情况
</div>
</div> -->
<div
class="words"
v-for="(item, index) in questiondata.subjectResultList"
@ -247,7 +244,7 @@
</div>
</div>
<!-- 电话外呼 -->
<!-- <div v-if="$route.query.taskType == 'PHONE_OUTBOUND'">
<!-- <div v-if="$route.query.taskNodeType == 'PHONE_OUTBOUND'">
<div class="sport">电话外呼</div>
<div class="nexttime">
@ -292,7 +289,7 @@
</el-form-item>
</el-form>
</div> -->
<div v-if="$route.query.taskType == 'PHONE_OUTBOUND'">
<div v-if="$route.query.taskNodeType == 'PHONE_OUTBOUND'">
<div class="sport">电话外呼</div>
<div class="nexttime">
@ -443,11 +440,10 @@ export default {
this.id = this.$route.query.manageRouteId;
this.info();
if (
this.$route.query.taskType == "QUESTIONNAIRE_SCALE" ||
this.$route.query.taskType == "ARTIFICIAL_FOLLOW_UP"
this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE"
) {
this.selectlist();
} else if (this.$route.query.taskType == "PHONE_OUTBOUND") {
} else if (this.$route.query.taskNodeType == "PHONE_OUTBOUND") {
if (this.$route.query.routeHandleRemark) {
this.questiondata.routeHandleRemark =
this.$route.query.routeHandleRemark;
@ -597,7 +593,7 @@ export default {
this.questiondata.manageRouteName = this.$route.query.manageRouteName;
this.questiondata.manageRouteNodeName =
this.$route.query.manageRouteNodeName;
this.questiondata.taskType = this.$route.query.taskType;
this.questiondata.taskNodeType = this.$route.query.taskNodeType;
this.questiondata.visitRecordId = this.$route.query.visitRecordId;
this.questiondata.totalScore = 0;
this.questiondata.subjectResultList.forEach((e) => {

View File

@ -50,15 +50,13 @@
<div
class="right"
v-if="
$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
"
>
<div
class="handle"
v-if="
$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
"
>
<el-form
@ -80,35 +78,35 @@
<div
class="sport"
v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'"
v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
>
问卷模板: Barthel指数评定问卷
</div>
<div
class="words"
v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'"
v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
>
您好!本问卷用于评估日常生活能力请根据自身日常实际表现选择合适的选项
</div>
<!--
<div
class="sport"
v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'"
v-if="$route.query.taskNodeType == 'ARTIFICIAL_FOLLOW_UP'"
>
人工随访模板: 神经内科人工随访
</div>
<div
class="words"
v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'"
v-if="$route.query.taskNodeType == 'ARTIFICIAL_FOLLOW_UP'"
>
**您好!
</div>
<div
class="words"
v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'"
v-if="$route.query.taskNodeType == 'ARTIFICIAL_FOLLOW_UP'"
>
我是医院的工作人员今天给您打电话想要了解一下您的恢复情况
</div>
</div> -->
<div
class="words"
@ -233,11 +231,11 @@
</div>
</div>
</div>
<!-- <div class="right_top" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
<!-- <div class="right_top" v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE' ||
$route.query.taskNodeType == 'ARTIFICIAL_FOLLOW_UP'
">
<div style="float: right; margin-top: 20px" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
<div style="float: right; margin-top: 20px" v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE' ||
$route.query.taskNodeType == 'ARTIFICIAL_FOLLOW_UP'
">
<el-form :inline="true" class="demo-form-inline" :model="questiondata" :rules="rules" ref="questiondata">
<el-form-item label="任务处理信息" prop="routeHandleRemark">
@ -259,7 +257,7 @@
</span>
</el-dialog>
<!-- 电话外呼 -->
<div v-if="$route.query.taskType == 'PHONE_OUTBOUND'">
<div v-if="$route.query.taskNodeType == 'PHONE_OUTBOUND'">
<div class="sport">电话外呼</div>
<div class="nexttime">
<el-form
@ -392,7 +390,7 @@ export default {
formlist: {},
optionslistS: [],
form: {
taskType: this.$route.query.taskType,
taskNodeType: this.$route.query.taskNodeType,
routeHandleId: Cookies.get("userId"),
routeHandlePerson: Cookies.get("userName"),
routeHandleRemark: null,
@ -435,11 +433,10 @@ export default {
this.info();
this.infolistword();
if (
this.$route.query.taskType == "QUESTIONNAIRE_SCALE" ||
this.$route.query.taskType == "ARTIFICIAL_FOLLOW_UP"
this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE"
) {
this.questioninfo();
} else if (this.$route.query.taskType == "PHONE_OUTBOUND") {
} else if (this.$route.query.taskNodeType == "PHONE_OUTBOUND") {
selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => {
if (response.data) {
this.formlist = response.data;
@ -551,7 +548,7 @@ export default {
this.questiondata.manageRouteName = this.$route.query.manageRouteName;
this.questiondata.manageRouteNodeName =
this.$route.query.manageRouteNodeName;
this.questiondata.taskType = this.$route.query.taskType;
this.questiondata.taskNodeType = this.$route.query.taskNodeType;
this.questiondata.visitRecordId = this.$route.query.visitRecordId;
this.questiondata.totalScore = 0;
this.questiondata.questionSubjectList.forEach((e) => {
@ -583,7 +580,7 @@ export default {
/** 提交按钮 */
submit() {
if (this.$route.query.taskType == "QUESTIONNAIRE_SCALE") {
if (this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE") {
// .=.
this.$delete(this.questiondata, "updateBy");
this.$delete(this.questiondata, "updateTime");
@ -623,7 +620,7 @@ export default {
delete e.questionSubjectOptionList;
});
// console.log(this.obj, 'obj')
} else if (this.$route.query.taskType == "ARTIFICIAL_FOLLOW_UP") {
} else if (this.$route.query.taskNodeType == "ARTIFICIAL_FOLLOW_UP") {
console.log(this.questiondata, "questiondata");
// .=.
this.$delete(this.questiondata, "updateBy");
@ -645,8 +642,7 @@ export default {
}
// 访
if (
this.$route.query.taskType == "QUESTIONNAIRE_SCALE" ||
this.$route.query.taskType == "ARTIFICIAL_FOLLOW_UP"
this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE"
) {
// console.log(this.obj, 'objobj')
// return
@ -673,7 +669,7 @@ export default {
});
}
});
} else if (this.$route.query.taskType == "PHONE_OUTBOUND") {
} else if (this.$route.query.taskNodeType == "PHONE_OUTBOUND") {
// console.log(this.form, '')
// return
this.$refs["formlist"].validate((valid) => {

View File

@ -87,9 +87,9 @@
</el-form-item>
<span style="display: inline-block; width: 10px"
v-if="form.taskNodeType == 'QUESTIONNAIRE_SCALE' && form.templateId">
<el-button @click="looklist">预览</el-button>
<el-button @click.native="looklist">预览</el-button>
</span>
<el-form-item label="开启人工随访" label-width="200px" v-if="form.taskNodeType == 'QUESTIONNAIRE_SCALE'">
<el-form-item label="开启人工随访" label-width="200px" v-if="form.taskNodeType == 'QUESTIONNAIRE_SCALE'" class="phoneDialMethod">
<el-switch v-model="form.phoneDialMethod" active-color="#13ce66" active-value="COMMON" inactive-value="">
</el-switch>
</el-form-item>
@ -479,6 +479,7 @@ export default {
methods: {
//
looklist() {
console.log(22222)
this.lookquestionlist = true;
},
//
@ -1119,6 +1120,9 @@ export default {
</script>
<style scoped lang="scss">
.phoneDialMethod{
margin-left: 20px;
}
::v-deep iframe {
width: 100%;
height: 500px;