From b60394f8417f6565ea673f47375ee33dd17688c0 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期六, 25 十月 2025 10:19:50 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/complaint/index.vue | 6
src/views/followvisit/outpatient/index.vue | 5
src/views/followvisit/technology/index.vue | 5
src/views/patient/physical/index.vue | 5
dist.zip | 0
src/views/followvisit/SpecificDisease/index.vue | 7
src/views/followvisit/again/index.vue | 6
src/views/followvisit/zbAgain/index.vue | 4
src/views/patient/patient/outpatient.vue | 24 ++-
src/views/patient/questionnaire/index.vue | 5
src/views/patient/subsequent/index.vue | 7
src/views/followvisit/record/index.vue | 5
src/views/followvisit/zysatisfaction/index.vue | 4
src/views/patient/propaganda/QuestionnaireTask.vue | 7
/dev/null | 0
src/views/followvisit/record/physical/index.vue | 10
src/views/followvisit/mzsatisfaction/index.vue | 4
src/views/followvisit/record/detailpage/index.vue | 232 ++++++++++++++++++++++++--------------
src/views/patient/shadow/index.vue | 5
src/views/followvisit/discharge/outpatientService.vue | 4
src/views/followvisit/discharge/index.vue | 10 -
21 files changed, 192 insertions(+), 163 deletions(-)
diff --git "a/dist \0502\051.zip" "b/dist \0502\051.zip"
deleted file mode 100644
index cae714b..0000000
--- "a/dist \0502\051.zip"
+++ /dev/null
Binary files differ
diff --git "a/dist \0503\051.zip" "b/dist \0503\051.zip"
deleted file mode 100644
index 612ef04..0000000
--- "a/dist \0503\051.zip"
+++ /dev/null
Binary files differ
diff --git "a/dist \0504\051.zip" "b/dist \0504\051.zip"
deleted file mode 100644
index 612ef04..0000000
--- "a/dist \0504\051.zip"
+++ /dev/null
Binary files differ
diff --git "a/dist \0505\051.zip" "b/dist \0505\051.zip"
deleted file mode 100644
index d6eca22..0000000
--- "a/dist \0505\051.zip"
+++ /dev/null
Binary files differ
diff --git a/dist.zip b/dist.zip
index 28a9580..6755c80 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/views/followvisit/SpecificDisease/index.vue b/src/views/followvisit/SpecificDisease/index.vue
index 407a58d..c5131a7 100644
--- a/src/views/followvisit/SpecificDisease/index.vue
+++ b/src/views/followvisit/SpecificDisease/index.vue
@@ -1264,14 +1264,11 @@
},
// 璺宠浆璇︽儏椤�
Seedetails(row) {
- let type = "";
+ let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
- console.log(type, "rwo");
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/followvisit/again/index.vue b/src/views/followvisit/again/index.vue
index 8315812..a6aed6b 100644
--- a/src/views/followvisit/again/index.vue
+++ b/src/views/followvisit/again/index.vue
@@ -1548,13 +1548,11 @@
},
// 璺宠浆璇︽儏椤�
Seedetails(row) {
- let type = "";
+ let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/followvisit/complaint/index.vue b/src/views/followvisit/complaint/index.vue
index b7ea96c..116f649 100644
--- a/src/views/followvisit/complaint/index.vue
+++ b/src/views/followvisit/complaint/index.vue
@@ -1679,13 +1679,11 @@
},
// 璺宠浆璇︽儏椤�
Seedetails(row) {
- let type = "";
+ let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 64383b4..9910019 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -1378,14 +1378,12 @@
this.topqueryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
- console.log(this.endOut);
-
if (this.endOut == 0) {
- this.topqueryParams.endOutHospTime = this.formatDateToYYYYMMDDHHMMSS(
+ this.topqueryParams.endSendDateTime = this.formatDateToYYYYMMDDHHMMSS(
this.getEndOfDay()
);
} else {
- this.topqueryParams.endOutHospTime = null;
+ this.topqueryParams.endSendDateTime = null;
}
// 鎺ュ彈寮傚父璺宠浆
if (this.errtype) {
@@ -1457,7 +1455,7 @@
const minutes = String(date.getMinutes()).padStart(2, "0");
const seconds = String(date.getSeconds()).padStart(2, "0");
- return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ return `${year}-${month}-${day}`;
},
affiliation() {
this.topqueryParams.managementDoctorCode = store.getters.hisUserId;
@@ -1845,11 +1843,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
if (row.type == 1) {
type = 1;
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/followvisit/discharge/outpatientService.vue b/src/views/followvisit/discharge/outpatientService.vue
index 8e4814d..53a4c79 100644
--- a/src/views/followvisit/discharge/outpatientService.vue
+++ b/src/views/followvisit/discharge/outpatientService.vue
@@ -1522,11 +1522,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/followvisit/mzsatisfaction/index.vue b/src/views/followvisit/mzsatisfaction/index.vue
index fb9cd08..0fbc077 100644
--- a/src/views/followvisit/mzsatisfaction/index.vue
+++ b/src/views/followvisit/mzsatisfaction/index.vue
@@ -1725,11 +1725,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue
index f0401bd..f253049 100644
--- a/src/views/followvisit/outpatient/index.vue
+++ b/src/views/followvisit/outpatient/index.vue
@@ -1130,12 +1130,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
- console.log(type, "rwo");
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index fa48d8a..c34b48f 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -302,7 +302,7 @@
handleOptionChange(
$event,
index,
- item.svyTaskTemplateTargetoptions,
+ item.svyLibTemplateTargetoptions,
item
)
"
@@ -310,11 +310,13 @@
<el-radio
v-for="(
items, indexs
- ) in item.svyTaskTemplateTargetoptions"
+ ) in item.svyLibTemplateTargetoptions"
:class="items.isabnormal ? 'red-star' : ''"
:key="indexs"
:label="items.optioncontent"
- @click.native.prevent="handleRadioToggle(item, items.optioncontent)"
+ @click.native.prevent="
+ handleRadioToggle(item, items.optioncontent)
+ "
>{{ items.optioncontent }}</el-radio
>
</el-radio-group>
@@ -361,7 +363,7 @@
@change="$forceUpdate()"
v-for="(
items, indexs
- ) in item.svyTaskTemplateTargetoptions"
+ ) in item.svyLibTemplateTargetoptions"
:key="indexs"
:label="items.optioncontent"
>
@@ -437,7 +439,9 @@
v-for="(items, index) in item.scriptResult"
:key="items"
:label="items"
- @click.native.prevent="handleRadioToggle(item, items.optioncontent)"
+ @click.native.prevent="
+ handleRadioToggle(item, items.optioncontent)
+ "
>{{ items }}</el-radio
>
</el-radio-group>
@@ -965,14 +969,14 @@
<el-divider></el-divider>
<el-row>
<el-col :span="12">
- <el-form-item label="闅忚鏂瑰紡" prop="date1">
+ <el-form-item label="闅忚鏂瑰紡" prop="visitType">
<el-select
v-model="form.visitType"
filterable
allow-create
default-first-option
@change="visitChange"
- placeholder="璇烽�夋嫨闅忚鏂瑰紡(渚濆嚭闄㈡椂闂存妧璁＄畻)"
+ placeholder="璇烽�夋嫨闅忚鏂瑰紡(渚濆嚭闄㈡椂闂磋绠�)"
>
<el-option
v-for="item in options"
@@ -993,6 +997,8 @@
align="right"
v-model="form.date1"
class="custom-disabled"
+ value-format="yyyy-MM-dd"
+ @change="checkFollowupDate"
></el-date-picker>
</el-form-item>
</el-col>
@@ -1216,7 +1222,23 @@
resource: [
{ required: true, message: "璇烽�夋嫨闅忚鏂瑰紡", trigger: "change" },
],
- date1: [{ required: true, message: "璇烽�夋嫨闅忚鏃堕棿", trigger: "blur" }],
+ date1: [
+ { required: true, message: "璇烽�夋嫨闅忚鏃堕棿", trigger: "blur" },
+ {
+ validator: (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error("璇烽�夋嫨闅忚鏃堕棿"));
+ }
+ const selectedDate = new Date(value);
+ const now = new Date();
+ if (selectedDate < now) {
+ return callback(new Error("闅忚鏃堕棿涓嶈兘鏃╀簬褰撳墠鏃ユ湡"));
+ }
+ callback();
+ },
+ trigger: "change",
+ },
+ ],
},
userrules: {
telcode: [{ validator: validatePhone, trigger: "blur" }],
@@ -1261,56 +1283,56 @@
// 绂佺敤浠婂ぉ鍙婁箣鍓嶇殑鏃ユ湡
return time.getTime() < Date.now() - 24 * 60 * 60 * 1000;
},
- shortcuts: [
- {
- text: "涓冨ぉ鍚�",
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() + 3600 * 1000 * 24 * 7);
- picker.$emit("pick", date);
- },
- },
- {
- text: "15澶╁悗",
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() + 3600 * 1000 * 24 * 15);
- picker.$emit("pick", date);
- },
- },
- {
- text: "涓�涓湀鍚�",
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() + 3600 * 1000 * 24 * 30);
- picker.$emit("pick", date);
- },
- },
- {
- text: "涓変釜鏈堝悗",
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() + 3600 * 1000 * 24 * 90);
- picker.$emit("pick", date);
- },
- },
- {
- text: "鍏釜鏈堝悗",
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() + 3600 * 1000 * 24 * 180);
- picker.$emit("pick", date);
- },
- },
- {
- text: "涓�骞村悗",
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() + 3600 * 1000 * 24 * 365);
- picker.$emit("pick", date);
- },
- },
- ],
+ // shortcuts: [
+ // {
+ // text: "涓冨ぉ鍚�",
+ // onClick(picker) {
+ // const date = new Date();
+ // date.setTime(date.getTime() + 3600 * 1000 * 24 * 7);
+ // picker.$emit("pick", date);
+ // },
+ // },
+ // {
+ // text: "15澶╁悗",
+ // onClick(picker) {
+ // const date = new Date();
+ // date.setTime(date.getTime() + 3600 * 1000 * 24 * 15);
+ // picker.$emit("pick", date);
+ // },
+ // },
+ // {
+ // text: "涓�涓湀鍚�",
+ // onClick(picker) {
+ // const date = new Date();
+ // date.setTime(date.getTime() + 3600 * 1000 * 24 * 30);
+ // picker.$emit("pick", date);
+ // },
+ // },
+ // {
+ // text: "涓変釜鏈堝悗",
+ // onClick(picker) {
+ // const date = new Date();
+ // date.setTime(date.getTime() + 3600 * 1000 * 24 * 90);
+ // picker.$emit("pick", date);
+ // },
+ // },
+ // {
+ // text: "鍏釜鏈堝悗",
+ // onClick(picker) {
+ // const date = new Date();
+ // date.setTime(date.getTime() + 3600 * 1000 * 24 * 180);
+ // picker.$emit("pick", date);
+ // },
+ // },
+ // {
+ // text: "涓�骞村悗",
+ // onClick(picker) {
+ // const date = new Date();
+ // date.setTime(date.getTime() + 3600 * 1000 * 24 * 365);
+ // picker.$emit("pick", date);
+ // },
+ // },
+ // ],
},
options: [
{
@@ -1466,35 +1488,64 @@
},
// 鍐嶆闅忚鏃堕棿閫夊彇
visitChange(value) {
- // 鏍规嵁閫夋嫨鐨勯殢璁挎柟寮忚缃椂闂�
+ if (!this.form.endtime) {
+ this.$message.warning("璇峰厛纭鍑洪櫌鏃堕棿");
+ this.form.visitType = "";
+ this.$refs.zcform.clearValidate(["visitType"]);
+ return;
+ }
+
+ const dischargeDate = new Date(this.form.endtime);
const now = new Date();
+ let followupDate = new Date(dischargeDate);
+
+ // 鏍规嵁閫夋嫨鐨勯殢璁挎柟寮忚绠楅殢璁挎棩鏈�
if (value.includes("涓冨ぉ鍚�")) {
- this.form.date1 = new Date(
- Date.parse(this.form.endtime) + 3600 * 1000 * 24 * 7
- );
+ followupDate.setDate(dischargeDate.getDate() + 7);
} else if (value.includes("15澶╁悗")) {
- this.form.date1 = new Date(
- Date.parse(this.form.endtime) + 3600 * 1000 * 24 * 15
- );
+ followupDate.setDate(dischargeDate.getDate() + 15);
} else if (value.includes("涓�涓湀鍚�")) {
- this.form.date1 = new Date(
- Date.parse(this.form.endtime) + 3600 * 1000 * 24 * 30
- );
+ followupDate.setMonth(dischargeDate.getMonth() + 1);
} else if (value.includes("涓変釜鏈堝悗")) {
- this.form.date1 = new Date(
- Date.parse(this.form.endtime) + 3600 * 1000 * 24 * 90
- );
+ followupDate.setMonth(dischargeDate.getMonth() + 3);
} else if (value.includes("鍏釜鏈堝悗")) {
- this.form.date1 = new Date(
- Date.parse(this.form.endtime) + 3600 * 1000 * 24 * 180
- );
+ followupDate.setMonth(dischargeDate.getMonth() + 6);
} else if (value.includes("涓�骞村悗")) {
- this.form.date1 = new Date(
- Date.parse(this.form.endtime) + 3600 * 1000 * 24 * 365
+ followupDate.setFullYear(dischargeDate.getFullYear() + 1);
+ }
+
+ if (followupDate < now) {
+ this.$message.warning(
+ `璁＄畻鍑虹殑闅忚鏃堕棿 ${this.formatTime(followupDate)} 宸茶繃鏈焋
);
+ this.form.visitType = "";
+ this.$refs.zcform.clearValidate(["visitType", "date1"]);
+ return;
+ }
+
+ this.form.date1 = this.formatTime(followupDate);
+
+ this.$refs.zcform.clearValidate(["date1"]);
+ },
+ // 妫�鏌ラ殢璁挎棩鏈熸槸鍚︽湁鏁�
+ checkFollowupDate(date) {
+ console.log(date);
+
+ if (!date) {
+ this.form.date1 = '';
+ this.$refs.zcform.clearValidate(["date1"]);
+ return;
+ }
+
+ const selectedDate = new Date(date);
+ const now = new Date();
+
+ if (selectedDate < now) {
+ this.$message.warning("闅忚鏃堕棿涓嶈兘鏃╀簬褰撳墠鏃ユ湡");
+ this.form.date1 = '';
+ this.$refs.zcform.validateField("date1"); // 瑙﹀彂楠岃瘉
}
},
-
// 鑾峰彇璇煶鏁版嵁
getPersonVoices(id) {
let obj = {
@@ -1561,7 +1612,7 @@
return;
}
}
- var objs = item.svyTaskTemplateTargetoptions.find(
+ var objs = item.svyLibTemplateTargetoptions.find(
(items) => items.optioncontent == item.scriptResult
);
if (obj) {
@@ -1606,7 +1657,7 @@
this.$modal
.confirm(
'浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' +
- this.logsheetlist[0].sendname +
+ this.userform.name +
'"鍐嶆闅忚锛�',
"纭",
{
@@ -1822,7 +1873,16 @@
formtidy() {
this.form.visitType2 = this.form.visitType;
this.form.date2 = this.form.longSendTime;
+ // this.form.date1 = this.setCurrentDate();
this.form.remark2 = this.form.remark;
+ },
+ setCurrentDate() {
+ // 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� yyyy-MM-dd
+ const today = new Date();
+ const year = today.getFullYear();
+ const month = String(today.getMonth() + 1).padStart(2, "0");
+ const day = String(today.getDate()).padStart(2, "0");
+ return `${year}-${month}-${day}`;
},
// 鑾峰彇鎮ｈ�呰褰�
getTaskservelist(id) {
@@ -1985,11 +2045,11 @@
this.$modal
.confirm('鏄惁鏌ョ湅浠诲姟涓�"' + row.taskName + '"鐨勬湇鍔¤鎯呮暟鎹紵')
.then(() => {
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
- this.Voicetype = 1;
- }
- }
+ let type = "";
+ console.log(row, "rwo");
+ if (row.type == 1) {
+ type = 1;
+ }
this.taskid = row.taskid;
this.id = row.id;
this.patid = row.patid;
@@ -2016,7 +2076,7 @@
(item) => item.optioncontent == a
);
} else {
- var obj = this.tableDatatop[b].svyTaskTemplateTargetoptions.find(
+ var obj = this.tableDatatop[b].svyLibTemplateTargetoptions.find(
(item) => item.optioncontent == a
);
}
@@ -2138,7 +2198,7 @@
},
overdata() {
this.tableDatatop.forEach((item, index) => {
- var obj = item.svyTaskTemplateTargetoptions.find(
+ var obj = item.svyLibTemplateTargetoptions.find(
(items) => items.optioncontent == item.scriptResult
);
if (obj) {
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index b52cbc8..332a54a 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -1412,12 +1412,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
- console.log(type, "rwo");
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/followvisit/record/physical/index.vue b/src/views/followvisit/record/physical/index.vue
index f41da2f..7e370f1 100644
--- a/src/views/followvisit/record/physical/index.vue
+++ b/src/views/followvisit/record/physical/index.vue
@@ -1105,11 +1105,11 @@
this.$modal
.confirm('鏄惁鏌ョ湅浠诲姟涓�"' + row.taskName + '"鐨勬湇鍔¤鎯呮暟鎹紵')
.then(() => {
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
- this.Voicetype = 1;
- }
- }
+ let type = "";
+ console.log(row, "rwo");
+ if (row.type == 1) {
+ type = 1;
+ }
this.taskid = row.taskid;
this.id = row.id;
this.patid = row.patid;
diff --git a/src/views/followvisit/technology/index.vue b/src/views/followvisit/technology/index.vue
index f7eca4f..5691b3e 100644
--- a/src/views/followvisit/technology/index.vue
+++ b/src/views/followvisit/technology/index.vue
@@ -1341,12 +1341,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
- console.log(type, "rwo");
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/followvisit/zbAgain/index.vue b/src/views/followvisit/zbAgain/index.vue
index dffa129..75cd9fe 100644
--- a/src/views/followvisit/zbAgain/index.vue
+++ b/src/views/followvisit/zbAgain/index.vue
@@ -1539,11 +1539,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/followvisit/zysatisfaction/index.vue b/src/views/followvisit/zysatisfaction/index.vue
index 7d66697..6b8edd4 100644
--- a/src/views/followvisit/zysatisfaction/index.vue
+++ b/src/views/followvisit/zysatisfaction/index.vue
@@ -1684,11 +1684,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index bb43741..0c4ec56 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -590,6 +590,7 @@
import { query360PatInfo, getTasklist, addSubtask } from "@/api/AiCentre/index";
import store from "@/store";
+import { type } from "jquery";
export default {
name: "Userhuanze",
@@ -879,11 +880,10 @@
});
},
//鎮ｈ��360璺宠浆
- gettoken360(sfzh,drcode,drname) {
+ gettoken360(sfzh, drcode, drname) {
// this.$modal.msgWarning('360鍔熻兘鏆傛湭寮�閫�');
this.postData.YeWuXX.BingRenXX.ZhengJianHM = sfzh;
-
query360PatInfo(this.postData).then((res) => {
if (res.data.url) {
@@ -1089,10 +1089,10 @@
});
// 鏍￠獙鏄惁鍚屼竴绉戝
- if (patientDepts.size > 1) {
- this.$modal.msgError("閫変腑鐨勬偅鑰呬笉灞炰簬鍚屼竴绉戝锛屾棤娉曟壒閲忔坊鍔犱换鍔�");
- return;
- }
+ // if (patientDepts.size > 1) {
+ // this.$modal.msgError("閫変腑鐨勬偅鑰呬笉灞炰簬鍚屼竴绉戝锛屾棤娉曟壒閲忔坊鍔犱换鍔�");
+ // return;
+ // }
// 鑾峰彇閫変腑鎮ｈ�呭垪琛�
this.selectedPatients = this.userList.filter((item) =>
@@ -1114,8 +1114,8 @@
pageSize: 10,
serviceType: 3,
type: 2,
- deptcode: deptcode,
};
+ // deptcode: deptcode,鍙栨秷绉戝闄愬埗
getTasklist(topqueryParams).then((response) => {
this.taskList = response.rows;
this.batchLoading = false;
@@ -1144,10 +1144,16 @@
for (const patient of this.selectedPatients) {
const params = {
taskid: this.selectedTask.taskid,
+ type: this.selectedTask.type,
taskName: this.selectedTask.taskName,
serviceType: this.selectedTask.serviceType,
- sendstate:2,
+ preachform: this.selectedTask.preachform,
+ templateid: this.selectedTask.templateid,
+ libtemplateid: this.selectedTask.libtemplateid,
+ sendstate: 2,
...patient,
+ sendname: patient.patname,
+ leavediagname: patient.diagname,
age: "",
};
@@ -1225,7 +1231,7 @@
}
}
.button-textsc {
- color: #3664D9;
+ color: #3664d9;
}
.batch-patient-section,
.batch-task-section {
diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue
index 2495cc9..f92b961 100644
--- a/src/views/patient/physical/index.vue
+++ b/src/views/patient/physical/index.vue
@@ -1130,12 +1130,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
- console.log(type, "rwo");
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index f708fc3..c4318f1 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -2128,6 +2128,9 @@
},
// 鐤剧梾鍒犻櫎瑙﹀彂
removediagg(row) {
+ console.log(row,'row');
+console.log(this.diagglist,'this.diagglist');
+
let result = this.diagglist
.filter((item) => item.icd10code == row)
.map((item) => item.id);
@@ -2318,9 +2321,9 @@
this.objyl.templateid = this.objyl.svyid;
this.form.libtemplateid = this.objyl.svyid;
this.objyl.isoperation = 1;
- this.objyl.svyTaskTemplateScriptVOS =
+ this.objyl.svyLibTemplateScriptVOS =
this.objyl.svyTemplateLibScripts;
- this.objyl.svyTaskTemplateScriptVOS.forEach((item) => {
+ this.objyl.svyLibTemplateScriptVOS.forEach((item) => {
item.svyTaskTemplateTargetoptions =
item.svyLibTemplateTargetoptions;
});
diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index 3290f95..ee15c93 100644
--- a/src/views/patient/questionnaire/index.vue
+++ b/src/views/patient/questionnaire/index.vue
@@ -1148,12 +1148,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
- console.log(type, "rwo");
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/patient/shadow/index.vue b/src/views/patient/shadow/index.vue
index 4677890..01325d6 100644
--- a/src/views/patient/shadow/index.vue
+++ b/src/views/patient/shadow/index.vue
@@ -1148,12 +1148,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
- console.log(type, "rwo");
}
- }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
diff --git a/src/views/patient/subsequent/index.vue b/src/views/patient/subsequent/index.vue
index a4c1cca..43936c8 100644
--- a/src/views/patient/subsequent/index.vue
+++ b/src/views/patient/subsequent/index.vue
@@ -1128,14 +1128,11 @@
},
// 璺宠浆璇︽儏椤�
Seedetails(row) {
- let type = "";
+ let type = "";
console.log(row, "rwo");
- if (row.preachformson) {
- if (row.preachformson.includes("3")) {
+ if (row.type == 1) {
type = 1;
- console.log(type, "rwo");
}
- }
this.$router.push({
path: "/followvisit/record/physical/",
query: {
--
Gitblit v1.9.3