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

This commit is contained in:
2024-07-17 15:09:51 +08:00
commit 08229cae4f

View File

@ -49,15 +49,11 @@
<!-- 问卷模板 --> <!-- 问卷模板 -->
<div <div
class="right" class="right"
v-if=" v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
"
> >
<div <div
class="handle" class="handle"
v-if=" v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
"
> >
<el-form <el-form
:inline="true" :inline="true"
@ -88,7 +84,7 @@
> >
您好!本问卷用于评估日常生活能力请根据自身日常实际表现选择合适的选项 您好!本问卷用于评估日常生活能力请根据自身日常实际表现选择合适的选项
</div> </div>
<!-- <!--
<div <div
class="sport" class="sport"
v-if="$route.query.taskNodeType == 'ARTIFICIAL_FOLLOW_UP'" v-if="$route.query.taskNodeType == 'ARTIFICIAL_FOLLOW_UP'"
@ -305,7 +301,7 @@
/> />
</el-form-item> </el-form-item>
<br /> <br />
<el-form-item label="电话短信提醒" prop="phone"> <el-form-item label="电话短信提醒" prop="phoneMessageRemind">
<el-input <el-input
disabled disabled
v-model="formlist.phoneMessageRemind" v-model="formlist.phoneMessageRemind"
@ -432,9 +428,7 @@ export default {
this.id = this.$route.query.manageRouteId; this.id = this.$route.query.manageRouteId;
this.info(); this.info();
this.infolistword(); this.infolistword();
if ( if (this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE") {
this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE"
) {
this.questioninfo(); this.questioninfo();
} else if (this.$route.query.taskNodeType == "PHONE_OUTBOUND") { } else if (this.$route.query.taskNodeType == "PHONE_OUTBOUND") {
selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => { selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => {
@ -500,7 +494,7 @@ export default {
timepickerselect(e, index) { timepickerselect(e, index) {
this.questiondata.questionSubjectList[index].fillBlanksAnswer = e; this.questiondata.questionSubjectList[index].fillBlanksAnswer = e;
}, },
radioGroupChange(e, item) { }, radioGroupChange(e, item) {},
// radio // radio
radioChange(e, item, index) { radioChange(e, item, index) {
console.log(e, item, index, "选中某个单选框时"); console.log(e, item, index, "选中某个单选框时");
@ -580,6 +574,7 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
submit() { submit() {
// return
if (this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE") { if (this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE") {
// .=. // .=.
this.$delete(this.questiondata, "updateBy"); this.$delete(this.questiondata, "updateBy");
@ -641,9 +636,7 @@ export default {
// this.$delete(this.obj, 'totalScore',) // this.$delete(this.obj, 'totalScore',)
} }
// 访 // 访
if ( if (this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE") {
this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE"
) {
// console.log(this.obj, 'objobj') // console.log(this.obj, 'objobj')
// return // return
this.$refs["questiondata"].validate((valid) => { this.$refs["questiondata"].validate((valid) => {
@ -670,40 +663,43 @@ export default {
} }
}); });
} else if (this.$route.query.taskNodeType == "PHONE_OUTBOUND") { } else if (this.$route.query.taskNodeType == "PHONE_OUTBOUND") {
// console.log(this.form, '')
// return
this.$refs["formlist"].validate((valid) => { this.$refs["formlist"].validate((valid) => {
if (valid) { if (valid) {
this.form.phoneMessageRemind = this.optionslist.find(
(el) => el.dictLabel == this.formlist.phoneMessageRemind
)?.dictValue;
this.form.phoneRedialTimes = this.optionslistS.find(
(el) => el.dictLabel == this.formlist.phoneRedialTimes
)?.dictValue;
(this.form.departmentId = this.formlist.departmentId), (this.form.departmentId = this.formlist.departmentId),
(this.form.departmentName = this.formlist.departmentName), (this.form.departmentName = this.formlist.departmentName),
(this.form.diseaseTypeId = this.formlist.diseaseTypeId), (this.form.diseaseTypeId = this.formlist.diseaseTypeId),
(this.form.diseaseTypeName = this.formlist.diseaseTypeName), (this.form.diseaseTypeName = this.formlist.diseaseTypeName),
(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.phoneMessageRemind = this.formlist.phoneMessageRemind; this.form.visitRecordId = this.$route.query.visitRecordId;
(this.form.visitRecordId = this.$route.query.visitRecordId), var formlists = JSON.parse(JSON.stringify(this.form));
// console.log(this.form, 'this.form') // return;
// return addPatientQuestionResult(formlists).then((response) => {
addPatientQuestionResult(this.form).then((response) => { this.$confirm("保存成功, 是否返回上一页?", "提示", {
this.$confirm("保存成功, 是否返回上一页?", "提示", { confirmButtonText: "确定",
confirmButtonText: "确定", cancelButtonText: "取消",
cancelButtonText: "取消", type: "success",
type: "success", })
}) .then(() => {
.then(() => { this.$store
this.$store .dispatch("tagsView/delView", this.$route)
.dispatch("tagsView/delView", this.$route) .then(({ visitedViews }) => {
.then(({ visitedViews }) => { this.$router.push({
this.$router.push({ path: "/task/followup",
path: "/task/followup",
});
}); });
}) });
.catch(() => { })
this.$modal.msgSuccess("保存成功"); .catch(() => {
}); this.$modal.msgSuccess("保存成功");
}); });
});
} }
}); });
} }
@ -824,8 +820,8 @@ export default {
margin-top: 20px; margin-top: 20px;
::v-deep .el-textarea__inner { ::v-deep .el-textarea__inner {
width: 500px; width: 500px;
height: 250px; height: 250px;
} }
} }
} }