From 6be49398a90a339a6c72ac9ea7a09fc368acda87 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 30 四月 2025 15:48:08 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/record/detailpage/index.vue | 89 ++++++++++++++++++++++++++++++++++----------
1 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 0fa7f18..5e0f9e1 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -1,6 +1,6 @@
<template>
<!-- 鑱婅繛椤甸潰璁板綍 -->
- <div class="Followupdetailspage">
+ <div class="Followupdetailspage" id="app-container">
<div class="Followuserinfo">
<div>
<div class="userinfo-text">
@@ -88,7 +88,7 @@
<el-table-column
prop="finishtime"
align="center"
- label="瀹屾垚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
width="200"
show-overflow-tooltip
>
@@ -243,7 +243,11 @@
<el-button plain type="info" @click="Editsingletaskson('5')"
>涓績闅忚</el-button
>
- <el-button type="primary" round @click="sendAgain()"
+ <el-button
+ type="primary"
+ round
+ v-if="this.form.isVisitAgain != 2"
+ @click="sendAgain()"
>鍐嶆闅忚</el-button
>
</div>
@@ -323,12 +327,12 @@
<div class="title">{{ taskname ? taskname : "闂嵎" }}</div>
<div class="preview-left" v-if="!Voicetype">
- <!-- 鍗曢�� -->
<div
class="topic-dev"
v-for="(item, index) in tableDatatop"
:key="item.id"
>
+ <!-- 鍗曢�� -->
<div
:class="
item.isabnormal
@@ -532,7 +536,11 @@
</el-tab-pane>
</el-tabs>
</div>
- <el-dialog title="鎮ｈ�呭啀娆￠殢璁�" :visible.sync="dialogFormVisible">
+ <el-dialog
+ title="鎮ｈ�呭啀娆￠殢璁�"
+ v-dialogDrags
+ :visible.sync="dialogFormVisible"
+ >
<el-form ref="zcform" :rules="zcrules" :model="form" label-width="80px">
<el-form-item label="浠诲姟鍚嶇О">
<el-input
@@ -565,6 +573,13 @@
v-model="form.leavehospitaldistrictname"
></el-input>
</el-form-item>
+ <el-form-item label="鍑洪櫌鏃堕棿">
+ <el-input
+ style="width: 400px"
+ disabled
+ v-model="form.endtime"
+ ></el-input>
+ </el-form-item>
<el-form-item label="闅忚鏂瑰紡" prop="resource">
<el-radio-group v-model="form.resource">
@@ -588,7 +603,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
+ <el-button type="warning" @click="dialogFormVisible = false"
+ >鍙� 娑�</el-button
+ >
<el-button type="primary" @click="setupsubtask">纭鍒涘缓鏈嶅姟</el-button>
</div>
</el-dialog>
@@ -654,6 +671,7 @@
this.patid = this.$route.query.patid;
this.Voicetype = this.$route.query.Voicetype;
this.serviceType = this.$route.query.serviceType;
+ console.log(this.id, this.patid);
this.getTaskservelist(this.id);
},
@@ -670,12 +688,11 @@
if (res.code === 200) {
this.tableDatatop = res.data.scriptResult;
this.tableDatatop.forEach((item) => {
- console.log(item.scriptResultId, "scriptResultId");
-
- if (item.scriptResultId && item.scriptType != 2) {
+ if (item.scriptType == 2) item.scriptResult = [];
+ if (item.scriptResult && item.scriptType != 2) {
item.isoption = 3;
item.scriptResult = item.scriptResult;
- } else if (item.scriptResultId && item.scriptType == 2) {
+ } else if (item.scriptResult && item.scriptType == 2) {
item.scriptResult = item.scriptResult.split("&");
item.isoption = 3;
}
@@ -725,6 +742,8 @@
item.scriptResult = [];
}
});
+ console.log(this.tableDatatop, "this.tableDatatop");
+
if (!this.tableDatatop.length) {
this.puttaskid(this.templateid);
}
@@ -800,11 +819,15 @@
}
});
this.Editsingletasksonyic(6);
+
this.$modal
.confirm(
- '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' + this.userform.name + '"鍐嶆闅忚锛�'
+ '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' +
+ this.logsheetlist[0].sendname +
+ '"鍐嶆闅忚锛�'
)
.then(() => {
+ document.querySelector("#app").scrollTo(0, 0);
this.dialogFormVisible = true;
})
.catch(() => {});
@@ -843,6 +866,7 @@
'浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' + this.userform.name + '"鍐嶆闅忚锛�'
)
.then(() => {
+ document.querySelector("#app").scrollTo(0, 0);
this.dialogFormVisible = true;
})
.catch(() => {});
@@ -852,7 +876,8 @@
// 鑾峰彇鎮ｈ�呰褰�
getTaskservelist(id) {
- this.id = id;
+ console.log(id, "idsub");
+
if (id) {
this.Whetherall = false;
} else {
@@ -865,12 +890,11 @@
}).then((res) => {
if (res.code == 200) {
this.form = res.rows[0].serviceSubtaskList[0];
- 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(); // 褰撳墠鏃堕棿
-
+ this.form.endtime = this.formatTime(this.form.endtime);
if (now < targetDate && this.form.sendstate == 2) {
this.$confirm("褰撳墠鏈嶅姟鏈埌鍙戦�佹椂闂磋璋ㄦ厧淇敼", "鎻愮ず", {
confirmButtonText: "纭畾",
@@ -882,6 +906,8 @@
}
this.getuserinfo();
}
+ console.log(this.Voicetype, "this.Voicetype");
+
if (this.Voicetype) {
this.getPersonVoices();
} else {
@@ -908,7 +934,7 @@
});
},
Editsingletasksonyic(sendstate) {
- console.log(sendstate,'sendstate');
+ console.log(sendstate, "sendstate");
let objson = {};
getTaskservelist({
@@ -937,6 +963,8 @@
},
// 璋冭捣鍐嶆鍙戦��
sendAgain() {
+ document.querySelector("#app").scrollTo(0, 0);
+ // scrollTo(0, 0)
this.dialogFormVisible = true;
},
// 鏌ョ湅璇︽儏
@@ -980,8 +1008,6 @@
},
overdata() {
this.tableDatatop.forEach((item, index) => {
- console.log(item.svyLibTemplateTargetoptions);
-
var obj = item.svyLibTemplateTargetoptions.find(
(items) => items.optioncontent == item.scriptResult
);
@@ -999,29 +1025,52 @@
setupsubtask() {
this.$refs["zcform"].validate((valid) => {
if (valid) {
+ this.form.remark =
+ this.form.remark + "銆�" + this.getCurrentTime() + "銆�";
let form = structuredClone(this.form);
form.longSendTime = this.formatTime(form.date1);
- form.finishtime = '';
+ form.finishtime = "";
if (form.resource) {
if (form.resource == 2) {
- form.serviceType = 10;
+ form.serviceType = 13;
}
} else {
this.$modal.msgError("鏈�夋嫨闅忚鏂瑰紡");
}
- form.id = null;
+ // form.id = null;
form.sendstate = 2;
addserviceSubtask(form).then((res) => {
if (res.code == 200) {
this.$modal.msgSuccess("鍒涘缓鎴愬姛");
+ if (form.serviceType == 13) {
+ this.$router.push({
+ path: "/logisticsservice/record",
+ });
+ }else if (form.serviceType == 2) {
+ this.$router.push({
+ path: "/followvisit/discharge",
+ });
+ }
} else {
this.$modal.msgError("鍒涘缓澶辫触");
}
+ document.querySelector("#app").scrollTo(0, 0);
this.dialogFormVisible = false;
});
}
});
},
+ getCurrentTime() {
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = String(now.getMonth() + 1).padStart(2, "0");
+ const day = String(now.getDate()).padStart(2, "0");
+ const hours = String(now.getHours()).padStart(2, "0");
+ const minutes = String(now.getMinutes()).padStart(2, "0");
+ const seconds = String(now.getSeconds()).padStart(2, "0");
+
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ },
updateScore(a, b, c) {
console.log(a);
console.log(b);
--
Gitblit v1.9.3