From c936ac935916355b1457903b926d74fb82ad4716 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 16 七月 2024 14:18:21 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 40 ++++++++++++++++++++++++++++++++++------
src/views/knowledge/questionnaire/compilequer/index.vue | 1 +
src/views/patient/propaganda/particty.vue | 8 +++++++-
3 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index defdf55..516f7a8 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -796,20 +796,20 @@
sponsor(row) {
console.log(row, "浠诲姟淇℃伅");
this.taskform = row;
- if (this.taskform.showDate) {
+ if (this.taskform.showDate && this.taskform.sendType != 2) {
this.taskform.showDate = this.taskform.showDate.split(",");
}
- if (this.taskform.showTimeMorn) {
+ if (this.taskform.showTimeMorn && this.taskform.sendType != 2) {
this.taskform.showTimeMorn = this.taskform.showTimeMorn.split(",");
} else {
this.taskform.showTimeMorn = [];
}
- if (this.taskform.showTimeNight) {
+ if (this.taskform.showTimeNight && this.taskform.sendType != 2) {
this.taskform.showTimeNight = this.taskform.showTimeNight.split(",");
} else {
this.taskform.showTimeNight = [];
}
- if (this.taskform.showTimeNoon) {
+ if (this.taskform.showTimeNoon && this.taskform.sendType != 2) {
this.taskform.showTimeNoon = this.taskform.showTimeNoon.split(",");
} else {
this.taskform.showTimeNoon = [];
@@ -861,13 +861,41 @@
// 渚濈収鏂板
newAdd(row) {
- TaskTemplateSendExecution().then((res) => {});
+ this.$modal
+ .confirm("鏄惁渚濈収褰撳墠浠诲姟鍒涘缓鏂颁换鍔★紵")
+ .then(() => {
+ if (
+ this.tasktopic == 2 ||
+ this.tasktopic == 3 ||
+ this.tasktopic == 4 ||
+ this.tasktopic == 5
+ ) {
+ this.$router.push({
+ path: "/followvisit/particty",
+ query: { type: 1, id: row.taskid, nhh: 1 },
+ });
+ } else if (this.tasktopic == 6) {
+ this.$router.push({
+ path: "/followvisit/QuestionnaireTask",
+ query: { type: 2, id: row.taskid, nhh: 1 },
+ });
+ } else if (this.tasktopic == 1) {
+ this.$router.push({
+ path: "/followvisit/Missioncreation",
+ query: { type: 3, id: row.taskid, nhh: 1 },
+ });
+ }
+ })
+ .catch(() => {});
},
// 鏆傚仠
stop(row) {
+ console.log(row);
if (row.sendState == 2) {
- this.TaskOperation.taskId = row.taskId;
+ this.TaskOperation.taskId = row.taskid;
this.TaskOperation.sendState = 3;
+ this.TaskOperation.sendType = "";
+ this.TaskOperation.taskType = row.type;
TaskTemplateSendExecution(this.TaskOperation).then((res) => {
this.$modal.msgSuccess("浠诲姟宸叉殏鍋�");
this.getList();
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 59b5d38..958a9ec 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -503,6 +503,7 @@
</el-col> -->
</el-row>
<el-row :gutter="10">
+
<el-form-item label="閫変腑鎻愮ず">
<el-input
style="width: 20vw"
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 873f2d7..6afd5c6 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -701,6 +701,7 @@
overallCase: [], //閫夋嫨鎮ｈ�呮��
allpids: [],
libId: null, //妯℃澘搴撴ā鐗坕d
+ nhh: null, //鏄惁渚濈収鏂板
Editprogress: 1, //缂栬緫杩涘害
drawermb: false, //閫夋嫨妯＄増寮圭獥
previewtf: false, //棰勮
@@ -887,6 +888,7 @@
this.id = this.$route.query.id;
this.form.type = this.$route.query.type;
this.form.typename = this.$route.query.typename;
+ this.form.nhh = this.$route.query.nhh;
this.listDept();
this.Acquisitiontype();
this.Getdetails();
@@ -1138,6 +1140,7 @@
this.formatFn(2);
console.log(this.form.showDate, "this.form");
this.daytime = this.form.showDate.split(",");
+ this.changeTimeday(this.daytime);
if (this.form.showTimeMorn) {
if (this.form.sendType == 3) {
this.time4 = this.form.showTimeMorn;
@@ -1193,10 +1196,13 @@
console.log(this.form.sendTimeslot, "鏃堕棿");
},
changeTimeday(row) {
+ console.log(row, "鏃ユ湡");
const startDate = new Date(row[0]);
const endDate = new Date(row[1]);
this.applydaytime = this.getDates(startDate, endDate);
- this.processingTime();
+ if (!top) {
+ this.processingTime();
+ }
},
getDates(startDate, endDate) {
const dates = [];
--
Gitblit v1.9.3