From fb34ba28cb908bd328cf6690ab0b19a56428f4e2 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期五, 13 十一月 2026 10:56:55 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/discharge/index.vue | 118 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 94 insertions(+), 24 deletions(-)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 27bc525..5712ad2 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -75,7 +75,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 +123,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 +287,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 +481,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 +636,7 @@
/>
<el-table-column
v-if="
- orgname == '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�' ||
- orgname == '涓芥按甯備腑鍖婚櫌'
+ orgname == '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�' || orgname == '涓芥按甯備腑鍖婚櫌'
"
label="鎷ㄥ彿鐘舵��"
width="120"
@@ -1335,8 +1376,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 +1440,8 @@
: "",
leaveldeptcodes: [],
leavehospitaldistrictcodes: [],
+ currentPreachforms: [],
+ importanceFlagCode: "",
},
orgname: "",
propss: { multiple: true },
@@ -1430,6 +1472,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: [
@@ -1648,9 +1700,12 @@
}
try {
- // 椤堕儴鍗$墖鐐瑰嚮鐨勪复鏃舵潯浠跺彧鍔犲湪鏈璇锋眰涓婏紝涓嶅啓鍥炶〃鍗�
- const query = this.applyCardFilter({ ...this.topqueryParams });
- const response = await getTaskservelist(query);
+ // 褰撳墠鎵ц鏂瑰紡涓哄閫夛紝闇�杞垚閫楀彿鍒嗛殧瀛楃涓诧紙濡� 1,2,5锛�
+ const params = { ...this.topqueryParams };
+ if (Array.isArray(params.currentPreachforms)) {
+ params.currentPreachforms = params.currentPreachforms.join(",");
+ }
+ const response = await getTaskservelist(params);
// 鉁� 绗竴姝ワ細鍏堥攣瀹氭仮澶嶇姸鎬�
this.isRestoring = true;
@@ -1668,9 +1723,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 绛夊叾浠栨暟鎹�
@@ -1679,10 +1738,13 @@
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(
@@ -1693,9 +1755,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;
}
});
@@ -2115,6 +2176,8 @@
scopetype: [],
leaveldeptcodes: [],
leavehospitaldistrictcodes: [],
+ currentPreachforms: [],
+ importanceFlagCode: "",
};
this.handleQuery(1);
},
@@ -2135,6 +2198,8 @@
scopetype: [],
leaveldeptcodes: [],
leavehospitaldistrictcodes: [],
+ currentPreachforms: [],
+ importanceFlagCode: "",
};
},
handleSelectionChange(rows) {
@@ -2457,6 +2522,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 +2551,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