From c899dff1fce7f8054008cd9887a9729cdffd88cb Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期四, 19 十一月 2026 11:34:32 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/discharge/index.vue | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 5712ad2..d31fa1d 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -47,6 +47,17 @@
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
+ <el-form-item label="闅忚瀹屾垚鏃堕棿">
+ <el-date-picker
+ v-model="dateRangefts"
+ style="width: 240px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
<el-form-item label="鎮h�呭鍚�" prop="sendname">
<el-input
@@ -1214,12 +1225,15 @@
export default {
name: "Discharge",
- dicts: ["sys_normal_disable", "sys_user_sex", "sys_yujing", "sys_suggest"],
+ // 椤甸潰鍙敤鍒� sys_suggest锛屽幓鎺夋湭浣跨敤鐨勫瓧鍏稿彲灏戝彂 3 涓姹�
+ dicts: ["sys_suggest"],
components: { Treeselect, StatisticsCards },
data() {
return {
// 閬僵灞�
loading: true,
+ // 棣栨鎸傝浇鏃� created 宸茬粡鏌ヨ繃锛岃烦杩囩揣鎺ョ潃瑙﹀彂鐨� activated锛岄伩鍏嶉噸澶嶈姹�
+ activatedOnce: false,
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -1245,6 +1259,7 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
dateRangefs: [],
+ dateRangefts: [],
// 宀椾綅閫夐」
postOptions: [],
ruleForm: {
@@ -1640,6 +1655,11 @@
this.taskQueryReady = true;
},
activated() {
+ // 棣栨鎸傝浇鏃� created 宸茬粡璇锋眰杩囷紝閬垮厤閲嶅璇锋眰
+ if (!this.activatedOnce) {
+ this.activatedOnce = true;
+ return;
+ }
// 浠庡埆鐨勬爣绛鹃〉鍒囧洖鏉ユ椂锛屼互琛ㄥ崟鏉′欢涓哄噯锛屼涪寮冨崱鐗囧甫鏉ョ殑涓�娆℃�х瓫閫�
this.cardFilter = null;
this.errtype = this.$route.query.errtype;
@@ -1701,7 +1721,8 @@
try {
// 褰撳墠鎵ц鏂瑰紡涓哄閫夛紝闇�杞垚閫楀彿鍒嗛殧瀛楃涓诧紙濡� 1,2,5锛�
- const params = { ...this.topqueryParams };
+ // 鍙犲姞椤堕儴鍗$墖鐐瑰嚮甯︽潵鐨勪复鏃剁瓫閫夛紙cardFilter锛�
+ const params = this.applyCardFilter({ ...this.topqueryParams });
if (Array.isArray(params.currentPreachforms)) {
params.currentPreachforms = params.currentPreachforms.join(",");
}
@@ -1738,13 +1759,10 @@
if (item.endtime) {
item.endDay = this.daysBetween(item.endtime);
}
- console.log(item, "3");
if (item.preachform) {
item.preachformson = item.preachform;
idArray = item.preachform.split(",");
- console.log(this.checkboxlist);
- console.log(idArray);
item.preachform = idArray.map((value) => {
const item = this.checkboxlist.find(
@@ -1979,6 +1997,8 @@
this.topqueryParams.endOutHospTime = this.dateRange[1];
this.topqueryParams.startSendDateTime = this.dateRangefs[0];
this.topqueryParams.endSendDateTime = this.dateRangefs[1];
+ this.topqueryParams.finishtimeStart = this.dateRangefts[0];
+ this.topqueryParams.finishtimeEnd = this.dateRangefts[1];
}
this.getList(refresh);
},
@@ -2163,6 +2183,7 @@
resetQuery() {
this.dateRange = [];
this.dateRangefs = [];
+ this.dateRangefts = [];
this.serviceStatusValue = 10;
this.lastScopeType = 3;
this.topqueryParams = {
@@ -2185,6 +2206,7 @@
resetQuerykj() {
this.dateRange = [];
this.dateRangefs = [];
+ this.dateRangefts = [];
this.serviceStatusValue = null;
this.lastScopeType = 3;
this.topqueryParams = {
--
Gitblit v1.9.3