From 6d7cd13eecd3a6f176d310986b4750b0c407e3a1 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 21 五月 2025 14:40:43 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/record/detailpage/index.vue | 27 ++++++++++++++++++---------
src/views/patient/patient/index.vue | 4 ++--
src/views/followvisit/record/index.vue | 18 ++++++++++++++++++
3 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index e02d87d..55dd174 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -798,17 +798,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;
}
@@ -1415,10 +1423,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;
}
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index 50b0605..e97d61c 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -211,6 +211,15 @@
</div>
</div>
</el-col>
+ <el-col :span="1.5">
+ <div class="documentf">
+ <div class="document">
+ <el-button type="success" size="medium" @click="onthatday()"
+ >褰撴棩鏈嶅姟</el-button
+ >
+ </div>
+ </div>
+ </el-col>
</el-row>
<el-table
v-loading="loading"
@@ -1270,6 +1279,15 @@
this.$refs.saveTagInput.$refs.input.focus();
});
},
+ onthatday() {
+ this.topqueryParams.startSendDateTime = this.getCurrentDate();
+ this.topqueryParams.endSendDateTime = this.getCurrentDate();
+ this.getList(1);
+ },
+ getCurrentDate() {
+ const now = new Date();
+ return now.toISOString().slice(0, 10); // 鎴彇鍓�10涓瓧绗︼紝鍗� YYYY-MM-DD
+ },
//鑾峰彇澶卞幓鐒︾偣瑙﹀彂
handleInputConfirm() {
let inputValue = this.inputValue;
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index 2c2d0ea..23b2740 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -1069,7 +1069,7 @@
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
- allhosp: "1",
+ allhosp: "0",
pageSize: 10,
notrequiredFlag: 0,
searchscope: 2,
@@ -1258,7 +1258,7 @@
this.dateRange = [];
this.queryParams = {
pageNum: 1,
- allhosp: "1",
+ allhosp: "0",
pageSize: 10,
notrequiredFlag: 0,
searchscope: 2,
--
Gitblit v1.9.3