From 9955d350edda1cecf63b1efa4f77923d15e7e1c3 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 27 六月 2024 14:33:35 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 3 +
src/views/patient/propaganda/QuestionnaireTask.vue | 82 +++++++++++++++++++----------------------
2 files changed, 41 insertions(+), 44 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 71ed556..d415167 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -627,6 +627,9 @@
/** 鏌ヨ浠诲姟鍒楄〃 */
getList() {
this.loading = true;
+ this.tasktopic = this.$route.query.tasktopic
+ ? this.$route.query.tasktopic
+ : this.tasktopic;
if (this.tasktopic == 1 || this.tasktopic == 2 || this.tasktopic == 3) {
getTasklist(this.topqueryParams).then((response) => {
this.userList = response.rows;
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 4ec9bd9..a0697f4 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -342,6 +342,7 @@
@selectfn="selectfn"
:currentList="userList"
:tableLabel="tableLabel"
+ :serialnumber="false"
:controlsc="false"
:multiplechoice="false"
:typeinfo="1"
@@ -669,19 +670,19 @@
<div
class="topic-dev"
v-for="(item, index) in questionList"
- :key="item.aaa"
+ :key="item.id"
>
<div class="dev-text">
- {{ index + 1 }}銆�<span>{{ item.questionText }}</span>
+ {{ index + 1 }}銆�<span>{{ item.script }}</span>
</div>
- <div class="dev-xx" v-if="item.valueType == 1">
+ <div class="dev-xx" v-if="item.scripttype != 3">
<el-radio-group v-model="item.radio">
<el-radio
- v-for="(items, index) in item.ivrLibaScriptTargetoptionList"
+ v-for="(items, index) in item.svyLibTemplateTargetoptions"
:key="items.id"
:label="items.id"
- >{{ items.targetvalue }}
+ >{{ items.optioncontent }}
</el-radio>
</el-radio-group>
</div>
@@ -754,10 +755,11 @@
],
tableLabelwj: [
- { label: "闂嵎鍚嶇О", width: "", prop: "name" },
- { label: "闂嵎妯＄増", width: "", prop: "impTemplate" },
- { label: "淇敼鏃ユ湡", width: "", prop: "uploadTime" },
- { label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "updateBy" },
+ { label: "搴忓彿", width: "", prop: "svyid" },
+ { label: "闂嵎鍚嶇О", width: "", prop: "svyname" },
+ { label: "闂嵎姒傝堪", width: "", prop: "description" },
+ { label: "淇敼鏃ユ湡", width: "", prop: "updateTime" },
+ { label: "鍒涘缓浜�", width: "", prop: "createBy" },
],
// 鍙橀噺
tableLabelvariable: [
@@ -775,6 +777,8 @@
{ label: "鏀粯瀹�", value: 7 },
{ label: "鏅鸿兘灏忕▼搴�", value: 8 },
{ label: "閽夐拤", value: 9 },
+ { label: "绾夸笅锛堢焊璐級", value: 10 },
+ { label: "绾夸笂锛堢煭淇�/閽夐拤鐨勬枃鏈�侀棶鍗烽摼鎺ワ級", value: 11 },
],
// 鏃堕棿澶勭悊
daytime: [], //鏃ユ湡
@@ -962,7 +966,10 @@
} else {
this.$modal.msgSuccess("淇敼鎴愬姛");
}
- this.$router.go(-1);
+ this.$router.push({
+ path: "/followvisit/tasklist",
+ query: { tasktopic: 6 },
+ });
}
});
},
@@ -971,30 +978,15 @@
selectfn(row, type) {
// 妯＄増鎯呭喌涓嬭幏鍙栨ā鐗堜俊鎭�
if (type == 1) {
- if (
- this.currenttype == 2 ||
- this.currenttype == 4 ||
- this.currenttype == 3 ||
- currenttype == 5 ||
- currenttype == 7
- ) {
- this.libName = row.templateName;
- this.libId = row.id;
- } else if (this.currenttype == 1) {
- this.libName = row.preachname;
- this.libId = row.id;
- }
- getQtemplatelist({ id: row.id }).then((res) => {
- if (res.code == 200) {
- this.Tasktemplate = res.data;
- const data = res.data;
- this.questionList = data.ivrLibaTemplateScriptVOList;
- this.previewtf = true;
- this.previewid = data.id;
- console.log(this.questionList, "questionList");
- this.Variablehandling(data.ivrLibaTemplateScriptVOList, 1);
- }
- });
+ this.libName = row.svyname;
+ this.libId = row.svyid;
+ console.log(row, "row");
+ this.Tasktemplate = row;
+ this.questionList = row.svyLibScripts;
+ this.previewtf = true;
+ this.previewid = row.svyid;
+ console.log(this.questionList, "questionList");
+ this.Variablehandling(row.svyLibScripts, 1);
} else if (type == 2) {
} else if (type == 3) {
}
@@ -1054,8 +1046,7 @@
handleUpdate() {},
handleDelete() {},
handleExport() {},
- // 閫変腑鎮ｈ�呰〃
- handlePitchionChange() {},
+
// 閫夋嫨鎮ｈ�呰〃鏁版嵁
handleSelectionChange(selection) {
console.log("澶氶�夋偅鑰�");
@@ -1067,6 +1058,7 @@
const isExist = this.overallCase.find((obj) => obj.name == item.name);
if (!isExist) {
item.isoperation = 1;
+ item.hospType = this.patientqueryParams.allhosp;
this.overallCase.push(item);
this.form.patTaskRelevances.push(item);
}
@@ -1141,6 +1133,10 @@
console.log(2233);
if (res.code == 200) {
this.form = res.data;
+
+ this.form.patTaskRelevances = this.form.patTaskRelevances
+ ? this.form.patTaskRelevances
+ : [];
this.overallCase = this.form.patTaskRelevances.concat();
this.formatFn(2);
console.log(this.form.showDate, "this.form");
@@ -1270,15 +1266,12 @@
previewFn() {
let id = this.Tasktemplate.id;
this.Tasktemplate.id = null;
- this.Tasktemplate.ivrLibaTemplateScriptVOList.ivrTaskScriptTargetoptionList =
- this.Tasktemplate.ivrLibaTemplateScriptVOList.ivrLibaScriptTargetoptionList;
- this.Tasktemplate.ivrTaskTemplateScriptVOList =
- this.Tasktemplate.ivrLibaTemplateScriptVOList;
- this.Tasktemplate.ivrLibaTemplateTagList = null;
- this.Tasktemplate.tempDetpRelevances = null;
- this.Tasktemplate.libtemplateid = id;
+ this.Tasktemplate.svyLibScripts.svyTaskTemplateTargetoptions =
+ this.Tasktemplate.svyLibScripts.svyLibTemplateTargetoptions;
+ this.Tasktemplate.svyTaskTemplateScriptVOS =
+ this.Tasktemplate.svyLibScripts;
+ this.Tasktemplate.templateid = id;
this.Tasktemplate.isoperation = 1;
- this.Tasktemplate.libtemplatename = this.Tasktemplate.templateName;
TaskQuestioncomit(this.Tasktemplate).then((response) => {
console.log(response);
this.previewtf = false;
@@ -1302,6 +1295,7 @@
}
});
});
+ console.log(list, "list");
this.form.preachform = list.join(",");
} else {
console.log(this.form.preachform, "this.form.preachform");
--
Gitblit v1.9.3