From 0c7cc21d8a51e164dd2fe4ce73ab566b3a9081a9 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期四, 26 三月 2026 10:25:05 +0800
Subject: [PATCH] 测试完成

---
 src/views/sfstatistics/percentage/index.vue |   78 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index 745f8f0..03f5de7 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -356,6 +356,7 @@
                   prop="leavehospitaldistrictname"
                   width="150"
                   :show-overflow-tooltip="true"
+                  :sort-method="sortChineseNumber"
                 />
                 <el-table-column
                   label="绉戝"
@@ -1168,6 +1169,20 @@
                   </template>
                 </el-table-column>
                 <el-table-column
+                  label="浠诲姟鎵ц鏂瑰紡"
+                  align="center"
+                  key="preachform"
+                  prop="preachform"
+                  width="160"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="scope">
+                    <span v-for="item in scope.row.preachform"
+                      >{{ item }}銆�
+                    </span>
+                  </template>
+                </el-table-column>
+                <el-table-column
                   prop="visitTime"
                   align="center"
                   label="搴旈殢璁挎椂闂�"
@@ -1420,6 +1435,7 @@
       allDeptCodes: [],
       // 瀛樺偍鎵�鏈夌梾鍖轰唬鐮�
       allWardCodes: [],
+      checkboxlist: [],
       // 琛ㄥ崟鍙傛暟
       form: {},
       forms: {
@@ -1469,6 +1485,7 @@
   created() {
     this.getDeptTree();
     this.getList();
+    this.checkboxlist = store.getters.checkboxlist;
     this.orgname = localStorage.getItem("orgname");
   },
 
@@ -1487,15 +1504,52 @@
           ? this.allDeptCodes
           : this.queryParams.deptcodes,
       };
-
+      this.loading = true;
       // 绉婚櫎鍙兘瀛樺湪鐨�"all"鍊�
       delete params.leavehospitaldistrictcodes.all;
       delete params.deptcodes.all;
       getSfStatistics(params).then((response) => {
-        console.log(response);
+        this.loading = false;
+
         // this.total = response.total;
         this.userList = this.customSort(response.data);
       });
+    },
+    sortChineseNumber(a, b) {
+      // 鎻愬彇涓枃鏁板瓧
+      const chineseNumbers = [
+        "涓�",
+        "浜�",
+        "涓�",
+        "鍥�",
+        "浜�",
+        "鍏�",
+        "涓�",
+        "鍏�",
+        "涔�",
+        "鍗�",
+        "鍗佷竴",
+        "鍗佷簩",
+      ];
+
+      // 浠庡瓧绗︿覆涓彁鍙栫梾鍖烘暟瀛楋紝濡�"鍥涚梾鍖�" -> "鍥�"
+      const getNumberFromText = (text) => {
+        if (!text) return -1;
+        const match = text.match(/^([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)/);
+        if (match && match[1]) {
+          return chineseNumbers.indexOf(match[1]);
+        }
+        return -1;
+      };
+
+      const numA = getNumberFromText(a);
+      const numB = getNumberFromText(b);
+
+      if (numA === -1 && numB === -1) return 0;
+      if (numA === -1) return 1; // 鏃犳硶瑙f瀽鐨勬斁鍒板悗闈�
+      if (numB === -1) return -1; // 鏃犳硶瑙f瀽鐨勬斁鍒板悗闈�
+
+      return numA - numB;
     },
     // 鎼滅储澶勭悊鍑芥暟
     handleSearch() {
@@ -1851,7 +1905,25 @@
       this.infotitleVisible = true;
       this.infotitle = title;
       this.infotitlelist = row; // 鍋囪row灏辨槸闇�瑕佸睍绀虹殑璇︾粏鏁扮粍
+      console.log(this.infotitlelist, "this.infotitlelist");
 
+      this.infotitlelist.forEach((item) => {
+        let idArray = null;
+
+        if (item.preachform) {
+          if (item.endtime) {
+            item.preachformson = item.preachform;
+            idArray = item.preachform.split(",");
+          }
+
+          item.preachform = idArray.map((value) => {
+            // 鏌ユ壘id瀵瑰簲鐨勫璞�
+            const item = this.checkboxlist.find((item) => item.value == value);
+            // 濡傛灉鎵惧埌瀵瑰簲鐨刬d锛岃繑鍥瀕abel鍊硷紝鍚﹀垯杩斿洖null
+            return item ? item.label : null;
+          });
+        }
+      });
       // 鍒濆鍖栧姞杞�
       this.loadIndex = 0;
       this.currentDisplayList = [];
@@ -1865,6 +1937,8 @@
 
       // 妯℃嫙寮傛鍔犺浇锛屽疄闄呭彲鑳芥槸鐩存帴鍒囩墖鏈湴鏁版嵁
       setTimeout(() => {
+        console.log(this.infotitlelist, "this.infotitlelist");
+
         const nextChunk = this.infotitlelist.slice(
           this.loadIndex,
           this.loadIndex + this.pageSize

--
Gitblit v1.9.3