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 | 142 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 117 insertions(+), 25 deletions(-)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 27bc525..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
@@ -75,7 +86,7 @@
<el-form-item label="缁忕鍖荤敓" prop="managementDoctor">
<el-input
v-model="topqueryParams.managementDoctor"
- placeholder="璇疯緭鍏ヤ富娌诲尰鐢�"
+ placeholder="璇疯緭鍏ョ粡绠″尰鐢�"
></el-input>
</el-form-item>
<el-form-item label="鏃ユ湡闄愬埗" prop="status">
@@ -123,6 +134,34 @@
>
</el-option>
</el-select>
+ </el-form-item>
+
+ <el-form-item label="褰撳墠鎵ц鏂瑰紡" prop="currentPreachforms">
+ <el-select
+ v-model="topqueryParams.currentPreachforms"
+ placeholder="璇烽�夋嫨"
+ multiple
+ clearable
+ collapse-tags
+ >
+ <el-option
+ v-for="item in currentPreachformOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ v-if="isTongdeCampus"
+ label="鏃ラ棿鏍囪"
+ prop="importanceFlagCode"
+ >
+ <el-input
+ v-model="topqueryParams.importanceFlagCode"
+ placeholder="璇疯緭鍏ユ棩闂存爣璁�"
+ ></el-input>
</el-form-item>
<el-form-item>
@@ -259,8 +298,12 @@
</el-row>
<div v-if="cardFilter" class="card-filter-tip">
褰撳墠鎸夐《閮ㄥ崱鐗囩瓫閫夛細<b>{{ cardFilter }}</b>
- <span class="tip-desc">锛堜笉褰卞搷涓婃柟琛ㄥ崟鏉′欢锛岀偣銆屾悳绱€�嶅彲鎭㈠琛ㄥ崟鏉′欢锛�</span>
- <el-button type="text" size="mini" @click="clearCardFilter">娓呴櫎</el-button>
+ <span class="tip-desc"
+ >锛堜笉褰卞搷涓婃柟琛ㄥ崟鏉′欢锛岀偣銆屾悳绱€�嶅彲鎭㈠琛ㄥ崟鏉′欢锛�</span
+ >
+ <el-button type="text" size="mini" @click="clearCardFilter"
+ >娓呴櫎</el-button
+ >
</div>
<div class="selected-info">
宸查�変腑
@@ -449,6 +492,16 @@
>
</el-table-column>
<el-table-column
+ v-if="isTongdeCampus"
+ label="鏃ラ棿鏍囪"
+ align="center"
+ key="importanceFlagCode"
+ prop="importanceFlagCode"
+ width="120"
+ :show-overflow-tooltip="true"
+ >
+ </el-table-column>
+ <el-table-column
label="闅忚瀹屾垚鏃堕棿"
sortable
align="center"
@@ -594,8 +647,7 @@
/>
<el-table-column
v-if="
- orgname == '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�' ||
- orgname == '涓芥按甯備腑鍖婚櫌'
+ orgname == '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�' || orgname == '涓芥按甯備腑鍖婚櫌'
"
label="鎷ㄥ彿鐘舵��"
width="120"
@@ -1173,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: [],
// 闈炲崟涓鐢�
@@ -1204,6 +1259,7 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
dateRangefs: [],
+ dateRangefts: [],
// 宀椾綅閫夐」
postOptions: [],
ruleForm: {
@@ -1335,8 +1391,7 @@
btstatus: "",
},
// endOut: 1,
- endOut:
- localStorage.getItem("orgname") == "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�" ? 0 : 1, //0 鍑洪櫌鏃堕棿(姝e簭) 1 鍑洪櫌鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝e簭) 3 鍙戦�佹椂闂�(鍊掑簭) 7搴旈殢璁挎棩鏈�(鍊掑簭) 搴旈殢璁挎棩鏈�(姝e簭)
+ endOut: localStorage.getItem("orgname") == "涓芥按甯備腑鍖婚櫌" ? 0 : 1, //0 鍑洪櫌鏃堕棿(姝e簭) 1 鍑洪櫌鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝e簭) 3 鍙戦�佹椂闂�(鍊掑簭) 7搴旈殢璁挎棩鏈�(鍊掑簭) 搴旈殢璁挎棩鏈�(姝e簭)
endOuts: [
{
value: 0,
@@ -1400,6 +1455,8 @@
: "",
leaveldeptcodes: [],
leavehospitaldistrictcodes: [],
+ currentPreachforms: [],
+ importanceFlagCode: "",
},
orgname: "",
propss: { multiple: true },
@@ -1430,6 +1487,16 @@
value: 5,
label: "鏃犻渶闅忚",
},
+ ],
+
+ currentPreachformOptions: [
+ { value: "1", label: "浜哄伐" },
+ { value: "2", label: "绾歌川" },
+ { value: "3", label: "鏅鸿兘璇煶" },
+ { value: "4", label: "鐭俊" },
+ { value: "5", label: "寰俊鍏紬鍙�" },
+ { value: "6", label: "寰俊灏忕▼搴�" },
+ { value: "7", label: "鏈悗闅忚" },
],
sextype: [
@@ -1588,6 +1655,11 @@
this.taskQueryReady = true;
},
activated() {
+ // 棣栨鎸傝浇鏃� created 宸茬粡璇锋眰杩囷紝閬垮厤閲嶅璇锋眰
+ if (!this.activatedOnce) {
+ this.activatedOnce = true;
+ return;
+ }
// 浠庡埆鐨勬爣绛鹃〉鍒囧洖鏉ユ椂锛屼互琛ㄥ崟鏉′欢涓哄噯锛屼涪寮冨崱鐗囧甫鏉ョ殑涓�娆℃�х瓫閫�
this.cardFilter = null;
this.errtype = this.$route.query.errtype;
@@ -1648,9 +1720,13 @@
}
try {
- // 椤堕儴鍗$墖鐐瑰嚮鐨勪复鏃舵潯浠跺彧鍔犲湪鏈璇锋眰涓婏紝涓嶅啓鍥炶〃鍗�
- const query = this.applyCardFilter({ ...this.topqueryParams });
- const response = await getTaskservelist(query);
+ // 褰撳墠鎵ц鏂瑰紡涓哄閫夛紝闇�杞垚閫楀彿鍒嗛殧瀛楃涓诧紙濡� 1,2,5锛�
+ // 鍙犲姞椤堕儴鍗$墖鐐瑰嚮甯︽潵鐨勪复鏃剁瓫閫夛紙cardFilter锛�
+ const params = this.applyCardFilter({ ...this.topqueryParams });
+ if (Array.isArray(params.currentPreachforms)) {
+ params.currentPreachforms = params.currentPreachforms.join(",");
+ }
+ const response = await getTaskservelist(params);
// 鉁� 绗竴姝ワ細鍏堥攣瀹氭仮澶嶇姸鎬�
this.isRestoring = true;
@@ -1668,9 +1744,13 @@
// 鉁� 绗洓姝ワ細澶勭悊鍏朵粬鏁版嵁
if (refresh) {
this.yfsvalue = response.rows[0].yfs;
- // 椤堕儴鍗$墖鐨勬暟瀛椾笉璺熴�岄殢璁跨姸鎬�/寮傚父銆嶈蛋锛氬崟鐙煡涓�娆″幓鎺夌姸鎬佹潯浠剁殑缁熻锛�
- // 鍚﹀垯绛涗簡銆屽緟闅忚銆嶅悗銆屽凡瀹屾垚銆嶆案杩滄槸 0锛岀湅鐫�鍍忕畻閿欎簡
- this.refreshCardCounts(query);
+ if (this.isTongdeOrg) {
+ // 鐪佺珛鍚屽痉/鍗楀崕锛氶《閮ㄥ崱鐗囨暟瀛椾笉璺熴�岄殢璁跨姸鎬�/寮傚父銆嶈蛋锛屽崟鐙煡涓�娆″幓鎺夌姸鎬佹潯浠剁殑缁熻
+ this.refreshCardCounts(params);
+ } else {
+ // 鍏朵粬鍖婚櫌锛氶《閮ㄦ暟鎹窡闅忕瓫閫夋潯浠跺彉鍔紝鍗曟鏌ヨ鍗冲彲
+ this.setCardValues(response.rows[0]);
+ }
}
// 鉁� 绗簲姝ワ細澶勭悊 preachform 绛夊叾浠栨暟鎹�
@@ -1693,9 +1773,8 @@
}
if (item.currentPreachform) {
item.currentPreachform = this.checkboxlist.find(
- (item) => item.value == item.currentPreachform
- )?.value;
- console.log(item.currentPreachform, "mi");
+ (items) => items.value == item.currentPreachform
+ )?.label;
}
});
@@ -1918,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);
},
@@ -2102,6 +2183,7 @@
resetQuery() {
this.dateRange = [];
this.dateRangefs = [];
+ this.dateRangefts = [];
this.serviceStatusValue = 10;
this.lastScopeType = 3;
this.topqueryParams = {
@@ -2115,6 +2197,8 @@
scopetype: [],
leaveldeptcodes: [],
leavehospitaldistrictcodes: [],
+ currentPreachforms: [],
+ importanceFlagCode: "",
};
this.handleQuery(1);
},
@@ -2122,6 +2206,7 @@
resetQuerykj() {
this.dateRange = [];
this.dateRangefs = [];
+ this.dateRangefts = [];
this.serviceStatusValue = null;
this.lastScopeType = 3;
this.topqueryParams = {
@@ -2135,6 +2220,8 @@
scopetype: [],
leaveldeptcodes: [],
leavehospitaldistrictcodes: [],
+ currentPreachforms: [],
+ importanceFlagCode: "",
};
},
handleSelectionChange(rows) {
@@ -2457,6 +2544,18 @@
// 椤堕儴缁熻鍗$墖鐐瑰嚮锛氭妸瀵瑰簲绛涢�夋潯浠朵笅甯﹀埌涓嬮潰鐨勫垪琛紙鏁板�间负 0 鐨勫崱鐗囧悓鏍峰彲鐐癸級
// 椤堕儴鍗$墖缁熻锛氬幓鎺夈�岄殢璁跨姸鎬� / 寮傚父銆嶆潯浠跺悗鍐嶇粺璁★紝
// 杩欐牱鍗$墖鏁板瓧鍙窡鏃ユ湡銆佺瀹�/鐥呭尯绛夋潯浠惰蛋锛屼笉浼氬洜涓虹瓫浜嗐�屽緟闅忚銆嶅氨鎶娿�屽凡瀹屾垚銆嶇畻鎴� 0
+ // 鎶婁竴娆℃煡璇㈣繑鍥炵殑缁熻琛屽啓鍏ラ《閮ㄥ崱鐗�
+ setCardValues(row) {
+ if (!row) return;
+ this.cardlist[0].value = Number(row.wxsf || 0) + Number(row.xsf || 0);
+ this.cardlist[1].value = Number(row.wxsf) || 0;
+ this.cardlist[2].value = Number(row.xsf) || 0;
+ this.cardlist[3].value = Number(row.dsf) || 0;
+ this.cardlist[4].value = Number(row.fssb) || 0;
+ this.cardlist[5].value = Number(row.ywc) || 0;
+ this.ycvalue = Number(row.yc) || 0;
+ this.jgvalue = Number(row.jg) || 0;
+ },
async refreshCardCounts(baseQuery) {
const query = {
...(baseQuery || this.topqueryParams),
@@ -2474,14 +2573,7 @@
if (!res || !res.rows || !res.rows.length) {
return;
}
- this.cardlist[0].value = Number(row.wxsf || 0) + Number(row.xsf || 0);
- this.cardlist[1].value = Number(row.wxsf) || 0;
- this.cardlist[2].value = Number(row.xsf) || 0;
- this.cardlist[3].value = Number(row.dsf) || 0;
- this.cardlist[4].value = Number(row.fssb) || 0;
- this.cardlist[5].value = Number(row.ywc) || 0;
- this.ycvalue = Number(row.yc) || 0;
- this.jgvalue = Number(row.jg) || 0;
+ this.setCardValues(row);
} catch (e) {
console.warn("鍒锋柊椤堕儴鍗$墖缁熻澶辫触", e);
}
--
Gitblit v1.9.3