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"
@ -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) => {
@ -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,22 +663,25 @@ 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: "取消",