From 4413b4649c337dd65e27c7a4be0d5ca1294477ab Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 04 六月 2025 14:32:36 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/record/detailpage/index.vue | 83 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 13 deletions(-)
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index e02d87d..94d9d8b 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -766,6 +766,7 @@
Whetherall: true, //鏄惁鍏ㄩ儴璁板綍灞曠ず
dialogFormVisible: false,
Voicetype: 0, //鏄惁涓鸿闊虫湇鍔�
+ visitCount: null,
logsheetlist: [],
topicobj: {},
sendname: null,
@@ -783,6 +784,7 @@
this.patid = this.$route.query.patid;
this.again = this.$route.query.again;
this.Voicetype = this.$route.query.Voicetype;
+ this.visitCount = this.$route.query.visitCount;
this.serviceType = this.$route.query.serviceType;
this.getTaskservelist();
@@ -798,17 +800,25 @@
isFinish: false,
}).then((res) => {
if (res.code === 200) {
+ // 閽堝鍐嶆闅忚鏈嶅姟杩涜鍒犻櫎缁撴灉璧嬪��
if (this.again && res.data.upScriptResult) {
- this.tableDatatop = res.data.upScriptResult;
- } else {
- this.tableDatatop = res.data.scriptResult;
+ res.data.upScriptResult.forEach((itemA) => {
+ const itemB = res.data.scriptResult.find(
+ (item) => item.scriptContent === itemA.scriptContent
+ );
+ if (itemB) {
+ itemB.scriptResult = itemA.scriptResult;
+ }
+ });
}
+ this.tableDatatop = res.data.scriptResult;
+
this.tableDatatop.forEach((item) => {
if (item.scriptType == 2) item.scriptResult = [];
- if (item.scriptResult && item.scriptType != 2) {
+ if (item.scriptResultId && item.scriptType != 2) {
item.isoption = 3;
item.scriptResult = item.scriptResult;
- } else if (item.scriptResult && item.scriptType == 2) {
+ } else if (item.scriptResultId && item.scriptType == 2) {
item.scriptResult = item.scriptResult.split("&");
item.isoption = 3;
}
@@ -974,7 +984,29 @@
document.querySelector("#app").scrollTo(0, 0);
this.dialogFormVisible = true;
})
- .catch(() => {});
+ .catch(() => {
+ if (this.form.serviceType == 13) {
+ if (this.visitCount) {
+ this.$router.push({
+ path: "/logisticsservice/zbAgain",
+ });
+ } else {
+ this.$router.push({
+ path: "/logisticsservice/record",
+ });
+ }
+ } else if (form.serviceType == 2) {
+ if (this.visitCount) {
+ this.$router.push({
+ path: "/followvisit/again",
+ });
+ } else {
+ this.$router.push({
+ path: "/followvisit/discharge",
+ });
+ }
+ }
+ });
})
.catch((error) => {
// 濡傛灉鏈変换浣曚竴涓紓姝ユ搷浣滃け璐ワ紝浼氳繘鍏ヨ繖閲�
@@ -1023,7 +1055,29 @@
document.querySelector("#app").scrollTo(0, 0);
this.dialogFormVisible = true;
})
- .catch(() => {});
+ .catch(() => {
+ if (this.form.serviceType == 13) {
+ if (this.visitCount) {
+ this.$router.push({
+ path: "/logisticsservice/zbAgain",
+ });
+ } else {
+ this.$router.push({
+ path: "/logisticsservice/record",
+ });
+ }
+ } else if (form.serviceType == 2) {
+ if (this.visitCount) {
+ this.$router.push({
+ path: "/followvisit/again",
+ });
+ } else {
+ this.$router.push({
+ path: "/followvisit/discharge",
+ });
+ }
+ }
+ });
}
});
},
@@ -1211,11 +1265,11 @@
this.$modal.msgSuccess("鍒涘缓鎴愬姛");
if (form.serviceType == 13) {
this.$router.push({
- path: "/logisticsservice/record",
+ path: "/logisticsservice/zbAgain",
});
} else if (form.serviceType == 2) {
this.$router.push({
- path: "/followvisit/discharge",
+ path: "/followvisit/again",
});
}
} else {
@@ -1242,6 +1296,8 @@
},
};
</script>
+
+
<style lang="scss">
.Followupdetailspage {
@@ -1415,10 +1471,11 @@
color: #02a7f0 !important;
}
.el-message-box__btns button:nth-child(2) {
- margin-left: 10px;
- background-color:#f57676;
- border-color:#f57676
-}.mulsz {
+ margin-left: 10px;
+ background-color: #f57676;
+ border-color: #f57676;
+}
+.mulsz {
font-size: 25px;
margin-top: 20px;
}
--
Gitblit v1.9.3