From 2b1cfeacf31e505d00a3613dd020fe14926950cd Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 10 三月 2025 16:27:32 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 7 +
src/views/followvisit/outpatient/index.vue | 6 +
src/views/followvisit/technology/index.vue | 7 +
src/views/patient/physical/index.vue | 6 +
src/views/followvisit/SpecificDisease/index.vue | 7 +
src/views/patient/medtechnician/SpecializedService.vue | 6 +
src/views/patient/questionnaire/index.vue | 6 +
src/views/patient/subsequent/index.vue | 6 +
src/views/followvisit/record/index.vue | 8 +
src/views/patient/propaganda/index.vue | 6 +
src/views/followvisit/record/detailpage/index.vue | 97 ++++++++++++++++-------
src/views/patient/propaganda/Missionotice.vue | 6 +
src/views/patient/patient/profile/index.vue | 2
src/views/followvisit/discharge/index.vue | 12 +-
src/views/patient/ycquestionnaire/index.vue | 6 +
15 files changed, 132 insertions(+), 56 deletions(-)
diff --git a/src/views/followvisit/SpecificDisease/index.vue b/src/views/followvisit/SpecificDisease/index.vue
index 9acd2a2..7222689 100644
--- a/src/views/followvisit/SpecificDisease/index.vue
+++ b/src/views/followvisit/SpecificDisease/index.vue
@@ -941,7 +941,11 @@
console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
this.total = response.total;
@@ -1254,7 +1258,6 @@
getTaskservelist({
patid: row.patid,
taskid: row.taskid,
- deptOrDistrict:2,
}).then((res) => {
if (res.code == 200) {
objson.sendstate = 4;
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 4d25298..c1c47d8 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -480,7 +480,7 @@
label="鎿嶄綔"
align="center"
fixed="right"
- width="200"
+ width="300"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
@@ -972,8 +972,12 @@
console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
- getTaskservelist(this.topqueryParams).then((response) => {
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
+ getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
this.total = response.total;
if (refresh) {
@@ -1348,8 +1352,6 @@
getTaskservelist({
patid: row.patid,
taskid: row.taskid,
- deptOrDistrict:2,
-
}).then((res) => {
if (res.code == 200) {
objson.sendstate = 4;
diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue
index 0326624..64329fd 100644
--- a/src/views/followvisit/outpatient/index.vue
+++ b/src/views/followvisit/outpatient/index.vue
@@ -883,7 +883,11 @@
console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index b5f9d8f..07ce29a 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -33,8 +33,12 @@
</div>
<div>
<el-table :data="logsheetlist" style="width: 100%">
- <el-table-column prop="sendname" align="center" label="濮撳悕"
- width="100">
+ <el-table-column
+ prop="sendname"
+ align="center"
+ label="濮撳悕"
+ width="100"
+ >
</el-table-column>
<el-table-column
prop="taskName"
@@ -190,7 +194,7 @@
</el-table>
</div>
</div>
- <div :class="form.serviceType == 2 ? 'Followuserinfo' : 'Followuserinfos'">
+ <div class="Followuserinfos">
<div>
<el-form ref="form" :model="form" label-width="120px">
<div class="headline">
@@ -214,8 +218,10 @@
></el-col>
</el-row>
<div style="margin-left: 30px">
- <el-button type="primary" plain @click="Editsingletasksonyic">淇濆瓨鏈嶅姟</el-button>
- </div>
+ <el-button type="primary" plain @click="Editsingletasksonyic"
+ >淇濆瓨鏈嶅姟</el-button
+ >
+ </div>
</div>
<el-form-item label="闅忚璁板綍">
@@ -309,7 +315,7 @@
</el-collapse>
</div>
</div>
- <div v-if="form.serviceType == 2">
+ <div>
<el-tabs v-model="activeName" type="border-card">
<el-tab-pane name="wj">
<span class="mulsz" slot="label"
@@ -685,7 +691,7 @@
messagelistpatient(queryParams).then((response) => {
if (response.rows[0]) {
this.userform = response.rows[0];
- this.dynamicTags = response.rows[0].tagList.map(this.processElement);
+ // this.dynamicTags = response.rows[0].tagList.map(this.processElement);
}
});
},
@@ -703,7 +709,7 @@
if (res.code == 200) {
this.voiceDatatop = res.data.serviceSubtaskDetails;
this.voice = res.data.voice;
- // // this.activeName = "yy";
+ this.activeName = "yy";
this.taskname = res.data.taskName;
// 闂嵎灞曠ず鏁版嵁澶勭悊
this.tableDatatop = res.data.filteredDetails;
@@ -748,6 +754,7 @@
// 鍖绘姢浜哄憳瀛樺偍鏁版嵁
getdetail() {
let excep = "";
+ const promises = [];
this.tableDatatop.forEach((item) => {
var objs = item.svyLibTemplateTargetoptions.find(
(items) => items.optioncontent == item.scriptResult
@@ -757,13 +764,13 @@
excep = 1;
}
}
-
let obj = {
asrtext: null,
patid: this.patid,
subId: this.id,
taskid: this.taskid,
scriptid: item.id,
+ excep: excep,
questiontext: item.scriptContent,
};
if (item.scriptType == 2 && item.scriptResult[0]) {
@@ -773,23 +780,34 @@
}
if (item.isoption == 3) {
- serviceSubtaskDetailedit(obj).then((res) => {
- if (res.code == 200) {
- } else {
- this.$modal.error("淇敼澶辫触");
- }
- });
+ promises.push(serviceSubtaskDetailedit(obj));
} else {
- serviceSubtaskDetailadd(obj).then((res) => {
- if (res.code == 200) {
- console.log(res);
- } else {
- this.$modal.error("淇敼澶辫触");
- }
- });
+ promises.push(serviceSubtaskDetailadd(obj));
}
});
- this.Editsingletasksonyic(excep);
+ // 浣跨敤 Promise.all 绛夊緟鎵�鏈夊紓姝ユ搷浣滃畬鎴�
+ Promise.all(promises)
+ .then((results) => {
+ // 鎵�鏈夊紓姝ユ搷浣滄垚鍔熷畬鎴愬悗鐨勯�昏緫
+ results.forEach((res) => {
+ if (res.code !== 200) {
+ this.$modal.error("淇敼澶辫触");
+ }
+ });
+ this.Editsingletasksonyic("6");
+ this.$modal
+ .confirm(
+ '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' + this.userform.name + '"鍐嶆闅忚锛�'
+ )
+ .then(() => {
+ this.dialogFormVisible = true;
+ })
+ .catch(() => {});
+ })
+ .catch((error) => {
+ // 濡傛灉鏈変换浣曚竴涓紓姝ユ搷浣滃け璐ワ紝浼氳繘鍏ヨ繖閲�
+ console.error("鍙戠敓閿欒锛�", error);
+ });
},
yuyingetdetail() {
this.tableDatatop.forEach((item, index) => {
@@ -815,6 +833,14 @@
addPersonVoices(obj).then((res) => {
if (res.code == 200) {
this.$modal.msgSuccess("鏈嶅姟淇濆瓨鎴愬姛");
+ this.$modal
+ .confirm(
+ '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' + this.userform.name + '"鍐嶆闅忚锛�'
+ )
+ .then(() => {
+ this.dialogFormVisible = true;
+ })
+ .catch(() => {});
}
});
},
@@ -831,15 +857,26 @@
getTaskservelist({
patid: this.patid,
subId: id,
- deptOrDistrict:2,
}).then((res) => {
if (res.code == 200) {
this.form = res.rows[0].serviceSubtaskList[0];
- console.log(this.form,'this.form');
+ console.log(this.form, "this.form");
this.logsheetlist = res.rows[0].serviceSubtaskList;
this.templateid = this.logsheetlist[0].templateid;
+ const targetDate = new Date(this.form.longSendTime); // 鐩爣鏃ユ湡
+ const now = new Date(); // 褰撳墠鏃堕棿
+
+ if (now < targetDate && this.form.sendstate == 2) {
+ this.$confirm("褰撳墠鏈嶅姟鏈埌鍙戦�佹椂闂磋璋ㄦ厧淇敼", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {})
+ .catch(() => {});
+ }
+ this.getuserinfo();
}
-this.getuserinfo();
if (this.Voicetype) {
this.getPersonVoices();
} else {
@@ -852,7 +889,6 @@
getTaskservelist({
patid: this.patid,
subId: this.id,
- deptOrDistrict:2,
}).then((res) => {
if (res.code == 200) {
objson = res.rows[0].serviceSubtaskList[0];
@@ -866,16 +902,16 @@
}
});
},
- Editsingletasksonyic(excep) {
+ Editsingletasksonyic(sendstate) {
let objson = {};
getTaskservelist({
patid: this.patid,
subId: this.id,
- deptOrDistrict:2,
}).then((res) => {
if (res.code == 200) {
objson = res.rows[0].serviceSubtaskList[0];
objson.remark = this.form.remark;
+ objson.sendstate = sendstate;
Editsingletaskson(objson).then((res) => {
if (res.code) {
this.$modal.msgSuccess("鏈嶅姟淇敼鎴愬姛");
@@ -899,7 +935,7 @@
this.patid = row.patid;
this.Voicetype = row.type;
this.serviceType = row.serviceType;
- this.getTaskservelist(this.id);
+ this.getTaskservelist(this.id);
})
.catch(() => {});
},
@@ -997,7 +1033,6 @@
.Followuserinfos {
margin: 20px 10px;
align-items: center;
- height: 300px;
padding: 30px;
background: #ffff;
border: 1px solid #dcdfe6;
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index 433000b..f772082 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -954,7 +954,11 @@
console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
this.total = response.total;
@@ -1329,8 +1333,6 @@
getTaskservelist({
patid: row.patid,
taskid: row.taskid,
- deptOrDistrict:2,
-
}).then((res) => {
if (res.code == 200) {
objson.sendstate = 4;
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 98eb295..e8e66a3 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -142,7 +142,7 @@
<el-table-column
label="浠诲姟鍚嶇О"
fixed
- width="120"
+ width="200"
align="center"
key="taskName"
prop="taskName"
@@ -168,6 +168,7 @@
label="寰呴殢璁�/鎬讳换鍔�"
align="center"
key="nickName"
+ width="120"
prop="nickName"
>
<template slot-scope="scope">
@@ -225,7 +226,7 @@
label="鎿嶄綔"
fixed="right"
align="center"
- width="180"
+ width="240"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
@@ -269,7 +270,7 @@
label="浠诲姟璇︽儏"
fixed="right"
align="center"
- width="200"
+ width="240"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
diff --git a/src/views/followvisit/technology/index.vue b/src/views/followvisit/technology/index.vue
index 751ea89..eb1a8ee 100644
--- a/src/views/followvisit/technology/index.vue
+++ b/src/views/followvisit/technology/index.vue
@@ -954,7 +954,11 @@
console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
this.total = response.total;
@@ -1329,7 +1333,6 @@
getTaskservelist({
patid: row.patid,
taskid: row.taskid,
- deptOrDistrict:2,
}).then((res) => {
if (res.code == 200) {
objson.sendstate = 4;
diff --git a/src/views/patient/medtechnician/SpecializedService.vue b/src/views/patient/medtechnician/SpecializedService.vue
index 0057721..093ea18 100644
--- a/src/views/patient/medtechnician/SpecializedService.vue
+++ b/src/views/patient/medtechnician/SpecializedService.vue
@@ -835,7 +835,11 @@
store.getters.belongWards.map((obj) => obj.districtCode);
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
this.cardlist[0].value =
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index 92c1d93..4cacbcc 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -1243,8 +1243,6 @@
handleClickfw(){
getTaskservelist({
patid: this.id,
- deptOrDistrict:2,
-
}).then((res) => {
if (res.code == 200) {
this.record = res.rows[0].serviceSubtaskList;
diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue
index 46341dd..45132bb 100644
--- a/src/views/patient/physical/index.vue
+++ b/src/views/patient/physical/index.vue
@@ -883,7 +883,11 @@
console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
diff --git a/src/views/patient/propaganda/Missionotice.vue b/src/views/patient/propaganda/Missionotice.vue
index 36719ca..4e1f701 100644
--- a/src/views/patient/propaganda/Missionotice.vue
+++ b/src/views/patient/propaganda/Missionotice.vue
@@ -453,7 +453,11 @@
/** 鏌ヨ闂ㄨ瘖閫氱煡鍒楄〃 */
getList() {
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows;
diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue
index b10eabf..00613a0 100644
--- a/src/views/patient/propaganda/index.vue
+++ b/src/views/patient/propaganda/index.vue
@@ -807,7 +807,11 @@
store.getters.belongWards.map((obj) => obj.districtCode);
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
this.userList.forEach((item) => {
diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index 6a691ce..2f008dd 100644
--- a/src/views/patient/questionnaire/index.vue
+++ b/src/views/patient/questionnaire/index.vue
@@ -867,7 +867,11 @@
console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
this.total = response.total;
diff --git a/src/views/patient/subsequent/index.vue b/src/views/patient/subsequent/index.vue
index 3edc54b..8a6dea1 100644
--- a/src/views/patient/subsequent/index.vue
+++ b/src/views/patient/subsequent/index.vue
@@ -884,7 +884,11 @@
console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
this.total = response.total;
diff --git a/src/views/patient/ycquestionnaire/index.vue b/src/views/patient/ycquestionnaire/index.vue
index 5834c66..7964707 100644
--- a/src/views/patient/ycquestionnaire/index.vue
+++ b/src/views/patient/ycquestionnaire/index.vue
@@ -867,7 +867,11 @@
console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
+ this.topqueryParams.deptOrDistrict=2;
+ }else{
+ this.topqueryParams.deptOrDistrict=1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
this.total = response.total;
--
Gitblit v1.9.3