From a9d2b856e0f6be6475319c2dc36bf405c2f908fc Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期二, 22 九月 2026 14:04:52 +0800
Subject: [PATCH] 测试完成
---
src/views/sfstatistics/percentage/components/FirstFollowUp.vue | 651 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 419 insertions(+), 232 deletions(-)
diff --git a/src/views/sfstatistics/percentage/components/FirstFollowUp.vue b/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
index 89b4de0..e2167f6 100644
--- a/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
+++ b/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
@@ -231,6 +231,7 @@
</template>
</el-table-column>
<el-table-column
+ v-if="orgname != '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�'"
label="鎴愬姛鐜�"
align="center"
width="120"
@@ -541,6 +542,7 @@
</template>
</el-table-column>
<el-table-column
+ v-if="orgname != '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�'"
label="鎴愬姛鐜�"
align="center"
width="120"
@@ -588,6 +590,223 @@
</template>
</el-table-column>
<el-table-column
+ v-if="isTargetHospital"
+ label="浜哄伐"
+ align="center"
+ >
+ <el-table-column
+ label="鍙戦�佸畬鎴�"
+ align="center"
+ key="manualSuccess"
+ prop="manualSuccess"
+ :render-header="Tooltipfswc"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="
+ handleViewDetails(
+ scope.row,
+ 'manualSuccessInfo',
+ '鍙戦�佸畬鎴愪汉宸ラ殢璁垮垪琛�'
+ )
+ "
+ >
+ <span class="button-zx">{{ scope.row.manualSuccess }}</span>
+ </el-button>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鏈�缁堝畬鎴�"
+ align="center"
+ key="manualAgainSuccess"
+ prop="manualAgainSuccess"
+ :render-header="Tooltipzzwc"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="
+ handleViewDetails(
+ scope.row,
+ 'manualAgainSuccessInfo',
+ '鏈�缁堝畬鎴愪汉宸ラ殢璁垮垪琛�'
+ )
+ "
+ >
+ <span class="button-zx">{{
+ scope.row.manualAgainSuccess
+ }}</span>
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ v-if="isTargetHospital"
+ label="璇煶"
+ align="center"
+ >
+ <el-table-column
+ label="鍙戦�佸畬鎴�"
+ align="center"
+ key="voiceSuccess"
+ prop="voiceSuccess"
+ :render-header="Tooltipfswc"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="
+ handleViewDetails(
+ scope.row,
+ 'voiceSuccessInfo',
+ '鍙戦�佸畬鎴愯闊抽殢璁垮垪琛�'
+ )
+ "
+ >
+ <span class="button-zx">{{ scope.row.voiceSuccess }}</span>
+ </el-button>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鏈�缁堝畬鎴�"
+ align="center"
+ key="voiceAgainSuccess"
+ prop="voiceAgainSuccess"
+ :render-header="Tooltipzzwc"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="
+ handleViewDetails(
+ scope.row,
+ 'voiceAgainSuccessInfo',
+ '鏈�缁堝畬鎴愯闊抽殢璁垮垪琛�'
+ )
+ "
+ >
+ <span class="button-zx">{{
+ scope.row.voiceAgainSuccess
+ }}</span>
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ v-if="isTargetHospital"
+ label="鐭俊"
+ align="center"
+ >
+ <el-table-column
+ label="鍙戦�佸畬鎴�"
+ align="center"
+ key="smsSuccess"
+ prop="smsSuccess"
+ :render-header="Tooltipfswc"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="
+ handleViewDetails(
+ scope.row,
+ 'smsSuccessInfo',
+ '鍙戦�佸畬鎴愮煭淇￠殢璁垮垪琛�'
+ )
+ "
+ >
+ <span class="button-zx">{{ scope.row.smsSuccess }}</span>
+ </el-button>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鏈�缁堝畬鎴�"
+ align="center"
+ key="smsAgainSuccess"
+ prop="smsAgainSuccess"
+ :render-header="Tooltipzzwc"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="
+ handleViewDetails(
+ scope.row,
+ 'smsAgainSuccessInfo',
+ '鏈�缁堝畬鎴愮煭淇￠殢璁垮垪琛�'
+ )
+ "
+ >
+ <span class="button-zx">{{
+ scope.row.smsAgainSuccess
+ }}</span>
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ v-if="isTargetHospital"
+ label="寰俊"
+ align="center"
+ >
+ <el-table-column
+ label="鍙戦�佸畬鎴�"
+ align="center"
+ key="weChatSuccess"
+ prop="weChatSuccess"
+ :render-header="Tooltipfswc"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="
+ handleViewDetails(
+ scope.row,
+ 'wechatSuccessInfo',
+ '鍙戦�佸畬鎴愬井淇￠殢璁垮垪琛�'
+ )
+ "
+ >
+ <span class="button-zx">{{ scope.row.weChatSuccess }}</span>
+ </el-button>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鏈�缁堝畬鎴�"
+ align="center"
+ key="weChatAgainSuccess"
+ prop="weChatAgainSuccess"
+ :render-header="Tooltipzzwc"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="
+ handleViewDetails(
+ scope.row,
+ 'wechatAgainSuccessInfo',
+ '鏈�缁堝畬鎴愬井淇￠殢璁垮垪琛�'
+ )
+ "
+ >
+ <span class="button-zx">{{
+ scope.row.weChatAgainSuccess
+ }}</span>
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ v-if="!isTargetHospital"
label="浜哄伐"
align="center"
key="manual"
@@ -605,7 +824,13 @@
</el-button>
</template>
</el-table-column>
- <el-table-column label="璇煶" align="center" key="voice" prop="voice">
+ <el-table-column
+ v-if="!isTargetHospital"
+ label="璇煶"
+ align="center"
+ key="voice"
+ prop="voice"
+ >
<template slot-scope="scope">
<el-button
size="medium"
@@ -618,7 +843,13 @@
</el-button>
</template>
</el-table-column>
- <el-table-column label="鐭俊" align="center" key="sms" prop="sms">
+ <el-table-column
+ v-if="!isTargetHospital"
+ label="鐭俊"
+ align="center"
+ key="sms"
+ prop="sms"
+ >
<template slot-scope="scope">
<el-button
size="medium"
@@ -630,6 +861,7 @@
</template>
</el-table-column>
<el-table-column
+ v-if="!isTargetHospital"
label="寰俊"
align="center"
key="weChat"
@@ -747,6 +979,14 @@
tasktypes: store.getters.tasktypes,
};
},
+ computed: {
+ isTargetHospital() {
+ return (
+ this.orgname == "绗竴浜烘皯鍖婚櫌婀栨花闄㈠尯" ||
+ this.orgname == "绗竴浜烘皯鍖婚櫌鍚村北闄㈠尯"
+ );
+ },
+ },
methods: {
loadData() {
this.loading = true;
@@ -764,7 +1004,7 @@
delete params.leavehospitaldistrictcodes.all;
delete params.deptcodes.all;
- params.rateDay = 7;
+ params.rateDay = this.orgname == "榫欐硥甯備汉姘戝尰闄�" ? 21 : 7;
getSfStatistics(params)
.then((response) => {
this.tableData = this.customSort(response.data);
@@ -791,201 +1031,19 @@
},
customSort(data) {
- const order = [
- "涓�",
- "浜�",
- "涓�",
- "鍥�",
- "浜�",
- "鍏�",
- "涓�",
- "鍏�",
- "涔�",
- "鍗�",
- "鍗佷竴",
- "鍗佷簩",
- "鍗佷笁",
- "鍗佸洓",
- "鍗佷簲",
- "鍗佸叚",
- "鍗佷竷",
- "鍗佸叓",
- "鍗佷節",
- "浜屽崄",
- "浜屽崄涓�",
- "浜屽崄浜�",
- "浜屽崄涓�",
- "浜屽崄鍥�",
- "浜屽崄浜�",
- "浜屽崄鍏�",
- "浜屽崄涓�",
- "浜屽崄鍏�",
- "浜屽崄涔�",
- "涓夊崄",
- "涓夊崄涓�",
- "涓夊崄浜�",
- "涓夊崄涓�",
- "涓夊崄鍥�",
- "涓夊崄浜�",
- "涓夊崄鍏�",
- "涓夊崄涓�",
- "涓夊崄鍏�",
- "涓夊崄涔�",
- "鍥涘崄",
- "鍥涘崄涓�",
- "鍥涘崄浜�",
- "鍥涘崄涓�",
- "鍥涘崄鍥�",
- "鍥涘崄浜�",
- ];
-
- return data.sort((a, b) => {
- const getIndex = (name) => {
- if (!name || typeof name !== "string") return -1;
- const chineseMatch = name.match(/^([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)/);
- if (chineseMatch && chineseMatch[1]) {
- return order.indexOf(chineseMatch[1]);
- }
- const arabicMatch = name.match(/^(\d+)/);
- if (arabicMatch && arabicMatch[1]) {
- const num = parseInt(arabicMatch[1], 10);
- if (num >= 1 && num <= 45) {
- return num - 1;
- }
- }
- return -1;
- };
-
- const indexA = getIndex(a.leavehospitaldistrictname);
- const indexB = getIndex(b.leavehospitaldistrictname);
-
- if (indexA === -1 && indexB === -1) {
- return (a.leavehospitaldistrictname || "").localeCompare(
- b.leavehospitaldistrictname || ""
- );
- }
- if (indexA === -1) return 1;
- if (indexB === -1) return -1;
- return indexA - indexB;
- });
- },
- Tooltipcgl(h, { column }) {
- return h(
- "el-tooltip",
- {
- props: {
- content: "闅忚鎴愬姛/(闇�闅忚-寰呴殢璁�)",
- placement: "top",
- effect: "dark",
- },
- },
- [h("span", column.label)]
+ return data.sort((a, b) =>
+ this.compareWardName(
+ a.leavehospitaldistrictname,
+ b.leavehospitaldistrictname
+ )
);
},
- Tooltipjsl(h, { column }) {
- return h(
- "el-tooltip",
- {
- props: {
- content: "(搴旈殢璁挎椂闂�+浠诲姟鍛ㄦ湡)灏忎簬瀹屾垚鏃堕棿鍗充负瓒呮椂;(闇�闅忚-瓒呮椂)/闇�闅忚",
- placement: "top",
- effect: "dark",
- },
- },
- [h("span", column.label)]
- );
- },
- Tooltipsfl(h, { column }) {
- return h(
- "el-tooltip",
- {
- props: {
- content: "(闅忚鎴愬姛+棣栨闅忚澶辫触)/棣栨搴旈殢璁�",
- placement: "top",
- effect: "dark",
- },
- },
- [h("span", column.label)]
- );
- },
+
sortChineseNumber(aRow, bRow) {
- const a = aRow.leavehospitaldistrictname;
- const b = bRow.leavehospitaldistrictname;
-
- const chineseNumMap = {
- 涓�: 1,
- 浜�: 2,
- 涓�: 3,
- 鍥�: 4,
- 浜�: 5,
- 鍏�: 6,
- 涓�: 7,
- 鍏�: 8,
- 涔�: 9,
- 鍗�: 10,
- 鍗佷竴: 11,
- 鍗佷簩: 12,
- 鍗佷笁: 13,
- 鍗佸洓: 14,
- 鍗佷簲: 15,
- 鍗佸叚: 16,
- 鍗佷竷: 17,
- 鍗佸叓: 18,
- 鍗佷節: 19,
- 浜屽崄: 20,
- 浜屽崄涓�: 21,
- 浜屽崄浜�: 22,
- 浜屽崄涓�: 23,
- 浜屽崄鍥�: 24,
- 浜屽崄浜�: 25,
- 浜屽崄鍏�: 26,
- 浜屽崄涓�: 27,
- 浜屽崄鍏�: 28,
- 浜屽崄涔�: 29,
- 涓夊崄: 30,
- 涓夊崄涓�: 31,
- 涓夊崄浜�: 32,
- 涓夊崄涓�: 33,
- 涓夊崄鍥�: 34,
- 涓夊崄浜�: 35,
- 涓夊崄鍏�: 36,
- 涓夊崄涓�: 37,
- 涓夊崄鍏�: 38,
- 涓夊崄涔�: 39,
- 鍥涘崄: 40,
- 鍥涘崄涓�: 41,
- 鍥涘崄浜�: 42,
- 鍥涘崄涓�: 43,
- 鍥涘崄鍥�: 44,
- 鍥涘崄浜�: 45,
- };
-
- const getNumberFromText = (text) => {
- if (!text || typeof text !== "string") return -1;
- const match = text.match(/^([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)/);
- if (match && match[1]) {
- const chineseNum = match[1];
- return chineseNumMap[chineseNum] !== undefined
- ? chineseNumMap[chineseNum]
- : -1;
- }
- const arabicMatch = text.match(/^(\d+)/);
- if (arabicMatch && arabicMatch[1]) {
- const num = parseInt(arabicMatch[1], 10);
- return num >= 1 && num <= 45 ? num : -1;
- }
- return -1;
- };
-
- const numA = getNumberFromText(a);
- const numB = getNumberFromText(b);
-
- if (numA === -1 && numB === -1) {
- return (a || "").localeCompare(b || "");
- }
- if (numA === -1) return 1;
- if (numB === -1) return -1;
- return numA - numB;
+ return this.compareWardName(
+ aRow.leavehospitaldistrictname,
+ bRow.leavehospitaldistrictname
+ );
},
getRowKey(row) {
@@ -1015,7 +1073,7 @@
if (!row.doctorStats) {
this.loading = true;
- params.rateDay = 7;
+ params.rateDay = this.orgname == "榫欐硥甯備汉姘戝尰闄�" ? 21 : 7;
getSfStatistics(params).then((res) => {
this.$set(row, "doctorStats", res.data);
@@ -1122,7 +1180,72 @@
return sums;
},
-
+ Tooltipcgl(h, { column }) {
+ return h(
+ "el-tooltip",
+ {
+ props: {
+ content: "闅忚鎴愬姛/(闇�闅忚-寰呴殢璁�)",
+ placement: "top",
+ effect: "dark",
+ },
+ },
+ [h("span", column.label)]
+ );
+ },
+ Tooltipjsl(h, { column }) {
+ return h(
+ "el-tooltip",
+ {
+ props: {
+ content:
+ "(鍑洪櫌鏃堕棿+浠诲姟鍛ㄦ湡)灏忎簬瀹屾垚鏃堕棿鍗充负瓒呮椂;(闇�闅忚-瓒呮椂)/闇�闅忚",
+ placement: "top",
+ effect: "dark",
+ },
+ },
+ [h("span", column.label)]
+ );
+ },
+ Tooltipsfl(h, { column }) {
+ return h(
+ "el-tooltip",
+ {
+ props: {
+ content: "(闅忚鎴愬姛+棣栨闅忚澶辫触)/棣栨搴旈殢璁�",
+ placement: "top",
+ effect: "dark",
+ },
+ },
+ [h("span", column.label)]
+ );
+ },
+ Tooltipfswc(h, { column }) {
+ return h(
+ "el-tooltip",
+ {
+ props: {
+ content: "棣栨鍙戦�佹偅鑰呭嵆濉姤鎴愬姛鐨勬暟閲�",
+ placement: "top",
+ effect: "dark",
+ },
+ },
+ [h("span", column.label)]
+ );
+ },
+ Tooltipzzwc(h, { column }) {
+ return h(
+ "el-tooltip",
+ {
+ props: {
+ content: "棣栨鏈畬鎴愪簩娆℃垨涓夋琛ュ伩鎺ㄩ�佹湰鏂瑰紡鐨勫畬鎴愭鏁�",
+ placement: "top",
+ effect: "dark",
+ },
+ },
+ [h("span", column.label)]
+ );
+ },
getInnerSummaries(param) {
const { columns, data } = param;
const sums = [];
@@ -1209,6 +1332,77 @@
return Number.isInteger(num) ? num.toString() : num.toFixed(0);
},
+ // ===== 鐥呭尯鍚嶆帓搴忥紙鏀寔 1-B10 / 2-A2 绛� 鏁板瓧-瀛楁瘝鏁板瓧 鏍煎紡锛� =====
+ // 瑙ｆ瀽鐥呭尯鍚嶏紝杩斿洖鎺掑簭閿� { group, letter, number }
+ parseWardKey(name) {
+ if (!name || typeof name !== "string") return null;
+ const trimmed = name.trim();
+
+ // 鏍煎紡1锛氭暟瀛�-瀛楁瘝鏁板瓧锛屽 1-B10銆�2-A2銆�1-A11
+ const dashMatch = trimmed.match(/^(\d+)-([A-Za-z]+)(\d+)/);
+ if (dashMatch) {
+ return {
+ group: parseInt(dashMatch[1], 10),
+ letter: dashMatch[2].toUpperCase(),
+ number: parseInt(dashMatch[3], 10),
+ };
+ }
+
+ // 鏍煎紡2锛氫腑鏂囨暟瀛楀紑澶达紝濡� 涓�鐥呭尯銆佸崄涓�鐥呭尯銆佷簩鍗佷竴鐥呭尯
+ const cnMatch = trimmed.match(/^([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)/);
+ if (cnMatch && cnMatch[1]) {
+ const num = this.chineseToNumber(cnMatch[1]);
+ if (num > 0) return { group: num, letter: "", number: 0 };
+ }
+
+ // 鏍煎紡3锛氶樋鎷変集鏁板瓧寮�澶达紝濡� 1鐥呭尯銆�12鐥呭尯
+ const numMatch = trimmed.match(/^(\d+)/);
+ if (numMatch && numMatch[1]) {
+ return { group: parseInt(numMatch[1], 10), letter: "", number: 0 };
+ }
+
+ return null;
+ },
+
+ // 涓枃鏁板瓧杞樋鎷変集鏁板瓧锛堟敮鎸� 涓� ~ 涔濆崄涔濓級
+ chineseToNumber(str) {
+ const digits = {
+ 涓�: 1,
+ 浜�: 2,
+ 涓�: 3,
+ 鍥�: 4,
+ 浜�: 5,
+ 鍏�: 6,
+ 涓�: 7,
+ 鍏�: 8,
+ 涔�: 9,
+ };
+ if (!str) return -1;
+ if (str === "鍗�") return 10;
+ if (str.startsWith("鍗�")) return 10 + (digits[str[1]] || 0);
+ if (str.includes("鍗�")) {
+ const parts = str.split("鍗�");
+ const tens = digits[parts[0]] || 0;
+ const ones = digits[parts[1]] || 0;
+ return tens * 10 + ones;
+ }
+ return digits[str] !== undefined ? digits[str] : -1;
+ },
+
+ // 鐥呭尯鍚嶆瘮杈冨櫒锛氭暟瀛楁 鈫� 瀛楁瘝娈� 鈫� 鏁板瓧娈�
+ compareWardName(nameA, nameB) {
+ const ka = this.parseWardKey(nameA);
+ const kb = this.parseWardKey(nameB);
+
+ if (!ka && !kb) return (nameA || "").localeCompare(nameB || "", "zh-CN");
+ if (!ka) return 1;
+ if (!kb) return -1;
+
+ if (ka.group !== kb.group) return ka.group - kb.group;
+ if (ka.letter !== kb.letter) return ka.letter.localeCompare(kb.letter);
+ return ka.number - kb.number;
+ },
+
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.tagid);
},
@@ -1277,50 +1471,41 @@
}
}
- // 鏍规嵁 serviceType 鐢熸垚闅忚绫诲瀷鍚嶇О
+ // 鏍规嵁 serviceType 鐢熸垚闅忚绫诲瀷鍚嶇О锛堝吋瀹瑰崟閫�/澶氶�夛級
+ const serviceTypes = Array.isArray(this.queryParams.serviceType)
+ ? this.queryParams.serviceType
+ : this.queryParams.serviceType
+ ? [this.queryParams.serviceType]
+ : [];
+
let serviceTypeName = "棣栨鍑洪櫌闅忚"; // 鏂囦欢鍚嶄娇鐢ㄧ殑鍚嶇О
let sheetTypeName = "棣栨闅忚"; // 宸ヤ綔琛ㄤ娇鐢ㄧ殑鍚嶇О锛堢畝鍖栫増锛�
- if (
- this.queryParams.serviceType &&
- Array.isArray(this.queryParams.serviceType) &&
- this.queryParams.serviceType.length > 0
- ) {
- if (this.tasktypes && Array.isArray(this.tasktypes)) {
- // 杩囨护鍑哄尮閰嶇殑闅忚绫诲瀷
- const matchedTypes = this.tasktypes.filter((task) =>
- this.queryParams.serviceType.includes(task.value)
+ if (serviceTypes.length > 0) {
+ // 浣跨敤 props 涓殑 options锛堝嵆 tasktypes锛�
+ if (this.options && Array.isArray(this.options)) {
+ const matchedTypes = this.options.filter((task) =>
+ serviceTypes.includes(task.value)
);
+ console.log(matchedTypes, "matchedTypes");
if (matchedTypes.length === 1) {
- // 鍗曚釜绫诲瀷
const label = matchedTypes[0].label;
serviceTypeName = `棣栨${label}`;
sheetTypeName = `棣栨${label}`;
} else if (matchedTypes.length > 1) {
- // 澶氫釜绫诲瀷
const typeNames = matchedTypes.map((task) => task.label);
-
- // 鏂囦欢鍚嶏細鐢ㄦ枩鏉犲垎闅�
serviceTypeName = `棣栨${typeNames.join("/")}`;
-
- // 宸ヤ綔琛ㄥ悕锛氫娇鐢ㄧ涓�涓被鍨嬫垨绠�鍖栧悕绉�
- if (matchedTypes.length <= 2) {
- // 濡傛灉鍙湁2涓被鍨嬶紝閮芥樉绀�
- sheetTypeName = `棣栨${typeNames[0]}绛塦;
- } else {
- // 濡傛灉瓒呰繃2涓被鍨嬶紝鍙樉绀虹涓�涓�
- sheetTypeName = `棣栨${typeNames[0]}绛塦;
- }
- } else if (this.queryParams.serviceType.length > 0) {
- // 濡傛灉娌℃湁鍖归厤鐨勶紝浣跨敤鍘熷鍊�
- const typeStr = this.queryParams.serviceType.join("/");
+ // 宸ヤ綔琛ㄥ悕绠�鍖栵紙鍙栫涓�涓�+鈥滅瓑鈥濓級
+ sheetTypeName = `棣栨${typeNames[0]}绛塦;
+ } else {
+ // 鏃犲尮閰嶆椂浣跨敤鍘熷鍊�
+ const typeStr = serviceTypes.join("/");
serviceTypeName = `棣栨${typeStr}`;
sheetTypeName = "棣栨闅忚";
}
- } else if (this.queryParams.serviceType.length > 0) {
- // 濡傛灉娌℃湁 tasktypes锛屼娇鐢ㄥ師濮嬪��
- const typeStr = this.queryParams.serviceType.join("/");
+ } else {
+ const typeStr = serviceTypes.join("/");
serviceTypeName = `棣栨${typeStr}`;
sheetTypeName = "棣栨闅忚";
}
@@ -1347,7 +1532,7 @@
const worksheet = workbook.addWorksheet(worksheetName);
// 鏋勫缓琛ㄦ牸
- this.buildExportSheet(worksheet, sheetNameSuffix);
+ this.buildExportSheet(worksheet, sheetNameSuffix, serviceTypeName);
const buffer = await workbook.xlsx.writeBuffer();
const blob = new Blob([buffer], {
@@ -1576,7 +1761,7 @@
return sums;
},
- buildExportSheet(worksheet, sheetNameSuffix) {
+ buildExportSheet(worksheet, sheetNameSuffix, serviceTypeName) {
const titleStyle = {
font: {
name: "寰蒋闆呴粦",
@@ -1650,11 +1835,11 @@
right: { style: "thin", color: { argb: "FFD0D0D0" } },
},
};
-
+ const titleText = `${serviceTypeName}缁熻琛╛${sheetNameSuffix}`;
// 娣诲姞鏍囬琛�
worksheet.mergeCells(1, 1, 1, 16);
const titleCell = worksheet.getCell(1, 1);
- titleCell.value = `棣栨鍑洪櫌闅忚缁熻琛╛${sheetNameSuffix}`;
+ titleCell.value = titleText; // 浣跨敤鍔ㄦ�佹爣棰�
titleCell.style = titleStyle;
worksheet.getRow(1).height = 35;
@@ -1700,7 +1885,7 @@
worksheet.getCell(2, 6).value = "搴旈殢璁夸汉娆�";
worksheet.mergeCells(2, 7, 2, 16); // 浠�7鍚堝苟鍒�16锛堝師鏉ユ槸7-15锛�
- worksheet.getCell(2, 7).value = "棣栨鍑洪櫌闅忚";
+ worksheet.getCell(2, 7).value = serviceTypeName; // 鎴栭�傚綋鎴彇
worksheet.getCell(2, 7).style = headerStyle;
worksheet.getRow(2).height = 28;
@@ -1881,7 +2066,9 @@
console.log(1);
this.patientqueryParams.serviceTypes = queryParams.serviceType
- ? queryParams.serviceType.join(",")
+ ? Array.isArray(queryParams.serviceType)
+ ? queryParams.serviceType.join(",")
+ : String(queryParams.serviceType)
: null;
return selectTimelyRate(this.patientqueryParams);
--
Gitblit v1.9.3