From 303d443d2a337e991d6e5e3579c28e1704711c27 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 06 六月 2025 17:20:56 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/record/detailpage/index.vue | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 158 insertions(+), 18 deletions(-)
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index e02d87d..dbb2ba3 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -622,6 +622,43 @@
v-model="form.endtime"
></el-input>
</el-form-item>
+ <div class="headline">涓婃闅忚</div>
+ <el-divider></el-divider>
+ <el-row>
+ <el-col>
+ <el-select
+ v-model="form.visitType"
+ multiple
+ filterable
+ allow-create
+ default-first-option
+ placeholder="璇烽�夋嫨鏂囩珷鏍囩"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-col>
+ </el-row>
+ <el-form-item label="闅忚鏃堕棿" prop="date1">
+ <el-date-picker
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="pickerOptions"
+ align="right"
+ v-model="form.date1"
+ style="width: 100%"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="闅忚璁板綍">
+ <el-input type="textarea" v-model="form.remark"></el-input>
+ </el-form-item>
+ <div class="headline">涓嬫闅忚</div>
+ <el-divider></el-divider>
<el-form-item label="闅忚鏂瑰紡" prop="resource">
<el-radio-group v-model="form.resource">
@@ -693,12 +730,10 @@
voiceDatatop: [], //棰樼洰琛�
dynamicTags: [],
zcrules: {
- date1: [
+ resource: [
{ required: true, message: "璇烽�夋嫨闅忚鏂瑰紡", trigger: "change" },
],
- resource: [
- { required: true, message: "璇烽�夋嫨闅忚鏃堕棿", trigger: "blur" },
- ],
+ date1: [{ required: true, message: "璇烽�夋嫨闅忚鏃堕棿", trigger: "blur" }],
},
url: "http://9.208.2.190:8090/smartor/serviceExternal/query360PatInfo",
postData: {
@@ -753,19 +788,70 @@
},
},
{
- text: "30澶╁悗",
+ 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: [
+ {
+ value: "涓冨ぉ鍚�",
+ label: "涓冨ぉ鍚�",
+ },
+ {
+ value: "15澶╁悗",
+ label: "15澶╁悗",
+ },
+ {
+ value: "涓�涓湀鍚�",
+ label: "涓�涓湀鍚�",
+ },
+ {
+ value: "涓変釜鏈堝悗",
+ label: "涓変釜鏈堝悗",
+ },
+ {
+ value: "鍏釜鏈堝悗",
+ label: "鍏釜鏈堝悗",
+ },
+ {
+ value: "涓�骞村悗",
+ label: "涓�骞村悗",
+ },
+ ],
userform: {},
Whetherall: true, //鏄惁鍏ㄩ儴璁板綍灞曠ず
dialogFormVisible: false,
Voicetype: 0, //鏄惁涓鸿闊虫湇鍔�
+ visitCount: null,
logsheetlist: [],
topicobj: {},
sendname: null,
@@ -783,6 +869,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 +885,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 +1069,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 +1140,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 +1350,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 {
@@ -1415,10 +1554,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