From 6cf8f9cdd963e3cc8af20b1d3b2df7e46bc34967 Mon Sep 17 00:00:00 2001
From: hebo <hebo@git123.com>
Date: Sat, 10 Jan 2026 10:09:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |    1 +
 src/api/base/invApplyApi.ts                   |  138 ++
 src/api/base/invItemApi.ts                    |   23 +
 src/api/base/invOutBillApi.ts                 |   37 +
 src/api/base/jfApi.ts                         |   43 +
 src/api/base/server.ts                        |    5 +
 src/pages.json                                |   63 +
 src/pages/base/service/index.vue              |   42 +
 .../components/InvItemSelector/index.vue      |  543 +++++++
 src/pages/components/PdfPreview/index.vue     |  253 +++
 src/pages/components/StudentPicker/index.vue  | 1144 +++++++++-----
 src/pages/statistics/jc/jcList.vue            |  430 +++++
 src/pages/system/web-viewer/index.vue         |   86 +-
 .../JiFenPingJia/jfself/IntegralApply.vue     |    4 +-
 .../JiFenPingJia/jfself/JiFenPingJia.vue      |  624 +++++++-
 .../JiFenPingJia/jfself/MyScoreDetail.vue     |  112 +-
 .../JiFenPingJia/jfself/ScoreListByType.vue   |   64 +-
 .../view/routine/JiFenPingJia/jfsp/JfFlow.vue |   15 +-
 .../routine/JiFenPingJia/jfsp/compare.vue     | 1397 +++++++++++++++++
 .../view/routine/JiFenPingJia/jfsp/index.vue  |  269 +++-
 .../view/routine/JiFenPingJia/jfsp/list.vue   |  458 ++++++
 .../view/routine/ShiTangXunCha/detail.vue     |    3 +-
 .../view/routine/inv/invout/ApprovalOut.vue   |  417 +++++
 .../view/routine/inv/invout/DirectOut.vue     | 1146 ++++++++++++++
 src/pages/view/routine/inv/invout/index.vue   |   96 ++
 .../routine/inv/invsp/InvApplyApprove.vue     |  617 ++++++++
 src/pages/view/routine/inv/invsp/index.vue    |  516 ++++++
 src/pages/view/routine/inv/invsq/Apply.vue    | 1179 ++++++++++++++
 src/pages/view/routine/inv/invsq/detail.vue   |  572 +++++++
 src/pages/view/routine/inv/invsq/index.vue    |  549 +++++++
 src/pages/view/routine/wj/wjList.vue          |    3 +-
 src/pages/view/routine/yishiyice/push.vue     |   37 +-
 .../view/routine/yishiyice/rw/detail.vue      |    1 -
 src/static/base/home/invly.png                |  Bin 0 -> 7578 bytes
 src/static/base/home/invout.png               |  Bin 0 -> 10067 bytes
 src/static/base/home/invsp.png                |  Bin 0 -> 7417 bytes
 src/static/base/home/jctjqd.png               |  Bin 0 -> 7055 bytes
 src/types/jweixin-js-sdk.d.ts                 |   54 +
 src/utils/request/index.ts                    |    3 +-
 src/utils/wechatShare.ts                      |  313 ++++
 vite.config.ts                                |   33 +-
 41 files changed, 10833 insertions(+), 457 deletions(-)
 create mode 100644 src/api/base/invApplyApi.ts
 create mode 100644 src/api/base/invItemApi.ts
 create mode 100644 src/api/base/invOutBillApi.ts
 create mode 100644 src/pages/components/InvItemSelector/index.vue
 create mode 100644 src/pages/components/PdfPreview/index.vue
 create mode 100644 src/pages/statistics/jc/jcList.vue
 create mode 100644 src/pages/view/routine/JiFenPingJia/jfsp/compare.vue
 create mode 100644 src/pages/view/routine/JiFenPingJia/jfsp/list.vue
 create mode 100644 src/pages/view/routine/inv/invout/ApprovalOut.vue
 create mode 100644 src/pages/view/routine/inv/invout/DirectOut.vue
 create mode 100644 src/pages/view/routine/inv/invout/index.vue
 create mode 100644 src/pages/view/routine/inv/invsp/InvApplyApprove.vue
 create mode 100644 src/pages/view/routine/inv/invsp/index.vue
 create mode 100644 src/pages/view/routine/inv/invsq/Apply.vue
 create mode 100644 src/pages/view/routine/inv/invsq/detail.vue
 create mode 100644 src/pages/view/routine/inv/invsq/index.vue
 create mode 100644 src/static/base/home/invly.png
 create mode 100644 src/static/base/home/invout.png
 create mode 100644 src/static/base/home/invsp.png
 create mode 100644 src/static/base/home/jctjqd.png
 create mode 100644 src/types/jweixin-js-sdk.d.ts
 create mode 100644 src/utils/wechatShare.ts

diff --git a/package.json b/package.json
index 168e6e8..57329af 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
 		"clipboard": "2.0.11",
 		"dayjs": "1.11.6",
 		"jest": "27.0.4",
+		"jweixin-js-sdk": "^1.6.0",
 		"lodash": "4.17.21",
 		"pinia": "2.0.23",
 		"pinia-plugin-persist-uni": "1.2.0",
diff --git a/src/api/base/invApplyApi.ts b/src/api/base/invApplyApi.ts
new file mode 100644
index 0000000..5c9e798
--- /dev/null
+++ b/src/api/base/invApplyApi.ts
@@ -0,0 +1,138 @@
+import { get, post } from '@/utils/request';
+
+/**
+ * 分页查询领用申请
+ */
+export function invApplyFindPageApi(params: any) {
+    return get('/api/invApply/findPage', params);
+}
+
+/**
+ * 根据ID查询领用申请
+ */
+export function invApplyFindByIdApi(params: any) {
+    return get('/api/invApply/findById', params);
+}
+
+/**
+ * 根据ID查询领用申请（完整信息）
+ */
+export function invApplyFindFullByIdApi(params: any) {
+    return get('/api/invApply/findByIdFull', params);
+}
+
+/**
+ * 保存领用申请（新增/修改）
+ */
+export function invApplySaveApi(params: any) {
+    return post('/api/invApply/save', params);
+}
+
+/**
+ * 删除领用申请
+ */
+export function invApplyDeleteApi(params: any) {
+    return post('/api/invApply/delete', params);
+}
+
+/**
+ * 提交领用申请（走审批流程）
+ */
+export function invApplySqApi(params: any) {
+    return post('/api/invApply/sq', params);
+}
+
+/**
+ * 重新提交领用申请
+ */
+export function invApplyReSubmitApi(params: any) {
+    return post('/api/invApply/reSubmit', params);
+}
+
+/**
+ * 撤回领用申请
+ */
+export function invApplyWithdrawApi(params: { id: string; spRemark?: string }) {
+    let url = `/api/invApply/withdraw?id=${params.id}`;
+    if (params.spRemark) {
+        url += `&spRemark=${encodeURIComponent(params.spRemark)}`;
+    }
+    return post(url, null);
+}
+
+/**
+ * 查询领用申请流程详情
+ */
+export function invApplyFlowByIdApi(params: any) {
+    return get('/api/invApply/flowById', params);
+}
+
+/**
+ * 根据申请单ID查询明细列表
+ */
+export function invApplyItemFindPageApi(params: any) {
+    return get('/api/invApplyItem/findPage', params);
+}
+
+/**
+ * 根据申请单ID查询明细列表（按申请单ID）
+ */
+export function invApplyItemFindByApplyIdApi(applyId: string) {
+    return get('/api/invApplyItem/findByApplyId', { applyId });
+}
+
+/**
+ * 批量保存明细
+ */
+export function invApplyItemSaveBatchApi(params: any) {
+    return post('/api/invApplyItem/saveBatch', params);
+}
+
+/**
+ * 查询仓库列表
+ */
+export function invWarehouseFindAllApi(params: any) {
+    return get('/api/invWarehouse/findAll', params);
+}
+
+/**
+ * 查询物品列表
+ */
+export function invItemFindAllApi(params: any) {
+    return get('/api/invItem/findAll', params);
+}
+
+/**
+ * 查询库位列表
+ */
+export function invLocationFindAllApi(params: any) {
+    return get('/api/invLocation/findAll', params);
+}
+
+/**
+ * 审批领用申请
+ */
+export function invApplySpApi(params: any) {
+    return post('/api/invApply/sp', params);
+}
+
+/**
+ * 转办领用申请
+ */
+export function invApplyTransferApi(params: any) {
+    return post('/api/invApply/transfer', params);
+}
+
+/**
+ * 终止领用申请
+ */
+export function invApplyStopApi(params: any) {
+    return post('/api/invApply/stop', params);
+}
+
+/**
+ * 领用申请待办/已办列表
+ */
+export function invApplyFindUserTodosPageApi(params: any) {
+    return get('/api/invApply/findUserTodosPage', params);
+}
\ No newline at end of file
diff --git a/src/api/base/invItemApi.ts b/src/api/base/invItemApi.ts
new file mode 100644
index 0000000..8bc1d99
--- /dev/null
+++ b/src/api/base/invItemApi.ts
@@ -0,0 +1,23 @@
+import { get, post } from '@/utils/request';
+
+/**
+ * 查询物品列表（全部）
+ */
+export function invItemFindAllApi(params?: any) {
+    return get('/api/invItem/findAll', params);
+}
+
+/**
+ * 分页查询物品列表
+ */
+export function invItemFindPageApi(params: any) {
+    return get('/api/invItem/findPage', params);
+}
+
+/**
+ * 根据ID查询物品
+ */
+export function invItemFindByIdApi(params: any) {
+    return get('/api/invItem/findById', params);
+}
+
diff --git a/src/api/base/invOutBillApi.ts b/src/api/base/invOutBillApi.ts
new file mode 100644
index 0000000..51995cd
--- /dev/null
+++ b/src/api/base/invOutBillApi.ts
@@ -0,0 +1,37 @@
+import { get, post } from '@/utils/request';
+
+/**
+ * 分页查询出库单
+ */
+export function invOutBillFindPageApi(params: any) {
+    return get('/api/invOutBill/findPage', params);
+}
+
+/**
+ * 根据ID查询出库单
+ */
+export function invOutBillFindByIdApi(params: any) {
+    return get('/api/invOutBill/findById', params);
+}
+
+/**
+ * 保存出库单（新增/修改）
+ */
+export function invOutBillSaveApi(params: any) {
+    return post('/api/invOutBill/save', params);
+}
+
+/**
+ * 删除出库单
+ */
+export function invOutBillDeleteApi(params: any) {
+    return post('/api/invOutBill/delete', params);
+}
+
+/**
+ * 查询全部出库单
+ */
+export function invOutBillFindAllApi() {
+    return get('/api/invOutBill/findAll', {});
+}
+
diff --git a/src/api/base/jfApi.ts b/src/api/base/jfApi.ts
index 4bf051f..5ce6437 100644
--- a/src/api/base/jfApi.ts
+++ b/src/api/base/jfApi.ts
@@ -93,6 +93,18 @@ export function jfReSubmitApi(params: any) {
     return post('/api/jf/reSubmit', params);
 }
 
+/**
+ * 积分审批-撤回
+ */
+export function jfWithdrawApi(params: { id: string; spRemark?: string }) {
+    // 将参数作为查询字符串传递
+    let url = `/api/jf/withdraw?id=${params.id}`;
+    if (params.spRemark) {
+        url += `&spRemark=${encodeURIComponent(params.spRemark)}`;
+    }
+    return post(url, null);
+}
+
 /**
  * 积分审批-流程详情
  */
@@ -135,3 +147,34 @@ export function jfStudentAwardDeleteApi(params: any) {
     return post('/api/jfXsqd/delete', params);
 }
 
+/**
+ * 导出教师积分明细
+ */
+export function jfExportApi(params: any) {
+    return get('/api/jf/export', params);
+}
+
+/**
+ * 按申请人分组统计待审批记录
+ * @param params { jsId: 审批人ID, dbZt: 待办状态(A/B), spType: 审批类型(SP/CC), page: 页码, rows: 每页条数 }
+ */
+export function jfFindUserTodosGroupByApplicantApi(params: any) {
+    return get('/api/jf/findUserTodosGroupByApplicant', params);
+}
+
+/**
+ * 获取指定申请人的所有待审批记录详情
+ * @param params { applicantId: 申请人ID, jsId: 审批人ID, dbZt: 待办状态, spType: 审批类型 }
+ */
+export function jfFindApplicantTodosDetailApi(params: any) {
+    return get('/api/jf/findApplicantTodosDetail', params);
+}
+
+/**
+ * 批量审批接口
+ * @param params { records: [{ xxtsId, ywId, spStatus, spRemark }], spStatus: 审批状态, spRemark: 审批意见 }
+ */
+export function jfBatchSpApi(params: any) {
+    return post('/api/jf/batchSp', params);
+}
+
diff --git a/src/api/base/server.ts b/src/api/base/server.ts
index 55173bd..2536e44 100644
--- a/src/api/base/server.ts
+++ b/src/api/base/server.ts
@@ -189,6 +189,11 @@ export const xsFindList = async (params: any) => {
   return await get("/api/xs/findPage", params);
 };
 
+// 获取学生列表（不受权限控制）
+export const xsFindListKz = async (params: any) => {
+  return await get("/api/xs/findPageKz", params);
+};
+
 // 获取学生家长列表
 export const xsJzListByXsIdApi = async (params: any) => {
   return await get("/api/jz/getListByXsId", params);
diff --git a/src/pages.json b/src/pages.json
index e48f1e9..dab017f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -136,6 +136,13 @@
         "enablePullDownRefresh": false
       }
     },
+    {
+      "path": "pages/statistics/jc/jcList",
+      "style": {
+        "navigationBarTitleText": "就餐统计",
+        "enablePullDownRefresh": false
+      }
+    },
     {
       "path": "pages/statistics/jc/grade-statistics",
       "style": {
@@ -876,6 +883,20 @@
         "enablePullDownRefresh": false
       }
     },
+    {
+      "path": "pages/view/routine/JiFenPingJia/jfsp/list",
+      "style": {
+        "navigationBarTitleText": "审批列表",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/JiFenPingJia/jfsp/compare",
+      "style": {
+        "navigationBarTitleText": "积分审批",
+        "enablePullDownRefresh": false
+      }
+    },
     {
       "path": "pages/view/routine/JiFenPingJia/jfdj/index",
       "style": {
@@ -911,6 +932,48 @@
         "enablePullDownRefresh": false
       }
     },
+    {
+      "path": "pages/view/routine/inv/invsq/index",
+      "style": {
+        "navigationBarTitleText": "领用申请",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/inv/invsq/detail",
+      "style": {
+        "navigationBarTitleText": "领用详情",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/inv/invsq/Apply",
+      "style": {
+        "navigationBarTitleText": "领用申请",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/inv/invsp/index",
+      "style": {
+        "navigationBarTitleText": "领用审批",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/inv/invsp/InvApplyApprove",
+      "style": {
+        "navigationBarTitleText": "领用审批详情",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/inv/invout/index",
+      "style": {
+        "navigationBarTitleText": "物品出库",
+        "enablePullDownRefresh": false
+      }
+    },
     {
       "path": "pages/view/routine/wj/index",
       "style": {
diff --git a/src/pages/base/service/index.vue b/src/pages/base/service/index.vue
index ffabdd5..1af25b2 100644
--- a/src/pages/base/service/index.vue
+++ b/src/pages/base/service/index.vue
@@ -710,6 +710,40 @@ const sections = reactive<Section[]>([
           },
         ],
       },
+      {
+        id: "routine-inv",
+        icon: "inv",
+        text: "库存管理",
+        show: true,
+        permissionKey: "routine-inv",
+        isFolder: true,
+        folderItems: [
+          {
+            id: "routine-inv-ly",
+            icon: "invly",
+            text: "领用申请",
+            show: true,
+            permissionKey: "routine-invly",
+            path: "/pages/view/routine/inv/invsq/index",
+          },
+          {
+            id: "routine-inv-sp",
+            icon: "invsp",
+            text: "领用审批",
+            show: true,
+            permissionKey: "routine-invsp",
+            path: "/pages/view/routine/inv/invsp/index",
+          },
+          {
+            id: "routine-inv-out",
+            icon: "invout",
+            text: "物品出库",
+            show: true,
+            permissionKey: "routine-invout",
+            path: "/pages/view/routine/inv/invout/index",
+          },
+        ],
+      },
     ],
   },
   {
@@ -845,6 +879,14 @@ const sections = reactive<Section[]>([
         permissionKey: "routine-jcdm", // 就餐点名权限编码
         path: "/pages/view/routine/jc/bzList",
       },
+      {
+        id: "r11",
+        icon: "jctjqd",
+        text: "就餐统计",
+        show: true,
+        permissionKey: "routine-jctjqd", // 就餐统计权限编码
+        path: "/pages/statistics/jc/jcList",
+      },
       {
         id: "r9",
         icon: "jlfb",
diff --git a/src/pages/components/InvItemSelector/index.vue b/src/pages/components/InvItemSelector/index.vue
new file mode 100644
index 0000000..9e841b9
--- /dev/null
+++ b/src/pages/components/InvItemSelector/index.vue
@@ -0,0 +1,543 @@
+<template>
+  <view class="item-selector-modal" v-if="visible" @click="handleMaskClick">
+    <!-- 加载遮罩层 -->
+    <view v-if="loading" class="loading-mask">
+      <view class="loading-content">
+        <text class="loading-text">加载中...</text>
+      </view>
+    </view>
+    <view class="item-selector-content" @click.stop>
+      <!-- 头部 -->
+      <view class="selector-header">
+        <view class="header-title">选择物品</view>
+        <view class="header-actions">
+          <button class="close-btn" @click="closeModal">取消</button>
+        </view>
+      </view>
+      
+      <!-- 搜索区域 -->
+      <view class="search-section">
+        <view class="search-input-container">
+          <input 
+            class="search-input" 
+            v-model="searchKeyword" 
+            placeholder="请输入物品名称" 
+            @confirm="handleSearch"
+          />
+          <button class="search-btn" @click="handleSearch">搜索</button>
+        </view>
+      </view>
+      
+      <!-- 表格区域 -->
+      <scroll-view 
+        class="table-container" 
+        scroll-y="true" 
+        :style="{ height: listHeight + 'px' }"
+        @scrolltolower="loadMore"
+        enable-back-to-top="true"
+      >
+        <view class="table-wrapper">
+          <!-- 表头 -->
+          <view class="table-header">
+            <view class="table-col col-radio"></view>
+            <view class="table-col col-name">物品名称</view>
+            <view class="table-col col-spec">规格</view>
+            <view class="table-col col-stock">库存</view>
+            <view class="table-col col-unit">单位</view>
+          </view>
+          
+          <!-- 表格内容 -->
+          <view class="table-body">
+            <view 
+              class="table-row" 
+              v-for="item in allItems" 
+              :key="item.id"
+              @click="toggleSelect(item)"
+            >
+              <view class="table-col col-radio">
+                <radio 
+                  :checked="selectedItemId === item.id" 
+                  @click.stop="selectItem(item)"
+                />
+              </view>
+              <view class="table-col col-name">{{ item.itemName || '-' }}</view>
+              <view class="table-col col-spec">{{ item.specModel || '-' }}</view>
+              <view class="table-col col-stock">{{ item.availableQty !== undefined && item.availableQty !== null ? item.availableQty : (item.qty !== undefined && item.qty !== null ? item.qty : '-') }}</view>
+              <view class="table-col col-unit">{{ item.unitName || '-' }}</view>
+            </view>
+            
+            <view v-if="allItems.length === 0 && !loading" class="empty-tips">
+              暂无物品数据
+            </view>
+          </view>
+        </view>
+        
+        <!-- 加载更多提示 -->
+        <view v-if="loadingMore" class="loading-more">
+          <text>加载中...</text>
+        </view>
+        <view v-else-if="hasMore === false && allItems.length > 0" class="no-more">
+          <text>没有更多数据了</text>
+        </view>
+      </scroll-view>
+      
+      <!-- 底部确认按钮 -->
+      <view class="footer-actions">
+        <button class="confirm-btn" @click="handleConfirm" :disabled="!selectedItemId">
+          确认
+        </button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch } from 'vue';
+import { invItemFindAllApi, invItemFindPageApi } from '@/api/base/invItemApi';
+
+// Props
+interface Props {
+  visible: boolean;
+  modelValue?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  visible: false,
+  modelValue: false
+});
+
+// Emits
+const emit = defineEmits<{
+  'update:visible': [value: boolean];
+  'update:modelValue': [value: boolean];
+  'confirm': [item: any];
+  'cancel': [];
+}>();
+
+// 响应式数据
+const searchKeyword = ref('');
+const allItems = ref<any[]>([]);
+const loading = ref(false);
+const loadingMore = ref(false);
+const hasMore = ref(true);
+const currentPage = ref(1);
+const pageSize = ref(20);
+const listHeight = ref(400);
+const selectedItemId = ref<string | null>(null);
+const selectedItemData = ref<any>(null);
+
+// 计算列表高度
+const calculateListHeight = () => {
+  // 在 H5 环境中使用 window 对象，在小程序中使用 uni
+  let windowHeight;
+  if (typeof window !== 'undefined') {
+    // H5 环境
+    windowHeight = window.innerHeight;
+  } else {
+    // 小程序环境
+    const systemInfo = uni.getSystemInfoSync();
+    windowHeight = systemInfo.windowHeight;
+  }
+  // 减去头部、搜索和分类区域的高度
+  listHeight.value = windowHeight - 200;
+};
+
+// 加载物品数据
+const loadItems = async () => {
+  try {
+    loading.value = true;
+    const params: any = {
+      page: currentPage.value,
+      rows: pageSize.value
+    };
+    
+    // 只按物品名称搜索
+    if (searchKeyword.value && searchKeyword.value.trim()) {
+      params.itemName = searchKeyword.value.trim();
+    }
+    
+    const res: any = await invItemFindPageApi(params);
+    // 处理返回格式：{total: 1, page: 1, records: 2, rows: [...]}
+    let items: any[] = [];
+    if (res?.rows && Array.isArray(res.rows)) {
+      items = res.rows;
+    } else if (res?.result?.rows && Array.isArray(res.result.rows)) {
+      items = res.result.rows;
+    } else if (Array.isArray(res)) {
+      items = res;
+    }
+    
+    if (currentPage.value === 1) {
+      allItems.value = items;
+    } else {
+      allItems.value = [...allItems.value, ...items];
+    }
+    
+    // 判断是否还有更多数据
+    const total = res?.total || res?.records || 0;
+    hasMore.value = allItems.value.length < total && items.length === pageSize.value;
+  } catch (error) {
+    console.error('加载物品数据失败:', error);
+  } finally {
+    loading.value = false;
+    loadingMore.value = false;
+  }
+};
+
+// 处理搜索
+const handleSearch = async () => {
+  currentPage.value = 1;
+  await loadItems();
+};
+
+// 关闭模态框
+const closeModal = () => {
+  emit('update:visible', false);
+  emit('update:modelValue', false);
+  emit('cancel');
+};
+
+// 点击遮罩层关闭
+const handleMaskClick = () => {
+  closeModal();
+};
+
+// 切换选择
+const toggleSelect = (item: any) => {
+  if (selectedItemId.value === item.id) {
+    selectedItemId.value = null;
+    selectedItemData.value = null;
+  } else {
+    selectedItemId.value = item.id;
+    selectedItemData.value = item;
+  }
+};
+
+// 选择物品（单选框点击）
+const selectItem = (item: any) => {
+  selectedItemId.value = item.id;
+  selectedItemData.value = item;
+};
+
+// 确认选择
+const handleConfirm = () => {
+  if (selectedItemData.value) {
+    // 传递完整的物品数据，包括可用库存数量
+    const itemData = {
+      ...selectedItemData.value,
+      // 优先使用可用库存，如果没有则使用总库存
+      qty: selectedItemData.value.availableQty !== undefined && selectedItemData.value.availableQty !== null
+        ? selectedItemData.value.availableQty
+        : (selectedItemData.value.qty !== undefined && selectedItemData.value.qty !== null 
+          ? selectedItemData.value.qty 
+          : 0),
+      // 同时传递总库存和可用库存
+      totalQty: selectedItemData.value.qty !== undefined && selectedItemData.value.qty !== null 
+        ? selectedItemData.value.qty 
+        : 0,
+      availableQty: selectedItemData.value.availableQty !== undefined && selectedItemData.value.availableQty !== null
+        ? selectedItemData.value.availableQty
+        : (selectedItemData.value.qty !== undefined && selectedItemData.value.qty !== null 
+          ? selectedItemData.value.qty 
+          : 0)
+    };
+    emit('confirm', itemData);
+    closeModal();
+  }
+};
+
+// 加载更多
+const loadMore = async () => {
+  if (!hasMore.value || loadingMore.value) return;
+  
+  loadingMore.value = true;
+  currentPage.value++;
+  await loadItems();
+};
+
+// 重置数据
+const resetData = () => {
+  searchKeyword.value = '';
+  allItems.value = [];
+  currentPage.value = 1;
+  hasMore.value = true;
+  selectedItemId.value = null;
+  selectedItemData.value = null;
+};
+
+// 监听 visible 变化
+watch(() => props.visible, (newVal) => {
+  if (newVal) {
+    // 计算列表高度
+    calculateListHeight();
+    // 加载物品数据（不传搜索关键词，加载全部）
+    searchKeyword.value = '';
+    currentPage.value = 1;
+    loadItems();
+  } else {
+    // 关闭时重置数据
+    resetData();
+  }
+}, { immediate: true });
+</script>
+
+<style scoped lang="scss">
+.item-selector-modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 1000;
+  display: flex;
+  align-items: flex-end;
+  animation: fadeIn 0.3s ease;
+
+  .loading-mask {
+    position: absolute;
+    inset: 0;
+    background: rgba(0, 0, 0, 0.35);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1001;
+
+    .loading-content {
+      min-width: 160rpx;
+      padding: 20rpx 28rpx;
+      background: rgba(0, 0, 0, 0.7);
+      border-radius: 12rpx;
+    }
+
+    .loading-text {
+      color: #fff;
+      font-size: 28rpx;
+    }
+  }
+  
+  .item-selector-content {
+    width: 100%;
+    background: #fff;
+    border-radius: 20rpx 20rpx 0 0;
+    max-height: 80vh;
+    display: flex;
+    flex-direction: column;
+    
+    .selector-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 24rpx;
+      border-bottom: 1rpx solid #eee;
+      
+      .header-title {
+        font-size: 36rpx;
+        font-weight: bold;
+        color: #333;
+      }
+      
+      .header-actions {
+        .close-btn {
+          padding: 12rpx 24rpx;
+          background: #f5f5f5;
+          border: none;
+          border-radius: 8rpx;
+          font-size: 28rpx;
+          color: #666;
+        }
+      }
+    }
+    
+    .search-section {
+      padding: 24rpx;
+      border-bottom: 1rpx solid #eee;
+      
+      .search-input-container {
+        display: flex;
+        gap: 16rpx;
+        
+        .search-input {
+          flex: 1;
+          height: 60rpx;
+          padding: 0 20rpx;
+          border: 1rpx solid #ddd;
+          border-radius: 8rpx;
+          font-size: 28rpx;
+        }
+        
+        .search-btn {
+          height: 60rpx;
+          padding: 0 30rpx;
+          background: #1890ff;
+          color: #fff;
+          border: none;
+          border-radius: 8rpx;
+          font-size: 28rpx;
+        }
+      }
+    }
+    
+    .table-container {
+      flex: 1;
+      padding: 0;
+      
+      .table-wrapper {
+        .table-header {
+          display: flex;
+          background: #f5f7fa;
+          border-bottom: 2rpx solid #e4e7ed;
+          position: sticky;
+          top: 0;
+          z-index: 10;
+          
+          .table-col {
+            padding: 20rpx 12rpx;
+            font-size: 28rpx;
+            font-weight: bold;
+            color: #303133;
+            text-align: center;
+            border-right: 1rpx solid #e4e7ed;
+            
+            &:last-child {
+              border-right: none;
+            }
+            
+            &.col-radio {
+              width: 80rpx;
+              flex-shrink: 0;
+            }
+            
+            &.col-name {
+              flex: 2;
+              min-width: 200rpx;
+            }
+            
+            &.col-spec {
+              flex: 1.5;
+              min-width: 150rpx;
+            }
+            
+            &.col-stock {
+              flex: 1;
+              min-width: 100rpx;
+            }
+            
+            &.col-unit {
+              flex: 1;
+              min-width: 100rpx;
+            }
+          }
+        }
+        
+        .table-body {
+          .table-row {
+            display: flex;
+            border-bottom: 1rpx solid #e4e7ed;
+            background: #fff;
+            transition: background-color 0.2s;
+            
+            &:active {
+              background: #f5f7fa;
+            }
+            
+            .table-col {
+              padding: 24rpx 12rpx;
+              font-size: 26rpx;
+              color: #606266;
+              text-align: center;
+              border-right: 1rpx solid #e4e7ed;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              
+              &:last-child {
+                border-right: none;
+              }
+              
+              &.col-radio {
+                width: 80rpx;
+                flex-shrink: 0;
+              }
+              
+              &.col-name {
+                flex: 2;
+                min-width: 200rpx;
+                justify-content: flex-start;
+                text-align: left;
+              }
+              
+              &.col-spec {
+                flex: 1.5;
+                min-width: 150rpx;
+              }
+              
+              &.col-stock {
+                flex: 1;
+                min-width: 100rpx;
+              }
+              
+              &.col-unit {
+                flex: 1;
+                min-width: 100rpx;
+              }
+            }
+          }
+          
+          .empty-tips {
+            text-align: center;
+            padding: 80rpx 0;
+            color: #999;
+            font-size: 28rpx;
+          }
+        }
+      }
+      
+      .loading-more,
+      .no-more {
+        text-align: center;
+        padding: 20rpx 0;
+        color: #999;
+        font-size: 26rpx;
+      }
+    }
+    
+    .footer-actions {
+      padding: 24rpx;
+      border-top: 1rpx solid #eee;
+      background: #fff;
+      
+      .confirm-btn {
+        width: 100%;
+        height: 88rpx;
+        line-height: 88rpx;
+        background: #1890ff;
+        color: #fff;
+        border: none;
+        border-radius: 12rpx;
+        font-size: 32rpx;
+        font-weight: 600;
+        
+        &:disabled {
+          background: #c0c4cc;
+          color: #fff;
+        }
+        
+        &:active:not(:disabled) {
+          background: #40a9ff;
+        }
+      }
+    }
+  }
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+</style>
+
diff --git a/src/pages/components/PdfPreview/index.vue b/src/pages/components/PdfPreview/index.vue
new file mode 100644
index 0000000..e3bcbe4
--- /dev/null
+++ b/src/pages/components/PdfPreview/index.vue
@@ -0,0 +1,253 @@
+<template>
+  <view class="pdf-preview-container" v-if="visible">
+    <!-- PDF 内容区域（全屏显示） -->
+    <view class="pdf-content" v-if="!loading && !error && pdfViewerUrl">
+      <!-- 使用 web-view 加载 PDF.js 预览页 -->
+      <web-view :src="pdfViewerUrl" @load="handleWebViewLoad" @error="handleWebViewError"></web-view>
+    </view>
+
+    <!-- 加载中（全屏） -->
+    <view v-if="loading" class="loading-container">
+      <view class="loading-spinner"></view>
+      <text class="loading-text">正在加载PDF...</text>
+    </view>
+
+    <!-- 错误提示（全屏） -->
+    <view v-if="error" class="error-container">
+      <text class="error-icon">⚠️</text>
+      <text class="error-text">{{ errorMessage }}</text>
+      <view class="retry-btn" @click="retryLoad">
+        <text class="retry-text">重试</text>
+      </view>
+      <view class="close-btn" @click="handleClose">
+        <text class="close-text">关闭</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref, watch, onBeforeUnmount } from 'vue';
+
+interface Props {
+  visible: boolean;
+  pdfUrl: string;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  visible: false,
+  pdfUrl: ''
+});
+
+const emit = defineEmits<{
+  (e: 'update:visible', value: boolean): void;
+  (e: 'close'): void;
+}>();
+
+const loading = ref(true);
+const error = ref(false);
+const errorMessage = ref('');
+const pdfViewerUrl = ref('');
+const pdfBlobUrl = ref(''); // 存储下载后的 blob URL
+
+// 清理资源
+const cleanup = () => {
+  // 清理 blob URL，避免内存泄漏
+  if (pdfBlobUrl.value) {
+    URL.revokeObjectURL(pdfBlobUrl.value);
+    pdfBlobUrl.value = '';
+    console.log('Blob URL已释放');
+  }
+  pdfViewerUrl.value = '';
+  loading.value = true;
+  error.value = false;
+  errorMessage.value = '';
+};
+
+// 加载PDF
+const loadPdf = (url: string) => {
+  if (!url) {
+    error.value = true;
+    errorMessage.value = '缺少PDF URL参数';
+    loading.value = false;
+    return;
+  }
+  
+  loading.value = true;
+  error.value = false;
+  errorMessage.value = '';
+  
+  // 设置PDF查看器URL
+  pdfViewerUrl.value = url;
+  
+  // 如果是blob URL，保存以便清理
+  if (url.startsWith('blob:')) {
+    pdfBlobUrl.value = url;
+  }
+  
+  // 延迟关闭loading，确保web-view已加载
+  setTimeout(() => {
+    loading.value = false;
+  }, 1000);
+};
+
+// 监听 visible 和 pdfUrl 变化，使用 watchEffect 确保两者都准备好
+watch([() => props.visible, () => props.pdfUrl], ([newVisible, newPdfUrl]) => {
+  console.log('[PdfPreview] visible 或 pdfUrl 变化:', { visible: newVisible, pdfUrl: newPdfUrl });
+  
+  if (newVisible && newPdfUrl) {
+    // 两者都准备好时，加载PDF
+    console.log('[PdfPreview] 开始加载PDF:', newPdfUrl);
+    loadPdf(newPdfUrl);
+  } else if (!newVisible) {
+    // 关闭时清理资源
+    console.log('[PdfPreview] 关闭预览，清理资源');
+    cleanup();
+  }
+}, { immediate: true });
+
+// 组件销毁前清理资源
+onBeforeUnmount(() => {
+  cleanup();
+});
+
+// web-view 加载完成
+const handleWebViewLoad = (e: any) => {
+  console.log('Web-view加载完成（PDF.js查看器已就绪）:', e);
+  loading.value = false;
+};
+
+// web-view 加载失败
+const handleWebViewError = (e: any) => {
+  console.error('Web-view加载失败:', e);
+  loading.value = false;
+  error.value = true;
+  errorMessage.value = 'PDF加载失败，请检查网络连接或重试';
+};
+
+// 重试加载
+const retryLoad = () => {
+  if (props.pdfUrl) {
+    loadPdf(props.pdfUrl);
+  }
+};
+
+// 关闭预览
+const handleClose = () => {
+  emit('update:visible', false);
+  emit('close');
+};
+</script>
+
+<style scoped lang="scss">
+.pdf-preview-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background-color: #525659;
+  z-index: 9999;
+}
+
+// PDF 内容（全屏显示）
+.pdf-content {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  touch-action: manipulation;
+  -webkit-overflow-scrolling: touch;
+}
+
+// 加载中（全屏显示）
+.loading-container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  background: #525659;
+}
+
+.loading-spinner {
+  width: 40px;
+  height: 40px;
+  border: 3px solid rgba(255, 255, 255, 0.3);
+  border-top-color: #ffffff;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+.loading-text {
+  margin-top: 15px;
+  font-size: 14px;
+  color: #ffffff;
+  font-weight: 500;
+}
+
+// 错误提示（全屏显示）
+.error-container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 20px;
+  background: #525659;
+}
+
+.error-icon {
+  font-size: 48px;
+  margin-bottom: 15px;
+}
+
+.error-text {
+  font-size: 14px;
+  color: #ffffff;
+  text-align: center;
+  margin-bottom: 20px;
+}
+
+.retry-btn,
+.close-btn {
+  padding: 10px 30px;
+  background: #667eea;
+  border-radius: 8px;
+  cursor: pointer;
+  margin: 5px;
+}
+
+.close-btn {
+  background: #999;
+}
+
+.retry-text,
+.close-text {
+  font-size: 14px;
+  color: #ffffff;
+  font-weight: 500;
+}
+</style>
+
diff --git a/src/pages/components/StudentPicker/index.vue b/src/pages/components/StudentPicker/index.vue
index cb63b51..b035d16 100644
--- a/src/pages/components/StudentPicker/index.vue
+++ b/src/pages/components/StudentPicker/index.vue
@@ -1,98 +1,199 @@
 <template>
   <view class="student-picker">
     <view class="picker-header">
-      <text class="header-title">选择学生</text>
-      <text class="selected-count">已选 {{ selectedStudents.length }} 人</text>
+      <text class="header-title">请选择</text>
+      <text class="selected-count">已选 {{ getSelectedCount() }}</text>
     </view>
     
-    <!-- 搜索框 -->
-    <view class="search-box">
-      <input 
-        class="search-input" 
-        v-model="searchKeyword" 
-        placeholder="搜索学生姓名"
-        @confirm="handleSearch"
-      />
-      <button class="search-btn" @click="handleSearch">搜索</button>
-    </view>
-    
-    <!-- 年级班级筛选 -->
-    <view class="filter-box">
-      <view class="filter-item filter-item-nj">
-        <text class="filter-label">年级：</text>
-        <picker
-          mode="selector"
-          :range="njOptions"
-          range-key="title"
-          :value="njIndex"
-          @change="onNjPickerChange"
-          class="filter-picker filter-picker-nj"
-        >
-          <view class="picker-display">
-            <text class="picker-text">{{ selectedNjTitle || '请选择年级' }}</text>
-            <uni-icons type="bottom" size="14" color="#666"></uni-icons>
-          </view>
-        </picker>
-      </view>
-      <view class="filter-item filter-item-bj" :class="{ disabled: !selectedNjId }">
-        <text class="filter-label">班级：</text>
-        <picker
-          mode="selector"
-          :range="bjOptions"
-          range-key="title"
-          :value="bjIndex"
-          @change="onBjPickerChange"
-          :disabled="!selectedNjId"
-          class="filter-picker filter-picker-bj"
-        >
-          <view class="picker-display">
-            <text class="picker-text">{{ selectedBjTitle || '请选择班级' }}</text>
-            <uni-icons type="bottom" size="14" color="#666"></uni-icons>
-          </view>
-        </picker>
-      </view>
-    </view>
-    
-    <!-- 学生列表 -->
-    <view class="student-list-container">
-      <z-paging
-        ref="pagingRef"
-        v-model="dataList"
-        :auto="true"
-        :refresher-enabled="true"
-        :loading-more-enabled="true"
-        :loading-more-threshold="50"
-        :default-page-size="10"
-        :show-loading-more-no-more-view="true"
-        :show-empty-view-reload="false"
-        :fixed="false"
-        class="paging-container"
-        @query="queryData"
+    <!-- 单选按钮区域：年级、班级、个人 -->
+    <view class="radio-group">
+      <view 
+        class="radio-item" 
+        :class="{ active: selectedScope === 'grade' }"
+        @click="selectScope('grade')"
       >
-        <view 
-          v-for="student in dataList" 
-          :key="student.xsId"
-          class="student-item"
-          :class="{ selected: isSelected(student.xsId) }"
-          @click="toggleStudent(student)"
-        >
-          <view class="student-checkbox">
-            <view class="checkbox" :class="{ checked: isSelected(student.xsId) }">
-              <uni-icons v-if="isSelected(student.xsId)" type="checkmarkempty" size="16" color="#fff"></uni-icons>
+        <view class="radio-circle" :class="{ checked: selectedScope === 'grade' }"></view>
+        <text class="radio-label">年级</text>
+      </view>
+      <view 
+        class="radio-item" 
+        :class="{ active: selectedScope === 'class' }"
+        @click="selectScope('class')"
+      >
+        <view class="radio-circle" :class="{ checked: selectedScope === 'class' }"></view>
+        <text class="radio-label">班级</text>
+      </view>
+      <view 
+        class="radio-item" 
+        :class="{ active: selectedScope === 'student' }"
+        @click="selectScope('student')"
+      >
+        <view class="radio-circle" :class="{ checked: selectedScope === 'student' }"></view>
+        <text class="radio-label">个人</text>
+      </view>
+    </view>
+    
+    <!-- 搜索框（仅个人模式显示） -->
+    <view v-if="selectedScope === 'student'" class="search-box">
+      <view class="search-input-wrapper">
+        <uni-icons type="search" size="18" color="#999" class="search-icon"></uni-icons>
+        <input 
+          class="search-input" 
+          v-model="searchKeyword" 
+          placeholder="请输入姓名"
+          @input="handleSearchInput"
+          @confirm="handleSearch"
+        />
+      </view>
+      <button class="search-btn" @click="handleSearch">搜索</button>
+      <view class="select-all-wrapper" @click="toggleSelectAll">
+        <view class="checkbox" :class="{ checked: isAllSelected }">
+          <uni-icons v-if="isAllSelected" type="checkmarkempty" size="16" color="#fff"></uni-icons>
+        </view>
+        <text class="select-all-text">全选</text>
+      </view>
+    </view>
+    
+    <!-- 列表区域 -->
+    <view class="content-wrapper" :class="{ 'student-mode': selectedScope === 'student' }">
+      <!-- 年级列表 -->
+      <scroll-view v-if="selectedScope === 'grade'" scroll-y class="list-container">
+        <view class="list-content">
+          <view 
+            v-for="(nj, index) in njOptions" 
+            :key="nj.id || index"
+            class="list-item"
+            @click="toggleGrade(nj)"
+          >
+            <text class="item-text">{{ nj.title || nj.name || '全部' }}</text>
+            <view class="checkbox" :class="{ checked: isGradeSelected(nj) }">
+              <uni-icons v-if="isGradeSelected(nj)" type="checkmarkempty" size="16" color="#fff"></uni-icons>
             </view>
           </view>
-          <view class="student-info">
-            <text class="student-name">{{ student.xsxm }}</text>
-            <text class="student-class">{{ student.bc || `${student.njmc || ''}${student.bjmc || ''}` }}</text>
+        </view>
+      </scroll-view>
+      
+      <!-- 班级列表：树形结构 -->
+      <scroll-view v-if="selectedScope === 'class'" scroll-y class="list-container">
+        <view class="tree-content">
+          <view 
+            v-for="(nj, njIndex) in njBjTree" 
+            :key="nj.id || njIndex"
+            class="tree-node"
+          >
+            <view 
+              class="tree-node-item"
+              @click="toggleTreeNode(nj)"
+            >
+              <uni-icons 
+                :type="expandedNodes[nj.id || ''] ? 'bottom' : 'right'" 
+                size="14" 
+                color="#666"
+                class="expand-icon"
+              ></uni-icons>
+              <text class="tree-node-text">{{ nj.title || nj.name || '' }}</text>
+            </view>
+            <!-- 班级子节点 -->
+            <view 
+              v-if="expandedNodes[nj.id || ''] && nj.children && nj.children.length > 0"
+              class="tree-children"
+            >
+              <view 
+                v-for="(bj, bjIndex) in nj.children" 
+                :key="bj.id || bjIndex"
+                class="tree-node-item tree-child-item class-tree-item"
+                @click.stop="toggleClass(bj)"
+              >
+                <text class="tree-node-text">{{ bj.title || bj.name || '' }}</text>
+                <view class="checkbox" :class="{ checked: isClassSelected(bj) }">
+                  <uni-icons v-if="isClassSelected(bj)" type="checkmarkempty" size="16" color="#fff"></uni-icons>
+                </view>
+              </view>
+            </view>
           </view>
         </view>
-      </z-paging>
+      </scroll-view>
+      
+      <!-- 个人模式：左侧树形结构 + 右侧学生列表 -->
+      <view v-if="selectedScope === 'student'" class="student-mode-container">
+        <!-- 左侧：年级班级树形结构 -->
+        <scroll-view scroll-y class="tree-container">
+          <view class="tree-content">
+            <view 
+              v-for="(nj, njIndex) in njBjTree" 
+              :key="nj.id || njIndex"
+              class="tree-node"
+            >
+              <view 
+                class="tree-node-item"
+                @click="toggleTreeNode(nj)"
+              >
+                <uni-icons 
+                  :type="expandedNodes[nj.id || ''] ? 'bottom' : 'right'" 
+                  size="14" 
+                  color="#666"
+                  class="expand-icon"
+                ></uni-icons>
+                <text class="tree-node-text">{{ nj.title || nj.name || '' }}</text>
+              </view>
+              <!-- 班级子节点 -->
+              <view 
+                v-if="expandedNodes[nj.id || ''] && nj.children && nj.children.length > 0"
+                class="tree-children"
+              >
+                <view 
+                  v-for="(bj, bjIndex) in nj.children" 
+                  :key="bj.id || bjIndex"
+                  class="tree-node-item tree-child-item"
+                  :class="{ active: selectedNjId === nj.id && selectedBjId === bj.id }"
+                  @click="selectClassFromTree(nj, bj)"
+                >
+                  <text class="tree-node-text">{{ bj.title || bj.name || '' }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+        
+        <!-- 右侧：学生列表 -->
+        <scroll-view scroll-y class="student-list-container">
+          <z-paging
+            ref="pagingRef"
+            v-model="dataList"
+            :auto="true"
+            :refresher-enabled="true"
+            :loading-more-enabled="true"
+            :loading-more-threshold="50"
+            :default-page-size="10"
+            :show-loading-more-no-more-view="true"
+            :show-empty-view-reload="false"
+            :fixed="false"
+            class="paging-container"
+            @query="queryData"
+          >
+            <view 
+              v-for="student in dataList" 
+              :key="student.xsId"
+              class="list-item student-list-item"
+              @click="toggleStudent(student)"
+            >
+              <view class="student-info-wrapper">
+                <text class="student-name">{{ student.xsxm }}</text>
+                <text class="student-class" v-if="student.bc">{{ student.bc }}</text>
+              </view>
+              <view class="checkbox" :class="{ checked: isSelected(student.xsId) }">
+                <uni-icons v-if="isSelected(student.xsId)" type="checkmarkempty" size="16" color="#fff"></uni-icons>
+              </view>
+            </view>
+          </z-paging>
+        </scroll-view>
+      </view>
     </view>
     
     <!-- 底部操作栏 -->
     <view class="picker-footer">
-      <button class="cancel-btn" @click="handleCancel">取消</button>
-      <button class="confirm-btn" @click="handleConfirm">确定 ({{ selectedStudents.length }})</button>
+      <text class="selected-info">已选择: {{ getSelectedCount() }}</text>
+      <button class="confirm-btn" @click="handleConfirm">确定</button>
     </view>
     
   </view>
@@ -101,8 +202,8 @@
 <script lang="ts" setup>
 import { ref, computed, watch, onMounted, nextTick } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
-import { xsFindList } from '@/api/base/server';
-import { findAllNjBjTreeApi } from '@/api/base/server';
+import { xsFindList, xsFindListKz } from '@/api/base/server';
+import { findAllNjBjTreeApi, findAllNjBjKzTreeApi } from '@/api/base/server';
 
 interface Student {
   xsId: string;
@@ -127,13 +228,17 @@ interface NjBjNode {
 const props = withDefaults(defineProps<{
   selectedIds?: string[] | string;  // 已选中的学生ID列表（可以是数组或逗号分隔的字符串）
   multiple?: boolean | string;      // 是否多选（可以是布尔值或字符串）
+  useKzTree?: boolean | string;     // 是否使用不受权限控制的接口（true: 调用 findAllNjBjKzTreeApi，false: 调用 findAllNjBjTreeApi）
 }>(), {
   selectedIds: () => [],
-  multiple: true
+  multiple: true,
+  useKzTree: false
 });
 
 // 从页面参数获取已选中的学生ID
 const pageSelectedIds = ref<string[]>([]);
+// 从页面参数获取 useKzTree（URL 参数不会自动映射到 props）
+const pageUseKzTree = ref<boolean | null>(null); // null 表示未设置，true/false 表示已设置
 
 // 处理 props 中的 selectedIds（可能是字符串或数组）
 const processedSelectedIds = computed(() => {
@@ -151,59 +256,106 @@ const processedMultiple = computed(() => {
   return props.multiple !== false;
 });
 
+// 处理 useKzTree（优先使用页面参数，其次使用 props）
+const processedUseKzTree = computed(() => {
+  // 优先使用从 URL 参数读取的值（如果已设置）
+  if (pageUseKzTree.value !== null) {
+    return pageUseKzTree.value;
+  }
+  // 其次使用 props（可能是字符串或布尔值）
+  if (typeof props.useKzTree === 'string') {
+    return props.useKzTree === 'true';
+  }
+  return props.useKzTree === true;
+});
+
 const emit = defineEmits<{
-  (e: 'confirm', students: Student[]): void;
+  (e: 'confirm', data: any): void;
   (e: 'cancel'): void;
 }>();
 
+// 选择范围（年级、班级、个人），默认为"个人"
+const selectedScope = ref<'grade' | 'class' | 'student'>('student');
+
+// 选中的年级列表
+const selectedGrades = ref<NjBjNode[]>([]);
+// 选中的班级列表
+const selectedClasses = ref<NjBjNode[]>([]);
+
 const dataList = ref<Student[]>([]);
 const selectedStudents = ref<Student[]>([]);
-const searchKeyword = ref('');
-const selectedNjId = ref<string>('');
-const selectedBjId = ref<string>('');
-const njIndex = ref(0);
-const bjIndex = ref(0);
 const njBjTree = ref<NjBjNode[]>([]);
 const pagingRef = ref<any>(null);
+const searchKeyword = ref('');
+const expandedNodes = ref<Record<string, boolean>>({});
+const selectedNjId = ref<string>('');
+const selectedBjId = ref<string>('');
 
-// 年级选项
+// 年级选项（不包含"全部"）
 const njOptions = computed(() => {
-  // 确保数据结构正确
-  const allOption = { id: '', title: '全部', name: '全部', children: [] };
-  return [allOption, ...njBjTree.value];
+  return njBjTree.value || [];
 });
 
-// 班级选项（根据选中的年级动态变化）
-const bjOptions = computed(() => {
-  if (!selectedNjId.value) {
-    return [{ id: '', title: '全部' }];
-  }
-  const selectedNj = njBjTree.value.find(nj => nj.id === selectedNjId.value);
-  if (!selectedNj || !selectedNj.children) {
-    return [{ id: '', title: '全部' }];
-  }
-  return [{ id: '', title: '全部' }, ...selectedNj.children];
+// 所有班级选项（从所有年级中提取）
+const allClassOptions = computed(() => {
+  const classes: NjBjNode[] = [];
+  njBjTree.value.forEach(nj => {
+    if (nj.children && Array.isArray(nj.children)) {
+      nj.children.forEach(bj => {
+        classes.push({
+          ...bj,
+          njId: nj.id,
+          njTitle: nj.title || nj.name
+        });
+      });
+    }
+  });
+  return classes;
 });
 
-// 选中的年级标题
-const selectedNjTitle = computed(() => {
-  if (!selectedNjId.value) return '全部';
-  const selected = njOptions.value.find(nj => nj.id === selectedNjId.value);
-  return selected?.title || '全部';
-});
+// 判断年级是否已选中
+const isGradeSelected = (nj: NjBjNode) => {
+  return selectedGrades.value.some(g => g.id === nj.id);
+};
 
-// 选中的班级标题
-const selectedBjTitle = computed(() => {
-  if (!selectedBjId.value) return '全部';
-  const selected = bjOptions.value.find(bj => bj.id === selectedBjId.value);
-  return selected?.title || '全部';
-});
+// 判断班级是否已选中
+const isClassSelected = (bj: NjBjNode) => {
+  return selectedClasses.value.some(c => c.id === bj.id);
+};
 
 // 判断学生是否已选中
 const isSelected = (xsId: string) => {
   return selectedStudents.value.some(s => s.xsId === xsId);
 };
 
+// 切换年级选择
+const toggleGrade = (nj: NjBjNode) => {
+  const index = selectedGrades.value.findIndex(g => g.id === nj.id);
+  if (index > -1) {
+    selectedGrades.value.splice(index, 1);
+  } else {
+    if (processedMultiple.value) {
+      selectedGrades.value.push(nj);
+    } else {
+      selectedGrades.value = [nj];
+    }
+  }
+};
+
+// 切换班级选择
+const toggleClass = (bj: NjBjNode) => {
+  const index = selectedClasses.value.findIndex(c => c.id === bj.id);
+  if (index > -1) {
+    selectedClasses.value.splice(index, 1);
+  } else {
+    if (processedMultiple.value) {
+      selectedClasses.value.push(bj);
+    } else {
+      selectedClasses.value = [bj];
+    }
+  }
+};
+
 // 切换学生选择状态
 const toggleStudent = (student: Student) => {
   const index = selectedStudents.value.findIndex(s => s.xsId === student.xsId);
@@ -220,83 +372,11 @@ const toggleStudent = (student: Student) => {
   }
 };
 
-// 搜索处理
-const handleSearch = () => {
-  pagingRef.value?.reload();
-};
-
-// 年级选择变化
-const onNjPickerChange = (e: any) => {
-  const index = e.detail.value;
-  njIndex.value = index;
-  const selected = njOptions.value[index];
-  
-  // 如果选择的是"全部"（index === 0），则 newNjId 为空字符串
-  // 否则从原始数据中获取 ID（可能字段名不是 id）
-  let newNjId = '';
-  if (index === 0) {
-    newNjId = '';
-  } else {
-    // 从原始 njBjTree 中获取对应的年级节点
-    const originalNode = njBjTree.value[index - 1]; // 减1因为第一个是"全部"
-    newNjId = originalNode?.id || (originalNode as any)?.njId || (originalNode as any)?.value || '';
-    // 如果还是空，尝试从 selected 对象的所有属性中查找可能的 ID 字段
-    if (!newNjId && selected) {
-      newNjId = selected.id || (selected as any)?.njId || (selected as any)?.value || '';
-    }
-  }
-  
-  console.log('年级选择变化:', { 
-    index, 
-    selected, 
-    newNjId, 
-    current: selectedNjId.value,
-    originalNode: index > 0 ? njBjTree.value[index - 1] : null
-  });
-  
-  // 如果年级没有变化，不重新加载
-  if (selectedNjId.value === newNjId) {
-    console.log('年级未变化，不重新加载');
-    return;
-  }
-  
-  selectedNjId.value = newNjId;
-  // 重置班级选择
-  selectedBjId.value = '';
-  bjIndex.value = 0;
-  
-  console.log('更新后的年级ID:', selectedNjId.value || '(全部)', '班级ID:', selectedBjId.value || '(全部)');
-  
-  // 确保 pagingRef 已初始化后再重新加载数据
-  nextTick(() => {
-    if (pagingRef.value) {
-      console.log('重新加载数据，年级ID:', newNjId || '(全部)');
-      pagingRef.value.reload();
-    } else {
-      console.warn('pagingRef 未初始化，无法重新加载数据');
-    }
-  });
-};
-
-// 班级选择变化
-const onBjPickerChange = (e: any) => {
-  const index = e.detail.value;
-  bjIndex.value = index;
-  const selected = bjOptions.value[index];
-  const newBjId = selected?.id || '';
-  
-  // 如果班级没有变化，不重新加载
-  if (selectedBjId.value === newBjId) {
-    return;
-  }
-  
-  selectedBjId.value = newBjId;
-  
-  // 确保 pagingRef 已初始化后再重新加载数据
-  if (pagingRef.value) {
-    pagingRef.value.reload();
-  } else {
-    // 如果还没初始化，等待一下再加载
+// 选择范围
+const selectScope = (scope: 'grade' | 'class' | 'student') => {
+  selectedScope.value = scope;
+  // 如果切换到学生列表，需要重新加载数据
+  if (scope === 'student') {
     nextTick(() => {
       if (pagingRef.value) {
         pagingRef.value.reload();
@@ -305,31 +385,113 @@ const onBjPickerChange = (e: any) => {
   }
 };
 
-// 分页查询数据
+// 获取选中数量
+const getSelectedCount = () => {
+  if (selectedScope.value === 'grade') {
+    return selectedGrades.value.length;
+  } else if (selectedScope.value === 'class') {
+    return selectedClasses.value.length;
+  } else {
+    return selectedStudents.value.length;
+  }
+};
+
+// 是否全选
+const isAllSelected = computed(() => {
+  if (selectedScope.value !== 'student' || dataList.value.length === 0) {
+    return false;
+  }
+  return dataList.value.every(student => isSelected(student.xsId));
+});
+
+// 搜索输入处理
+const handleSearchInput = () => {
+  // 可以添加防抖逻辑
+};
+
+// 搜索处理
+const handleSearch = () => {
+  if (pagingRef.value) {
+    pagingRef.value.reload();
+  }
+};
+
+// 全选/取消全选
+const toggleSelectAll = () => {
+  if (isAllSelected.value) {
+    // 取消全选：移除当前页所有学生
+    dataList.value.forEach(student => {
+      const index = selectedStudents.value.findIndex(s => s.xsId === student.xsId);
+      if (index > -1) {
+        selectedStudents.value.splice(index, 1);
+      }
+    });
+  } else {
+    // 全选：添加当前页所有未选中的学生
+    dataList.value.forEach(student => {
+      if (!isSelected(student.xsId)) {
+        selectedStudents.value.push(student);
+      }
+    });
+  }
+};
+
+// 切换树形节点展开/收起
+const toggleTreeNode = (nj: NjBjNode) => {
+  const nodeId = nj.id || '';
+  expandedNodes.value[nodeId] = !expandedNodes.value[nodeId];
+};
+
+// 从树形结构选择班级
+const selectClassFromTree = (nj: NjBjNode, bj: NjBjNode) => {
+  selectedNjId.value = nj.id || '';
+  selectedBjId.value = bj.id || '';
+  // 重新加载学生列表
+  if (pagingRef.value) {
+    pagingRef.value.reload();
+  }
+};
+
+
+// 分页查询数据（仅用于学生列表）
 const queryData = async (pageNo: number, pageSize: number) => {
+  if (selectedScope.value !== 'student') {
+    pagingRef.value?.complete([]);
+    return;
+  }
+  
   try {
     const params: any = {
       page: pageNo,
       rows: pageSize
     };
     
-    // 添加年级筛选（如果选择了年级且不是"全部"）
-    if (selectedNjId.value && selectedNjId.value !== '') {
+    // 树形选择：如果从树形结构选择了年级和班级，使用树形选择的值
+    if (selectedNjId.value) {
       params.njId = selectedNjId.value;
     }
-    
-    // 添加班级筛选（如果选择了班级且不是"全部"）
-    if (selectedBjId.value && selectedBjId.value !== '') {
+    if (selectedBjId.value) {
       params.bjId = selectedBjId.value;
     }
     
-    // 按姓名搜索（后端支持 xm 参数）
+    // 如果选择了年级（非树形选择），添加筛选
+    if (selectedGrades.value.length > 0 && !selectedNjId.value) {
+      params.njId = selectedGrades.value.map(g => g.id).join(',');
+    }
+    
+    // 如果选择了班级（非树形选择），添加筛选
+    if (selectedClasses.value.length > 0 && !selectedBjId.value) {
+      params.bjId = selectedClasses.value.map(c => c.id).join(',');
+    }
+    
+    // 搜索关键词
     if (searchKeyword.value && searchKeyword.value.trim()) {
       params.xm = searchKeyword.value.trim();
     }
     
     console.log('查询学生列表参数:', params);
-    const res: any = await xsFindList(params);
+    const api = processedUseKzTree.value ? xsFindListKz : xsFindList;
+    const res: any = await api(params);
     console.log('查询学生列表结果:', res);
     const result = res?.result || res?.data || res;
     let rows: any[] = [];
@@ -340,13 +502,11 @@ const queryData = async (pageNo: number, pageSize: number) => {
       rows = result;
     }
     
-    // 转换为标准格式
     const list = rows.map((item: any) => {
-      const njbc = item.njbc || item.njBc || '';  // 年级别称，如"2025级"
-      const njmc = item.njmc || item.njmcName || '';  // 年级名称，如"一年级"
-      const bjmc = item.bjmc || '';  // 班级名称，如"1班"
+      const njbc = item.njbc || item.njBc || '';
+      const njmc = item.njmc || item.njmcName || '';
+      const bjmc = item.bjmc || '';
       
-      // 生成 bc：njmc(njbc)bjmc，例如：一年级(2025级)1班
       let bc = item.bc;
       if (!bc && (njmc || njbc || bjmc)) {
         const parts: string[] = [];
@@ -369,17 +529,11 @@ const queryData = async (pageNo: number, pageSize: number) => {
       };
     });
     
-    // 后端已支持按 xm 搜索，不需要前端过滤
-    const filtered = list;
-    
-    // 恢复已选中的学生（首次加载时，从当前页数据中查找）
     const idsToUse = pageSelectedIds.value.length > 0 ? pageSelectedIds.value : processedSelectedIds.value;
     if (idsToUse.length > 0) {
-      // 从当前页数据中查找已选中的学生
-      const selected = filtered.filter((s: Student) => 
+      const selected = list.filter((s: Student) => 
         idsToUse.includes(s.xsId)
       );
-      // 合并到已选中列表（避免重复）
       selected.forEach((s: Student) => {
         if (!selectedStudents.value.some(sel => sel.xsId === s.xsId)) {
           selectedStudents.value.push(s);
@@ -387,8 +541,7 @@ const queryData = async (pageNo: number, pageSize: number) => {
       });
     }
     
-    // z-paging 会自动管理 dataList
-    pagingRef.value?.complete(filtered);
+    pagingRef.value?.complete(list);
   } catch (error) {
     console.error('加载学生列表失败:', error);
     uni.showToast({
@@ -402,7 +555,9 @@ const queryData = async (pageNo: number, pageSize: number) => {
 // 加载年级班级树
 const loadNjBjTree = async () => {
   try {
-    const res = await findAllNjBjTreeApi();
+    // 根据 useKzTree 参数选择接口：true 使用不受权限控制的接口，false 使用受权限控制的接口
+    const api = processedUseKzTree.value ? findAllNjBjKzTreeApi : findAllNjBjTreeApi;
+    const res = await api();
     const rawData = res.result || [];
     console.log('年级班级树原始数据:', rawData);
     
@@ -431,10 +586,127 @@ const loadNjBjTree = async () => {
   }
 };
 
+// 根据年级或班级查询学生
+const queryStudentsByGradeOrClass = async (): Promise<Student[]> => {
+  try {
+    const params: any = {
+      page: 1,
+      rows: 10000 // 获取所有学生
+    };
+    
+    if (selectedScope.value === 'grade' && selectedGrades.value.length > 0) {
+      // 根据选中的年级查询学生
+      params.njId = selectedGrades.value.map(g => g.id).join(',');
+    } else if (selectedScope.value === 'class' && selectedClasses.value.length > 0) {
+      // 根据选中的班级查询学生
+      params.bjId = selectedClasses.value.map(c => c.id).join(',');
+    } else {
+      return [];
+    }
+    
+    console.log('查询学生参数（年级/班级）:', params);
+    const api = processedUseKzTree.value ? xsFindListKz : xsFindList;
+    const res: any = await api(params);
+    console.log('查询学生结果（年级/班级）:', res);
+    const result = res?.result || res?.data || res;
+    let rows: any[] = [];
+    
+    if (result?.rows && Array.isArray(result.rows)) {
+      rows = result.rows;
+    } else if (Array.isArray(result)) {
+      rows = result;
+    }
+    
+    const list = rows.map((item: any) => {
+      const njbc = item.njbc || item.njBc || '';
+      const njmc = item.njmc || item.njmcName || '';
+      const bjmc = item.bjmc || '';
+      
+      let bc = item.bc;
+      if (!bc && (njmc || njbc || bjmc)) {
+        const parts: string[] = [];
+        if (njmc) parts.push(njmc);
+        if (njbc) parts.push(`(${njbc})`);
+        if (bjmc) parts.push(bjmc);
+        bc = parts.join('');
+      }
+      
+      return {
+        xsId: item.xsId || item.id,
+        xsxm: item.xsxm || item.xm,
+        njId: item.njId,
+        njmcId: item.njmcId,
+        bjId: item.bjId,
+        njbc: njbc,
+        njmc: njmc,
+        bjmc: bjmc,
+        bc: bc || ''
+      };
+    });
+    
+    return list;
+  } catch (error) {
+    console.error('查询学生失败（年级/班级）:', error);
+    uni.showToast({
+      title: '查询学生失败',
+      icon: 'error'
+    });
+    return [];
+  }
+};
+
 // 确定选择
-const handleConfirm = () => {
-  // 通过全局事件总线返回选择结果
-  uni.$emit('studentPickerConfirm', selectedStudents.value);
+const handleConfirm = async () => {
+  if (selectedScope.value === 'student') {
+    // 直接返回学生数组，兼容现有代码
+    if (selectedStudents.value.length === 0) {
+      uni.showToast({
+        title: '请至少选择一个学生',
+        icon: 'none'
+      });
+      return;
+    }
+    uni.$emit('studentPickerConfirm', selectedStudents.value);
+  } else if (selectedScope.value === 'grade') {
+    // 根据选中的年级查询对应的学生
+    if (selectedGrades.value.length === 0) {
+      uni.showToast({
+        title: '请至少选择一个年级',
+        icon: 'none'
+      });
+      return;
+    }
+    const students = await queryStudentsByGradeOrClass();
+    if (students.length > 0) {
+      uni.$emit('studentPickerConfirm', students);
+    } else {
+      uni.showToast({
+        title: '未找到对应的学生',
+        icon: 'none'
+      });
+      return; // 如果没有学生，不返回上一页
+    }
+  } else if (selectedScope.value === 'class') {
+    // 根据选中的班级查询对应的学生
+    if (selectedClasses.value.length === 0) {
+      uni.showToast({
+        title: '请至少选择一个班级',
+        icon: 'none'
+      });
+      return;
+    }
+    const students = await queryStudentsByGradeOrClass();
+    if (students.length > 0) {
+      uni.$emit('studentPickerConfirm', students);
+    } else {
+      uni.showToast({
+        title: '未找到对应的学生',
+        icon: 'none'
+      });
+      return; // 如果没有学生，不返回上一页
+    }
+  }
+  
   // 返回上一页
   uni.navigateBack();
 };
@@ -450,6 +722,10 @@ onLoad((options: any) => {
     const ids = options.selectedIds.split(',').filter((id: string) => id);
     pageSelectedIds.value = ids;
   }
+  // 从页面参数获取 useKzTree（URL 参数是字符串，需要转换为布尔值）
+  if (options.useKzTree !== undefined) {
+    pageUseKzTree.value = options.useKzTree === 'true' || options.useKzTree === true;
+  }
 });
 
 onMounted(async () => {
@@ -492,129 +768,270 @@ onMounted(async () => {
   }
 }
 
-.search-box {
+.radio-group {
   display: flex;
-  align-items: center;
-  gap: 16rpx;
   padding: 24rpx;
   background-color: #fff;
   border-bottom: 1rpx solid #f0f0f0;
+  gap: 32rpx;
   
-  .search-input {
+  .radio-item {
+    display: flex;
+    align-items: center;
+    gap: 12rpx;
     flex: 1;
-    height: 80rpx;
-    padding: 0 32rpx;
-    background: linear-gradient(135deg, #f8f9fa 0%, #f0f2f5 100%);
-    border: 1rpx solid #e1e8ed;
-    border-radius: 40rpx;
-    font-size: 28rpx;
-    color: #333;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-    transition: all 0.3s ease;
     
-    &:focus {
-      border-color: #667eea;
-      box-shadow: 0 4rpx 12rpx rgba(102, 126, 234, 0.15);
+    .radio-circle {
+      width: 40rpx;
+      height: 40rpx;
+      border: 2rpx solid #d1d5db;
+      border-radius: 50%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: all 0.3s ease;
+      
+      &.checked {
+        border-color: #1890ff;
+        background-color: #1890ff;
+      }
     }
-  }
-  
-  .search-btn {
-    padding: 0 40rpx;
-    height: 80rpx;
-    line-height: 80rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #fff;
-    border-radius: 40rpx;
-    font-size: 28rpx;
-    font-weight: 500;
-    border: none;
-    box-shadow: 0 4rpx 12rpx rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
     
-    &:active {
-      transform: scale(0.95);
-      box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
+    .radio-label {
+      font-size: 28rpx;
+      color: #333;
+    }
+    
+    &.active .radio-label {
+      color: #1890ff;
+      font-weight: 500;
     }
   }
 }
 
-.filter-box {
+.search-box {
   display: flex;
+  align-items: center;
+  gap: 16rpx;
   padding: 20rpx 24rpx;
   background-color: #fff;
-  border-bottom: 1rpx solid #eee;
-  gap: 16rpx;
+  border-bottom: 1rpx solid #f0f0f0;
   
-  .filter-item {
+  .search-input-wrapper {
+    flex: 1;
     display: flex;
     align-items: center;
-    gap: 12rpx;
+    background-color: #f5f5f5;
+    border-radius: 8rpx;
+    padding: 0 20rpx;
+    height: 64rpx;
     
-    &.disabled {
-      opacity: 0.5;
+    .search-icon {
+      margin-right: 12rpx;
     }
     
-    .filter-label {
+    .search-input {
+      flex: 1;
       font-size: 28rpx;
       color: #333;
-      font-weight: 500;
-      white-space: nowrap;
+      height: 64rpx;
+      line-height: 64rpx;
+    }
+  }
+  
+  .search-btn {
+    padding: 0 32rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    background-color: #1890ff;
+    color: #fff;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+    border: none;
+  }
+  
+  .select-all-wrapper {
+    display: flex;
+    align-items: center;
+    gap: 8rpx;
+    margin-left: 8rpx;
+    
+    .select-all-text {
+      font-size: 28rpx;
+      color: #333;
+    }
+  }
+}
+
+.content-wrapper {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  
+  &.student-mode {
+    flex-direction: row;
+  }
+}
+
+.list-container {
+  flex: 1;
+  overflow: hidden;
+}
+
+.list-content {
+  padding: 0;
+}
+
+.list-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 32rpx 24rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+  background-color: #fff;
+  
+  .item-text {
+    flex: 1;
+    font-size: 32rpx;
+    color: #333;
+  }
+  
+  .checkbox {
+    width: 44rpx;
+    height: 44rpx;
+    border: 2rpx solid #d1d5db;
+    border-radius: 8rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.3s ease;
+    background-color: #fff;
+    flex-shrink: 0;
+    
+    &.checked {
+      background-color: #1890ff;
+      border-color: #1890ff;
+    }
+  }
+}
+
+// 个人模式：双列布局
+.student-mode-container {
+  display: flex;
+  flex: 1;
+  overflow: hidden;
+}
+
+.tree-container {
+  width: 300rpx;
+  border-right: 1rpx solid #f0f0f0;
+  background-color: #fff;
+}
+
+.tree-content {
+  padding: 0;
+}
+
+.tree-node {
+  .tree-node-item {
+    display: flex;
+    align-items: center;
+    padding: 24rpx 20rpx;
+    border-bottom: 1rpx solid #f5f5f5;
+    background-color: #fff;
+    
+    .expand-icon {
+      margin-right: 12rpx;
       flex-shrink: 0;
     }
     
-    .filter-picker {
+    .tree-node-text {
       flex: 1;
-      min-width: 0;
+      font-size: 28rpx;
+      color: #333;
     }
     
-    // 年级下拉框 - 更宽
-    &.filter-item-nj {
-      flex: 2;  // 年级占 2 份宽度
-    }
-    
-    // 班级下拉框 - 更窄
-    &.filter-item-bj {
-      flex: 1.5;  // 班级占 1.5 份宽度
-    }
-    
-    .picker-display {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 14rpx 20rpx;
-      background: linear-gradient(135deg, #f8f9fa 0%, #f0f2f5 100%);
-      border: 1rpx solid #e1e8ed;
-      border-radius: 12rpx;
-      min-height: 50rpx;
-      height: 50rpx;
-      transition: all 0.3s ease;
-      box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+    &.tree-child-item {
+      padding-left: 60rpx;
+      background-color: #fafafa;
       
-      &:active {
-        background: linear-gradient(135deg, #e9ecef 0%, #dee2e6 100%);
-        transform: scale(0.98);
+      &.active {
+        background-color: #e6f7ff;
+        color: #1890ff;
+        
+        .tree-node-text {
+          color: #1890ff;
+          font-weight: 500;
+        }
       }
       
-      .picker-text {
-        flex: 1;
-        font-size: 28rpx;
-        color: #333;
-        font-weight: 500;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        margin-right: 12rpx;
-        line-height: 1.4;
+      &.class-tree-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        
+        .tree-node-text {
+          flex: 1;
+        }
+        
+        .checkbox {
+          width: 44rpx;
+          height: 44rpx;
+          border: 2rpx solid #d1d5db;
+          border-radius: 8rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          transition: all 0.3s ease;
+          background-color: #fff;
+          flex-shrink: 0;
+          margin-left: 12rpx;
+          
+          &.checked {
+            background-color: #1890ff;
+            border-color: #1890ff;
+          }
+        }
       }
     }
   }
+  
+  .tree-children {
+    background-color: #fafafa;
+  }
 }
 
 .student-list-container {
   flex: 1;
-  display: flex;
-  flex-direction: column;
   overflow: hidden;
+  background-color: #fff;
+}
+
+.student-list-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 32rpx 24rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+  
+  .student-info-wrapper {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 8rpx;
+    
+    .student-name {
+      font-size: 32rpx;
+      color: #333;
+      font-weight: 500;
+    }
+    
+    .student-class {
+      font-size: 26rpx;
+      color: #999;
+    }
+  }
 }
 
 .paging-container {
@@ -622,117 +1039,52 @@ onMounted(async () => {
   height: 100%;
 }
 
-.student-item {
-  display: flex;
-  align-items: center;
-  padding: 28rpx 24rpx;
-  margin: 0 0 16rpx 0;
-  background: linear-gradient(135deg, #ffffff 0%, #f8f9fa 100%);
-  border-radius: 0;
-  border: none;
-  border-bottom: 1rpx solid #e1e8ed;
-  transition: all 0.3s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    background: linear-gradient(135deg, #f8f9fa 0%, #f0f2f5 100%);
-  }
-  
-  &.selected {
-    background: linear-gradient(135deg, #f0f4ff 0%, #e8edff 100%);
-    border-bottom-color: #667eea;
-  }
-  
-  .student-checkbox {
-    margin-right: 24rpx;
-    flex-shrink: 0;
-    
-    .checkbox {
-      width: 44rpx;
-      height: 44rpx;
-      border: 2rpx solid #d1d5db;
-      border-radius: 10rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      transition: all 0.3s ease;
-      background-color: #fff;
-      
-      &.checked {
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-color: #667eea;
-        box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.3);
-      }
-    }
-  }
-  
-  .student-info {
-    flex: 1;
-    min-width: 0;
-    
-    .student-name {
-      display: block;
-      font-size: 32rpx;
-      font-weight: 600;
-      color: #1f2937;
-      margin-bottom: 10rpx;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-    
-    .student-class {
-      font-size: 26rpx;
-      color: #6b7280;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
-
 
 .picker-footer {
   display: flex;
+  align-items: center;
+  justify-content: flex-end;
   padding: 24rpx;
-  background: linear-gradient(to top, #ffffff 0%, #f8f9fa 100%);
+  background-color: #fff;
   border-top: 1rpx solid #e1e8ed;
-  gap: 20rpx;
   box-shadow: 0 -4rpx 12rpx rgba(0, 0, 0, 0.05);
+  gap: 24rpx;
+  
+  .selected-info {
+    font-size: 28rpx;
+    color: #333;
+    margin-right: auto;
+  }
   
-  .cancel-btn,
   .confirm-btn {
-    flex: 1;
-    height: 96rpx;
-    line-height: 96rpx;
-    border-radius: 20rpx;
+    min-width: 200rpx;
+    padding: 0 80rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    border-radius: 40rpx;
     font-size: 32rpx;
-    font-weight: 600;
+    font-weight: 500;
     border: none;
-    transition: all 0.3s ease;
-  }
-  
-  .cancel-btn {
-    background: linear-gradient(135deg, #f3f4f6 0%, #e5e7eb 100%);
-    color: #6b7280;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-    
-    &:active {
-      transform: scale(0.98);
-      background: linear-gradient(135deg, #e5e7eb 0%, #d1d5db 100%);
-    }
-  }
-  
-  .confirm-btn {
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    background: linear-gradient(135deg, #1890ff 0%, #40a9ff 100%);
     color: #fff;
-    box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4);
+    box-shadow: 0 4rpx 12rpx rgba(24, 144, 255, 0.3);
+    transition: all 0.3s ease;
+    margin-left: 0 !important;
+    margin-right: 0 !important;
     
     &:active {
       transform: scale(0.98);
-      box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.3);
+      box-shadow: 0 2rpx 8rpx rgba(24, 144, 255, 0.2);
     }
   }
 }
+
+// 覆盖 uni-app button 的默认样式
+::v-deep button,
+::v-deep uni-button {
+  margin-left: 0 !important;
+  margin-right: 0 !important;
+}
 </style>
 
+
diff --git a/src/pages/statistics/jc/jcList.vue b/src/pages/statistics/jc/jcList.vue
new file mode 100644
index 0000000..b0ee66e
--- /dev/null
+++ b/src/pages/statistics/jc/jcList.vue
@@ -0,0 +1,430 @@
+<template>
+  <view class="jc-list-container">
+    <!-- 页面标题 -->
+    <view class="page-header">
+      <text class="page-title">就餐标准列表</text>
+    </view>
+
+    <!-- 就餐列表 -->
+    <view class="section" v-if="jcBzList.length > 0">
+      <!-- 就餐列表 -->
+      <view class="jc-list">
+        <view
+          v-for="bz in jcBzList"
+          :key="bz.id"
+          class="jc-item bg-white r-md p-12"
+          @click="goToBz(bz)"
+        >
+          <view class="jc-header">
+            <view class="jc-title">{{ bz.bzMc }}</view>
+          </view>
+          
+           <view class="jc-info">
+             <view class="info-row">
+               <text class="info-label">学期名称：</text>
+               <text class="info-value">{{ bz.xqMc || '未知' }}</text>
+             </view>
+             <view class="info-row">
+               <text class="info-label">年级范围：</text>
+               <text class="info-value">{{ bz.njmc || '全部' }}</text>
+             </view>
+              <view class="info-row">
+                <text class="info-label">说明：</text>
+                <text class="info-value">{{ bz.bzSm }}</text>
+              </view>
+           </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 空状态 -->
+    <view class="empty-state" v-if="!loading && jcBzList.length === 0 && hasSearched">
+      <view class="empty-icon">📚</view>
+      <view class="empty-text">暂无就餐数据</view>
+      <view class="empty-tip">请联系管理员添加就餐信息</view>
+    </view>
+
+    <!-- 加载状态 -->
+    <view class="loading-state" v-if="loading">
+      <view class="loading-text">正在加载...</view>
+    </view>
+    
+    <!-- 滚动加载更多 -->
+    <view class="load-more" v-if="hasMore && !loading">
+      <view class="load-more-text">上拉加载更多</view>
+    </view>
+    
+    <!-- 没有更多数据 -->
+    <view class="no-more" v-if="!hasMore && hasSearched && jcBzList.length > 0">
+      <view class="no-more-text">没有更多数据了</view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { jcBzFindPageApi } from '@/api/base/jcApi'
+import { useDataStore } from "@/store/modules/data";
+import dayjs from 'dayjs';
+const { setJcBz } = useDataStore();
+
+// 响应式数据
+const jcBzList = ref<any>([])
+const loading = ref(false)
+const hasSearched = ref(false)
+const hasMore = ref(true)
+const currentPage = ref(1)
+const pageSize = ref(10)
+
+// 页面加载
+onLoad(() => {
+  console.log('就餐列表页面加载')
+  loadJcBzList()
+})
+
+// 加载就餐列表
+const loadJcBzList = async (isLoadMore = false) => {
+  if (loading.value) return
+  
+  loading.value = true
+  hasSearched.value = true
+
+  try {
+    // 调用后端接口查询就餐列表
+    const response = await jcBzFindPageApi({
+      pageNo: currentPage.value,
+      rows: 10,
+      sfFb: 1, // 查询已发布的数据
+    });
+    
+    console.log('API返回结果:', response)
+    
+    if (response && response.rows) {
+      const newData = response.rows || []
+      
+      if (isLoadMore) {
+        // 加载更多时追加数据
+        jcBzList.value = [...jcBzList.value, ...newData]
+      } else {
+        // 首次加载或刷新时替换数据
+        jcBzList.value = newData
+      }
+      
+      // 判断是否还有更多数据
+      hasMore.value = newData.length >= pageSize.value
+    } else {
+      throw new Error('查询失败')
+    }
+  } catch (error) {
+    console.error('查询就餐列表失败:', error)
+    uni.showToast({
+      title: '查询失败，请重试',
+      icon: 'none'
+    })
+    if (!isLoadMore) {
+      jcBzList.value = []
+    }
+  } finally {
+    loading.value = false
+  }
+}
+
+// 加载更多数据
+const loadMore = () => {
+  if (loading.value || !hasMore.value) {
+    return
+  }
+  
+  currentPage.value++
+  loadJcBzList(true)
+}
+
+// 滚动到底部触发加载更多
+const onReachBottom = () => {
+  loadMore()
+}
+
+// 跳转到报名统计年级页面
+const goToBz = (bz: any) => {
+  setJcBz(bz);
+  
+  // 解析 jfJsSj 字段，提取月份（YYYY-MM格式）
+  let month = dayjs().format('YYYY-MM'); // 默认使用当前月份
+  
+  if (bz.jfJsSj) {
+    try {
+      // jfJsSj 格式： "2025-09-27 09:57:56"
+      // 提取前10个字符（YYYY-MM-DD），然后提取前7个字符（YYYY-MM）
+      const dateStr = bz.jfJsSj.trim();
+      if (dateStr.length >= 7) {
+        month = dateStr.substring(0, 7); // 提取 "YYYY-MM"
+        console.log('从 jfJsSj 解析月份:', bz.jfJsSj, '->', month);
+      } else {
+        console.warn('jfJsSj 格式不正确，使用当前月份:', bz.jfJsSj);
+      }
+    } catch (error) {
+      console.error('解析 jfJsSj 失败，使用当前月份:', error);
+    }
+  } else {
+    console.log('jfJsSj 字段不存在，使用当前月份');
+  }
+  
+  // 默认统计类型为未报名统计
+  const defaultType = 'unregistered';
+  
+  // 跳转到报名统计年级页面，传递月份和统计类型参数
+  uni.navigateTo({ 
+    url: `/pages/statistics/jc/registration-grade-statistics?type=${defaultType}&month=${month}`
+  });
+};
+
+// 获取状态样式类
+const getStatusClass = (status: string) => {
+  switch (status) {
+    case '未开始':
+      return 'status-pending'
+    case '进行中':
+      return 'status-active'
+    case '已结束':
+      return 'status-ended'
+    default:
+      return 'status-unknown'
+  }
+}
+
+</script>
+
+<style lang="scss" scoped>
+.jc-list-container {
+  min-height: 100vh;
+  background-color: #f5f5f5;
+  padding: 20rpx;
+}
+
+.page-header {
+  background-color: #fff;
+  border-radius: 16rpx;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
+
+.page-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.section {
+  background-color: #fff;
+  border-radius: 16rpx;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
+
+.section-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 20rpx;
+}
+
+.jc-list {
+  margin-bottom: 30rpx;
+}
+
+.jc-item {
+  margin-bottom: 20rpx;
+  border-radius: 16rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+  transition: all 0.2s;
+  position: relative;
+  cursor: pointer;
+  
+  &:hover {
+    transform: translateY(-2rpx);
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15);
+  }
+  
+  &:active {
+    transform: translateY(0);
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+  }
+}
+
+.jc-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20rpx;
+  padding-bottom: 15rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+
+.jc-actions {
+  display: flex;
+  align-items: center;
+}
+
+.jc-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  flex: 1;
+}
+
+.jc-status {
+  font-size: 24rpx;
+  padding: 8rpx 16rpx;
+  border-radius: 20rpx;
+  font-weight: bold;
+  
+  &.status-pending {
+    background-color: #fff7e6;
+    color: #fa8c16;
+    border: 1rpx solid #ffd591;
+  }
+  
+  &.status-active {
+    background-color: #f6ffed;
+    color: #52c41a;
+    border: 1rpx solid #b7eb8f;
+  }
+  
+  &.status-ended {
+    background-color: #fff2f0;
+    color: #ff4d4f;
+    border: 1rpx solid #ffccc7;
+  }
+  
+  &.status-unknown {
+    background-color: #f5f5f5;
+    color: #999;
+    border: 1rpx solid #d9d9d9;
+  }
+}
+
+.more-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  background-color: #f5f5f5;
+  transition: all 0.2s ease;
+  cursor: pointer;
+  
+  &:hover {
+    background-color: #e6f7ff;
+    transform: scale(1.1);
+  }
+  
+  &:active {
+    background-color: #d9d9d9;
+    transform: scale(0.95);
+  }
+}
+
+.more-icon {
+  width: 32rpx;
+  height: 32rpx;
+}
+
+.jc-info {
+  margin-bottom: 20rpx;
+}
+
+.info-row {
+  display: flex;
+  margin-bottom: 12rpx;
+  font-size: 28rpx;
+}
+
+.info-label {
+  color: #666;
+  margin-right: 10rpx;
+  min-width: 140rpx;
+}
+
+.info-value {
+  color: #333;
+  flex: 1;
+}
+
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 100rpx 40rpx;
+  
+  .empty-icon {
+    font-size: 120rpx;
+    margin-bottom: 20rpx;
+  }
+  
+  .empty-text {
+    font-size: 32rpx;
+    color: #666;
+    margin-bottom: 10rpx;
+  }
+  
+  .empty-tip {
+    font-size: 28rpx;
+    color: #999;
+  }
+}
+
+.loading-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 100rpx;
+  
+  .loading-text {
+    font-size: 32rpx;
+    color: #666;
+  }
+}
+
+.bg-white {
+  background-color: #fff;
+}
+
+.r-md {
+  border-radius: 16rpx;
+}
+
+.p-12 {
+  padding: 24rpx;
+}
+
+/* 滚动加载样式 */
+.load-more {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 30rpx;
+  
+  .load-more-text {
+    font-size: 28rpx;
+    color: #999;
+  }
+}
+
+.no-more {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 30rpx;
+  
+  .no-more-text {
+    font-size: 28rpx;
+    color: #ccc;
+  }
+}
+</style>
diff --git a/src/pages/system/web-viewer/index.vue b/src/pages/system/web-viewer/index.vue
index 2b3e578..7320bb9 100644
--- a/src/pages/system/web-viewer/index.vue
+++ b/src/pages/system/web-viewer/index.vue
@@ -6,6 +6,15 @@
         <text class="header-title">{{ pageTitle }}</text>
       </view>
       <view class="header-right">
+        <!-- #ifdef H5 -->
+        <u-icon 
+          v-if="isWeixin" 
+          name="share" 
+          size="20" 
+          @click="handleShareClick"
+          style="margin-right: 20rpx;"
+        ></u-icon>
+        <!-- #endif -->
         <u-button size="mini" @click="refreshPage">刷新</u-button>
       </view>
     </view>
@@ -20,11 +29,14 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
+import { ref, onMounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import { initWechatShare, isWeixinBrowser, buildShareLink } from '@/utils/wechatShare';
+import { imagUrl } from '@/utils';
 
 const previewUrl = ref('');
 const pageTitle = ref('文件预览');
+const isWeixin = ref(false);
 
 onLoad((options) => {
   if (options.url) {
@@ -37,6 +49,76 @@ onLoad((options) => {
   console.log('Web-View预览URL:', previewUrl.value);
 });
 
+// 初始化微信分享
+const initShare = async () => {
+  // #ifdef H5
+  // 检测是否在微信浏览器环境
+  isWeixin.value = isWeixinBrowser();
+  
+  if (!isWeixin.value) {
+    console.log('当前不在微信浏览器环境，跳过分享初始化');
+    return;
+  }
+
+  // 构建分享链接
+  // 获取当前页面完整路径（包含hash路由）
+  const currentPath = window.location.href;
+  
+  // 构建分享链接，包含预览URL和标题参数
+  const shareLink = buildShareLink(currentPath, {
+    url: previewUrl.value,
+    title: pageTitle.value
+  });
+
+  // 获取封面图URL，添加时间戳避免缓存
+  const logoUrl = imagUrl('/upload/zhxy/report/logo.jpg');
+  const imgUrl = logoUrl ? `${logoUrl}${logoUrl.includes('?') ? '&' : '?'}t=${Date.now()}` : '';
+
+  // 初始化分享配置
+  await initWechatShare({
+    title: pageTitle.value || '文件预览',
+    desc: `点击查看：${pageTitle.value}`,
+    link: shareLink,
+    imgUrl: imgUrl // 使用默认的logo作为封面图，添加时间戳避免缓存
+  });
+  // #endif
+};
+
+// 分享按钮点击事件（可选，主要用于手动触发）
+const handleShareClick = () => {
+  // #ifdef H5
+  if (isWeixin.value) {
+    // 在微信中，点击右上角分享按钮会自动触发分享
+    // 这里可以显示提示信息
+    uni.showToast({
+      title: '请点击右上角分享按钮',
+      icon: 'none',
+      duration: 2000
+    });
+  }
+  // #endif
+};
+
+// 页面加载完成后初始化分享
+onMounted(() => {
+  // 延迟一下，确保微信JS-SDK已加载
+  setTimeout(() => {
+    initShare();
+  }, 500);
+});
+
+// 页面显示时重新设置分享内容（解决分享缓存问题）
+onShow(() => {
+  // #ifdef H5
+  // 每次页面显示时重新设置分享内容，避免使用其他页面的分享数据
+  if (isWeixin.value) {
+    setTimeout(() => {
+      initShare();
+    }, 300);
+  }
+  // #endif
+});
+
 const goBack = () => {
   uni.navigateBack();
 };
diff --git a/src/pages/view/routine/JiFenPingJia/jfself/IntegralApply.vue b/src/pages/view/routine/JiFenPingJia/jfself/IntegralApply.vue
index 8fd8ac4..b131ab3 100644
--- a/src/pages/view/routine/JiFenPingJia/jfself/IntegralApply.vue
+++ b/src/pages/view/routine/JiFenPingJia/jfself/IntegralApply.vue
@@ -958,9 +958,9 @@ const handleAddStudent = () => {
   // 注册监听
   uni.$once('studentPickerConfirm', handleStudentConfirm);
   
-  // 跳转到学生选择页面
+  // 跳转到学生选择页面（使用不受权限控制的接口）
   uni.navigateTo({
-    url: `/pages/components/StudentPicker/index?selectedIds=${selectedIds.join(',')}&multiple=true`
+    url: `/pages/components/StudentPicker/index?selectedIds=${selectedIds.join(',')}&multiple=true&useKzTree=true`
   });
 };
 
diff --git a/src/pages/view/routine/JiFenPingJia/jfself/JiFenPingJia.vue b/src/pages/view/routine/JiFenPingJia/jfself/JiFenPingJia.vue
index 176dbc8..9624c6a 100644
--- a/src/pages/view/routine/JiFenPingJia/jfself/JiFenPingJia.vue
+++ b/src/pages/view/routine/JiFenPingJia/jfself/JiFenPingJia.vue
@@ -29,6 +29,10 @@
         <uni-card :is-shadow="false" is-full>
           <view class="header">
             <text class="score">业绩积分: {{ totalScore }}</text>
+            <view class="header-actions">
+              <text class="detail-btn" @click="handleGoToDetail">明细</text>
+              <text class="export-btn" @click="showExportDialog">导出</text>
+            </view>
           </view>
         </uni-card>
 
@@ -75,13 +79,61 @@
         </view>
       </view>
     </template>
+
+    <!-- 导出格式选择弹窗 -->
+    <view class="export-modal" v-if="showExportModal" @click="closeExportDialog">
+      <view class="export-modal-content" @click.stop>
+        <view class="export-modal-header">
+          <text class="export-modal-title">选择导出格式</text>
+          <text class="export-modal-close" @click="closeExportDialog">×</text>
+        </view>
+        <view class="export-modal-body">
+          <view 
+            class="export-option-item"
+            :class="{ selected: selectedExportFormat === 'excel' }"
+            @click="selectExportFormat('excel')"
+          >
+            <view class="option-radio">
+              <view class="radio-dot" v-if="selectedExportFormat === 'excel'"></view>
+            </view>
+            <text class="option-text">Excel 表格</text>
+          </view>
+          <view 
+            class="export-option-item"
+            :class="{ selected: selectedExportFormat === 'pdf' }"
+            @click="selectExportFormat('pdf')"
+          >
+            <view class="option-radio">
+              <view class="radio-dot" v-if="selectedExportFormat === 'pdf'"></view>
+            </view>
+            <text class="option-text">PDF 报告（含证书图片）</text>
+          </view>
+        </view>
+        <view class="export-modal-footer">
+          <view class="export-modal-btn cancel-btn" @click="closeExportDialog">取消</view>
+          <view class="export-modal-btn confirm-btn" @click="confirmExport">确认导出</view>
+        </view>
+      </view>
+    </view>
+
+    <!-- PDF预览组件 -->
+    <PdfPreview 
+      :visible="showPdfPreview" 
+      :pdfUrl="pdfPreviewUrl"
+      @update:visible="showPdfPreview = $event"
+      @close="showPdfPreview = false"
+    />
   </BasicLayout>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed, onMounted, reactive } from "vue";
 import { onShow } from "@dcloudio/uni-app";
-import { jfSummaryByJfTypeApi } from "@/api/base/jfApi";
+import { jfSummaryByJfTypeApi, jfExportApi } from "@/api/base/jfApi";
+import { imagUrl } from "@/utils";
+import { BASE_URL, AUTH_KEY } from "@/config";
+import { useUserStore } from "@/store/modules/user";
+import PdfPreview from "@/pages/components/PdfPreview/index.vue";
 
 interface EvaluationItem {
   id: string;
@@ -97,14 +149,23 @@ const evaluationItems = ref<EvaluationItem[]>([]);
 const totalScore = ref(0);
 const loading = ref(false);
 
-// 时间筛选（默认当年）
+// 导出相关
+const showExportModal = ref(false);
+const selectedExportFormat = ref<'excel' | 'pdf'>('excel');
+
+// PDF预览相关
+const showPdfPreview = ref(false);
+const pdfPreviewUrl = ref('');
+
+// 时间筛选（默认最近两年）
 const currentYear = new Date().getFullYear();
+const twoYearsAgo = currentYear - 1; // 两年前（去年）
 const formatDate = (date: Date) =>
   `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
 
 const searchForm = reactive({
-  startTime: `${currentYear}-01-01`,
-  endTime: `${currentYear}-12-31`,
+  startTime: `${twoYearsAgo}-01-01`, // 两年前的1月1日
+  endTime: `${currentYear}-12-31`, // 当前年的12月31日
 });
 
 const onStartTimeChange = (e: any) => {
@@ -116,8 +177,8 @@ const onEndTimeChange = (e: any) => {
 };
 
 const handleReset = () => {
-  searchForm.startTime = `${currentYear}-01-01`;
-  searchForm.endTime = `${currentYear}-12-31`;
+  searchForm.startTime = `${twoYearsAgo}-01-01`; // 重置为两年前的1月1日
+  searchForm.endTime = `${currentYear}-12-31`; // 重置为当前年的12月31日
   handleSearch();
 };
 
@@ -258,6 +319,383 @@ function handleIntegralApply() {
   });
 }
 
+// 跳转到明细页面
+const handleGoToDetail = () => {
+  // 从本地缓存获取当前教师ID
+  const userDataStr = uni.getStorageSync('app-user');
+  let jsId = '';
+  if (userDataStr) {
+    try {
+      const userData = typeof userDataStr === 'string' ? JSON.parse(userDataStr) : userDataStr;
+      if (userData && userData.jsData && userData.jsData.id) {
+        jsId = userData.jsData.id;
+      }
+    } catch (error) {
+      console.error('解析用户数据失败:', error);
+    }
+  }
+  
+  if (!jsId) {
+    uni.showToast({
+      title: '未找到教师信息',
+      icon: 'none'
+    });
+    return;
+  }
+  
+  // 跳转到明细页面（不传 jfTypeId 表示查看所有类别的明细）
+  uni.navigateTo({
+    url: `/pages/view/routine/JiFenPingJia/jfself/ScoreListByType?jsId=${jsId}`
+  });
+};
+
+// 显示导出格式选择弹窗
+const showExportDialog = () => {
+  showExportModal.value = true;
+  selectedExportFormat.value = 'excel'; // 默认选择 Excel
+};
+
+// 关闭导出弹窗
+const closeExportDialog = () => {
+  showExportModal.value = false;
+  selectedExportFormat.value = 'excel';
+};
+
+// 选择导出格式
+const selectExportFormat = (format: 'excel' | 'pdf') => {
+  selectedExportFormat.value = format;
+};
+
+// 确认导出
+const confirmExport = () => {
+  // 先保存选择的值，再关闭弹窗（因为 closeExportDialog 会重置 selectedExportFormat）
+  const format = selectedExportFormat.value;
+  closeExportDialog();
+  
+  console.log('[导出] 用户选择的格式:', format);
+  
+  if (format === 'excel') {
+    console.log('[导出] 执行 Excel 导出');
+    handleExportExcel();
+  } else if (format === 'pdf') {
+    console.log('[导出] 执行 PDF 导出');
+    handleExportPdf();
+  } else {
+    console.error('[导出] 未知的导出格式:', format);
+    uni.showToast({
+      title: '未知的导出格式',
+      icon: 'none'
+    });
+  }
+};
+
+// 导出 Excel
+const handleExportExcel = async () => {
+  try {
+    // 从本地缓存获取当前教师ID
+    const userDataStr = uni.getStorageSync('app-user');
+    let jsId = '';
+    let userData = null;
+    
+    if (userDataStr) {
+      try {
+        userData = typeof userDataStr === 'string' ? JSON.parse(userDataStr) : userDataStr;
+        if (userData && userData.jsData && userData.jsData.id) {
+          jsId = userData.jsData.id;
+        } else {
+          uni.showToast({
+            title: '未找到教师信息',
+            icon: 'none'
+          });
+          return;
+        }
+      } catch (error) {
+        console.error('解析用户数据失败:', error);
+        uni.showToast({
+          title: '用户数据解析失败',
+          icon: 'none'
+        });
+        return;
+      }
+    } else {
+      uni.showToast({
+        title: '未找到用户数据',
+        icon: 'none'
+      });
+      return;
+    }
+
+    console.log('[导出] 步骤1: 开始导出');
+    uni.showLoading({ title: '导出中...' });
+
+    console.log('[导出] 步骤2: 调用后端接口, jsId:', jsId, 'startTime:', searchForm.startTime, 'endTime:', searchForm.endTime);
+    
+    // 调用导出接口
+    // 传递教师ID和时间范围（按获奖时间筛选）
+    const result: any = await jfExportApi({
+      fileds: '', // 空字符串（已废弃，使用DTO固定字段）
+      jsId: jsId, // 教师ID（根据当前教师过滤）
+      startTime: searchForm.startTime, // 开始时间（按获奖时间筛选）
+      endTime: searchForm.endTime // 结束时间（按获奖时间筛选）
+    });
+
+    console.log('[导出] 步骤3: 接口返回, result:', result);
+    console.log('[导出] 步骤3.1: result.resultCode =', result.resultCode, ', result.result =', result.result);
+    
+    // 关闭加载提示
+    uni.hideLoading();
+    console.log('[导出] 步骤4: 已关闭loading');
+    
+    // AjaxResult 返回的文件路径在 msg 字段中，ReturnMsg 返回的在 result 字段中
+    // 兼容两种格式
+    const filePath = result.msg || result.result;
+    if ((result.resultCode === 1 || result.resultCode === 0) && filePath) {
+      console.log('[导出] 步骤5: 验证通过，开始处理下载');
+      
+      // 后端返回文件路径（AjaxResult 在 msg 字段，ReturnMsg 在 result 字段）
+      console.log('[导出] 步骤6: 文件路径:', filePath);
+      
+      // 构建完整的下载URL
+      console.log('[导出] 步骤7: 调用imagUrl前, filePath:', filePath);
+      const downloadUrl = filePath.startsWith('http') ? filePath : imagUrl(filePath);
+      console.log('[导出] 步骤8: 下载URL构建完成:', downloadUrl);
+      
+      // 提示用户
+      console.log('[导出] 步骤10: 显示下载提示');
+      uni.showToast({
+        title: '正在下载Excel文件...',
+        icon: 'success',
+        duration: 2000
+      });
+      
+      console.log('[导出] 步骤11: 准备触发下载');
+      // 延迟触发下载，确保toast显示
+      setTimeout(() => {
+        console.log('[导出] 步骤12: setTimeout执行，准备下载');
+        // 判断平台并执行相应的下载逻辑
+        // @ts-ignore
+        if (typeof window !== 'undefined' && window.location) {
+          // H5平台：直接使用window.location.href触发下载
+          console.log('[导出] 步骤13: H5环境，触发下载');
+          window.location.href = downloadUrl;
+          console.log('[导出] 步骤14: window.location.href已执行');
+        } else {
+          // APP/小程序环境：使用uni.downloadFile
+          console.log('[导出] 步骤13: APP/小程序环境，使用uni.downloadFile');
+          uni.downloadFile({
+            url: downloadUrl,
+            success: (res) => {
+              if (res.statusCode === 200) {
+                console.log('[导出] Excel下载成功，临时文件路径:', res.tempFilePath);
+                
+                // 保存文件到本地
+                uni.saveFile({
+                  tempFilePath: res.tempFilePath,
+                  success: (saveRes) => {
+                    console.log('[导出] Excel文件已保存到本地:', saveRes.savedFilePath);
+                    uni.showToast({
+                      title: '文件已保存',
+                      icon: 'success'
+                    });
+                  },
+                  fail: (err) => {
+                    console.error('[导出] 文件保存失败:', err);
+                    uni.showToast({
+                      title: '文件保存失败',
+                      icon: 'none'
+                    });
+                  }
+                });
+              } else {
+                console.error('[导出] 下载失败，状态码:', res.statusCode);
+                uni.showToast({
+                  title: `下载失败（状态码: ${res.statusCode}）`,
+                  icon: 'none'
+                });
+              }
+            },
+            fail: (err) => {
+              console.error('[导出] 下载Excel失败:', err);
+              uni.showToast({
+                title: '下载失败: ' + (err.errMsg || '网络异常'),
+                icon: 'none'
+              });
+            }
+          });
+        }
+      }, 100);
+      
+      console.log('[导出] 步骤15: 主流程执行完毕');
+    } else {
+      console.log('[导出] 验证失败, resultCode:', result.resultCode, ', message:', result.message);
+      uni.showToast({
+        title: result.message || '导出失败',
+        icon: 'none'
+      });
+    }
+  } catch (error) {
+    console.error('[导出] catch捕获异常, error对象:', error);
+    console.error('[导出] error类型:', typeof error);
+    console.error('[导出] error详情:', JSON.stringify(error));
+    uni.hideLoading();
+    uni.showToast({
+      title: '导出失败',
+      icon: 'error'
+    });
+  }
+};
+
+// 导出 PDF
+const handleExportPdf = async () => {
+  try {
+    // 从本地缓存获取当前教师ID
+    const userDataStr = uni.getStorageSync('app-user');
+    let jsId = '';
+    let userData = null;
+    
+    if (userDataStr) {
+      try {
+        userData = typeof userDataStr === 'string' ? JSON.parse(userDataStr) : userDataStr;
+        if (userData && userData.jsData && userData.jsData.id) {
+          jsId = userData.jsData.id;
+        } else {
+          uni.showToast({
+            title: '未找到教师信息',
+            icon: 'none'
+          });
+          return;
+        }
+      } catch (error) {
+        console.error('解析用户数据失败:', error);
+        uni.showToast({
+          title: '用户数据解析失败',
+          icon: 'none'
+        });
+        return;
+      }
+    } else {
+      uni.showToast({
+        title: '未找到用户数据',
+        icon: 'none'
+      });
+      return;
+    }
+
+    console.log('[导出PDF] 步骤1: 开始导出PDF');
+    uni.showLoading({ title: '正在生成PDF...' });
+
+    console.log('[导出PDF] 步骤2: 调用后端接口, jsId:', jsId, 'startTime:', searchForm.startTime, 'endTime:', searchForm.endTime);
+    
+    // 构建 PDF 生成 URL
+    const userStore = useUserStore();
+    const pdfApiUrl = `${BASE_URL}/api/jf/exportPdf?jsId=${jsId}&startTime=${searchForm.startTime}&endTime=${searchForm.endTime}`;
+    
+    console.log('[导出PDF] PDF生成URL:', pdfApiUrl);
+    
+    // #ifdef H5
+    // H5环境：使用fetch下载PDF到blob，然后使用PDF.js预览
+    try {
+      console.log('[导出PDF] H5环境：开始下载PDF用于预览');
+      
+      const response = await fetch(pdfApiUrl, {
+        method: 'GET',
+        headers: {
+          [AUTH_KEY]: userStore.getToken
+        }
+      });
+      
+      if (!response.ok) {
+        throw new Error(`服务器返回错误: ${response.status}`);
+      }
+      
+      const blob = await response.blob();
+      console.log('[导出PDF] PDF数据接收成功，大小:', (blob.size / 1024 / 1024).toFixed(2), 'MB');
+      
+      // 创建blob URL
+      const blobUrl = URL.createObjectURL(blob);
+      console.log('[导出PDF] Blob URL创建成功:', blobUrl);
+      
+      // 使用项目中的 PDF.js 查看器预览
+      const viewerPath = '/static/system/pdfReader/index.html';
+      const previewUrl = `${viewerPath}?file=${encodeURIComponent(blobUrl)}#pagemode=none`;
+      console.log('[导出PDF] PDF查看器URL:', previewUrl);
+      
+      uni.hideLoading();
+      
+      // 使用组件预览PDF
+      console.log('[导出PDF] 设置预览URL:', previewUrl);
+      pdfPreviewUrl.value = previewUrl;
+      console.log('[导出PDF] pdfPreviewUrl.value 已设置:', pdfPreviewUrl.value);
+      // 使用 nextTick 确保响应式更新
+      setTimeout(() => {
+        showPdfPreview.value = true;
+        console.log('[导出PDF] showPdfPreview.value 已设置为 true:', showPdfPreview.value);
+      }, 100);
+    } catch (error: any) {
+      console.error('[导出PDF] H5环境下载失败:', error);
+      uni.hideLoading();
+      uni.showToast({
+        title: '下载失败: ' + (error?.message || '网络异常'),
+        icon: 'none'
+      });
+    }
+    // #endif
+    
+    // #ifndef H5
+    // APP/小程序环境：使用uni.downloadFile
+    uni.downloadFile({
+      url: pdfApiUrl,
+      header: {
+        [AUTH_KEY]: userStore.getToken
+      },
+      success: (res) => {
+        uni.hideLoading();
+        if (res.statusCode === 200) {
+          console.log('[导出PDF] PDF下载成功，临时文件路径:', res.tempFilePath);
+          
+          // 使用PDF.js查看器预览（通过web-view）
+          const viewerPath = '/static/system/pdfReader/index.html';
+          // 对于APP环境，需要将文件路径转换为可访问的URL
+          // 这里使用file://协议或者通过web-view直接访问
+          const previewUrl = `${viewerPath}?file=${encodeURIComponent(res.tempFilePath)}#pagemode=none`;
+          
+          // 使用组件预览PDF
+          console.log('[导出PDF] APP环境设置预览URL:', previewUrl);
+          pdfPreviewUrl.value = previewUrl;
+          console.log('[导出PDF] pdfPreviewUrl.value 已设置:', pdfPreviewUrl.value);
+          // 使用 nextTick 确保响应式更新
+          setTimeout(() => {
+            showPdfPreview.value = true;
+            console.log('[导出PDF] showPdfPreview.value 已设置为 true:', showPdfPreview.value);
+          }, 100);
+        } else {
+          console.error('[导出PDF] 下载失败，状态码:', res.statusCode);
+          uni.showToast({
+            title: `下载失败（状态码: ${res.statusCode}）`,
+            icon: 'none'
+          });
+        }
+      },
+      fail: (err) => {
+        console.error('[导出PDF] 下载PDF失败:', err);
+        uni.hideLoading();
+        uni.showToast({
+          title: '下载失败: ' + (err.errMsg || '网络异常'),
+          icon: 'none'
+        });
+      }
+    });
+    // #endif
+  } catch (error) {
+    console.error('[导出PDF] catch捕获异常:', error);
+    uni.hideLoading();
+    uni.showToast({
+      title: '导出失败',
+      icon: 'error'
+    });
+  }
+};
+
 // 页面加载时获取数据
 onMounted(() => {
   loadTeacherScore();
@@ -307,6 +745,40 @@ onShow(() => {
   font-weight: bold;
 }
 
+.header-actions {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.detail-btn {
+  font-size: 14px;
+  color: #1890ff;
+  padding: 4px 12px;
+  border: 1px solid #1890ff;
+  border-radius: 4px;
+  transition: all 0.3s ease;
+  
+  &:active {
+    background-color: #1890ff;
+    color: #fff;
+  }
+}
+
+.export-btn {
+  font-size: 14px;
+  color: #52c41a;
+  padding: 4px 12px;
+  border: 1px solid #52c41a;
+  border-radius: 4px;
+  transition: all 0.3s ease;
+  
+  &:active {
+    background-color: #52c41a;
+    color: #fff;
+  }
+}
+
 .loading-container {
   display: flex;
   justify-content: center;
@@ -471,4 +943,144 @@ onShow(() => {
     box-shadow: 0 0 0 0 rgba(255, 107, 53, 0);
   }
 }
+
+/* 导出弹窗样式 */
+.export-modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+}
+
+.export-modal-content {
+  width: 80%;
+  max-width: 400px;
+  background-color: #fff;
+  border-radius: 12px;
+  overflow: hidden;
+}
+
+.export-modal-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 16px 20px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.export-modal-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+
+.export-modal-close {
+  font-size: 28px;
+  color: #999;
+  line-height: 1;
+  cursor: pointer;
+  
+  &:active {
+    color: #666;
+  }
+}
+
+.export-modal-body {
+  padding: 20px;
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.export-option-item {
+  display: flex;
+  align-items: center;
+  padding: 12px;
+  margin-bottom: 12px;
+  background-color: #f8f9fa;
+  border: 2px solid #e9ecef;
+  border-radius: 8px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  
+  &.selected {
+    background-color: #e6f7ff;
+    border-color: #1890ff;
+  }
+  
+  &:active {
+    transform: scale(0.98);
+  }
+}
+
+.option-radio {
+  width: 20px;
+  height: 20px;
+  border: 2px solid #d9d9d9;
+  border-radius: 50%;
+  margin-right: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  transition: all 0.3s ease;
+  
+  .export-option-item.selected & {
+    border-color: #1890ff;
+  }
+}
+
+.radio-dot {
+  width: 10px;
+  height: 10px;
+  background-color: #1890ff;
+  border-radius: 50%;
+}
+
+.option-text {
+  font-size: 14px;
+  color: #333;
+  flex: 1;
+  line-height: 1.5;
+}
+
+.export-modal-footer {
+  display: flex;
+  padding: 12px 20px;
+  border-top: 1px solid #f0f0f0;
+  gap: 12px;
+}
+
+.export-modal-btn {
+  flex: 1;
+  text-align: center;
+  padding: 10px 0;
+  border-radius: 6px;
+  font-size: 15px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  
+  &.cancel-btn {
+    background-color: #f5f5f5;
+    color: #666;
+    
+    &:active {
+      background-color: #e0e0e0;
+    }
+  }
+  
+  &.confirm-btn {
+    background-color: #1890ff;
+    color: #fff;
+    
+    &:active {
+      background-color: #0050b3;
+    }
+  }
+}
 </style>
diff --git a/src/pages/view/routine/JiFenPingJia/jfself/MyScoreDetail.vue b/src/pages/view/routine/JiFenPingJia/jfself/MyScoreDetail.vue
index 508f75a..6f5583b 100644
--- a/src/pages/view/routine/JiFenPingJia/jfself/MyScoreDetail.vue
+++ b/src/pages/view/routine/JiFenPingJia/jfself/MyScoreDetail.vue
@@ -37,6 +37,13 @@
               </button>
             </view>
             
+            <!-- 审核中状态显示撤回按钮 -->
+            <view v-if="isPendingReview(item.spJd, item.spResult) && item.spResult !== 'C'" class="card-actions-header">
+              <button class="withdraw-btn-header" @click="handleWithdraw(item)">
+                撤回申请
+              </button>
+            </view>
+            
             <view class="item-content">
               <!-- 业绩类别区域 -->
               <view class="section">
@@ -163,7 +170,7 @@
                 </view>
                 
                 <!-- 驳回原因列表 -->
-                <view v-if="item.jfStatus === 'C' && item.rejectionReasons && item.rejectionReasons.length > 0" class="rejection-reasons-section">
+                <view v-if="item.spResult === 'C' && item.rejectionReasons && item.rejectionReasons.length > 0" class="rejection-reasons-section">
                   <view class="section-title-rejection">
                     <view class="title-line-rejection"></view>
                     <text class="title-text-rejection">驳回原因</text>
@@ -207,7 +214,7 @@
 <script lang="ts" setup>
 import { ref, onMounted } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
-import { jfFindPageApi, jfTypeStructureApi } from "@/api/base/jfApi";
+import { jfFindPageApi, jfTypeStructureApi, jfWithdrawApi } from "@/api/base/jfApi";
 
 interface ScoreItem {
   id?: string;
@@ -372,19 +379,29 @@ const formatScoreConfig = (config: any): ScoreConfigCategory[] => {
 // 解析驳回原因 JSON 字符串
 function parseRejectionReasons(jsonStr: string | null | undefined): Array<{
   userName: string;
-  approveTime: string;
+  approveTime: string | null;
   approveRemark: string;
 }> {
   if (!jsonStr) return [];
   try {
+    let parsed: any[] = [];
     // 如果是字符串，尝试解析为 JSON
     if (typeof jsonStr === 'string') {
-      const parsed = JSON.parse(jsonStr);
-      return Array.isArray(parsed) ? parsed : [];
+      parsed = JSON.parse(jsonStr);
+    } else if (Array.isArray(jsonStr)) {
+      // 如果已经是数组，直接使用
+      parsed = jsonStr;
+    } else {
+      return [];
     }
-    // 如果已经是数组，直接返回
-    if (Array.isArray(jsonStr)) {
-      return jsonStr;
+    
+    // 确保返回的是数组，并处理 null 值
+    if (Array.isArray(parsed)) {
+      return parsed.map(item => ({
+        userName: item.userName || '',
+        approveTime: item.approveTime || null,
+        approveRemark: item.approveRemark || ''
+      }));
     }
     return [];
   } catch (error) {
@@ -445,6 +462,66 @@ function handleResubmit(item: ScoreItem) {
   });
 }
 
+// 处理撤回
+async function handleWithdraw(item: ScoreItem) {
+  if (!item.id) {
+    uni.showToast({
+      title: '缺少积分ID',
+      icon: 'none'
+    });
+    return;
+  }
+  
+  uni.showModal({
+    title: '确认撤回',
+    content: '确定要撤回该积分申请吗？撤回后将无法恢复。',
+    success: async (res) => {
+      if (res.confirm) {
+        try {
+          uni.showLoading({ title: '撤回中...' });
+          const result: any = await jfWithdrawApi({
+            id: item.id,
+            spRemark: '申请人撤回'
+          });
+          
+          uni.hideLoading();
+          
+          console.log('撤回接口返回结果:', result);
+          console.log('resultCode:', result?.resultCode, 'success:', result?.success, 'message:', result?.message);
+          
+          // 判断成功：resultCode === 1 或 success === true
+          if (result && (result.resultCode === 1 || result.resultCode === 0 || result.success === true)) {
+            uni.showToast({
+              title: result.message || '撤回成功',
+              icon: 'success',
+              duration: 1500
+            });
+            // 延迟返回，确保提示信息显示
+            setTimeout(() => {
+              uni.navigateBack({
+                delta: 1
+              });
+            }, 500);
+          } else {
+            console.warn('撤回失败，返回结果:', result);
+            uni.showToast({
+              title: result?.message || result?.msg || '撤回失败',
+              icon: 'none'
+            });
+          }
+        } catch (error) {
+          uni.hideLoading();
+          console.error('撤回失败，异常信息:', error);
+          uni.showToast({
+            title: '撤回失败',
+            icon: 'none'
+          });
+        }
+      }
+    }
+  });
+}
+
 // 预览文件
 function previewFile(item: ScoreItem) {
   if (item.fileUrl) {
@@ -1060,6 +1137,25 @@ onLoad(async (options) => {
           background: linear-gradient(135deg, #d81b24 0%, #f5222d 100%);
         }
       }
+      
+      .withdraw-btn-header {
+        width: 100%;
+        height: 88rpx;
+        line-height: 88rpx;
+        background: linear-gradient(135deg, #ff9800 0%, #ffa726 100%);
+        color: #ffffff;
+        border: none;
+        border-radius: 16rpx;
+        font-size: 32rpx;
+        font-weight: 600;
+        box-shadow: 0 4rpx 16rpx rgba(255, 152, 0, 0.35);
+        transition: all 0.3s;
+        
+        &:active {
+          transform: scale(0.98);
+          background: linear-gradient(135deg, #f57c00 0%, #ff9800 100%);
+        }
+      }
 }
 
 // 审批状态徽章动画
diff --git a/src/pages/view/routine/JiFenPingJia/jfself/ScoreListByType.vue b/src/pages/view/routine/JiFenPingJia/jfself/ScoreListByType.vue
index 061fe8b..c819635 100644
--- a/src/pages/view/routine/JiFenPingJia/jfself/ScoreListByType.vue
+++ b/src/pages/view/routine/JiFenPingJia/jfself/ScoreListByType.vue
@@ -79,12 +79,24 @@
         </view>
       </z-paging>
     </view>
+    
+    <!-- 底部返回按钮 -->
+    <view class="bottom-section">
+      <view class="bottom-btn-wrapper">
+        <u-button
+          text="返回"
+          type="primary"
+          class="back-btn"
+          @click="handleBack"
+        />
+      </view>
+    </view>
   </view>
 </template>
 
 <script setup lang="ts">
 import { ref } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
+import { onLoad, onShow } from "@dcloudio/uni-app";
 import dayjs from "dayjs";
 import BasicSearch from "@/components/BasicSearch/Search.vue";
 import { jfFindPageApi, jfTypeStructureApi } from "@/api/base/jfApi";
@@ -170,9 +182,13 @@ const queryData = async (pageNo: number, pageSize: number) => {
     const params: any = {
       page: pageNo,
       rows: pageSize,
-      jfTypeIds: jfTypeIdsParam,
       jsId: jsId.value,
     };
+    
+    // 只有当 jfTypeIdsParam 有值时才添加该参数（查看所有明细时不传）
+    if (jfTypeIdsParam) {
+      params.jfTypeIds = jfTypeIdsParam;
+    }
     const res: any = await jfFindPageApi(params);
     const result = res?.data || res?.result || res;
     let rows: any[] = [];
@@ -245,6 +261,11 @@ const loadAllJfTypeIds = async () => {
   }
 };
 
+// 返回按钮处理
+const handleBack = () => {
+  uni.navigateBack();
+};
+
 onLoad((options: any) => {
   jfTypeId.value = options?.jfTypeId || "";
   jsId.value = options?.jsId || "";
@@ -253,6 +274,13 @@ onLoad((options: any) => {
     pagingRef.value?.reload();
   });
 });
+
+// 页面显示时刷新列表（用于从详情页返回时刷新）
+onShow(() => {
+  if (pagingRef.value) {
+    pagingRef.value.reload();
+  }
+});
 </script>
 
 <style scoped lang="scss">
@@ -299,12 +327,20 @@ onLoad((options: any) => {
   flex: 0 0 20%;
   max-width: 20%;
   min-width: 68px;
+  height: 40px;
+  
+  // 使用深度选择器确保按钮高度与输入框一致
+  :deep(.u-btn) {
+    height: 40px !important;
+    line-height: 40px !important;
+  }
 }
 
 .list-section {
   flex: 1;
   margin-top: 80px;
-  height: calc(100vh - 80px);
+  margin-bottom: 70px; // 为底部按钮留出空间
+  height: calc(100vh - 80px - 70px); // 减去顶部和底部高度
   padding: 12px;
   padding-bottom: 16px;
   position: relative;
@@ -469,5 +505,27 @@ onLoad((options: any) => {
   from { transform: rotate(0deg); }
   to { transform: rotate(360deg); }
 }
+
+// 底部按钮区域
+.bottom-section {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 20;
+  background: #fff;
+  padding: 12px;
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.05);
+  border-top: 1px solid #f0f0f0;
+}
+
+.bottom-btn-wrapper {
+  max-width: 100%;
+  padding: 0 0;
+}
+
+.back-btn {
+  width: 100%;
+}
 </style>
 
diff --git a/src/pages/view/routine/JiFenPingJia/jfsp/JfFlow.vue b/src/pages/view/routine/JiFenPingJia/jfsp/JfFlow.vue
index 335ad47..06497b7 100644
--- a/src/pages/view/routine/JiFenPingJia/jfsp/JfFlow.vue
+++ b/src/pages/view/routine/JiFenPingJia/jfsp/JfFlow.vue
@@ -452,9 +452,18 @@ const handleStop = () => {
 // 跳转回审批列表页面
 const navigateToIndex = () => {
   setTimeout(() => {
-    uni.redirectTo({
-      url: '/pages/view/routine/JiFenPingJia/jfsp/index'
-    });
+    // 使用 navigateBack 返回上一页，保留查询条件
+    // 如果上一页不存在（直接打开详情页），则使用 redirectTo
+    const pages = getCurrentPages();
+    if (pages.length > 1) {
+      uni.navigateBack({
+        delta: 1
+      });
+    } else {
+      uni.redirectTo({
+        url: '/pages/view/routine/JiFenPingJia/jfsp/index'
+      });
+    }
   }, 500);
 };
 
diff --git a/src/pages/view/routine/JiFenPingJia/jfsp/compare.vue b/src/pages/view/routine/JiFenPingJia/jfsp/compare.vue
new file mode 100644
index 0000000..03a1500
--- /dev/null
+++ b/src/pages/view/routine/JiFenPingJia/jfsp/compare.vue
@@ -0,0 +1,1397 @@
+<template>
+  <BasicLayout>
+    <!-- 顶部信息栏（固定） -->
+    <view class="top-info-bar">
+      <view class="applicant-info-card">
+        <view class="avatar">
+          <text class="avatar-text">{{ getAvatarText(applicantName) }}</text>
+        </view>
+        <view class="info-content">
+          <view class="info-stats">
+            <text class="stat-item">待审批 {{ recordCount }} 条</text>
+            <text class="stat-divider">|</text>
+            <text class="stat-item score">总积分 +{{ totalScore }}分</text>
+          </view>
+          <view class="info-bottom-row">
+            <text class="time-range" v-if="timeRange">{{ timeRange }}</text>
+            <view class="filter-checkbox" @click="toggleShowDifferent">
+              <text class="checkbox-icon" :class="{ checked: showDifferent }">✓</text>
+              <text class="checkbox-label">只看不同</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 对比表格区域（可纵向滚动） -->
+    <scroll-view scroll-y class="compare-scroll" :class="{ 'full-height': hideBottomBtn }">
+      <!-- 对比表格容器 -->
+      <view class="compare-table-wrapper">
+        <scroll-view scroll-x class="table-scroll-container">
+          <table class="compare-table">
+            <thead>
+              <tr>
+                <th class="field-header">字段名称</th>
+                <th 
+                  v-for="(record, index) in records" 
+                  :key="record.id || record.ywId || index"
+                  class="record-header"
+                  :class="{ 'selected': selectedRecordIds.includes(record.id || record.ywId) }"
+                  @click="toggleSelectRecord(record)"
+                >
+                  <view class="record-header-content">
+                    <view class="checkbox-wrapper" @click.stop="toggleSelectRecord(record)">
+                      <text class="checkbox-icon" :class="{ checked: selectedRecordIds.includes(record.id || record.ywId) }">✓</text>
+                    </view>
+                    <text class="record-title">记录{{ index + 1 }}</text>
+                    <text class="record-time" v-if="record.hjtime">{{ formatDate(record.hjtime) }}</text>
+                    <text class="record-score" v-if="record.score">+{{ record.score }}分</text>
+                  </view>
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr 
+                v-for="field in currentFields" 
+                :key="field.key"
+                class="table-row"
+                :class="{ 'different-row': isFieldDifferent(field.key) }"
+              >
+                <td class="field-cell">
+                  <text class="field-label">{{ field.label }}</text>
+                </td>
+                <td 
+                  v-for="(record, index) in records" 
+                  :key="record.id || record.ywId || index"
+                  class="value-cell"
+                  :class="{ 
+                    'different-cell': isValueDifferent(field.key, record[field.key]),
+                    'selected': selectedRecordIds.includes(record.id || record.ywId)
+                  }"
+                  @click="toggleSelectRecord(record)"
+                >
+                  <view class="field-value-content">
+                    <template v-if="field.key === 'attachments'">
+                      <view v-if="getFieldValue(record, field.key)" class="attachment-list">
+                        <view 
+                          v-for="(attach, attachIndex) in getFieldValue(record, field.key)" 
+                          :key="attachIndex" 
+                          class="attachment-item"
+                          @click.stop="handlePreviewAttachment(attach)"
+                        >
+                          📎 {{ attach.name || attach }}
+                        </view>
+                      </view>
+                      <text v-else class="placeholder-text">—</text>
+                    </template>
+                    <template v-else-if="field.key === 'hjmdList'">
+                      <view v-if="getFieldValue(record, field.key) && getFieldValue(record, field.key).length > 0" class="student-list">
+                        <text class="student-count">{{ getFieldValue(record, field.key).length }}人</text>
+                        <view 
+                          v-for="(student, studentIndex) in getFieldValue(record, field.key).slice(0, 3)" 
+                          :key="studentIndex" 
+                          class="student-item"
+                        >
+                          {{ student.xsxm || student }}
+                        </view>
+                        <text v-if="getFieldValue(record, field.key).length > 3" class="more-text">...</text>
+                      </view>
+                      <text v-else class="placeholder-text">—</text>
+                    </template>
+                    <template v-else>
+                      <text class="value-text">{{ formatFieldValue(record, field) }}</text>
+                    </template>
+                  </view>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </scroll-view>
+      </view>
+    </scroll-view>
+
+    <template #bottom>
+      <view class="bottom-action-bar" :class="{ 'hide-bottom': hideBottomBtn }">
+        <!-- 单条审批模式 -->
+        <view v-if="selectedRecordIds.length === 1" class="single-mode">
+          <view class="selected-info">
+            <text class="info-text">当前选中：记录{{ getSelectedRecordIndex() + 1 }}</text>
+          </view>
+          <view class="action-buttons">
+            <u-button 
+              text="通过" 
+              type="primary" 
+              size="small"
+              @click="handleApprove"
+              :disabled="!showButton || isYiban"
+            />
+            <u-button 
+              text="驳回" 
+              type="error" 
+              size="small"
+              @click="handleReject"
+              :disabled="!showButton || isYiban"
+            />
+            <u-button 
+              text="终止" 
+              type="warning" 
+              size="small"
+              @click="handleStop"
+              :disabled="!showButton"
+            />
+          </view>
+        </view>
+        
+        <!-- 批量审批模式 -->
+        <view v-else-if="selectedRecordIds.length > 1" class="batch-mode">
+          <view class="selected-info">
+            <text class="info-text">已选择 {{ selectedRecordIds.length }} 条记录</text>
+          </view>
+          <view class="action-buttons">
+            <u-button 
+              text="全选" 
+              type="info" 
+              size="small"
+              @click="selectAll"
+            />
+            <u-button 
+              text="取消全选" 
+              type="info" 
+              size="small"
+              @click="clearSelection"
+            />
+            <u-button 
+              text="批量通过" 
+              type="primary" 
+              size="small"
+              @click="handleBatchApprove"
+              :disabled="!showButton || isYiban"
+            />
+            <u-button 
+              text="批量驳回" 
+              type="error" 
+              size="small"
+              @click="handleBatchReject"
+              :disabled="!showButton || isYiban"
+            />
+            <u-button 
+              text="终止" 
+              type="warning" 
+              size="small"
+              @click="handleStop"
+              :disabled="!showButton"
+            />
+          </view>
+        </view>
+        
+        <!-- 未选择模式 -->
+        <view v-else class="no-selection-mode">
+          <text class="hint-text">请选择要审批的记录</text>
+        </view>
+      </view>
+    </template>
+
+    <!-- 遮罩层 -->
+    <view v-if="loading" class="loading-mask">
+      <view class="loading-content">
+        <view class="loading-spinner"></view>
+        <text class="loading-text">{{ loadingText }}</text>
+      </view>
+    </view>
+  </BasicLayout>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, onMounted } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import BasicLayout from "@/components/BasicLayout/Layout.vue";
+import { jfFindApplicantTodosDetailApi, jfSpApi, jfStopApi, jfTransferApi, jfBatchSpApi } from "@/api/base/jfApi";
+import { navigateTo } from "@/utils/uniapp";
+import dayjs from "dayjs";
+import { useUserStore } from "@/store/modules/user";
+
+// 标签页配置（只保留综合对比）
+const tabs = [
+  { key: "comprehensive", label: "综合对比" },
+];
+
+// 字段分组配置（合并所有字段到综合对比）
+const fieldGroups = {
+  comprehensive: [
+    // 基本信息
+    { key: "jfTypeName", label: "业绩类别" },
+    { key: "ruleStandard", label: "获奖内容" },
+    { key: "rymc", label: "荣誉名称" },
+    { key: "hjtime", label: "获奖时间", formatter: "date" },
+    { key: "hjlx", label: "颁奖类型" },
+    { key: "bjdw", label: "颁奖单位" },
+    { key: "score", label: "积分", formatter: "score" },
+    // 基本参数
+    { key: "category", label: "类别" },
+    { key: "level", label: "级别" },
+    { key: "grade", label: "等级" },
+    { key: "khTime", label: "考核时间", formatter: "date" },
+    { key: "khjsxm", label: "考核人" },
+    { key: "khRemark", label: "考核备注" },
+    // 附件信息
+    { key: "attachments", label: "附件文件" },
+    { key: "fileName", label: "文件名称" },
+    { key: "fileFormat", label: "文件格式" },
+    // 审批流程
+    { key: "spJd", label: "审批进度" },
+    { key: "spResult", label: "审批结果" },
+    { key: "spRemark", label: "审批意见" },
+    { key: "spStatus", label: "审批状态" },
+  ],
+};
+
+// 申请人ID
+const applicantId = ref<string>("");
+// 申请人名称
+const applicantName = ref<string>("");
+// 记录数量
+const recordCount = ref<number>(0);
+// 总积分
+const totalScore = ref<number>(0);
+// 时间范围
+const timeRange = ref<string>("");
+// 记录列表
+const records = ref<any[]>([]);
+// 选中的记录ID列表
+const selectedRecordIds = ref<string[]>([]);
+// 当前标签页
+const activeTab = ref<string>("comprehensive");
+// 只看不同
+const showDifferent = ref<boolean>(false);
+// 横向滚动位置
+const scrollLeft = ref<number>(0);
+// 待办状态
+const dbZt = ref<string>("");
+// 是否为已办
+const isYiban = ref<boolean>(false);
+// 显示按钮
+const showButton = ref<boolean>(true);
+// 隐藏底部按钮
+const hideBottomBtn = ref<boolean>(false);
+// 加载状态
+const loading = ref<boolean>(false);
+const loadingText = ref<string>("正在加载数据...");
+
+// 当前显示的字段列表
+const currentFields = computed(() => {
+  const fields = fieldGroups[activeTab.value as keyof typeof fieldGroups] || [];
+  if (showDifferent.value && records.value.length > 0) {
+    return fields.filter(field => isFieldDifferent(field.key));
+  }
+  return fields;
+});
+
+// 工具函数
+const getAvatarText = (name?: string) => {
+  if (!name) return "?";
+  return name.charAt(name.length - 1);
+};
+
+const formatDate = (val?: string | Date) => {
+  if (!val) return "—";
+  return dayjs(val).format("YYYY-MM");
+};
+
+const formatFieldValue = (record: any, field: any) => {
+  // 特殊处理审批状态
+  if (field.key === 'spStatus') {
+    const spResult = record.spResult || record.sp_result;
+    const spJd = record.spJd || record.sp_jd;
+    if (spResult === "C") return "驳回";
+    if (spJd === "Z" || spResult === "B") return "完结";
+    if (spJd === "A") return "审核中";
+    if (spResult === "A") return "待审核";
+    return "待审核";
+  }
+  
+  const value = getFieldValue(record, field.key);
+  if (value === null || value === undefined || value === '') return "—";
+  
+  if (field.formatter === 'date') {
+    return formatDate(value);
+  } else if (field.formatter === 'score') {
+    return `+${value}分`;
+  }
+  return String(value);
+};
+
+const getFieldValue = (record: any, key: string) => {
+  if (key === 'attachments') {
+    const fileUrl = record.fileUrl || record.file_url;
+    if (fileUrl) {
+      const urls = fileUrl.split(',').filter((url: string) => url.trim());
+      const fileName = record.fileName || record.file_name || '';
+      const names = fileName.split(',').filter((name: string) => name.trim());
+      return urls.map((url: string, index: number) => ({
+        url: url.trim(),
+        name: names[index] || `附件${index + 1}`,
+      }));
+    }
+    return null;
+  }
+  
+  // 优先使用驼峰格式，如果没有则使用下划线格式
+  if (record[key] !== undefined && record[key] !== null) {
+    return record[key];
+  }
+  
+  // 尝试下划线格式
+  const snakeKey = key.replace(/([A-Z])/g, '_$1').toLowerCase();
+  if (record[snakeKey] !== undefined && record[snakeKey] !== null) {
+    return record[snakeKey];
+  }
+  
+  return null;
+};
+
+// 判断字段值是否不同
+const isFieldDifferent = (fieldKey: string): boolean => {
+  if (records.value.length <= 1) return false;
+  const values = records.value.map(r => {
+    const val = getFieldValue(r, fieldKey);
+    return val !== null && val !== undefined ? String(val) : '';
+  });
+  return new Set(values).size > 1;
+};
+
+// 判断某个值是否与其他值不同
+const isValueDifferent = (fieldKey: string, value: any): boolean => {
+  if (records.value.length <= 1) return false;
+  const currentVal = value !== null && value !== undefined ? String(value) : '';
+  const otherValues = records.value
+    .filter(r => {
+      const val = getFieldValue(r, fieldKey);
+      return (val !== null && val !== undefined ? String(val) : '') !== currentVal;
+    })
+    .map(r => getFieldValue(r, fieldKey));
+  return otherValues.length > 0;
+};
+
+// 切换标签页
+const switchTab = (tabKey: string) => {
+  activeTab.value = tabKey;
+};
+
+// 切换只看不同
+const toggleShowDifferent = () => {
+  showDifferent.value = !showDifferent.value;
+};
+
+// 切换选择记录
+const toggleSelectRecord = (record: any) => {
+  const recordId = record.id || record.ywId;
+  const index = selectedRecordIds.value.indexOf(recordId);
+  if (index > -1) {
+    selectedRecordIds.value.splice(index, 1);
+  } else {
+    selectedRecordIds.value.push(recordId);
+  }
+};
+
+// 全选
+const selectAll = () => {
+  selectedRecordIds.value = records.value.map(r => r.id || r.ywId).filter(Boolean);
+};
+
+// 取消全选
+const clearSelection = () => {
+  selectedRecordIds.value = [];
+};
+
+// 获取选中记录的索引
+const getSelectedRecordIndex = () => {
+  if (selectedRecordIds.value.length !== 1) return -1;
+  const selectedId = selectedRecordIds.value[0];
+  return records.value.findIndex(r => (r.id || r.ywId) === selectedId);
+};
+
+// 加载申请人的审批记录
+const loadApplicantRecords = async () => {
+  try {
+    loading.value = true;
+    loadingText.value = '正在加载审批记录...';
+    
+    const jsId = useUserStore().getJs?.id;
+    if (!jsId) {
+      uni.showToast({ title: "无法获取用户信息", icon: "none" });
+      return;
+    }
+    
+    // 获取申请人的积分记录
+    let res: any;
+    try {
+      res = await jfFindApplicantTodosDetailApi({
+        applicantId: applicantId.value,
+        jsId,
+        dbZt: dbZt.value || 'A',
+        spType: 'SP',
+      });
+    } catch (apiError: any) {
+      // 如果接口调用抛出异常，但异常对象是数组，说明接口实际返回了数据
+      if (Array.isArray(apiError)) {
+        console.log('接口异常但返回了数组数据，直接使用');
+        res = apiError;
+      } else {
+        throw apiError;
+      }
+    }
+    
+    console.log('接口返回数据类型:', typeof res, '是否为数组:', Array.isArray(res), '数据:', res);
+    
+    let recordsList: any[] = [];
+    let applicantInfo: any = null;
+    
+    // 兼容多种返回格式
+    if (Array.isArray(res)) {
+      // 直接返回数组
+      console.log('直接使用数组数据，长度:', res.length);
+      recordsList = res;
+    } else if (res && res.resultCode === 1) {
+      if (Array.isArray(res.result)) {
+        // result 是数组
+        recordsList = res.result;
+      } else if (res.result && Array.isArray(res.result.records)) {
+        // result.records 是数组
+        recordsList = res.result.records;
+        applicantInfo = res.result.applicantInfo;
+      } else if (res.result && res.result.rows && Array.isArray(res.result.rows)) {
+        // result.rows 是数组
+        recordsList = res.result.rows;
+      }
+    } else if (res && res.data) {
+      if (Array.isArray(res.data)) {
+        recordsList = res.data;
+      } else if (res.data.records && Array.isArray(res.data.records)) {
+        recordsList = res.data.records;
+        applicantInfo = res.data.applicantInfo;
+      } else if (res.data.rows && Array.isArray(res.data.rows)) {
+        recordsList = res.data.rows;
+      }
+    }
+    
+    console.log('解析后的记录列表长度:', recordsList.length);
+    
+    if (recordsList.length === 0) {
+      uni.showToast({ title: "暂无审批记录", icon: "none" });
+      loading.value = false;
+      return;
+    }
+    
+    // 处理记录数据
+    records.value = recordsList.map((item: any) => ({
+      ...item,
+      id: item.id || item.ywId,
+      // 统一字段名（后端可能返回下划线格式）
+      jfTypeName: item.jfTypeName || item.jf_type_name,
+      ruleStandard: item.ruleStandard || item.rule_standard,
+      hjtime: item.hjtime || item.hj_time,
+      hjlx: item.hjlx || item.hj_lx,
+      bjdw: item.bjdw || item.bj_dw,
+      hjrs: item.hjrs || item.hj_rs,
+      spResult: item.spResult || item.sp_result,
+      spJd: item.spJd || item.sp_jd,
+      spRemark: item.spRemark || item.sp_remark,
+      fileUrl: item.fileUrl || item.file_url,
+      fileName: item.fileName || item.file_name,
+      fileFormat: item.fileFormat || item.file_format,
+      xxtsId: item.xxtsId || item.xxts_id,
+    }));
+    
+    // 设置申请人信息
+    if (applicantInfo) {
+      applicantName.value = applicantInfo.applicantName || '未知申请人';
+    } else if (recordsList.length > 0) {
+      // 从第一条记录中获取申请人信息
+      const firstRecord = recordsList[0];
+      applicantName.value = firstRecord.rymc || firstRecord.jsmx || firstRecord.js_xm || '未知申请人';
+    }
+    
+    recordCount.value = recordsList.length;
+    totalScore.value = recordsList.reduce((sum: number, item: any) => {
+      const score = item.score || 0;
+      return sum + (typeof score === 'number' ? score : parseFloat(score) || 0);
+    }, 0);
+    
+    // 计算时间范围
+    if (recordsList.length > 0) {
+      const times = recordsList
+        .map((item: any) => item.hjtime || item.hj_time)
+        .filter(Boolean)
+        .sort();
+      if (times.length > 0) {
+        const earliest = dayjs(times[0]).format("YYYY-MM");
+        const latest = dayjs(times[times.length - 1]).format("YYYY-MM");
+        timeRange.value = earliest === latest ? earliest : `${earliest} ~ ${latest}`;
+      }
+    }
+    
+    // 默认选中第一条
+    if (records.value.length > 0 && !isYiban.value) {
+      selectedRecordIds.value = [records.value[0].id];
+    }
+    
+    // 根据流程状态判断是否显示按钮
+    if (recordsList.length > 0) {
+      const firstRecord = recordsList[0];
+      const spResult = firstRecord.spResult || firstRecord.sp_result;
+      const spJd = firstRecord.spJd || firstRecord.sp_jd;
+      
+      if (spResult === "C" || (spJd === "Z" && spResult === "B")) {
+        showButton.value = false;
+      } else if (spResult && spResult !== "A" && dbZt.value === "A") {
+        showButton.value = false;
+      } else {
+        showButton.value = true;
+      }
+    }
+  } catch (error: any) {
+    console.error('加载审批记录失败:', error);
+    
+    // 如果错误对象本身就是数组，说明接口返回了数据但被当作错误
+    if (Array.isArray(error)) {
+      console.log('错误对象是数组，直接处理数据');
+      // 重新处理数组数据
+      const recordsList = error;
+      
+      records.value = recordsList.map((item: any) => ({
+        ...item,
+        id: item.id || item.ywId,
+        jfTypeName: item.jfTypeName || item.jf_type_name,
+        ruleStandard: item.ruleStandard || item.rule_standard,
+        hjtime: item.hjtime || item.hj_time,
+        hjlx: item.hjlx || item.hj_lx,
+        bjdw: item.bjdw || item.bj_dw,
+        hjrs: item.hjrs || item.hj_rs,
+        spResult: item.spResult || item.sp_result,
+        spJd: item.spJd || item.sp_jd,
+        spRemark: item.spRemark || item.sp_remark,
+        fileUrl: item.fileUrl || item.file_url,
+        fileName: item.fileName || item.file_name,
+        fileFormat: item.fileFormat || item.file_format,
+        xxtsId: item.xxtsId || item.xxts_id,
+      }));
+      
+      if (recordsList.length > 0) {
+        const firstRecord = recordsList[0];
+        applicantName.value = firstRecord.rymc || firstRecord.jsmx || firstRecord.js_xm || '未知申请人';
+        recordCount.value = recordsList.length;
+        totalScore.value = recordsList.reduce((sum: number, item: any) => {
+          const score = item.score || 0;
+          return sum + (typeof score === 'number' ? score : parseFloat(score) || 0);
+        }, 0);
+        
+        // 计算时间范围
+        const times = recordsList
+          .map((item: any) => item.hjtime || item.hj_time)
+          .filter(Boolean)
+          .sort();
+        if (times.length > 0) {
+          const earliest = dayjs(times[0]).format("YYYY-MM");
+          const latest = dayjs(times[times.length - 1]).format("YYYY-MM");
+          timeRange.value = earliest === latest ? earliest : `${earliest} ~ ${latest}`;
+        }
+        
+        // 默认选中第一条
+        if (records.value.length > 0 && !isYiban.value) {
+          selectedRecordIds.value = [records.value[0].id];
+        }
+        
+        // 判断是否显示按钮
+        const spResult = firstRecord.spResult || firstRecord.sp_result;
+        const spJd = firstRecord.spJd || firstRecord.sp_jd;
+        if (spResult === "C" || (spJd === "Z" && spResult === "B")) {
+          showButton.value = false;
+        } else if (spResult && spResult !== "A" && dbZt.value === "A") {
+          showButton.value = false;
+        } else {
+          showButton.value = true;
+        }
+      }
+    } else {
+      const errorMsg = error?.message || error?.resultMsg || "加载失败";
+      uni.showToast({ 
+        title: errorMsg.length > 20 ? "加载失败，请重试" : errorMsg, 
+        icon: "none",
+        duration: 2000
+      });
+    }
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 审批操作
+const handleApprove = async () => {
+  if (selectedRecordIds.value.length !== 1) {
+    uni.showToast({ title: "请选择一条记录", icon: "none" });
+    return;
+  }
+  
+  const recordId = selectedRecordIds.value[0];
+  const record = records.value.find(r => (r.id || r.ywId) === recordId);
+  if (!record) return;
+  
+  uni.showModal({
+    title: "审批确认",
+    content: "确定通过该记录吗？",
+    success: async (res) => {
+      if (res.confirm) {
+        try {
+          loading.value = true;
+          loadingText.value = '正在审批...';
+          
+          // 获取 xxtsId
+          let xxtsId = record.xxtsId;
+          if (!xxtsId && record.ywId) {
+            // 可能需要通过 ywId 查询 xxts
+            // 这里简化处理，实际需要根据接口调整
+          }
+          
+          const result = await jfSpApi({
+            xxtsId,
+            ywId: record.ywId || record.id,
+            spStatus: 'B',
+            spRemark: '通过',
+          });
+          
+          if (result && result.resultCode === 1) {
+            uni.showToast({ title: "审批成功", icon: "success" });
+            // 从列表中移除
+            records.value = records.value.filter(r => (r.id || r.ywId) !== recordId);
+            selectedRecordIds.value = [];
+            recordCount.value = records.value.length;
+            
+            if (records.value.length === 0) {
+              navigateToIndex();
+            } else {
+              // 自动选中下一条
+              selectedRecordIds.value = [records.value[0].id];
+            }
+          } else {
+            uni.showToast({ title: result?.resultMsg || "审批失败", icon: "none" });
+          }
+        } catch (error) {
+          console.error('审批失败:', error);
+          uni.showToast({ title: "审批失败", icon: "none" });
+        } finally {
+          loading.value = false;
+        }
+      }
+    },
+  });
+};
+
+const handleReject = async () => {
+  if (selectedRecordIds.value.length !== 1) {
+    uni.showToast({ title: "请选择一条记录", icon: "none" });
+    return;
+  }
+  
+  uni.showModal({
+    title: "驳回确认",
+    content: "确定驳回该记录吗？",
+    editable: true,
+    placeholderText: "请输入驳回原因",
+    success: async (res) => {
+      if (res.confirm) {
+        const recordId = selectedRecordIds.value[0];
+        const record = records.value.find(r => (r.id || r.ywId) === recordId);
+        if (!record) return;
+        
+        try {
+          loading.value = true;
+          loadingText.value = '正在驳回...';
+          
+          const result = await jfSpApi({
+            xxtsId: record.xxtsId,
+            ywId: record.ywId || record.id,
+            spStatus: 'C',
+            spRemark: res.content || '驳回',
+          });
+          
+          if (result && result.resultCode === 1) {
+            uni.showToast({ title: "驳回成功", icon: "success" });
+            records.value = records.value.filter(r => (r.id || r.ywId) !== recordId);
+            selectedRecordIds.value = [];
+            recordCount.value = records.value.length;
+            
+            if (records.value.length === 0) {
+              navigateToIndex();
+            }
+          } else {
+            uni.showToast({ title: result?.resultMsg || "驳回失败", icon: "none" });
+          }
+        } catch (error) {
+          console.error('驳回失败:', error);
+          uni.showToast({ title: "驳回失败", icon: "none" });
+        } finally {
+          loading.value = false;
+        }
+      }
+    },
+  });
+};
+
+const handleBatchApprove = async () => {
+  if (selectedRecordIds.value.length === 0) {
+    uni.showToast({ title: "请选择要审批的记录", icon: "none" });
+    return;
+  }
+  
+  uni.showModal({
+    title: "批量审批确认",
+    content: `确定通过选中的 ${selectedRecordIds.value.length} 条记录吗？`,
+    success: async (res) => {
+      if (res.confirm) {
+        try {
+          loading.value = true;
+          loadingText.value = '正在批量审批...';
+          
+          const batchRecords = records.value
+            .filter(r => selectedRecordIds.value.includes(r.id || r.ywId))
+            .map(r => ({
+              xxtsId: r.xxtsId,
+              ywId: r.ywId || r.id,
+              spStatus: 'B',
+              spRemark: '批量通过',
+            }));
+          
+          const result = await jfBatchSpApi({
+            records: batchRecords,
+            spStatus: 'B',
+            spRemark: '批量通过',
+          });
+          
+          if (result && result.resultCode === 1) {
+            uni.showToast({ title: "批量审批成功", icon: "success" });
+            // 从列表中移除已审批的记录
+            records.value = records.value.filter(r => !selectedRecordIds.value.includes(r.id || r.ywId));
+            selectedRecordIds.value = [];
+            recordCount.value = records.value.length;
+            
+            if (records.value.length === 0) {
+              navigateToIndex();
+            }
+          } else {
+            uni.showToast({ title: result?.resultMsg || "批量审批失败", icon: "none" });
+          }
+        } catch (error) {
+          console.error('批量审批失败:', error);
+          uni.showToast({ title: "批量审批失败", icon: "none" });
+        } finally {
+          loading.value = false;
+        }
+      }
+    },
+  });
+};
+
+const handleBatchReject = async () => {
+  if (selectedRecordIds.value.length === 0) {
+    uni.showToast({ title: "请选择要驳回的记录", icon: "none" });
+    return;
+  }
+  
+  uni.showModal({
+    title: "批量驳回确认",
+    content: `确定驳回选中的 ${selectedRecordIds.value.length} 条记录吗？`,
+    editable: true,
+    placeholderText: "请输入驳回原因",
+    success: async (res) => {
+      if (res.confirm) {
+        try {
+          loading.value = true;
+          loadingText.value = '正在批量驳回...';
+          
+          const batchRecords = records.value
+            .filter(r => selectedRecordIds.value.includes(r.id || r.ywId))
+            .map(r => ({
+              xxtsId: r.xxtsId,
+              ywId: r.ywId || r.id,
+              spStatus: 'C',
+              spRemark: res.content || '批量驳回',
+            }));
+          
+          const result = await jfBatchSpApi({
+            records: batchRecords,
+            spStatus: 'C',
+            spRemark: res.content || '批量驳回',
+          });
+          
+          if (result && result.resultCode === 1) {
+            uni.showToast({ title: "批量驳回成功", icon: "success" });
+            records.value = records.value.filter(r => !selectedRecordIds.value.includes(r.id || r.ywId));
+            selectedRecordIds.value = [];
+            recordCount.value = records.value.length;
+            
+            if (records.value.length === 0) {
+              navigateToIndex();
+            }
+          } else {
+            uni.showToast({ title: result?.resultMsg || "批量驳回失败", icon: "none" });
+          }
+        } catch (error) {
+          console.error('批量驳回失败:', error);
+          uni.showToast({ title: "批量驳回失败", icon: "none" });
+        } finally {
+          loading.value = false;
+        }
+      }
+    },
+  });
+};
+
+const handleStop = async () => {
+  uni.showModal({
+    title: "终止确认",
+    content: "确定终止该审批流程吗？",
+    editable: true,
+    placeholderText: "请输入终止原因",
+    success: async (res) => {
+      if (res.confirm) {
+        try {
+          loading.value = true;
+          loadingText.value = '正在终止...';
+          
+          // 终止所有选中的记录
+          const promises = selectedRecordIds.value.map(recordId => {
+            const record = records.value.find(r => (r.id || r.ywId) === recordId);
+            if (!record) return Promise.resolve();
+            return jfStopApi({
+              xxtsId: record.xxtsId,
+              ywId: record.ywId || record.id,
+              spRemark: res.content || '终止',
+            });
+          });
+          
+          await Promise.all(promises);
+          uni.showToast({ title: "终止成功", icon: "success" });
+          navigateToIndex();
+        } catch (error) {
+          console.error('终止失败:', error);
+          uni.showToast({ title: "终止失败", icon: "none" });
+        } finally {
+          loading.value = false;
+        }
+      }
+    },
+  });
+};
+
+// 跳转回审批列表页面
+const navigateToIndex = () => {
+  setTimeout(() => {
+    uni.redirectTo({
+      url: '/pages/view/routine/JiFenPingJia/jfsp/list'
+    });
+  }, 500);
+};
+
+// 预览附件
+const handlePreviewAttachment = (attachment: any) => {
+  const url = typeof attachment === 'string' ? attachment : attachment.url;
+  if (!url) return;
+  
+  // 判断是否为图片
+  const imageExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp'];
+  const isImage = imageExts.some(ext => url.toLowerCase().includes(ext));
+  
+  if (isImage) {
+    uni.previewImage({
+      urls: [url],
+      current: url
+    });
+  } else {
+    uni.downloadFile({
+      url: url,
+      success: (res) => {
+        if (res.statusCode === 200) {
+          uni.openDocument({
+            filePath: res.tempFilePath,
+            showMenu: true
+          });
+        }
+      },
+      fail: () => {
+        uni.showToast({ title: "文件下载失败", icon: "none" });
+      }
+    });
+  }
+};
+
+onLoad(async (options: any) => {
+  console.log('compare页面加载，参数:', options);
+  
+  if (!options || !options.applicantId) {
+    uni.showToast({ title: "缺少申请人ID", icon: "none" });
+    setTimeout(() => uni.navigateBack(), 1500);
+    return;
+  }
+  
+  applicantId.value = options.applicantId;
+  dbZt.value = options.dbZt || 'A';
+  isYiban.value = dbZt.value === 'B';
+  
+  // 加载数据
+  await loadApplicantRecords();
+});
+</script>
+
+<style scoped lang="scss">
+/* 顶部信息栏 */
+.top-info-bar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 100;
+  background-color: #fff;
+  padding: 20rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+}
+
+.applicant-info-card {
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+  padding: 20rpx;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  border-radius: 16rpx;
+}
+
+.avatar {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  background: rgba(255, 255, 255, 0.3);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.avatar-text {
+  color: #fff;
+  font-size: 32rpx;
+  font-weight: 600;
+}
+
+.info-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 8rpx;
+}
+
+.info-bottom-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 20rpx;
+  flex-wrap: nowrap;
+  white-space: nowrap;
+}
+
+.filter-checkbox {
+  display: flex;
+  align-items: center;
+  gap: 8rpx;
+  padding: 4rpx 12rpx;
+  border-radius: 8rpx;
+  background-color: rgba(255, 255, 255, 0.2);
+  transition: all 0.3s;
+  flex-shrink: 0;
+  white-space: nowrap;
+  
+  &:active {
+    background-color: rgba(255, 255, 255, 0.3);
+  }
+}
+
+.applicant-name {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #fff;
+}
+
+.info-stats {
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+  font-size: 24rpx;
+}
+
+.stat-item {
+  color: rgba(255, 255, 255, 0.9);
+  
+  &.score {
+    font-weight: 600;
+  }
+}
+
+.stat-divider {
+  color: rgba(255, 255, 255, 0.6);
+}
+
+.time-range {
+  font-size: 22rpx;
+  color: rgba(255, 255, 255, 0.8);
+}
+
+
+.checkbox-icon {
+  width: 28rpx;
+  height: 28rpx;
+  border: 2rpx solid rgba(255, 255, 255, 0.6);
+  border-radius: 4rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 18rpx;
+  color: transparent;
+  transition: all 0.3s;
+  
+  &.checked {
+    background-color: rgba(255, 255, 255, 0.9);
+    border-color: rgba(255, 255, 255, 0.9);
+    color: #007aff;
+  }
+}
+
+.checkbox-label {
+  font-size: 22rpx;
+  color: rgba(255, 255, 255, 0.9);
+}
+
+/* 对比表格区域 */
+.compare-scroll {
+  flex: 1;
+  margin-top: 180rpx;
+  height: calc(100vh - 180rpx - 120rpx);
+  overflow-y: auto;
+  background-color: #f5f5f5;
+  
+  &.full-height {
+    height: calc(100vh - 180rpx);
+  }
+}
+
+.compare-table-wrapper {
+  padding: 20rpx;
+}
+
+.table-scroll-container {
+  width: 100%;
+  overflow-x: auto;
+  background-color: #fff;
+  border-radius: 12rpx;
+  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
+}
+
+.compare-table {
+  width: 100%;
+  border-collapse: collapse;
+  min-width: 100%;
+  
+  thead {
+    position: sticky;
+    top: 0;
+    z-index: 10;
+  }
+  
+  th, td {
+    padding: 24rpx 16rpx;
+    text-align: center;
+    vertical-align: middle;
+    border: 1rpx solid #e5e5e5;
+    word-break: break-word;
+  }
+  
+  th {
+    background-color: #007aff;
+    color: #fff;
+    font-size: 28rpx;
+    font-weight: 600;
+    position: sticky;
+    top: 0;
+    z-index: 10;
+    
+    &.field-header {
+      z-index: 200;
+    }
+  }
+  
+  tbody tr {
+    transition: background-color 0.3s;
+    
+    &.different-row {
+      background-color: #fff7e6;
+    }
+    
+    &:hover {
+      background-color: #f8f9fa;
+    }
+  }
+}
+
+.field-header {
+  width: 200rpx;
+  min-width: 200rpx;
+  background-color: #007aff !important;
+  position: sticky;
+  left: 0;
+  z-index: 200;
+  box-shadow: 2rpx 0 8rpx rgba(0, 0, 0, 0.15);
+}
+
+.field-cell {
+  width: 200rpx;
+  min-width: 200rpx;
+  background-color: #fafafa;
+  position: sticky;
+  left: 0;
+  z-index: 199;
+  font-size: 26rpx;
+  color: #333;
+  font-weight: 500;
+  box-shadow: 2rpx 0 8rpx rgba(0, 0, 0, 0.1);
+  
+  .field-label {
+    text-align: center;
+    line-height: 36rpx;
+  }
+}
+
+.record-header {
+  min-width: 280rpx;
+  background-color: #007aff !important;
+  color: #fff;
+  position: relative;
+  cursor: pointer;
+  transition: all 0.3s;
+  z-index: 10;
+  
+  &.selected {
+    background-color: #0056b3 !important;
+    box-shadow: inset 0 0 0 2rpx #fff;
+  }
+}
+
+.record-header-content {
+  display: flex;
+  flex-direction: column;
+  gap: 8rpx;
+  align-items: center;
+  position: relative;
+}
+
+.checkbox-wrapper {
+  position: absolute;
+  left: 16rpx;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.record-title {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #fff;
+}
+
+.record-time {
+  font-size: 22rpx;
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.record-score {
+  font-size: 24rpx;
+  color: #ffd700;
+  font-weight: 600;
+}
+
+/* 字段值单元格 */
+.value-cell {
+  min-width: 280rpx;
+  min-height: 100rpx;
+  background-color: #fff;
+  cursor: pointer;
+  transition: all 0.3s;
+  position: relative;
+  z-index: 1;
+  
+  &.different-cell {
+    background-color: #fff7e6;
+    color: #fa8c16;
+  }
+  
+  &.selected {
+    background-color: #f0f7ff;
+    box-shadow: inset 0 0 0 2rpx #007aff;
+  }
+}
+
+.field-value-content {
+  width: 100%;
+  text-align: center;
+}
+
+.value-text {
+  font-size: 26rpx;
+  color: #666;
+  line-height: 36rpx;
+  word-break: break-all;
+}
+
+.placeholder-text {
+  color: #ccc;
+  font-size: 26rpx;
+}
+
+/* 特殊字段样式 */
+.attachment-list {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 8rpx;
+}
+
+.attachment-item {
+  background-color: #f0f8ff;
+  color: #007aff;
+  padding: 8rpx 12rpx;
+  border-radius: 8rpx;
+  font-size: 22rpx;
+  line-height: 32rpx;
+  text-align: center;
+  word-break: break-all;
+}
+
+.student-list {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 6rpx;
+  align-items: center;
+}
+
+.student-count {
+  font-size: 22rpx;
+  color: #10b981;
+  font-weight: 600;
+  margin-bottom: 4rpx;
+}
+
+.student-item {
+  background-color: #f0fff0;
+  color: #10b981;
+  padding: 6rpx 12rpx;
+  border-radius: 8rpx;
+  font-size: 22rpx;
+  line-height: 28rpx;
+  text-align: center;
+}
+
+.more-text {
+  font-size: 22rpx;
+  color: #999;
+}
+
+/* 底部操作栏 */
+.bottom-action-bar {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 100;
+  background-color: #fff;
+  border-top: 1rpx solid #e5e5e5;
+  padding: 20rpx;
+  box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
+  
+  &.hide-bottom {
+    display: none !important;
+  }
+}
+
+.single-mode,
+.batch-mode,
+.no-selection-mode {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 20rpx;
+}
+
+.selected-info {
+  flex: 1;
+}
+
+.info-text {
+  font-size: 26rpx;
+  color: #666;
+}
+
+.hint-text {
+  font-size: 26rpx;
+  color: #999;
+  text-align: center;
+  width: 100%;
+}
+
+.action-buttons {
+  display: flex;
+  gap: 12rpx;
+  flex-wrap: wrap;
+}
+
+/* 遮罩层样式 */
+.loading-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+  
+  .loading-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    background-color: #ffffff;
+    border-radius: 16rpx;
+    padding: 60rpx 80rpx;
+    min-width: 300rpx;
+    
+    .loading-spinner {
+      width: 60rpx;
+      height: 60rpx;
+      border: 6rpx solid #f3f3f3;
+      border-top: 6rpx solid #007aff;
+      border-radius: 50%;
+      animation: spin 1s linear infinite;
+      margin-bottom: 30rpx;
+    }
+    
+    .loading-text {
+      font-size: 28rpx;
+      color: #333333;
+      text-align: center;
+    }
+  }
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/view/routine/JiFenPingJia/jfsp/index.vue b/src/pages/view/routine/JiFenPingJia/jfsp/index.vue
index 193890b..9379d02 100644
--- a/src/pages/view/routine/JiFenPingJia/jfsp/index.vue
+++ b/src/pages/view/routine/JiFenPingJia/jfsp/index.vue
@@ -19,6 +19,17 @@
             />
           </view>
         </view>
+        <view class="category-filter">
+          <view class="category-selector" @click="openJfTypePicker">
+            <text class="category-text" :class="{ 'placeholder': !selectedJfTypeName }">
+              {{ selectedJfTypeName || '选择业绩类别' }}
+            </text>
+            <uni-icons type="right" size="16" color="#999" />
+            <view v-if="selectedJfTypeId" class="clear-btn" @click.stop="clearJfType">
+              <uni-icons type="closeempty" size="14" color="#999" />
+            </view>
+          </view>
+        </view>
         <view class="filter-tabs">
           <view
             v-for="tab in filterTabs"
@@ -33,6 +44,19 @@
       </view>
     </view>
 
+    <!-- 业绩类别树形选择器 -->
+    <BasicTree
+      ref="basicTreeRef"
+      :range="jfTypeTree"
+      :idKey="'id'"
+      :rangeKey="'jfmc'"
+      title="选择业绩类别"
+      :multiple="false"
+      :selectParent="false"
+      :defaultExpandLevel="0"
+      @confirm="handleJfTypeConfirm"
+    />
+
     <view class="middle-section">
       <z-paging
         ref="pagingRef"
@@ -86,11 +110,12 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, onMounted } from "vue";
 import { onShow } from "@dcloudio/uni-app";
 import dayjs from "dayjs";
 import BasicSearch from "@/components/BasicSearch/Search.vue";
-import { jfFindUserTodosPageApi } from "@/api/base/jfApi";
+import BasicTree from "@/components/BasicTree/Tree.vue";
+import { jfFindUserTodosPageApi, jfTypeFindPageApi } from "@/api/base/jfApi";
 import { navigateTo } from "@/utils/uniapp";
 import { useUserStore } from "@/store/modules/user";
 
@@ -100,12 +125,54 @@ const filterTabs = [
   { key: "all", label: "全部" },
 ];
 
+// 本地存储的 key
+const STORAGE_KEY = 'jfsp_search_conditions';
+
+// 查询条件状态
 const activeTab = ref("pending");
 const searchKeyword = ref("");
 const dataList = ref<any[]>([]);
 const pagingRef = ref<any>(null);
 const userStore = useUserStore();
 
+// 业绩类别相关
+const selectedJfTypeId = ref<string>("");
+const selectedJfTypeName = ref<string>("");
+const jfTypeTree = ref<any[]>([]);
+const basicTreeRef = ref<any>(null);
+
+// 保存查询条件到本地存储
+const saveSearchConditions = () => {
+  try {
+    const conditions = {
+      activeTab: activeTab.value,
+      searchKeyword: searchKeyword.value,
+      selectedJfTypeId: selectedJfTypeId.value,
+      selectedJfTypeName: selectedJfTypeName.value,
+    };
+    uni.setStorageSync(STORAGE_KEY, conditions);
+  } catch (error) {
+    console.error('保存查询条件失败:', error);
+  }
+};
+
+// 从本地存储恢复查询条件
+const restoreSearchConditions = () => {
+  try {
+    const conditions = uni.getStorageSync(STORAGE_KEY);
+    if (conditions) {
+      activeTab.value = conditions.activeTab || "pending";
+      searchKeyword.value = conditions.searchKeyword || "";
+      selectedJfTypeId.value = conditions.selectedJfTypeId || "";
+      selectedJfTypeName.value = conditions.selectedJfTypeName || "";
+      return true;
+    }
+  } catch (error) {
+    console.error('恢复查询条件失败:', error);
+  }
+  return false;
+};
+
 const getCurrentTeacherId = () => {
   const jsData = userStore.getJs;
   return jsData?.id || null;
@@ -113,11 +180,13 @@ const getCurrentTeacherId = () => {
 
 const handleSearch = (keyword: string) => {
   searchKeyword.value = keyword;
+  saveSearchConditions(); // 保存查询条件
   pagingRef.value?.reload();
 };
 
 const switchTab = (tabKey: string) => {
   activeTab.value = tabKey;
+  saveSearchConditions(); // 保存查询条件
   pagingRef.value?.reload();
 };
 
@@ -142,17 +211,34 @@ const queryData = async (pageNo: number, pageSize: number) => {
     }
 
     let response: any;
+    const params: any = {
+      jsId,
+      page: pageNo,
+      rows: pageSize,
+      jfTypeId: selectedJfTypeId.value || "",
+    };
+    
     if (activeTab.value === "all") {
-      response = await jfFindUserTodosPageApi({ dbZt: "", jsId, spType: "", page: pageNo, rows: pageSize });
+      params.dbZt = "";
+      params.spType = "";
+      params.spJd = "";
     } else if (activeTab.value === "pending") {
-      response = await jfFindUserTodosPageApi({ dbZt: "A", jsId, spType: "SP", page: pageNo, rows: pageSize });
+      params.dbZt = "A";
+      params.spType = "SP";
+      params.spJd = "A";
     } else if (activeTab.value === "approved") {
       // 为了让驳回数据也出现在已办列表，这里不过滤 dbZt，后续用前端筛选
-      response = await jfFindUserTodosPageApi({ dbZt: "", jsId, spType: "SP", page: pageNo, rows: pageSize });
+      params.dbZt = "";
+      params.spType = "SP";
+      params.spJd = "Z";
     } else {
       // 默认全部（不含抄送）
-      response = await jfFindUserTodosPageApi({ dbZt: "", jsId, spType: "SP", page: pageNo, rows: pageSize });
+      params.dbZt = "";
+      params.spType = "SP";
+      params.spJd = "";
     }
+    
+    response = await jfFindUserTodosPageApi(params);
 
     console.log("积分审批列表接口返回 raw:", response);
     const result = response?.data || response;
@@ -232,8 +318,132 @@ const goToDetail = (item: any) => {
   navigateTo(`/pages/view/routine/JiFenPingJia/jfsp/JfFlow?id=${id}&from=db&dbZt=${dbZt}`);
 };
 
-onShow(() => {
+// 构建树形结构
+function buildTree(list: any[]): any[] {
+  const map = new Map();
+  const roots: any[] = [];
+  
+  list.forEach(item => {
+    map.set(item.id, {
+      ...item,
+      children: []
+    });
+  });
+  
+  list.forEach(item => {
+    const node = map.get(item.id);
+    if (item.pid && map.has(item.pid)) {
+      const parent = map.get(item.pid);
+      parent.children.push(node);
+    } else {
+      roots.push(node);
+    }
+  });
+  
+  function cleanEmptyChildren(nodes: any[]) {
+    nodes.forEach(node => {
+      if (node.children && node.children.length > 0) {
+        cleanEmptyChildren(node.children);
+      } else {
+        delete node.children;
+      }
+    });
+  }
+  
+  cleanEmptyChildren(roots);
+  return roots;
+}
+
+// 根据 ID 查找树节点并获取完整路径
+function findNodeById(nodes: any[], id: string, path: string[] = []): { node: any, path: string[] } | null {
+  for (const node of nodes) {
+    const currentPath = [...path, node.jfmc];
+    if (String(node.id) === String(id)) {
+      return { node, path: currentPath };
+    }
+    if (node.children && node.children.length > 0) {
+      const found = findNodeById(node.children, id, currentPath);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return null;
+}
+
+// 加载业绩类别数据
+const loadJfTypes = async () => {
+  try {
+    const res: any = await jfTypeFindPageApi({
+      page: 1,
+      rows: 1000
+    });
+    const list = res?.result?.rows || res?.rows || res?.result || [];
+    const treeData = buildTree(list);
+    jfTypeTree.value = treeData;
+  } catch (error) {
+    console.error('加载业绩类别失败:', error);
+  }
+};
+
+// 打开类别选择器
+const openJfTypePicker = () => {
+  if (basicTreeRef.value && basicTreeRef.value._show) {
+    basicTreeRef.value._show();
+  }
+};
+
+// 处理类别选择确认
+const handleJfTypeConfirm = (value: any) => {
+  // value 是选中的节点数组，每个节点包含 source（原始数据）和 parents（父级数组）
+  if (value && value.length > 0) {
+    const selectedNode = value[0];
+    const source = selectedNode.source || selectedNode;
+    const jfTypeId = source.id || source[basicTreeRef.value?.idKey || 'id'];
+    selectedJfTypeId.value = String(jfTypeId);
+    
+    // 构建路径显示：使用 parents 数组构建完整路径
+    if (selectedNode.parents && selectedNode.parents.length > 0) {
+      const pathParts = selectedNode.parents.map((p: any) => p[basicTreeRef.value?.rangeKey || 'jfmc'] || p.jfmc || p.name);
+      pathParts.push(source[basicTreeRef.value?.rangeKey || 'jfmc'] || source.jfmc || source.name);
+      selectedJfTypeName.value = pathParts.join(' / ');
+    } else {
+      // 如果没有 parents，尝试从树中查找
+      const found = findNodeById(jfTypeTree.value, jfTypeId);
+      if (found) {
+        selectedJfTypeName.value = found.path.join(' / ');
+      } else {
+        selectedJfTypeName.value = source[basicTreeRef.value?.rangeKey || 'jfmc'] || source.jfmc || source.name || '';
+      }
+    }
+  } else {
+    clearJfType();
+  }
+  saveSearchConditions(); // 保存查询条件
   pagingRef.value?.reload();
+};
+
+// 清除类别选择
+const clearJfType = () => {
+  selectedJfTypeId.value = '';
+  selectedJfTypeName.value = '';
+  saveSearchConditions(); // 保存查询条件
+  pagingRef.value?.reload();
+};
+
+onMounted(() => {
+  loadJfTypes();
+  // 页面加载时恢复查询条件
+  restoreSearchConditions();
+});
+
+onShow(() => {
+  // 如果页面被重新初始化（如使用 redirectTo），恢复查询条件
+  const hasRestored = restoreSearchConditions();
+  // 恢复条件后需要重新加载数据
+  if (hasRestored || pagingRef.value) {
+    pagingRef.value?.reload();
+  }
 });
 </script>
 
@@ -282,6 +492,47 @@ onShow(() => {
   color: #333;
 }
 
+.category-filter {
+  margin-top: 10px;
+}
+
+.category-selector {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 10px 12px;
+  background-color: #f8f9fa;
+  border: 1px solid #e9ecef;
+  border-radius: 8px;
+  position: relative;
+  cursor: pointer;
+}
+
+.category-text {
+  flex: 1;
+  font-size: 14px;
+  color: #333;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  
+  &.placeholder {
+    color: #999;
+  }
+}
+
+.clear-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  margin-left: 8px;
+  padding: 2px;
+  background-color: #e9ecef;
+  border-radius: 50%;
+}
+
 .filter-tabs {
   display: flex;
   gap: 8px;
@@ -308,8 +559,8 @@ onShow(() => {
 
 .middle-section {
   flex: 1;
-  margin-top: 140px; // 为顶部搜索栏留出空间
-  height: calc(100vh - 140px); // 减去顶部区域的高度
+  margin-top: 200px; // 为顶部搜索栏和类别选择器留出空间
+  height: calc(100vh - 200px); // 减去顶部区域的高度
   padding: 12px;
   position: relative;
   z-index: 0;
diff --git a/src/pages/view/routine/JiFenPingJia/jfsp/list.vue b/src/pages/view/routine/JiFenPingJia/jfsp/list.vue
new file mode 100644
index 0000000..109d78e
--- /dev/null
+++ b/src/pages/view/routine/JiFenPingJia/jfsp/list.vue
@@ -0,0 +1,458 @@
+<template>
+  <view class="jfsp-list-page">
+    <view class="top-section">
+      <view class="search-card">
+        <view class="search-item">
+          <view class="search-container">
+            <BasicSearch
+              placeholder="搜索申请人姓名"
+              v-model="searchKeyword"
+              class="search-input"
+              @search="handleSearch"
+            />
+            <u-button
+              text="查询"
+              type="primary"
+              size="small"
+              class="search-button"
+              @click="handleSearch(searchKeyword)"
+            />
+          </view>
+        </view>
+        <view class="filter-tabs">
+          <view
+            v-for="tab in filterTabs"
+            :key="tab.key"
+            class="filter-tab"
+            :class="{ active: activeTab === tab.key }"
+            @click="switchTab(tab.key)"
+          >
+            {{ tab.label }}
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="middle-section">
+      <z-paging
+        ref="pagingRef"
+        v-model="dataList"
+        :auto="true"
+        :refresher-enabled="true"
+        :loading-more-enabled="true"
+        :loading-more-threshold="50"
+        :default-page-size="10"
+        :show-loading-more-no-more-view="true"
+        :show-empty-view-reload="false"
+        :fixed="false"
+        class="paging-container"
+        @query="queryData"
+      >
+        <view
+          v-for="(item, index) in dataList"
+          :key="item.applicantId || index"
+          class="applicant-card"
+          @click="goToCompare(item)"
+        >
+          <view class="card-header">
+            <view class="applicant-info">
+              <view class="avatar">
+                <text class="avatar-text">{{ getAvatarText(item.applicantName) }}</text>
+              </view>
+              <view class="name-section">
+                <text class="applicant-name">{{ item.applicantName || "—" }}</text>
+                <text class="applicant-dept" v-if="item.applicantDept">{{ item.applicantDept }}</text>
+              </view>
+            </view>
+            <view class="badge" v-if="item.recordCount > 0">
+              <text class="badge-text">{{ item.recordCount }}</text>
+            </view>
+          </view>
+          <view class="card-body">
+            <view class="stat-row">
+              <text class="stat-label">待审批：</text>
+              <text class="stat-value highlight">{{ item.recordCount || 0 }}条</text>
+            </view>
+            <view class="stat-row">
+              <text class="stat-label">总积分：</text>
+              <text class="stat-value score">+{{ item.totalScore || 0 }}分</text>
+            </view>
+            <view class="stat-row" v-if="item.earliestTime || item.latestTime">
+              <text class="stat-label">时间范围：</text>
+              <text class="stat-value">{{ formatTimeRange(item.earliestTime, item.latestTime) }}</text>
+            </view>
+          </view>
+          <view class="card-footer">
+            <view class="action-text">
+              审批
+              <uni-icons type="arrowright" size="14" color="#007aff"></uni-icons>
+            </view>
+          </view>
+        </view>
+      </z-paging>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import dayjs from "dayjs";
+import BasicSearch from "@/components/BasicSearch/Search.vue";
+import { jfFindUserTodosGroupByApplicantApi } from "@/api/base/jfApi";
+import { navigateTo } from "@/utils/uniapp";
+import { useUserStore } from "@/store/modules/user";
+
+const filterTabs = [
+  { key: "pending", label: "待办" },
+  { key: "approved", label: "已办" },
+  { key: "all", label: "全部" },
+];
+
+const activeTab = ref("pending");
+const searchKeyword = ref("");
+const dataList = ref<any[]>([]);
+const pagingRef = ref<any>(null);
+const userStore = useUserStore();
+
+const getCurrentTeacherId = () => {
+  const jsData = userStore.getJs;
+  return jsData?.id || null;
+};
+
+const handleSearch = (keyword: string) => {
+  searchKeyword.value = keyword;
+  pagingRef.value?.reload();
+};
+
+const switchTab = (tabKey: string) => {
+  activeTab.value = tabKey;
+  pagingRef.value?.reload();
+};
+
+const filterData = (list: any[]) => {
+  let filtered = list;
+  if (searchKeyword.value) {
+    const kw = searchKeyword.value.toLowerCase();
+    filtered = filtered.filter((item) =>
+      (item.applicantName || "").toLowerCase().includes(kw)
+    );
+  }
+  return filtered;
+};
+
+const queryData = async (pageNo: number, pageSize: number) => {
+  try {
+    const jsId = getCurrentTeacherId();
+    if (!jsId) {
+      uni.showToast({ title: "无法获取用户信息", icon: "none" });
+      pagingRef.value?.complete([]);
+      return;
+    }
+
+    let dbZt = "";
+    let spType = "SP";
+    
+    if (activeTab.value === "pending") {
+      dbZt = "A";
+      spType = "SP";
+    } else if (activeTab.value === "approved") {
+      dbZt = "B";
+      spType = "SP";
+    } else if (activeTab.value === "all") {
+      dbZt = "";
+      spType = "";
+    }
+
+    const response: any = await jfFindUserTodosGroupByApplicantApi({
+      jsId,
+      dbZt,
+      spType,
+      page: pageNo,
+      rows: pageSize,
+    });
+
+    console.log("按申请人分组统计接口返回:", response);
+    const result = response?.data || response;
+    let rows: any[] = [];
+    
+    if (result?.rows && Array.isArray(result.rows)) {
+      rows = result.rows;
+    } else if (result?.resultCode === 1 && Array.isArray(result.result)) {
+      rows = result.result;
+    } else if (Array.isArray(result)) {
+      rows = result;
+    }
+
+    const filtered = filterData(rows);
+    console.log("过滤后的申请人列表:", filtered);
+    
+    pagingRef.value?.complete(filtered);
+  } catch (error) {
+    console.error("加载申请人列表失败:", error);
+    uni.showToast({ title: "加载失败", icon: "none" });
+    pagingRef.value?.complete([]);
+  }
+};
+
+const getAvatarText = (name?: string) => {
+  if (!name) return "?";
+  // 取姓名的最后一个字符
+  return name.charAt(name.length - 1);
+};
+
+const formatTimeRange = (earliest?: string, latest?: string) => {
+  if (!earliest && !latest) return "—";
+  if (earliest && latest) {
+    const e = dayjs(earliest).format("YYYY-MM");
+    const l = dayjs(latest).format("YYYY-MM");
+    if (e === l) return e;
+    return `${e} ~ ${l}`;
+  }
+  return earliest ? dayjs(earliest).format("YYYY-MM") : dayjs(latest).format("YYYY-MM");
+};
+
+const goToCompare = (item: any) => {
+  if (!item.applicantId) {
+    uni.showToast({ title: "缺少申请人ID", icon: "none" });
+    return;
+  }
+  
+  const dbZt = activeTab.value === 'approved' ? 'B' : activeTab.value === 'pending' ? 'A' : '';
+  navigateTo(
+    `/pages/view/routine/JiFenPingJia/jfsp/compare?applicantId=${item.applicantId}&from=db&dbZt=${dbZt}&mode=compare`
+  );
+};
+
+onShow(() => {
+  pagingRef.value?.reload();
+});
+</script>
+
+<style scoped lang="scss">
+.jfsp-list-page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background-color: #f5f7fa;
+}
+
+.top-section {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 20;
+  background-color: #fff;
+  padding: 10px 12px 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+.search-card {
+  background-color: #ffffff;
+  border-radius: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+  border: 1px solid #f0f0f0;
+}
+
+.search-container {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}
+
+.search-input {
+  flex: 1;
+  min-width: 70%;
+  height: 42px;
+  background-color: #f8f9fa;
+  border: 1px solid #e9ecef;
+  border-radius: 8px;
+  padding: 0 15px;
+  font-size: 16px;
+  color: #333;
+}
+
+.filter-tabs {
+  display: flex;
+  gap: 8px;
+  margin-top: 10px;
+}
+
+.filter-tab {
+  flex: 1;
+  text-align: center;
+  padding: 8px 12px;
+  border-radius: 6px;
+  font-size: 14px;
+  color: #666;
+  transition: all 0.3s;
+  background-color: #f0f0f0;
+  border: 1px solid #e9ecef;
+
+  &.active {
+    background-color: #007aff;
+    color: white;
+    border-color: #007aff;
+  }
+}
+
+.middle-section {
+  flex: 1;
+  margin-top: 140px;
+  height: calc(100vh - 140px);
+  padding: 12px;
+  position: relative;
+  z-index: 0;
+  overflow: hidden;
+  background-color: #f5f7fa;
+}
+
+.paging-container {
+  height: 100%;
+  position: relative;
+  z-index: 0;
+}
+
+.applicant-card {
+  background: #fff;
+  border-radius: 10px;
+  padding: 16px;
+  margin-bottom: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  transition: all 0.3s;
+  
+  &:active {
+    transform: scale(0.98);
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+  }
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 12px;
+}
+
+.applicant-info {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  flex: 1;
+}
+
+.avatar {
+  width: 48px;
+  height: 48px;
+  border-radius: 50%;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  
+  .avatar-text {
+    color: #fff;
+    font-size: 18px;
+    font-weight: 600;
+  }
+}
+
+.name-section {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  flex: 1;
+  min-width: 0;
+}
+
+.applicant-name {
+  font-size: 16px;
+  font-weight: 600;
+  color: #2c3e50;
+  line-height: 1.4;
+}
+
+.applicant-dept {
+  font-size: 12px;
+  color: #999;
+  line-height: 1.2;
+}
+
+.badge {
+  min-width: 24px;
+  height: 24px;
+  background-color: #f43f5e;
+  border-radius: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8px;
+  flex-shrink: 0;
+  
+  .badge-text {
+    color: #fff;
+    font-size: 12px;
+    font-weight: 600;
+  }
+}
+
+.card-body {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 12px;
+  background-color: #f8f9fa;
+  border-radius: 8px;
+}
+
+.stat-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 14px;
+}
+
+.stat-label {
+  color: #666;
+  width: 80px;
+  flex-shrink: 0;
+}
+
+.stat-value {
+  color: #333;
+  flex: 1;
+  
+  &.highlight {
+    color: #007aff;
+    font-weight: 600;
+  }
+  
+  &.score {
+    color: #fa8c16;
+    font-weight: 600;
+  }
+}
+
+.card-footer {
+  display: flex;
+  justify-content: flex-end;
+  padding-top: 8px;
+  border-top: 1px solid #f0f0f0;
+}
+
+.action-text {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  color: #007aff;
+  font-size: 14px;
+  font-weight: 600;
+}
+</style>
+
diff --git a/src/pages/view/routine/ShiTangXunCha/detail.vue b/src/pages/view/routine/ShiTangXunCha/detail.vue
index be7b112..e0807cb 100644
--- a/src/pages/view/routine/ShiTangXunCha/detail.vue
+++ b/src/pages/view/routine/ShiTangXunCha/detail.vue
@@ -10,7 +10,7 @@
       <view class="detail-section">
         <text class="section-title">工作描述</text>
         <view class="section-content">
-          <rich-text class="detail-text" :nodes="detailData.gzms || '暂无描述'"></rich-text>
+          <text class="detail-text">{{ detailData.gzms || '暂无描述' }}</text>
         </view>
       </view>
 
@@ -284,6 +284,7 @@ const goBack = () => {
       color: #5a6c7d;
       line-height: 1.6;
       word-break: break-word;
+      white-space: pre-line;
     }
   }
 }
diff --git a/src/pages/view/routine/inv/invout/ApprovalOut.vue b/src/pages/view/routine/inv/invout/ApprovalOut.vue
new file mode 100644
index 0000000..7805621
--- /dev/null
+++ b/src/pages/view/routine/inv/invout/ApprovalOut.vue
@@ -0,0 +1,417 @@
+<template>
+  <view class="approval-out-container">
+    <view v-if="loading" class="loading-mask">
+      <view class="loading-content">
+        <uni-icons type="spinner-cycle" size="24" color="#fff" class="loading-icon"></uni-icons>
+        <text class="loading-text">{{ loadingText }}</text>
+      </view>
+    </view>
+
+    <!-- 搜索区域 -->
+    <view class="search-section">
+      <view class="search-card">
+        <view class="search-item">
+          <BasicSearch
+            placeholder="搜索申请人或申请原因"
+            v-model="searchKeyword"
+            class="search-input"
+            @search="handleSearch"
+          />
+          <u-button
+            text="查询"
+            type="primary"
+            size="small"
+            class="search-button"
+            @click="handleSearch"
+          />
+        </view>
+      </view>
+    </view>
+
+    <!-- 列表区域 -->
+    <scroll-view scroll-y class="list-scroll">
+      <view v-if="loading && applyList.length === 0" class="loading-container">
+        <text class="loading-text">加载中...</text>
+      </view>
+      
+      <view v-else-if="applyList.length === 0" class="empty-container">
+        <text class="empty-text">暂无已审批的申请记录</text>
+      </view>
+      
+      <view v-else>
+        <view
+          v-for="(item, index) in applyList"
+          :key="item.id || index"
+          class="apply-card"
+          @click="handleSelectApply(item)"
+        >
+          <view class="card-header">
+            <text class="apply-title">{{ item.applyUserName || '—' }}的申请</text>
+            <text class="apply-date">{{ formatDate(item.applyDate) }}</text>
+          </view>
+          
+          <view class="card-body">
+            <view class="info-row">
+              <text class="label">申请原因：</text>
+              <text class="value ellipsis">{{ item.applyReason || '—' }}</text>
+            </view>
+            <view class="info-row">
+              <text class="label">总数量：</text>
+              <text class="value qty">{{ item.totalQty || 0 }}</text>
+            </view>
+          </view>
+          
+          <view class="card-footer">
+            <view class="action-text" @click.stop="handleViewDetail(item)">
+              查看详情
+            </view>
+            <view class="action-text primary" @click.stop="handleCreateOut(item)">
+              创建出库
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue';
+import { onShow } from '@dcloudio/uni-app';
+import { invApplyFindPageApi, invApplyFindFullByIdApi } from '@/api/base/invApplyApi';
+import { invOutBillSaveApi } from '@/api/base/invOutBillApi';
+import { useUserStore } from '@/store/modules/user';
+import { showToast } from '@/utils/uniapp';
+import dayjs from 'dayjs';
+
+const { getJs } = useUserStore();
+
+const applyList = ref<any[]>([]);
+const loading = ref(false);
+const loadingText = ref('加载中...');
+const searchKeyword = ref('');
+
+// 查询已审批的申请（spResult='B' 且 spJd='Z'）
+const loadApprovedApplies = async () => {
+  loading.value = true;
+  loadingText.value = '加载中...';
+  
+  try {
+    const params = {
+      page: 1,
+      rows: 100, // 获取足够多的数据
+      spResult: 'B', // 审批通过
+      spJd: 'Z' // 审批完结
+    };
+    
+    const res: any = await invApplyFindPageApi(params);
+    let list = res?.result?.rows || res?.rows || [];
+    
+    // 前端再次筛选，确保是已审批通过的
+    list = list.filter((item: any) => 
+      item.spResult === 'B' && item.spJd === 'Z'
+    );
+    
+    // 如果有搜索关键词，进行过滤
+    if (searchKeyword.value) {
+      const keyword = searchKeyword.value.toLowerCase();
+      list = list.filter((item: any) => {
+        const applyUserName = (item.applyUserName || '').toLowerCase();
+        const applyReason = (item.applyReason || '').toLowerCase();
+        return applyUserName.includes(keyword) || applyReason.includes(keyword);
+      });
+    }
+    
+    applyList.value = list;
+  } catch (error: any) {
+    console.error('加载已审批申请失败:', error);
+    showToast({
+      title: '加载失败：' + (error?.message || '未知错误'),
+      icon: 'none',
+      duration: 3000
+    });
+  } finally {
+    loading.value = false;
+  }
+};
+
+const handleSearch = () => {
+  loadApprovedApplies();
+};
+
+const formatDate = (date: any) => {
+  if (!date) return '—';
+  return dayjs(date).format('YYYY-MM-DD');
+};
+
+const handleViewDetail = (item: any) => {
+  uni.navigateTo({
+    url: `/pages/view/routine/inv/invsq/detail?id=${item.id}`
+  });
+};
+
+const handleSelectApply = (item: any) => {
+  // 点击卡片也可以创建出库
+  handleCreateOut(item);
+};
+
+const handleCreateOut = async (applyItem: any) => {
+  try {
+    loading.value = true;
+    loadingText.value = '创建出库单中...';
+    
+    // 获取申请详情（包含明细）
+    const res: any = await invApplyFindFullByIdApi({ id: applyItem.id });
+    let data = null;
+    if (res && res.resultCode === 1 && res.result) {
+      data = res.result;
+    } else if (res && res.id) {
+      data = res;
+    }
+    
+    if (!data || !data.items || data.items.length === 0) {
+      showToast({
+        title: '申请明细为空，无法创建出库单',
+        icon: 'none'
+      });
+      return;
+    }
+    
+    // 构建出库单数据
+    const js = getJs;
+    const outBillData = {
+      outType: 1, // 1-领用
+      billDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      receiverUserId: data.applyUserId,
+      handlerUserId: js?.id, // 经办人（当前用户）
+      totalQty: data.totalQty || 0,
+      totalAmount: 0, // 金额暂时为0
+      billStatus: 1, // 已提交
+      invOutBillItemDtos: data.items.map((item: any) => ({
+        itemId: item.itemId,
+        itemName: item.itemName,
+        unitName: item.unitName,
+        outQty: item.applyQty, // 出库数量等于申请数量
+        warehouseId: item.warehouseId || '',
+        locationId: item.locationId || ''
+      }))
+    };
+    
+    // 调用保存接口
+    const saveRes: any = await invOutBillSaveApi(outBillData);
+    
+    if (saveRes && (saveRes.resultCode === 1 || saveRes.success === true)) {
+      showToast({
+        title: '出库单创建成功',
+        icon: 'success'
+      });
+      
+      // 刷新列表
+      setTimeout(() => {
+        loadApprovedApplies();
+      }, 500);
+    } else {
+      const errorMessage = saveRes?.message || saveRes?.resultMsg || '创建出库单失败，请重试';
+      showToast({
+        title: errorMessage,
+        icon: 'none',
+        duration: 3000
+      });
+    }
+  } catch (error: any) {
+    console.error('创建出库单失败:', error);
+    showToast({
+      title: '创建出库单失败：' + (error?.message || '未知错误'),
+      icon: 'none',
+      duration: 3000
+    });
+  } finally {
+    loading.value = false;
+  }
+};
+
+onMounted(() => {
+  loadApprovedApplies();
+});
+
+onShow(() => {
+  // 页面显示时刷新数据
+  loadApprovedApplies();
+});
+</script>
+
+<style scoped lang="scss">
+.approval-out-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  background-color: #f5f5f5;
+}
+
+.search-section {
+  background-color: #ffffff;
+  padding: 20rpx;
+  border-bottom: 1rpx solid #e4e7ed;
+  
+  .search-card {
+    .search-item {
+      display: flex;
+      align-items: center;
+      gap: 16rpx;
+      
+      .search-input {
+        flex: 1;
+      }
+      
+      .search-button {
+        flex-shrink: 0;
+      }
+    }
+  }
+}
+
+.list-scroll {
+  flex: 1;
+  padding: 20rpx;
+}
+
+.loading-container,
+.empty-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 100rpx 0;
+  
+  .loading-text,
+  .empty-text {
+    font-size: 28rpx;
+    color: #909399;
+  }
+}
+
+.apply-card {
+  background-color: #ffffff;
+  border-radius: 12rpx;
+  padding: 24rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
+  
+  .card-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 16rpx;
+    padding-bottom: 12rpx;
+    border-bottom: 1rpx solid #e4e7ed;
+    
+    .apply-title {
+      font-size: 32rpx;
+      font-weight: 600;
+      color: #303133;
+    }
+    
+    .apply-date {
+      font-size: 24rpx;
+      color: #909399;
+    }
+  }
+  
+  .card-body {
+    margin-bottom: 16rpx;
+    
+    .info-row {
+      display: flex;
+      align-items: flex-start;
+      margin-bottom: 12rpx;
+      
+      &:last-child {
+        margin-bottom: 0;
+      }
+      
+      .label {
+        font-size: 28rpx;
+        color: #606266;
+        margin-right: 8rpx;
+        flex-shrink: 0;
+      }
+      
+      .value {
+        font-size: 28rpx;
+        color: #303133;
+        flex: 1;
+        
+        &.ellipsis {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        
+        &.qty {
+          font-weight: 600;
+          color: #1890ff;
+        }
+      }
+    }
+  }
+  
+  .card-footer {
+    display: flex;
+    justify-content: flex-end;
+    gap: 20rpx;
+    padding-top: 16rpx;
+    border-top: 1rpx solid #e4e7ed;
+    
+    .action-text {
+      font-size: 28rpx;
+      color: #606266;
+      padding: 8rpx 16rpx;
+      cursor: pointer;
+      
+      &.primary {
+        color: #1890ff;
+        font-weight: 500;
+      }
+      
+      &:active {
+        opacity: 0.7;
+      }
+    }
+  }
+}
+
+// 加载遮罩层样式
+.loading-mask {
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.35);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 999;
+}
+
+.loading-content {
+  min-width: 200rpx;
+  padding: 24rpx 32rpx;
+  background: rgba(0, 0, 0, 0.7);
+  border-radius: 16rpx;
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
+
+.loading-text {
+  color: #fff;
+  font-size: 28rpx;
+}
+
+.loading-icon {
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
+}
+</style>
+
diff --git a/src/pages/view/routine/inv/invout/DirectOut.vue b/src/pages/view/routine/inv/invout/DirectOut.vue
new file mode 100644
index 0000000..1d9c8e9
--- /dev/null
+++ b/src/pages/view/routine/inv/invout/DirectOut.vue
@@ -0,0 +1,1146 @@
+<template>
+  <view class="direct-out-container">
+    <view v-if="loading" class="loading-mask">
+      <view class="loading-content">
+        <uni-icons type="spinner-cycle" size="24" color="#fff" class="loading-icon"></uni-icons>
+        <text class="loading-text">{{ loadingText }}</text>
+      </view>
+    </view>
+    
+    <scroll-view scroll-y class="form-scroll" :class="{ 'full-height': hideBottomBtn }" :enable-back-to-top="false">
+      <view class="form-container">
+        <!-- 出库信息区域 -->
+        <view class="section">
+          <view class="section-title">
+            <view class="title-line"></view>
+            <text class="title-text">出库信息</text>
+          </view>
+          
+          <BasicForm
+            :modelValue="formData"
+            @update:modelValue="(val: any) => Object.assign(formData, val)"
+            :schema="formSchema"
+            :formsProps="{ labelWidth: 100 }"
+            :key="formSchemaKey"
+          >
+            <template #remark>
+              <view class="node-field">
+                <view class="field-label-title">备注</view>
+                <textarea
+                  v-model="formData.remark"
+                  class="textarea-field"
+                  placeholder="请输入备注"
+                  :maxlength="500"
+                  :auto-height="true"
+                />
+              </view>
+            </template>
+          </BasicForm>
+        </view>
+        
+        <!-- 出库明细区域 -->
+        <view class="section">
+          <view class="section-title">
+            <view class="title-line"></view>
+            <text class="title-text">出库明细</text>
+          </view>
+          
+          <view class="item-list">
+            <view 
+              v-for="(item, index) in formData.items" 
+              :key="index" 
+              class="item-row"
+            >
+              <view class="item-header">
+                <text class="item-index">第{{ index + 1 }}项</text>
+                <view class="delete-icon" @click.stop="handleDeleteItem(index)">×</view>
+              </view>
+              
+              <view class="item-content">
+                <!-- 物品选择区域 -->
+                <view class="item-field-wrapper">
+                  <view class="item-field" @click="showItemSelector(index)">
+                    <view class="field-label">
+                      <text class="required-mark">*</text>
+                      <text>物品</text>
+                    </view>
+                    <view class="field-value-wrapper">
+                      <text class="field-value" :class="{ 'placeholder-text': !item.itemName }">
+                        {{ item.itemName || '请选择物品' }}
+                      </text>
+                      <view class="dropdown-icon">
+                        <text class="arrow-down">▼</text>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                
+                <view class="quantity-field-wrapper">
+                  <BasicForm
+                    :modelValue="item"
+                    @update:modelValue="(val: any) => updateItem(index, val)"
+                    :schema="itemSchema"
+                    :formsProps="{ labelWidth: 100 }"
+                    :key="`item-${index}-${itemSchemaKey}`"
+                  />
+                </view>
+                
+                <!-- 可用库存提示 -->
+                <view v-if="item.itemId && (item.availableQty !== undefined || item.qty !== undefined)" class="stock-tip">
+                  <text class="stock-label">可用库存：</text>
+                  <text class="stock-value" :class="{ 'stock-warning': (item.availableQty || item.qty || 0) < (typeof item.qty === 'number' ? item.qty : 0) }">
+                    {{ item.availableQty !== undefined && item.availableQty !== null ? item.availableQty : (item.totalQty || 0) }}
+                  </text>
+                </view>
+              </view>
+                      
+              <!-- 物品选择器 -->
+              <InvItemSelector
+                v-if="itemSelectorVisible === index"
+                :visible="itemSelectorVisible === index"
+                @confirm="(selectedItem) => handleItemSelect(index, selectedItem)"
+                @cancel="() => closeItemSelector()"
+              />
+            </view>
+            
+            <button class="add-item-btn" @click="handleAddItem">+ 添加明细</button>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    
+    <!-- 固定在底部的按钮组 -->
+    <view class="fixed-bottom" :class="{ 'hide-bottom': hideBottomBtn }">
+      <view class="button-group">
+        <button class="save-btn" @click="handleSave" :disabled="saving || submitting">
+          {{ saving ? '保存中...' : '暂存' }}
+        </button>
+        <button class="submit-btn" @click="handleSubmit" :disabled="saving || submitting">
+          {{ submitting ? '提交中...' : '提交' }}
+        </button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, nextTick, watch } from "vue";
+import { onLoad, onBackPress } from "@dcloudio/uni-app";
+import { 
+  invOutBillSaveApi
+} from '@/api/base/invOutBillApi';
+import { invWarehouseFindAllApi } from '@/api/base/invApplyApi';
+import { useUserStore } from "@/store/modules/user";
+import { showToast } from "@/utils/uniapp";
+import dayjs from "dayjs";
+import InvItemSelector from '@/pages/components/InvItemSelector/index.vue';
+
+const { getJs } = useUserStore();
+
+// 表单数据
+const formData = reactive<any>({
+  id: '',
+  outType: 1, // 1-领用, 2-调拨, 3-报废, 4-盘亏
+  warehouseId: '',
+  warehouseName: '',
+  receiverUserId: '',
+  receiverUserName: '',
+  handlerUserId: '',
+  handlerUserName: '',
+  billDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  totalQty: 0,
+  totalAmount: 0,
+  billStatus: 0, // 0-草稿, 1-已提交
+  remark: '',
+  items: [] as Array<{
+    id?: string;
+    itemId: string;
+    itemName: string;
+    unitName: string;
+    qty: number | ''; // 出库数量，默认为空
+    price?: number; // 单价
+    amount?: number; // 金额
+    locationId?: string; // 库位ID
+    locationName?: string; // 库位名称
+    warehouseId?: string; // 仓库ID
+    totalQty?: number; // 总库存
+    availableQty?: number; // 可用库存
+  }>
+});
+
+const saving = ref(false);      // 暂存状态
+const submitting = ref(false);  // 提交状态
+const loading = ref(false);     // 页面加载状态
+const loadingText = ref('加载中...'); // 加载提示文本
+const hideBottomBtn = ref(false); // 控制底部按钮区域显示/隐藏
+// 用于强制更新表单的 key
+const formSchemaKey = ref(0);
+const itemSchemaKey = ref(0);
+
+// 物品选择器相关
+const itemSelectorVisible = ref<number | null>(null);
+
+// 仓库列表
+const warehouseList = ref<any[]>([]);
+
+// 监听物品选择器可见性变化
+watch(itemSelectorVisible, (newVal) => {
+  // 当物品选择器显示时，显示底部按钮
+  if (newVal !== null) {
+    hideBottomBtn.value = false;
+  }
+});
+
+// 监听每个明细项的数量变化，进行实时验证
+watch(() => formData.items.map(item => item.qty), (newQtys, oldQtys) => {
+  formData.items.forEach((item, index) => {
+    const newQty = newQtys[index];
+    const oldQty = oldQtys?.[index];
+    
+    // 如果数量发生变化且是数字类型
+    if (newQty !== oldQty && typeof newQty === 'number') {
+      const availableQty = item.availableQty !== undefined && item.availableQty !== null 
+        ? item.availableQty 
+        : (item.qty || 0);
+      
+      // 验证数量不能超过可用库存
+      if (availableQty > 0 && newQty > availableQty) {
+        showToast({
+          title: `数量不能超过可用库存（${availableQty}）`,
+          icon: 'none',
+          duration: 2000
+        });
+        // 限制为最大可用库存
+        item.qty = availableQty;
+      }
+    }
+  });
+}, { deep: true });
+
+// 初始化当前用户信息
+const initUserInfo = () => {
+  const js = getJs;
+  if (js && js.id) {
+    formData.handlerUserId = js.id;
+    formData.handlerUserName = js.jsxm || '';
+  }
+};
+
+// 加载仓库列表
+const loadWarehouseList = async () => {
+  try {
+    const res: any = await invWarehouseFindAllApi({});
+    let list = res?.result || res?.rows || res || [];
+    if (Array.isArray(list)) {
+      warehouseList.value = list;
+    }
+  } catch (error: any) {
+    console.error('加载仓库列表失败:', error);
+  }
+};
+
+// 处理选择器弹窗状态变化
+const handlePickerPopupChange = (show: boolean) => {
+  hideBottomBtn.value = show;
+};
+
+// 更新明细项
+const updateItem = (index: number, updates: any) => {
+  const item = formData.items[index];
+  if (!item) return;
+  
+  // 如果更新的是数量字段，进行验证
+  if (updates.qty !== undefined) {
+    const value = String(updates.qty);
+    handleQtyInput(index, value);
+  } else {
+    Object.assign(item, updates);
+    recalculateTotals();
+  }
+};
+
+// 重新计算总数量和总金额
+const recalculateTotals = () => {
+  let totalQty = 0;
+  let totalAmount = 0;
+  
+  formData.items.forEach(item => {
+    const qty = typeof item.qty === 'number' ? item.qty : 0;
+    const amount = typeof item.amount === 'number' ? item.amount : 0;
+    totalQty += qty;
+    totalAmount += amount;
+  });
+  
+  formData.totalQty = parseFloat(totalQty.toFixed(2));
+  formData.totalAmount = parseFloat(totalAmount.toFixed(2));
+};
+
+// 添加明细项
+const handleAddItem = () => {
+  formData.items.push({
+    itemId: '',
+    itemName: '',
+    unitName: '',
+    qty: '', // 默认为空
+    price: 0,
+    amount: 0,
+    totalQty: 0,
+    availableQty: 0
+  });
+  itemSchemaKey.value++; // 强制更新明细表单
+};
+
+// 删除明细项
+const handleDeleteItem = (index: number) => {
+  uni.showModal({
+    title: '确认删除',
+    content: `确定要删除第${index + 1}项吗？`,
+    success: (res) => {
+      if (res.confirm) {
+        formData.items.splice(index, 1);
+        recalculateTotals();
+      }
+    }
+  });
+};
+
+// 表单配置 - 出库信息
+const formSchema = computed(() => {
+  return [
+    {
+      field: "outType",
+      label: "出库类型",
+      component: "BasicSelect",
+      required: true,
+      componentProps: {
+        options: [
+          { label: '领用', value: 1 },
+          { label: '调拨', value: 2 },
+          { label: '报废', value: 3 },
+          { label: '盘亏', value: 4 }
+        ],
+        placeholder: '请选择出库类型',
+        onPopupChange: handlePickerPopupChange
+      }
+    },
+    {
+      field: "warehouseId",
+      label: "出库仓库",
+      component: "BasicSelect",
+      required: true,
+      componentProps: {
+        options: warehouseList.value.map(w => ({ label: w.warehouseName, value: w.id })),
+        placeholder: '请选择出库仓库',
+        onPopupChange: handlePickerPopupChange,
+        onChange: (value: any) => {
+          const warehouse = warehouseList.value.find(w => w.id === value);
+          if (warehouse) {
+            formData.warehouseName = warehouse.warehouseName;
+          }
+        }
+      }
+    },
+    {
+      field: "receiverUserId",
+      label: "领用人",
+      component: "BasicSelect",
+      required: true,
+      componentProps: {
+        placeholder: '请选择领用人',
+        onPopupChange: handlePickerPopupChange
+      }
+    },
+    {
+      field: "billDate",
+      label: "出库日期",
+      component: "BasicDateTime",
+      required: true,
+      componentProps: {
+        mode: "datetime",
+        minDate: dayjs('1950-01-01').valueOf(),
+        maxDate: dayjs().valueOf(),
+        placeholder: '请选择出库日期',
+        onPopupChange: handlePickerPopupChange
+      }
+    },
+    {
+      field: "remark",
+      label: "",
+      slot: "remark"
+    }
+  ];
+});
+
+// 数量输入验证函数
+const handleQtyInput = (index: number, value: string) => {
+  if (!formData.items[index]) return;
+  
+  const item = formData.items[index];
+  
+  // 如果输入为空，设置为空字符串
+  if (value === '' || value === null || value === undefined) {
+    item.qty = '';
+    recalculateTotals();
+    return;
+  }
+  
+  const inputValue = parseFloat(value);
+  const availableQty = item.availableQty !== undefined && item.availableQty !== null ? item.availableQty : (item.totalQty || 0);
+  
+  // 验证是否为有效数字
+  if (isNaN(inputValue)) {
+    item.qty = '';
+    recalculateTotals();
+    return;
+  }
+  
+  // 验证数量不能小于0
+  if (inputValue < 0) {
+    showToast({
+      title: '数量不能小于0',
+      icon: 'none',
+      duration: 2000
+    });
+    item.qty = '';
+    recalculateTotals();
+    return;
+  }
+  
+  // 验证数量不能超过可用库存
+  if (availableQty > 0 && inputValue > availableQty) {
+    showToast({
+      title: `数量不能超过可用库存（${availableQty}）`,
+      icon: 'none',
+      duration: 2000
+    });
+    // 限制为最大可用库存
+    item.qty = availableQty;
+  } else {
+    item.qty = inputValue;
+  }
+  
+  // 计算金额（如果有单价）
+  if (item.price && typeof item.price === 'number') {
+    item.amount = parseFloat((item.qty * item.price).toFixed(2));
+  }
+  
+  recalculateTotals();
+};
+
+// 明细项表单配置
+const itemSchema = computed(() => {
+  return [
+    {
+      field: "qty",
+      label: "数量",
+      component: "BasicInput",
+      required: true,
+      componentProps: {
+        type: "number",
+        placeholder: '请输入数量'
+      }
+    }
+  ];
+});
+
+// 显示物品选择器
+const showItemSelector = (index: number) => {
+  itemSelectorVisible.value = index;
+  // 显示底部按钮
+  hideBottomBtn.value = false;
+};
+
+// 关闭物品选择器
+const closeItemSelector = () => {
+  itemSelectorVisible.value = null;
+};
+
+// 选择物品
+const handleItemSelect = (index: number, selectedItem: any) => {
+  if (!formData.items[index]) {
+    closeItemSelector();
+    return;
+  }
+  
+  // 检查是否与其他明细项重复（排除当前项）
+  const selectedItemId = selectedItem.id;
+  const duplicateIndex = formData.items.findIndex((item, idx) => 
+    idx !== index && item.itemId && item.itemId === selectedItemId
+  );
+  
+  if (duplicateIndex !== -1) {
+    showToast({
+      title: `物品"${selectedItem.itemName}"已在第${duplicateIndex + 1}项中选择，不能重复添加`,
+      icon: 'none',
+      duration: 3000
+    });
+    closeItemSelector();
+    return;
+  }
+  
+  // 没有重复，正常选择
+  formData.items[index].itemId = selectedItem.id;
+  formData.items[index].itemName = selectedItem.itemName;
+  formData.items[index].unitName = selectedItem.unitName || '';
+  // 保存库存信息
+  formData.items[index].totalQty = selectedItem.qty !== undefined && selectedItem.qty !== null ? parseFloat(String(selectedItem.qty)) || 0 : 0;
+  formData.items[index].availableQty = selectedItem.availableQty !== undefined && selectedItem.availableQty !== null 
+    ? parseFloat(String(selectedItem.availableQty)) || 0 
+    : (formData.items[index].totalQty || 0);
+  
+  closeItemSelector();
+};
+
+// 暂存表单
+const handleSave = async () => {
+  if (!formData.warehouseId) {
+    showToast({
+      title: '请选择出库仓库',
+      icon: 'none'
+    });
+    return;
+  }
+  
+  if (formData.items.length === 0) {
+    showToast({
+      title: '请至少添加一项出库明细',
+      icon: 'none'
+    });
+    return;
+  }
+  
+  // 验证明细项必填字段和库存
+  for (let i = 0; i < formData.items.length; i++) {
+    const item = formData.items[i];
+    if (!item.itemId) {
+      showToast({
+        title: `第${i + 1}项请选择物品`,
+        icon: 'none'
+      });
+      return;
+    }
+    
+    // 验证数量是否填写
+    const qty = typeof item.qty === 'number' ? item.qty : 0;
+    if (!item.qty || qty <= 0) {
+      showToast({
+        title: `第${i + 1}项请输入数量`,
+        icon: 'none'
+      });
+      return;
+    }
+    
+    // 验证数量不能超过可用库存
+    const availableQty = item.availableQty !== undefined && item.availableQty !== null 
+      ? item.availableQty 
+      : (item.totalQty !== undefined && item.totalQty !== null ? item.totalQty : 0);
+    
+    if (qty > availableQty) {
+      showToast({
+        title: `第${i + 1}项数量（${qty}）超过可用库存（${availableQty}）`,
+        icon: 'none',
+        duration: 3000
+      });
+      return;
+    }
+  }
+  
+  saving.value = true;
+  loading.value = true;
+  loadingText.value = '暂存中...';
+  try {
+    // 暂存：调用 save 接口
+    const saveData = {
+      ...formData,
+      billStatus: 0, // 草稿状态
+      invOutBillItemDtos: formData.items.map(item => ({
+        itemId: item.itemId,
+        itemName: item.itemName,
+        unitName: item.unitName,
+        qty: typeof item.qty === 'number' ? item.qty : 0,
+        price: item.price || 0,
+        amount: item.amount || 0,
+        locationId: item.locationId || '',
+        warehouseId: formData.warehouseId
+      }))
+    };
+    
+    const res: any = await invOutBillSaveApi(saveData);
+    
+    if (res && (res.resultCode === 1 || res.success === true)) {
+      showToast({
+        title: '暂存成功',
+        icon: 'success'
+      });
+      
+      // 重置表单
+      formData.id = '';
+      formData.items = [];
+      handleAddItem();
+    } else {
+      const errorMessage = res?.message || res?.resultMsg || '暂存失败，请重试';
+      showToast({
+        title: errorMessage,
+        icon: 'none',
+        duration: 3000
+      });
+    }
+  } catch (error: any) {
+    console.error('暂存失败:', error);
+    const errorMessage = error?.message || error?.resultMsg || '网络错误，请检查网络连接后重试';
+    showToast({
+      title: errorMessage,
+      icon: 'none',
+      duration: 3000
+    });
+  } finally {
+    saving.value = false;
+    loading.value = false;
+  }
+};
+
+// 提交表单
+const handleSubmit = async () => {
+  if (!formData.warehouseId) {
+    showToast({
+      title: '请选择出库仓库',
+      icon: 'none'
+    });
+    return;
+  }
+  
+  if (formData.items.length === 0) {
+    showToast({
+      title: '请至少添加一项出库明细',
+      icon: 'none'
+    });
+    return;
+  }
+  
+  // 验证明细项必填字段和库存
+  for (let i = 0; i < formData.items.length; i++) {
+    const item = formData.items[i];
+    if (!item.itemId) {
+      showToast({
+        title: `第${i + 1}项请选择物品`,
+        icon: 'none'
+      });
+      return;
+    }
+    
+    // 验证数量是否填写
+    const qty = typeof item.qty === 'number' ? item.qty : 0;
+    if (!item.qty || qty <= 0) {
+      showToast({
+        title: `第${i + 1}项请输入数量`,
+        icon: 'none'
+      });
+      return;
+    }
+    
+    // 验证数量不能超过可用库存
+    const availableQty = item.availableQty !== undefined && item.availableQty !== null 
+      ? item.availableQty 
+      : (item.totalQty !== undefined && item.totalQty !== null ? item.totalQty : 0);
+    
+    if (qty > availableQty) {
+      showToast({
+        title: `第${i + 1}项数量（${qty}）超过可用库存（${availableQty}）`,
+        icon: 'none',
+        duration: 3000
+      });
+      return;
+    }
+  }
+  
+  submitting.value = true;
+  loading.value = true;
+  loadingText.value = '提交中...';
+  try {
+    // 提交：调用 save 接口，billStatus 为 1
+    const submitData = {
+      ...formData,
+      billStatus: 1, // 已提交状态
+      invOutBillItemDtos: formData.items.map(item => ({
+        itemId: item.itemId,
+        itemName: item.itemName,
+        unitName: item.unitName,
+        qty: typeof item.qty === 'number' ? item.qty : 0,
+        price: item.price || 0,
+        amount: item.amount || 0,
+        locationId: item.locationId || '',
+        warehouseId: formData.warehouseId
+      }))
+    };
+    
+    const submitRes: any = await invOutBillSaveApi(submitData);
+    
+    if (submitRes && (submitRes.resultCode === 1 || submitRes.success === true)) {
+      showToast({
+        title: '提交成功',
+        icon: 'success'
+      });
+      
+      // 重置表单
+      formData.id = '';
+      formData.items = [];
+      handleAddItem();
+    } else {
+      const errorMessage = submitRes?.message || submitRes?.resultMsg || '提交失败，请重试';
+      showToast({
+        title: errorMessage,
+        icon: 'none',
+        duration: 3000
+      });
+    }
+  } catch (error: any) {
+    console.error('提交失败:', error);
+    const errorMessage = error?.message || error?.resultMsg || '网络错误，请检查网络连接后重试';
+    showToast({
+      title: errorMessage,
+      icon: 'none',
+      duration: 3000
+    });
+  } finally {
+    submitting.value = false;
+    loading.value = false;
+  }
+};
+
+// 返回按钮监听
+onBackPress(() => {
+  // 没有特殊处理，允许正常返回
+  return false;
+});
+
+// 页面加载
+onLoad(async (options: any) => {
+  try {
+    loading.value = true;
+    loadingText.value = '初始化中...';
+    
+    // 初始化用户信息
+    initUserInfo();
+    
+    // 加载仓库列表
+    await loadWarehouseList();
+    
+    // 新增模式，添加一个空的明细项
+    handleAddItem();
+    
+    loading.value = false;
+  } catch (error) {
+    console.error('页面初始化失败:', error);
+    loading.value = false;
+  }
+});
+</script>
+
+<style scoped lang="scss">
+.direct-out-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  background-color: #f5f5f5;
+}
+
+.form-scroll {
+  flex: 1;
+  height: calc(100vh - 120rpx);
+  
+  &.full-height {
+    height: 100vh;
+  }
+}
+
+.form-container {
+  padding: 20rpx;
+  padding-bottom: 160rpx; // 为底部按钮留出空间
+  background-color: #f5f5f5;
+  min-height: 100%;
+}
+
+.section {
+  background-color: #ffffff;
+  border-radius: 12rpx;
+  padding: 24rpx;
+  margin-bottom: 24rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
+  
+  .section-title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 24rpx;
+    padding: 0 12rpx;
+    
+    .title-line {
+      width: 8rpx;
+      height: 32rpx;
+      background: #1890ff;
+      border-radius: 4rpx;
+      margin-right: 16rpx;
+    }
+    
+    .title-text {
+      font-size: 32rpx;
+      font-weight: 600;
+      color: #262626;
+    }
+  }
+}
+
+.node-field {
+  margin-top: 20rpx;
+  
+  &:first-child {
+    margin-top: 0;
+  }
+
+  .field-label-title {
+    font-size: 30rpx;
+    font-weight: bold;
+    color: #303133;
+    margin-bottom: 12rpx;
+    padding-bottom: 8rpx;
+    border-bottom: 2rpx solid #e4e7ed;
+  }
+
+  .textarea-field {
+    width: 100%;
+    min-height: 120rpx;
+    padding: 20rpx;
+    border: 1rpx solid #e4e7ed;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+    line-height: 1.5;
+  }
+}
+
+.item-list {
+  .item-row {
+    border: 1rpx solid #e4e7ed;
+    border-radius: 8rpx;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    background-color: #fafafa;
+    
+    .item-header {
+      position: relative;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 16rpx;
+      padding-bottom: 12rpx;
+      border-bottom: 1rpx solid #e4e7ed;
+      
+      .item-index {
+        font-size: 28rpx;
+        font-weight: bold;
+        color: #303133;
+      }
+      
+      .delete-icon {
+        position: absolute;
+        top: -10rpx;
+        right: -10rpx;
+        width: 40rpx;
+        height: 40rpx;
+        line-height: 40rpx;
+        text-align: center;
+        background: #f56c6c;
+        color: #fff;
+        border-radius: 50%;
+        font-size: 36rpx;
+        font-weight: bold;
+        cursor: pointer;
+        z-index: 10;
+        
+        &:active {
+          background: #e53e3e;
+          transform: scale(0.95);
+        }
+      }
+    }
+    
+    .item-content {
+      position: relative;
+      
+      .item-field-wrapper {
+        margin-bottom: 16rpx;
+        
+        .item-field {
+          display: flex;
+          align-items: center;
+          padding: 0;
+          background: transparent;
+          border: none;
+          cursor: pointer;
+          position: relative;
+          
+          .field-label {
+            width: 100rpx;
+            font-size: 28rpx;
+            color: #606266;
+            margin-right: 0;
+            flex-shrink: 0;
+            text-align: left;
+            padding-right: 12rpx;
+            display: flex;
+            align-items: center;
+            justify-content: flex-start;
+            box-sizing: border-box;
+            white-space: nowrap;
+            
+            .required-mark {
+              color: #f56c6c;
+              margin-right: 4rpx;
+              font-size: 28rpx;
+              line-height: 1;
+              width: 20rpx;
+              flex-shrink: 0;
+            }
+            
+            > text {
+              white-space: nowrap;
+            }
+          }
+          
+          .field-value-wrapper {
+            flex: 1;
+            position: relative;
+            min-height: 64rpx;
+            
+            .field-value {
+              display: block;
+              width: 100%;
+              font-size: 28rpx;
+              color: #303133;
+              text-align: left;
+              min-height: 64rpx;
+              line-height: 64rpx;
+              padding: 0 48rpx 0 24rpx;
+              background: #ffffff;
+              border: 1rpx solid #dcdfe6;
+              border-radius: 4rpx;
+              box-sizing: border-box;
+              
+              &.placeholder-text {
+                color: #c0c4cc;
+              }
+            }
+            
+            .dropdown-icon {
+              position: absolute;
+              right: 16rpx;
+              top: 50%;
+              transform: translateY(-50%);
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              pointer-events: none;
+              z-index: 2;
+              width: 32rpx;
+              height: 32rpx;
+              
+              .arrow-down {
+                font-size: 20rpx;
+                color: #909399;
+                line-height: 1;
+              }
+            }
+          }
+        }
+      }
+      
+      .stock-tip {
+        margin-top: 12rpx;
+        padding: 12rpx 16rpx;
+        background: #f0f9ff;
+        border-radius: 6rpx;
+        display: flex;
+        align-items: center;
+        
+        .stock-label {
+          font-size: 24rpx;
+          color: #606266;
+          margin-right: 8rpx;
+        }
+        
+        .stock-value {
+          font-size: 24rpx;
+          color: #1890ff;
+          font-weight: 500;
+          
+          &.stock-warning {
+            color: #f56c6c;
+          }
+        }
+      }
+      
+      .quantity-field-wrapper {
+        :deep(.forms-item-row) {
+          padding: 0;
+          margin: 0;
+          display: flex;
+          align-items: center;
+        }
+        
+        :deep(.label-container) {
+          width: 100rpx;
+          flex: 0 0 100rpx;
+          white-space: nowrap;
+          padding-right: 12rpx;
+          box-sizing: border-box;
+        }
+        
+        :deep(.label-text) {
+          white-space: nowrap;
+        }
+        
+        :deep(.flex-1) {
+          flex: 1;
+          position: relative;
+        }
+        
+        :deep(.uni-easyinput) {
+          width: 100% !important;
+          border: 1rpx solid #dcdfe6 !important;
+          border-radius: 4rpx !important;
+          background: #ffffff !important;
+          min-height: 64rpx !important;
+          box-sizing: border-box !important;
+        }
+        
+        :deep(.uni-easyinput__content-input),
+        :deep(.uni-input),
+        :deep(input) {
+          border: none !important;
+          border-radius: 0 !important;
+          background: transparent !important;
+          padding: 0 24rpx !important;
+          min-height: 64rpx !important;
+          line-height: 64rpx !important;
+          font-size: 28rpx !important;
+          color: #303133 !important;
+          box-sizing: border-box !important;
+          width: 100% !important;
+        }
+        
+        :deep(.uni-easyinput__content) {
+          border: none !important;
+        }
+      }
+    }
+  }
+  
+  .add-item-btn {
+    width: 100%;
+    padding: 20rpx;
+    background: #f0f9ff;
+    color: #409eff;
+    border: 1rpx dashed #b3d8ff;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+  }
+}
+
+/* 固定在底部的按钮组 */
+.fixed-bottom {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: #ffffff;
+  padding: 24rpx;
+  box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.08);
+  z-index: 1;
+  
+  &.hide-bottom {
+    display: none !important;
+    height: 0 !important;
+    padding: 0 !important;
+  }
+  
+  .button-group {
+    display: flex;
+    gap: 24rpx;
+    
+    .save-btn,
+    .submit-btn {
+      flex: 1;
+      height: 88rpx;
+      line-height: 88rpx;
+      border: none;
+      border-radius: 16rpx;
+      font-size: 32rpx;
+      font-weight: 600;
+      transition: all 0.3s;
+      
+      &:disabled {
+        opacity: 0.6;
+      }
+      
+      &:active:not(:disabled) {
+        transform: scale(0.98);
+      }
+    }
+    
+    .save-btn {
+      background: #f3f4f6;
+      color: #374151;
+      
+      &:active:not(:disabled) {
+        background: #e5e7eb;
+      }
+    }
+    
+    .submit-btn {
+      background: #3b82f6;
+      color: #ffffff;
+      box-shadow: 0 4rpx 16rpx rgba(59, 130, 246, 0.3);
+      
+      &:active:not(:disabled) {
+        background: #1d4ed8;
+      }
+    }
+  }
+}
+
+// 加载遮罩层样式
+.loading-mask {
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.35);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 999;
+}
+
+.loading-content {
+  min-width: 200rpx;
+  padding: 24rpx 32rpx;
+  background: rgba(0, 0, 0, 0.7);
+  border-radius: 16rpx;
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
+
+.loading-text {
+  color: #fff;
+  font-size: 28rpx;
+}
+
+.loading-icon {
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
+}
+</style>
+
+
+
diff --git a/src/pages/view/routine/inv/invout/index.vue b/src/pages/view/routine/inv/invout/index.vue
new file mode 100644
index 0000000..1e90777
--- /dev/null
+++ b/src/pages/view/routine/inv/invout/index.vue
@@ -0,0 +1,96 @@
+<template>
+  <BasicLayout>
+    <view class="invout-container">
+      <!-- Tab切换 -->
+      <view class="tab-container">
+        <view 
+          class="tab-item" 
+          :class="{ active: activeTab === 'approval' }"
+          @click="switchTab('approval')"
+        >
+          <text class="tab-text">审批出库</text>
+        </view>
+        <view 
+          class="tab-item" 
+          :class="{ active: activeTab === 'direct' }"
+          @click="switchTab('direct')"
+        >
+          <text class="tab-text">直接出库</text>
+        </view>
+      </view>
+
+      <!-- Tab内容区域 -->
+      <view class="tab-content">
+        <ApprovalOut v-if="activeTab === 'approval'" />
+        <DirectOut v-if="activeTab === 'direct'" />
+      </view>
+    </view>
+  </BasicLayout>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import ApprovalOut from './ApprovalOut.vue';
+import DirectOut from './DirectOut.vue';
+
+const activeTab = ref<'approval' | 'direct'>('approval');
+
+const switchTab = (tab: 'approval' | 'direct') => {
+  activeTab.value = tab;
+};
+</script>
+
+<style scoped lang="scss">
+.invout-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  background-color: #f5f5f5;
+}
+
+.tab-container {
+  display: flex;
+  background-color: #ffffff;
+  border-bottom: 1rpx solid #e4e7ed;
+  padding: 0 20rpx;
+  
+  .tab-item {
+    flex: 1;
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    cursor: pointer;
+    
+    .tab-text {
+      font-size: 32rpx;
+      color: #606266;
+      font-weight: 500;
+    }
+    
+    &.active {
+      .tab-text {
+        color: #1890ff;
+        font-weight: 600;
+      }
+      
+      &::after {
+        content: '';
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        height: 4rpx;
+        background-color: #1890ff;
+      }
+    }
+  }
+}
+
+.tab-content {
+  flex: 1;
+  overflow: hidden;
+}
+</style>
+
diff --git a/src/pages/view/routine/inv/invsp/InvApplyApprove.vue b/src/pages/view/routine/inv/invsp/InvApplyApprove.vue
new file mode 100644
index 0000000..f1fc431
--- /dev/null
+++ b/src/pages/view/routine/inv/invsp/InvApplyApprove.vue
@@ -0,0 +1,617 @@
+<template>
+  <BasicLayout>
+    <!-- 统一的滚动容器，包含编辑组件和流程组件 -->
+    <scroll-view scroll-y class="unified-scroll" :class="{ 'full-height': hideBottomBtn }">
+      <!-- 领用申请详情展示 -->
+      <view class="section">
+        <view class="section-title">
+          <view class="title-line"></view>
+          <text class="title-text">申请信息</text>
+        </view>
+        
+        <view class="info-item">
+          <text class="info-label">申请人</text>
+          <text class="info-value">{{ applyInfo.applyUserName }}</text>
+        </view>
+        
+        <view class="info-item">
+          <text class="info-label">申请日期</text>
+          <text class="info-value">{{ formatDate(applyInfo.applyDate) }}</text>
+        </view>
+        
+        <view class="info-item">
+          <text class="info-label">申请原因</text>
+          <text class="info-value">{{ applyInfo.applyReason || '无' }}</text>
+        </view>
+        
+        <view class="info-item">
+          <text class="info-label">总数量</text>
+          <text class="info-value">{{ applyInfo.totalQty || 0 }}</text>
+        </view>
+        
+        <view class="info-item">
+          <text class="info-label">总金额</text>
+          <text class="info-value">{{ applyInfo.totalAmount || 0 }}</text>
+        </view>
+      </view>
+
+      <!-- 申请明细展示 -->
+      <view class="section">
+        <view class="section-title">
+          <view class="title-line"></view>
+          <text class="title-text">申请明细</text>
+        </view>
+        
+        <view class="item-list" v-if="applyInfo.items && applyInfo.items.length > 0">
+          <view 
+            v-for="(item, index) in applyInfo.items" 
+            :key="index" 
+            class="item-row"
+          >
+            <view class="item-header">
+              <text class="item-index">第{{ index + 1 }}项</text>
+            </view>
+            
+            <view class="item-detail">
+              <view class="info-item">
+                <text class="info-label">物品</text>
+                <text class="info-value">{{ item.itemName || '无' }}</text>
+              </view>
+              
+              <view class="info-item">
+                <text class="info-label">单位</text>
+                <text class="info-value">{{ item.unitName || '无' }}</text>
+              </view>
+              
+              <view class="info-item">
+                <text class="info-label">数量</text>
+                <text class="info-value">{{ item.applyQty || 0 }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view v-else class="empty-tip">
+          <text>暂无明细数据</text>
+        </view>
+      </view>
+
+      <!-- 审批流程展示 -->
+      <view class="flow-section" v-if="applyId">
+        <LcglSp :yw-id="applyId" yw-type="INV_APPLY" :key="applyId" />
+      </view>
+    </scroll-view>
+
+    <template #bottom>
+      <view :class="{ 'hide-bottom': hideBottomBtn }">
+        <YwConfirm
+          v-if="showButton"
+          :spApi="wrappedInvApplySpApi"
+          :stopApi="wrappedInvApplyStopApi"
+          :transferApi="wrappedInvApplyTransferApi"
+          :params="spParams"
+          :autoToMessage="false"
+          :showXt="false"
+          :showReject="!isYiban"
+          :showTransfer="false"
+          :showApprove="!isYiban"
+          :showReturn="false"
+          :showStop="true"
+          :showXtDk="false"
+          approveText="通过"
+          @submit="handleSubmit"
+          @reject="handleReject"
+          @transfer="handleTransfer"
+          @stop="handleStop"
+        />
+      </view>
+    </template>
+
+    <!-- 遮罩层 -->
+    <view v-if="loading" class="loading-mask">
+      <view class="loading-content">
+        <view class="loading-spinner"></view>
+        <text class="loading-text">{{ loadingText }}</text>
+      </view>
+    </view>
+  </BasicLayout>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from "vue";
+import { onLoad, onBackPress } from "@dcloudio/uni-app";
+import dayjs from "dayjs";
+import BasicLayout from "@/components/BasicLayout/Layout.vue";
+import LcglSp from "@/components/LcglSp/index.vue";
+import YwConfirm from "@/pages/components/YwConfirm/index.vue";
+import { 
+  invApplyFindFullByIdApi, 
+  invApplySpApi, 
+  invApplyTransferApi, 
+  invApplyStopApi 
+} from "@/api/base/invApplyApi";
+import { xxtsFindByIdApi } from "@/api/base/xxtsApi";
+import { useUserStore } from "@/store/modules/user";
+
+const { loginByOpenId, getJs } = useUserStore();
+
+const applyId = ref<string>("");
+const applyInfo = ref<any>({});
+const showButton = ref<boolean>(false);
+const isLoginReady = ref<boolean>(false); // 登录是否准备就绪
+// 控制底部按钮区域显示/隐藏
+const hideBottomBtn = ref(false);
+// 遮罩层状态
+const loading = ref<boolean>(false);
+const loadingText = ref<string>("处理中...");
+// 数据加载状态
+const applyInfoLoaded = ref<boolean>(false); // 流程数据是否已加载
+// 是否已办（dbZt === "B" 表示已办）
+const dbZtFromUrl = ref<string>("");
+// 直接用一个 ref 保存 xxtsId
+const xxtsId = ref<string>("");
+const isYiban = computed(() => {
+  return dbZtFromUrl.value === "B";
+});
+
+// 审批参数（只包含审批相关字段，业务字段通过 save 接口保存）
+const spParams = computed(() => {
+  return {
+    xxtsId: xxtsId.value,
+    ywId: applyId.value,
+    ywType: 'INV_APPLY' // 领用申请类型
+  };
+});
+
+// 读取申请详情（用于审批时获取最新数据，包含申请信息和明细）
+const getApplyInfo = async () => {
+  try {
+    const res: any = await invApplyFindFullByIdApi({ id: applyId.value });
+    
+    // 后端接口直接返回 InvApply 对象，也可能包装在 ReturnMsg 中
+    let data = null;
+    if (res && res.resultCode === 1 && res.result) {
+      // 包装在 ReturnMsg 中的情况
+      data = res.result;
+    } else if (res && res.id) {
+      // 直接返回对象的情况
+      data = res;
+    }
+    
+    if (!data) {
+      console.error("获取领用申请详情失败: 数据为空");
+      showButton.value = false;
+      applyInfoLoaded.value = true;
+      loading.value = false; // 关闭遮罩层
+      return;
+    }
+    
+    // 设置申请信息（包含明细数据）
+    applyInfo.value = data;
+    
+    // 判断是否显示审批按钮
+    const spResult = data.spResult;
+    const spJd = data.spJd;
+
+    // 已完结或驳回：隐藏审批按钮
+    if (spResult === "C" || (spJd === "Z" && spResult === "B")) {
+      showButton.value = false;
+    } else if (spResult && spResult !== "A" && dbZtFromUrl.value === "A") {
+      // 历史逻辑：当流程已完成且待办状态关闭时，不显示审批按钮
+      showButton.value = false;
+    } else {
+      showButton.value = true;
+    }
+    
+    applyInfoLoaded.value = true;
+    loading.value = false; // 关闭遮罩层
+  } catch (error) {
+    console.error("获取领用申请详情失败:", error);
+    showButton.value = false;
+    applyInfoLoaded.value = true;
+    loading.value = false; // 关闭遮罩层
+  }
+};
+
+// 包装审批接口，先保存数据再审批
+const wrappedInvApplySpApi = async (params: any) => {
+  console.log('领用申请审批接口被调用，参数:', params);
+  
+  try {
+    console.log('步骤1: 数据已保存，开始审批');
+    loadingText.value = '正在审批...';
+    
+    // 保存成功后，再调用审批接口（只传递审批相关参数，不传递业务字段）
+    const spParams = {
+      xxtsId: params.xxtsId,
+      ywId: params.ywId,
+      spStatus: params.spStatus,
+      spRemark: params.spRemark,
+      ywType: params.ywType
+    };
+    
+    console.log('步骤2: 调用审批接口，参数:', spParams);
+    const result = await invApplySpApi(spParams);
+    console.log('审批接口返回:', result);
+    loading.value = false;
+    return result;
+  } catch (error: any) {
+    console.error('审批流程出错:', error);
+    loading.value = false;
+    throw error;
+  }
+};
+
+// 包装转办接口
+const wrappedInvApplyTransferApi = async (params: any) => {
+  console.log('领用申请转办接口被调用，参数:', params);
+  
+  try {
+    loadingText.value = '正在转办...';
+    
+    // 调用转办接口
+    const transferParams = {
+      xxtsId: params.xxtsId,
+      ywId: params.ywId,
+      zbrIds: params.zbrIds,
+      csrIds: params.csrIds,
+      spRemark: params.spRemark,
+      ywType: params.ywType
+    };
+    
+    console.log('调用转办接口，参数:', transferParams);
+    const result = await invApplyTransferApi(transferParams);
+    console.log('转办接口返回:', result);
+    loading.value = false;
+    return result;
+  } catch (error: any) {
+    console.error('转办流程出错:', error);
+    loading.value = false;
+    throw error;
+  }
+};
+
+// 包装终止接口
+const wrappedInvApplyStopApi = async (params: any) => {
+  console.log('领用申请终止接口被调用，参数:', params);
+  
+  try {
+    loadingText.value = '正在终止...';
+    
+    // 调用终止接口
+    const stopParams = {
+      xxtsId: params.xxtsId,
+      ywId: params.ywId,
+      spRemark: params.spRemark,
+      ywType: params.ywType
+    };
+    
+    console.log('调用终止接口，参数:', stopParams);
+    const result = await invApplyStopApi(stopParams);
+    console.log('终止接口返回:', result);
+    loading.value = false;
+    return result;
+  } catch (error: any) {
+    console.error('终止流程出错:', error);
+    loading.value = false;
+    throw error;
+  }
+};
+
+// 格式化日期
+const formatDate = (dateStr: string) => {
+  if (!dateStr) return '';
+  return dayjs(dateStr).format('YYYY-MM-DD');
+};
+
+// 处理审批操作完成后的跳转
+const handleSubmit = () => {
+  navigateToIndex();
+};
+
+const handleReject = () => {
+  navigateToIndex();
+};
+
+const handleTransfer = () => {
+  navigateToIndex();
+};
+
+const handleStop = () => {
+  navigateToIndex();
+};
+
+// 跳转回审批列表页面
+const navigateToIndex = () => {
+  setTimeout(() => {
+    // 发送刷新事件，通知列表页面刷新
+    uni.$emit('refreshInvApplyList');
+    
+    // 使用 navigateBack 返回上一页，保留查询条件
+    // 如果上一页不存在（直接打开详情页），则使用 redirectTo
+    const pages = getCurrentPages();
+    if (pages.length > 1) {
+      uni.navigateBack({
+        delta: 1
+      });
+    } else {
+      uni.redirectTo({
+        url: '/pages/view/routine/inv/invsp/index'
+      });
+    }
+  }, 500);
+};
+
+// 返回按钮监听（仅 App 端生效，H5 端已在 ImagePreviewWithRotate 组件内部处理）
+onBackPress(() => {
+  // 没有特殊处理，允许正常返回
+  return false;
+});
+
+onLoad(async (options: any) => {
+  if (!options || !options.id) {
+    uni.showToast({ title: "缺少申请ID", icon: "none" });
+    setTimeout(() => uni.navigateBack(), 1500);
+    return;
+  }
+
+  // 如果有 openId，先进行认证（防止 token 过期）
+  if (options.openId) {
+    try {
+      const loginSuccess = await loginByOpenId(options.openId);
+      if (!loginSuccess) {
+        // 登录失败，停止后续流程
+        return;
+      }
+      // 等待一下，确保 token 已保存到 store 中
+      await new Promise(resolve => setTimeout(resolve, 100));
+    } catch (e) {
+      console.error("openId认证失败:", e);
+      // 认证失败，停止后续流程
+      return;
+    }
+  }
+  
+  // 标记登录准备就绪，允许组件开始加载数据（无论是否有 openId）
+  isLoginReady.value = true;
+
+  // 显示遮罩层
+  loading.value = true;
+  loadingText.value = '正在加载数据...';
+  // 重置加载状态
+  applyInfoLoaded.value = false;
+
+  let actualApplyId = options.id; // 默认使用传入的 ID
+
+  // 如果是从待办进入的（from=db），需要先获取 xxts 信息，然后获取业务 ID
+  if (options.from === 'db') {
+    try {
+      // 从后端根据 url 中的 id（xxts ID）查询待办信息
+      const xxtsRes = await xxtsFindByIdApi({ id: options.id });
+      
+      if (xxtsRes && xxtsRes.result) {
+        const xxts = xxtsRes.result;
+        
+        // 直接保存 xxtsId
+        if (xxts.id) {
+          xxtsId.value = xxts.id;
+        }
+        
+        // 从 xxts 中获取业务 ID（xxzbId）
+        if (xxts.xxzbId) {
+          actualApplyId = xxts.xxzbId;
+        }
+        
+        // 从 xxts 获取 dbZt
+        if (xxts.dbZt) {
+          dbZtFromUrl.value = xxts.dbZt;
+        }
+      }
+    } catch (error) {
+      console.error('获取待办信息失败:', error);
+      // 如果获取失败，继续使用原始 ID
+    }
+  } else {
+    // 如果不是从待办进入，检查 URL 参数中是否有 xxtsId
+    if (options.xxtsId) {
+      xxtsId.value = options.xxtsId;
+    }
+    
+    // 从 URL 参数获取 dbZt（如果传递了的话）
+    if (options.dbZt) {
+      dbZtFromUrl.value = options.dbZt;
+    }
+  }
+
+  // 使用实际的业务 ID
+  applyId.value = actualApplyId;
+  
+  getApplyInfo();
+});
+</script>
+
+<style scoped lang="scss">
+.unified-scroll {
+  flex: 1;
+  height: calc(100vh - 120rpx);
+  overflow-y: auto;
+  
+  &.full-height {
+    height: 100vh;
+  }
+}
+
+.section {
+  background-color: #ffffff;
+  border-radius: 12rpx;
+  padding: 24rpx;
+  margin-bottom: 24rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
+  
+  .section-title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 24rpx;
+    padding: 0 12rpx;
+    
+    .title-line {
+      width: 8rpx;
+      height: 32rpx;
+      background: #1890ff;
+      border-radius: 4rpx;
+      margin-right: 16rpx;
+    }
+    
+    .title-text {
+      font-size: 32rpx;
+      font-weight: 600;
+      color: #262626;
+    }
+  }
+}
+
+.info-item {
+  display: flex;
+  padding: 16rpx 0;
+  border-bottom: 1rpx solid #f0f0f0;
+  
+  &:last-child {
+    border-bottom: none;
+  }
+  
+  .info-label {
+    width: 160rpx;
+    font-size: 28rpx;
+    color: #606266;
+    flex-shrink: 0;
+  }
+  
+  .info-value {
+    flex: 1;
+    font-size: 28rpx;
+    color: #303133;
+    word-break: break-all;
+  }
+}
+
+.item-list {
+  .item-row {
+    border: 1rpx solid #e4e7ed;
+    border-radius: 8rpx;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    background-color: #fafafa;
+    
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 16rpx;
+      padding-bottom: 12rpx;
+      border-bottom: 1rpx solid #e4e7ed;
+      
+      .item-index {
+        font-size: 28rpx;
+        font-weight: bold;
+        color: #303133;
+      }
+    }
+    
+    .item-detail {
+      .info-item {
+        padding: 12rpx 0;
+        border-bottom: 1rpx dashed #f0f0f0;
+        
+        &:last-child {
+          border-bottom: none;
+        }
+      }
+    }
+  }
+}
+
+.flow-section {
+  padding: 0;
+  background-color: #f5f5f5;
+  margin-top: 30rpx;
+  
+  // 确保流程组件与编辑组件有间距
+  :deep(.lcgl-info) {
+    padding-top: 0;
+    margin-top: 0;
+    padding-left: 0;
+    padding-right: 0;
+  }
+  
+  // 流程组件的 section 也要移除左右边距
+  :deep(.info-section) {
+    border-radius: 0;
+    margin-left: 0;
+    margin-right: 0;
+  }
+}
+
+// 统一滚动容器的样式
+.unified-scroll {
+  background-color: #f5f5f5;
+}
+
+// 遮罩层样式
+.loading-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+  
+  .loading-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    background-color: #ffffff;
+    border-radius: 16rpx;
+    padding: 60rpx 80rpx;
+    min-width: 300rpx;
+    
+    .loading-spinner {
+      width: 60rpx;
+      height: 60rpx;
+      border: 6rpx solid #f3f3f3;
+      border-top: 6rpx solid #007aff;
+      border-radius: 50%;
+      animation: spin 1s linear infinite;
+      margin-bottom: 30rpx;
+    }
+    
+    .loading-text {
+      font-size: 28rpx;
+      color: #333333;
+      text-align: center;
+    }
+  }
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+// 隐藏底部按钮区域
+.hide-bottom {
+  display: none !important;
+  height: 0 !important;
+  padding: 0 !important;
+}
+
+.empty-tip {
+  padding: 40rpx;
+  text-align: center;
+  color: #909399;
+  font-size: 28rpx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/view/routine/inv/invsp/index.vue b/src/pages/view/routine/inv/invsp/index.vue
new file mode 100644
index 0000000..e3ee926
--- /dev/null
+++ b/src/pages/view/routine/inv/invsp/index.vue
@@ -0,0 +1,516 @@
+<template>
+  <view class="invsp-list-page">
+    <view class="top-section">
+      <view class="search-card">
+        <view class="search-item">
+          <view class="search-container">
+            <BasicSearch
+              placeholder="搜索申请人或申请原因"
+              v-model="searchKeyword"
+              class="search-input"
+              @search="handleSearch"
+            />
+            <u-button
+              text="查询"
+              type="primary"
+              size="small"
+              class="search-button"
+              @click="handleSearch(searchKeyword)"
+            />
+          </view>
+        </view>
+        <view class="filter-tabs">
+          <view
+            v-for="tab in filterTabs"
+            :key="tab.key"
+            class="filter-tab"
+            :class="{ active: activeTab === tab.key }"
+            @click="switchTab(tab.key)"
+          >
+            {{ tab.label }}
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="middle-section">
+      <z-paging
+        ref="pagingRef"
+        v-model="dataList"
+        :auto="true"
+        :refresher-enabled="true"
+        :loading-more-enabled="true"
+        :loading-more-threshold="50"
+        :default-page-size="10"
+        :show-loading-more-no-more-view="true"
+        :show-empty-view-reload="false"
+        :fixed="false"
+        class="paging-container"
+        @query="queryData"
+      >
+        <view
+          v-for="(data, index) in dataList"
+          :key="data.id || index"
+          class="inv-card"
+        >
+          <view class="card-header">
+            <text class="inv-title">{{ getTitle(data) }}</text>
+            <text class="inv-status" :class="getStatusClass(data.spJd, data.spResult)">
+              {{ getStatusText(data.spJd, data.spResult) }}
+            </text>
+          </view>
+          <view class="card-body">
+            <view class="info-row">
+              <text class="label">申请人：</text>
+              <text class="value">{{ data.applyUserName || "—" }}</text>
+              <text class="label label-compact">申请日期：</text>
+              <text class="value">{{ formatDate(data.applyDate) }}</text>
+            </view>
+            <view class="info-row">
+              <text class="label">申请原因：</text>
+              <text class="value ellipsis">{{ data.applyReason || "—" }}</text>
+            </view>
+            <view class="info-row">
+              <text class="label">总数量：</text>
+              <text class="value qty">{{ data.totalQty || 0 }}</text>
+            </view>
+          </view>
+          <view class="card-footer">
+            <view class="action-text" @click="goToDetail(data)">
+              {{ activeTab === 'pending' ? '审批' : '查看' }}
+              <uni-icons type="arrowright" size="14" color="#007aff"></uni-icons>
+            </view>
+          </view>
+        </view>
+      </z-paging>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, onUnmounted } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import dayjs from "dayjs";
+import BasicSearch from "@/components/BasicSearch/Search.vue";
+import { invApplyFindUserTodosPageApi } from "@/api/base/invApplyApi";
+import { navigateTo } from "@/utils/uniapp";
+import { useUserStore } from "@/store/modules/user";
+
+const filterTabs = [
+  { key: "pending", label: "待办" },
+  { key: "approved", label: "已办" },
+  { key: "all", label: "全部" },
+];
+
+// 本地存储的 key
+const STORAGE_KEY = 'invsp_search_conditions';
+
+// 查询条件状态
+const activeTab = ref("pending");
+const searchKeyword = ref("");
+const dataList = ref<any[]>([]);
+const pagingRef = ref<any>(null);
+const userStore = useUserStore();
+
+// 保存查询条件到本地存储
+const saveSearchConditions = () => {
+  try {
+    const conditions = {
+      activeTab: activeTab.value,
+      searchKeyword: searchKeyword.value,
+    };
+    uni.setStorageSync(STORAGE_KEY, conditions);
+  } catch (error) {
+    console.error('保存查询条件失败:', error);
+  }
+};
+
+// 从本地存储恢复查询条件
+const restoreSearchConditions = () => {
+  try {
+    const conditions = uni.getStorageSync(STORAGE_KEY);
+    if (conditions) {
+      activeTab.value = conditions.activeTab || "pending";
+      searchKeyword.value = conditions.searchKeyword || "";
+      return true;
+    }
+  } catch (error) {
+    console.error('恢复查询条件失败:', error);
+  }
+  return false;
+};
+
+const getCurrentTeacherId = () => {
+  const jsData = userStore.getJs;
+  return jsData?.id || null;
+};
+
+const handleSearch = (keyword: string) => {
+  searchKeyword.value = keyword;
+  saveSearchConditions(); // 保存查询条件
+  pagingRef.value?.reload();
+};
+
+const switchTab = (tabKey: string) => {
+  activeTab.value = tabKey;
+  saveSearchConditions(); // 保存查询条件
+  pagingRef.value?.reload();
+};
+
+const filterInvData = (list: any[]) => {
+  let filtered = list;
+  if (searchKeyword.value) {
+    const kw = searchKeyword.value.toLowerCase();
+    filtered = filtered.filter((item) => {
+      const applyUserName = (item.applyUserName || '').toLowerCase();
+      const applyReason = (item.applyReason || '').toLowerCase();
+      return applyUserName.includes(kw) || applyReason.includes(kw);
+    });
+  }
+  return filtered;
+};
+
+const queryData = async (pageNo: number, pageSize: number) => {
+  try {
+    const jsId = getCurrentTeacherId();
+    if (!jsId) {
+      uni.showToast({ title: "无法获取用户信息", icon: "none" });
+      pagingRef.value?.complete([]);
+      return;
+    }
+
+    let response: any;
+    const params: any = {
+      jsId,
+      page: pageNo,
+      rows: pageSize,
+    };
+    
+    if (activeTab.value === "all") {
+      params.dbZt = "";
+      params.spType = "";
+      params.spJd = "";
+    } else if (activeTab.value === "pending") {
+      params.dbZt = "A";
+      params.spType = "SP";
+      params.spJd = "A";
+    } else if (activeTab.value === "approved") {
+      // 为了让驳回数据也出现在已办列表，这里不过滤 dbZt，后续用前端筛选
+      params.dbZt = "";
+      params.spType = "SP";
+      params.spJd = "Z";
+    } else {
+      // 默认全部（不含抄送）
+      params.dbZt = "";
+      params.spType = "SP";
+      params.spJd = "";
+    }
+    
+    // 如果有搜索关键词，传递申请原因参数
+    if (searchKeyword.value) {
+      params.applyReason = searchKeyword.value;
+    }
+    
+    response = await invApplyFindUserTodosPageApi(params);
+
+    console.log("领用审批列表接口返回 raw:", response);
+    const result = response?.data || response;
+    let rows: any[] = [];
+    if (result?.rows && Array.isArray(result.rows)) {
+      rows = result.rows;
+    } else if (result?.resultCode === 1 && Array.isArray(result.result)) {
+      rows = result.result;
+    }
+    console.log("领用审批列表 rows:", rows);
+    // 针对待办/已办做前端筛选：
+    // - 待办：去掉驳回（spResult === 'C'）
+    // - 已办：仅保留完结/已办/驳回（spResult === 'C' 或 dbZt === 'B' 或 spJd === 'Z' 或 spResult === 'B'）
+    if (activeTab.value === "pending") {
+      rows = rows.filter(item => item.spResult !== "C");
+    } else if (activeTab.value === "approved") {
+      rows = rows.filter(item => item.spResult === "C" || item.dbZt === "B" || item.spJd === "Z" || item.spResult === "B");
+    }
+
+    const filtered = filterInvData(rows);
+    console.log("领用审批列表 filtered:", filtered);
+    console.log('是否还有更多数据（根据数据量判断）:', filtered.length === pageSize);
+    
+    // z-paging 的 v-model 会自动管理 dataList
+    // complete() 方法会根据 pageNo 自动判断是替换（第一页）还是追加（后续页）
+    // 不传递 total 参数，让 z-paging 根据返回的数据量自动判断
+    // 如果返回的数据量等于 pageSize，就认为还有更多数据
+    pagingRef.value?.complete(filtered);
+  } catch (error) {
+    console.error("加载领用审批列表失败:", error);
+    uni.showToast({ title: "加载失败", icon: "none" });
+    // z-paging 会自动管理 dataList，只需要调用 complete 即可
+    pagingRef.value?.complete([]);
+  }
+};
+
+const getTitle = (item: any) => {
+  if (item.applyUserName && item.applyReason) {
+    return `${item.applyUserName} - ${item.applyReason}`;
+  }
+  return item.applyUserName || item.applyReason || "领用申请";
+};
+
+// 状态文案优先级：驳回 > 完结 > 审核中 > 待审核
+// 注意：暂存数据已在后端过滤，不会出现在审批列表中
+const getStatusText = (spJd?: string, spResult?: string) => {
+  if (spResult === "C") return "驳回";
+  if (spJd === "Z" || spResult === "B") return "完结";
+  if (spJd === "A") return "审核中";
+  if (spResult === "A") return "待审核";
+  // 如果都不满足，默认返回待审核（暂存数据已被后端过滤）
+  return "待审核";
+};
+
+const getStatusClass = (spJd?: string, spResult?: string) => {
+  if (spResult === "C") return "status-reject";
+  if (spJd === "Z" || spResult === "B") return "status-done";
+  if (spJd === "A" || spResult === "A") return "status-pending";
+  // 如果都不满足，默认返回空（暂存数据已被后端过滤）
+  return "";
+};
+
+const formatDate = (val?: string) => (val ? dayjs(val).format("YYYY-MM-DD") : "--");
+
+const goToDetail = (item: any) => {
+  // 优先使用 xxtsId（如果有），否则使用业务 ID
+  const id = item.xxtsId || item.ywId || item.id;
+  if (!id) {
+    uni.showToast({ title: "缺少申请ID", icon: "none" });
+    return;
+  }
+  // 传递 dbZt 参数，用于判断是否已办
+  const dbZt = item.dbZt || (activeTab.value === 'approved' ? 'B' : activeTab.value === 'pending' ? 'A' : '');
+  navigateTo(`/pages/view/routine/inv/invsp/InvApplyApprove?id=${id}&from=db&dbZt=${dbZt}`);
+};
+
+// 刷新列表的方法
+const refreshList = () => {
+  if (pagingRef.value) {
+    pagingRef.value.reload();
+  }
+};
+
+// 监听刷新事件
+const handleRefreshEvent = () => {
+  refreshList();
+};
+
+onMounted(() => {
+  // 页面加载时恢复查询条件
+  restoreSearchConditions();
+  
+  // 监听刷新事件
+  uni.$on('refreshInvApplyList', handleRefreshEvent);
+});
+
+onUnmounted(() => {
+  // 页面卸载时移除事件监听
+  uni.$off('refreshInvApplyList', handleRefreshEvent);
+});
+
+onShow(() => {
+  // 如果页面被重新初始化（如使用 redirectTo），恢复查询条件
+  const hasRestored = restoreSearchConditions();
+  // 恢复条件后需要重新加载数据
+  if (hasRestored || pagingRef.value) {
+    pagingRef.value?.reload();
+  }
+});
+</script>
+
+<style scoped lang="scss">
+.invsp-list-page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background-color: #f5f7fa;
+}
+
+.top-section {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 20;
+  background-color: #fff;
+  padding: 10px 12px 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+.search-card {
+  background-color: #ffffff;
+  border-radius: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+  border: 1px solid #f0f0f0;
+}
+
+.search-container {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}
+
+.search-input {
+  flex: 1;
+  min-width: 70%;
+  height: 42px;
+  background-color: #f8f9fa;
+  border: 1px solid #e9ecef;
+  border-radius: 8px;
+  padding: 0 15px;
+  font-size: 16px;
+  color: #333;
+}
+
+.filter-tabs {
+  display: flex;
+  gap: 8px;
+  margin-top: 10px;
+}
+
+.filter-tab {
+  flex: 1;
+  text-align: center;
+  padding: 8px 12px;
+  border-radius: 6px;
+  font-size: 14px;
+  color: #666;
+  transition: all 0.3s;
+  background-color: #f0f0f0;
+  border: 1px solid #e9ecef;
+
+  &.active {
+    background-color: #007aff;
+    color: white;
+    border-color: #007aff;
+  }
+}
+
+.middle-section {
+  flex: 1;
+  margin-top: 140px; // 为顶部搜索栏留出空间
+  height: calc(100vh - 140px); // 减去顶部区域的高度
+  padding: 12px;
+  position: relative;
+  z-index: 0;
+  overflow: hidden; // 重要：防止内容溢出
+  background-color: #f5f7fa;
+}
+
+.paging-container {
+  height: 100%; // 使用固定高度，让 z-paging 能正确计算滚动区域
+  position: relative;
+  z-index: 0;
+}
+
+.inv-card {
+  background: #fff;
+  border-radius: 10px;
+  padding: 14px;
+  margin-bottom: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 10px;
+}
+
+.inv-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #2c3e50;
+  line-height: 1.4;
+  flex: 1;
+}
+
+.inv-status {
+  padding: 4px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+  font-weight: 500;
+  white-space: nowrap;
+}
+
+.status-pending {
+  background: #fff7e6;
+  color: #f59e0b;
+}
+.status-done {
+  background: #e8fff3;
+  color: #10b981;
+}
+.status-reject {
+  background: #ffecec;
+  color: #f43f5e;
+}
+
+.card-body {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+.info-row {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 14px;
+  flex-wrap: wrap;
+}
+
+.label {
+  color: #666;
+  width: 76px;
+  flex-shrink: 0;
+}
+
+.label-compact {
+  width: auto;
+  min-width: 74px;
+}
+
+.value {
+  color: #333;
+  flex: 1;
+}
+
+.ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.qty {
+  color: #fa8c16;
+  font-weight: 600;
+}
+
+.card-footer {
+  display: flex;
+  justify-content: flex-end;
+  padding-top: 8px;
+  border-top: 1px solid #f0f0f0;
+}
+
+.action-text {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  color: #007aff;
+  font-size: 14px;
+  font-weight: 600;
+}
+</style>
+
diff --git a/src/pages/view/routine/inv/invsq/Apply.vue b/src/pages/view/routine/inv/invsq/Apply.vue
new file mode 100644
index 0000000..3103260
--- /dev/null
+++ b/src/pages/view/routine/inv/invsq/Apply.vue
@@ -0,0 +1,1179 @@
+<template>
+  <BasicLayout>
+    <view v-if="loading" class="loading-mask">
+      <view class="loading-content">
+        <uni-icons type="spinner-cycle" size="24" color="#fff" class="loading-icon"></uni-icons>
+        <text class="loading-text">{{ loadingText }}</text>
+      </view>
+    </view>
+    <scroll-view scroll-y class="form-scroll" :class="{ 'full-height': hideBottomBtn }" :enable-back-to-top="false">
+      <view class="form-container">
+        <!-- 申请信息区域 -->
+        <view class="section">
+          <view class="section-title">
+            <view class="title-line"></view>
+            <text class="title-text">申请信息</text>
+          </view>
+          
+          <BasicForm
+            :modelValue="formData"
+            @update:modelValue="(val: any) => Object.assign(formData, val)"
+            :schema="formSchema"
+            :formsProps="{ labelWidth: 100 }"
+            :key="formSchemaKey"
+          >
+            <template #applyReason>
+              <view class="node-field">
+                <view class="field-label-title">申请原因</view>
+                <textarea
+                  v-model="formData.applyReason"
+                  class="textarea-field"
+                  placeholder="请输入申请原因"
+                  :maxlength="500"
+                  :auto-height="true"
+                />
+              </view>
+              <!-- 驳回原因（仅在驳回状态下显示） -->
+              <view class="node-field" v-if="isRejected && formData.rejectRemark">
+                <view class="field-label-title reject-label">驳回原因</view>
+                <view class="reject-reason-field">{{ formData.rejectRemark }}</view>
+              </view>
+            </template>
+          </BasicForm>
+        </view>
+        
+        <!-- 申请明细区域 -->
+        <view class="section">
+          <view class="section-title">
+            <view class="title-line"></view>
+            <text class="title-text">申请明细</text>
+          </view>
+          
+          <view class="item-list">
+            <view 
+              v-for="(item, index) in formData.items" 
+              :key="index" 
+              class="item-row"
+            >
+              <view class="item-header">
+                <text class="item-index">第{{ index + 1 }}项</text>
+                <view class="delete-icon" @click.stop="handleDeleteItem(index)">×</view>
+              </view>
+              
+              <view class="item-content">
+                <!-- 物品选择区域 -->
+                <view class="item-field-wrapper">
+                  <view class="item-field" @click="showItemSelector(index)">
+                    <view class="field-label">
+                      <text class="required-mark">*</text>
+                      <text>物品</text>
+                    </view>
+                    <view class="field-value-wrapper">
+                      <text class="field-value" :class="{ 'placeholder-text': !item.itemName }">
+                        {{ item.itemName || '请选择物品' }}
+                      </text>
+                      <view class="dropdown-icon">
+                        <text class="arrow-down">▼</text>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                
+                <view class="quantity-field-wrapper">
+                  <BasicForm
+                    :modelValue="item"
+                    @update:modelValue="(val: any) => updateItem(index, val)"
+                    :schema="itemSchema"
+                    :formsProps="{ labelWidth: 100 }"
+                    :key="`item-${index}-${itemSchemaKey}`"
+                  />
+                </view>
+                
+                <!-- 可用库存提示 -->
+                <view v-if="item.itemId && (item.availableQty !== undefined || item.qty !== undefined)" class="stock-tip">
+                  <text class="stock-label">可用库存：</text>
+                  <text class="stock-value" :class="{ 'stock-warning': (item.availableQty || item.qty || 0) < (typeof item.applyQty === 'number' ? item.applyQty : 0) }">
+                    {{ item.availableQty !== undefined && item.availableQty !== null ? item.availableQty : (item.qty || 0) }}
+                  </text>
+                </view>
+              </view>
+                      
+              <!-- 物品选择器 -->
+              <InvItemSelector
+                v-if="itemSelectorVisible === index"
+                :visible="itemSelectorVisible === index"
+                @confirm="(selectedItem) => handleItemSelect(index, selectedItem)"
+                @cancel="() => closeItemSelector()"
+              />
+            </view>
+            
+            <button class="add-item-btn" @click="handleAddItem">+ 添加明细</button>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    
+    <!-- 固定在底部的按钮组 -->
+    <view class="fixed-bottom" :class="{ 'hide-bottom': hideBottomBtn }">
+      <view class="button-group">
+        <button class="save-btn" @click="handleSave" :disabled="saving || submitting">
+          {{ saving ? '保存中...' : '暂存' }}
+        </button>
+        <button class="submit-btn" @click="handleSubmit" :disabled="saving || submitting">
+          {{ submitting ? '提交中...' : '提交' }}
+        </button>
+      </view>
+    </view>
+  </BasicLayout>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, nextTick, watch } from "vue";
+import { onLoad, onBackPress } from "@dcloudio/uni-app";
+import { 
+  invApplySaveApi,
+  invApplyFindFullByIdApi,
+  invApplySqApi,
+  invApplyReSubmitApi,
+  invApplyItemSaveBatchApi
+} from '@/api/base/invApplyApi';
+import { useUserStore } from "@/store/modules/user";
+import { showToast } from "@/utils/uniapp";
+import dayjs from "dayjs";
+import InvItemSelector from '@/pages/components/InvItemSelector/index.vue';
+
+const { getJs } = useUserStore();
+
+// 表单数据
+const formData = reactive<any>({
+  id: '',
+  applyUserId: '',
+  applyUserName: '',
+  applyDate: dayjs().format('YYYY-MM-DD'),
+  applyReason: '',
+  totalQty: 0,
+  billStatus: 0, // 0-暂存, 1-已提交
+  spResult: '', // 审批结果
+  rejectRemark: '', // 驳回原因
+  items: [] as Array<{
+    id?: string;
+    itemId: string;
+    itemName: string;
+    unitName: string;
+    applyQty: number | ''; // 数量，默认为空
+    qty?: number; // 总库存
+    availableQty?: number; // 可用库存
+  }>
+});
+
+const saving = ref(false);      // 暂存状态
+const submitting = ref(false);  // 提交状态
+const loading = ref(false);     // 页面加载状态
+const loadingText = ref('加载中...'); // 加载提示文本
+const hideBottomBtn = ref(false); // 控制底部按钮区域显示/隐藏
+// 用于强制更新表单的 key
+const formSchemaKey = ref(0);
+const itemSchemaKey = ref(0);
+
+// 物品选择器相关
+const itemSelectorVisible = ref<number | null>(null);
+
+// 判断是否为驳回状态
+const isRejected = computed(() => {
+  return formData.spResult === 'C';
+});
+
+// 监听物品选择器可见性变化
+watch(itemSelectorVisible, (newVal) => {
+  // 当物品选择器显示时，显示底部按钮
+  if (newVal !== null) {
+    hideBottomBtn.value = false;
+  }
+});
+
+// 监听每个明细项的数量变化，进行实时验证
+watch(() => formData.items.map(item => item.applyQty), (newQtys, oldQtys) => {
+  formData.items.forEach((item, index) => {
+    const newQty = newQtys[index];
+    const oldQty = oldQtys?.[index];
+    
+    // 如果数量发生变化且是数字类型
+    if (newQty !== oldQty && typeof newQty === 'number') {
+      const availableQty = item.availableQty !== undefined && item.availableQty !== null 
+        ? item.availableQty 
+        : (item.qty || 0);
+      
+      // 验证数量不能超过可用库存
+      if (availableQty > 0 && newQty > availableQty) {
+        showToast({
+          title: `数量不能超过可用库存（${availableQty}）`,
+          icon: 'none',
+          duration: 2000
+        });
+        // 限制为最大可用库存
+        item.applyQty = availableQty;
+      }
+    }
+  });
+}, { deep: true });
+
+// 初始化当前用户信息
+const initUserInfo = () => {
+  const js = getJs;
+  if (js && js.id) {
+    formData.applyUserId = js.id;
+    formData.applyUserName = js.jsxm || '';
+  }
+};
+
+// 处理选择器弹窗状态变化
+const handlePickerPopupChange = (show: boolean) => {
+  hideBottomBtn.value = show;
+};
+
+// 更新明细项
+const updateItem = (index: number, updates: any) => {
+  const item = formData.items[index];
+  if (!item) return;
+  
+  // 如果更新的是数量字段，进行验证
+  if (updates.applyQty !== undefined) {
+    const value = String(updates.applyQty);
+    handleQtyInput(index, value);
+  } else {
+    Object.assign(item, updates);
+    recalculateTotals();
+  }
+};
+
+// 重新计算总数量
+const recalculateTotals = () => {
+  let totalQty = 0;
+  
+  formData.items.forEach(item => {
+    const qty = typeof item.applyQty === 'number' ? item.applyQty : 0;
+    totalQty += qty;
+  });
+  
+  formData.totalQty = parseFloat(totalQty.toFixed(2));
+};
+
+// 添加明细项
+const handleAddItem = () => {
+  formData.items.push({
+    itemId: '',
+    itemName: '',
+    unitName: '',
+    applyQty: '', // 默认为空
+    qty: 0,
+    availableQty: 0
+  });
+  itemSchemaKey.value++; // 强制更新明细表单
+};
+
+// 删除明细项
+const handleDeleteItem = (index: number) => {
+  uni.showModal({
+    title: '确认删除',
+    content: `确定要删除第${index + 1}项吗？`,
+    success: (res) => {
+      if (res.confirm) {
+        formData.items.splice(index, 1);
+        recalculateTotals();
+      }
+    }
+  });
+};
+
+// 表单配置 - 申请信息
+const formSchema = computed(() => {
+  return [
+    {
+      field: "applyDate",
+      label: "申请日期",
+      component: "BasicDateTime",
+      required: true,
+      componentProps: {
+        mode: "date",
+        minDate: dayjs('1950-01-01').valueOf(),
+        maxDate: dayjs().valueOf(),
+        placeholder: '请选择申请日期',
+        onPopupChange: handlePickerPopupChange
+      }
+    },
+    {
+      field: "applyReason",
+      label: "",
+      slot: "applyReason"
+    }
+  ];
+});
+
+// 数量输入验证函数
+const handleQtyInput = (index: number, value: string) => {
+  if (!formData.items[index]) return;
+  
+  const item = formData.items[index];
+  
+  // 如果输入为空，设置为空字符串
+  if (value === '' || value === null || value === undefined) {
+    item.applyQty = '';
+    recalculateTotals();
+    return;
+  }
+  
+  const inputValue = parseFloat(value);
+  const availableQty = item.availableQty !== undefined && item.availableQty !== null ? item.availableQty : (item.qty || 0);
+  
+  // 验证是否为有效数字
+  if (isNaN(inputValue)) {
+    item.applyQty = '';
+    recalculateTotals();
+    return;
+  }
+  
+  // 验证数量不能小于0
+  if (inputValue < 0) {
+    showToast({
+      title: '数量不能小于0',
+      icon: 'none',
+      duration: 2000
+    });
+    item.applyQty = '';
+    recalculateTotals();
+    return;
+  }
+  
+  // 验证数量不能超过可用库存
+  if (availableQty > 0 && inputValue > availableQty) {
+    showToast({
+      title: `数量不能超过可用库存（${availableQty}）`,
+      icon: 'none',
+      duration: 2000
+    });
+    // 限制为最大可用库存
+    item.applyQty = availableQty;
+  } else {
+    item.applyQty = inputValue;
+  }
+  recalculateTotals();
+};
+
+// 数量失焦验证函数
+const handleQtyBlur = (index: number) => {
+  if (!formData.items[index]) return;
+  
+  const item = formData.items[index];
+  const applyQty = typeof item.applyQty === 'number' ? item.applyQty : 0;
+  const availableQty = item.availableQty !== undefined && item.availableQty !== null ? item.availableQty : (item.qty || 0);
+  
+  // 如果数量超过可用库存，自动调整为最大可用库存
+  if (availableQty > 0 && applyQty > availableQty) {
+    showToast({
+      title: `数量已调整为可用库存（${availableQty}）`,
+      icon: 'none',
+      duration: 2000
+    });
+    item.applyQty = availableQty;
+    recalculateTotals();
+  }
+};
+
+// 明细项表单配置
+const itemSchema = computed(() => {
+  return [
+    {
+      field: "applyQty",
+      label: "数量",
+      component: "BasicInput",
+      required: true,
+      componentProps: {
+        type: "number",
+        placeholder: '请输入数量'
+      }
+    }
+  ];
+});
+
+// 显示物品选择器
+const showItemSelector = (index: number) => {
+  itemSelectorVisible.value = index;
+  // 显示底部按钮
+  hideBottomBtn.value = false;
+};
+
+// 关闭物品选择器
+const closeItemSelector = () => {
+  itemSelectorVisible.value = null;
+};
+
+// 选择物品
+const handleItemSelect = (index: number, selectedItem: any) => {
+  if (!formData.items[index]) {
+    closeItemSelector();
+    return;
+  }
+  
+  // 检查是否与其他明细项重复（排除当前项）
+  const selectedItemId = selectedItem.id;
+  const duplicateIndex = formData.items.findIndex((item, idx) => 
+    idx !== index && item.itemId && item.itemId === selectedItemId
+  );
+  
+  if (duplicateIndex !== -1) {
+    showToast({
+      title: `物品"${selectedItem.itemName}"已在第${duplicateIndex + 1}项中选择，不能重复添加`,
+      icon: 'none',
+      duration: 3000
+    });
+    closeItemSelector();
+    return;
+  }
+  
+  // 没有重复，正常选择
+  formData.items[index].itemId = selectedItem.id;
+  formData.items[index].itemName = selectedItem.itemName;
+  formData.items[index].unitName = selectedItem.unitName || '';
+  // 保存库存信息
+  formData.items[index].qty = selectedItem.qty !== undefined && selectedItem.qty !== null ? parseFloat(String(selectedItem.qty)) || 0 : 0;
+  formData.items[index].availableQty = selectedItem.availableQty !== undefined && selectedItem.availableQty !== null 
+    ? parseFloat(String(selectedItem.availableQty)) || 0 
+    : (formData.items[index].qty || 0);
+  
+  closeItemSelector();
+};
+
+// 暂存表单
+const handleSave = async () => {
+  if (!formData.applyReason) {
+    showToast({
+      title: '请输入申请原因',
+      icon: 'none'
+    });
+    return;
+  }
+  
+  if (formData.items.length === 0) {
+    showToast({
+      title: '请至少添加一项申请明细',
+      icon: 'none'
+    });
+    return;
+  }
+  
+  // 验证明细项必填字段和库存
+  for (let i = 0; i < formData.items.length; i++) {
+    const item = formData.items[i];
+    if (!item.itemId) {
+      showToast({
+        title: `第${i + 1}项请选择物品`,
+        icon: 'none'
+      });
+      return;
+    }
+    
+    // 验证数量是否填写
+    const applyQty = typeof item.applyQty === 'number' ? item.applyQty : 0;
+    if (!item.applyQty || applyQty <= 0) {
+      showToast({
+        title: `第${i + 1}项请输入数量`,
+        icon: 'none'
+      });
+      return;
+    }
+    
+    // 验证数量不能超过可用库存
+    const availableQty = item.availableQty !== undefined && item.availableQty !== null 
+      ? item.availableQty 
+      : (item.qty !== undefined && item.qty !== null ? item.qty : 0);
+    
+    if (applyQty > availableQty) {
+      showToast({
+        title: `第${i + 1}项数量（${applyQty}）超过可用库存（${availableQty}）`,
+        icon: 'none',
+        duration: 3000
+      });
+      return;
+    }
+  }
+  
+  saving.value = true;
+  loading.value = true;
+  loadingText.value = '暂存中...';
+  try {
+    // 暂存：调用 save 接口，后端会保存主表和明细，并更新预留库存
+    const saveData = {
+      ...formData,
+      billStatus: 0, // 暂存状态
+      invApplyItemDtos: formData.items // 将 items 转换为 invApplyItemDtos
+    };
+    
+    const res: any = await invApplySaveApi(saveData);
+    
+    if (res && (res.resultCode === 1 || res.success === true)) {
+      showToast({
+        title: '暂存成功',
+        icon: 'success'
+      });
+      
+      // 跳转到列表页面
+      setTimeout(() => {
+        uni.redirectTo({
+          url: '/pages/view/routine/inv/invsq/index'
+        });
+      }, 800);
+    } else {
+      const errorMessage = res?.message || res?.resultMsg || '暂存失败，请重试';
+      showToast({
+        title: errorMessage,
+        icon: 'none',
+        duration: 3000
+      });
+    }
+  } catch (error: any) {
+    console.error('暂存失败:', error);
+    const errorMessage = error?.message || error?.resultMsg || '网络错误，请检查网络连接后重试';
+    showToast({
+      title: errorMessage,
+      icon: 'none',
+      duration: 3000
+    });
+  } finally {
+    saving.value = false;
+    loading.value = false;
+  }
+};
+
+// 提交表单（提交审批）
+const handleSubmit = async () => {
+  if (!formData.applyReason) {
+    showToast({
+      title: '请输入申请原因',
+      icon: 'none'
+    });
+    return;
+  }
+  
+  if (formData.items.length === 0) {
+    showToast({
+      title: '请至少添加一项申请明细',
+      icon: 'none'
+    });
+    return;
+  }
+  
+  // 验证明细项必填字段和库存
+  for (let i = 0; i < formData.items.length; i++) {
+    const item = formData.items[i];
+    if (!item.itemId) {
+      showToast({
+        title: `第${i + 1}项请选择物品`,
+        icon: 'none'
+      });
+      return;
+    }
+    
+    // 验证数量是否填写
+    const applyQty = typeof item.applyQty === 'number' ? item.applyQty : 0;
+    if (!item.applyQty || applyQty <= 0) {
+      showToast({
+        title: `第${i + 1}项请输入数量`,
+        icon: 'none'
+      });
+      return;
+    }
+    
+    // 验证数量不能超过可用库存
+    const availableQty = item.availableQty !== undefined && item.availableQty !== null 
+      ? item.availableQty 
+      : (item.qty !== undefined && item.qty !== null ? item.qty : 0);
+    
+    if (applyQty > availableQty) {
+      showToast({
+        title: `第${i + 1}项数量（${applyQty}）超过可用库存（${availableQty}）`,
+        icon: 'none',
+        duration: 3000
+      });
+      return;
+    }
+  }
+  
+  submitting.value = true;
+  loading.value = true;
+  loadingText.value = '提交中...';
+  try {
+    // 提交：根据状态判断调用不同接口
+    const submitData = {
+      ...formData,
+      billStatus: 1, // 已提交状态
+      invApplyItemDtos: formData.items // 将 items 转换为 invApplyItemDtos
+    };
+    
+    // 判断是否为驳回状态，如果是驳回状态，调用重新提交接口
+    const isRejected = formData.spResult === 'C';
+    loadingText.value = isRejected ? '重新提交中...' : '提交中...';
+    const submitRes: any = isRejected 
+      ? await invApplyReSubmitApi(submitData)  // 驳回后重新提交
+      : await invApplySqApi(submitData);       // 正常提交
+    
+    if (submitRes && (submitRes.resultCode === 1 || submitRes.success === true)) {
+      showToast({
+        title: isRejected ? '重新提交成功' : '提交审批成功',
+        icon: 'success'
+      });
+      
+      // 跳转到列表页面
+      setTimeout(() => {
+        uni.redirectTo({
+          url: '/pages/view/routine/inv/invsq/index'
+        });
+      }, 800);
+    } else {
+      const errorMessage = submitRes?.message || submitRes?.resultMsg || (isRejected ? '重新提交失败，请重试' : '提交审批失败，请重试');
+      showToast({
+        title: errorMessage,
+        icon: 'none',
+        duration: 3000
+      });
+    }
+  } catch (error: any) {
+    console.error('提交失败:', error);
+    const errorMessage = error?.message || error?.resultMsg || '网络错误，请检查网络连接后重试';
+    showToast({
+      title: errorMessage,
+      icon: 'none',
+      duration: 3000
+    });
+  } finally {
+    submitting.value = false;
+    loading.value = false;
+  }
+};
+
+// 加载已有数据（编辑模式）
+const loadApplyData = async (id: string) => {
+  try {
+    loadingText.value = '加载数据...';
+    loading.value = true;
+    const res: any = await invApplyFindFullByIdApi({ id });
+    
+    // 后端接口直接返回 InvApply 对象，也可能包装在 ReturnMsg 中
+    let data = null;
+    if (res && res.resultCode === 1 && res.result) {
+      // 包装在 ReturnMsg 中的情况
+      data = res.result;
+    } else if (res && res.id) {
+      // 直接返回对象的情况
+      data = res;
+    }
+    
+    if (!data) {
+      console.error("获取申请数据失败: 数据为空");
+      showToast({
+        title: '获取申请数据失败',
+        icon: 'none'
+      });
+      return;
+    }
+    
+    // 等待表单完全加载
+    await nextTick();
+    
+    // 设置主表数据
+    Object.assign(formData, {
+      id: data.id,
+      applyUserId: data.applyUserId,
+      applyUserName: data.applyUserName,
+      applyDate: data.applyDate ? dayjs(data.applyDate).format('YYYY-MM-DD') : dayjs().format('YYYY-MM-DD'),
+      applyReason: data.applyReason,
+      totalQty: data.totalQty,
+      billStatus: data.billStatus,
+      spResult: data.spResult || '',
+      rejectRemark: data.rejectRemark || ''
+    });
+    
+    // 设置明细数据
+    if (data.items && Array.isArray(data.items)) {
+      formData.items = data.items.map((item: any) => ({
+        id: item.id,
+        itemId: item.itemId,
+        itemName: item.itemName,
+        unitName: item.unitName,
+        applyQty: item.applyQty,
+        warehouseId: item.warehouseId || '',
+        warehouseName: item.warehouseName || '',
+        locationId: item.locationId || '',
+        locationName: item.locationName || '',
+        sortOrder: item.sortOrder || 0,
+        qty: item.qty !== undefined && item.qty !== null ? parseFloat(String(item.qty)) || 0 : 0,
+        availableQty: item.availableQty !== undefined && item.availableQty !== null ? parseFloat(String(item.availableQty)) || 0 : (item.qty !== undefined && item.qty !== null ? parseFloat(String(item.qty)) || 0 : 0)
+      }));
+    } else {
+      // 如果没有明细数据，添加一个空的明细项
+      if (formData.items.length === 0) {
+        handleAddItem();
+      }
+    }
+  } catch (error: any) {
+    console.error('加载申请数据失败:', error);
+    showToast({
+      title: '加载申请数据失败: ' + (error?.message || '未知错误'),
+      icon: 'none',
+      duration: 3000
+    });
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 返回按钮监听
+onBackPress(() => {
+  // 没有特殊处理，允许正常返回
+  return false;
+});
+
+// 页面加载
+onLoad(async (options: any) => {
+  try {
+    loading.value = true;
+    loadingText.value = '初始化中...';
+    
+    // 初始化用户信息
+    initUserInfo();
+    
+    // 检查是否为编辑模式
+    if (options && options.id) {
+      await loadApplyData(options.id);
+    } else {
+      // 新增模式，添加一个空的明细项
+      handleAddItem();
+    }
+    
+    loading.value = false;
+  } catch (error) {
+    console.error('页面初始化失败:', error);
+    loading.value = false;
+  }
+});
+</script>
+
+<style scoped lang="scss">
+.form-scroll {
+  flex: 1;
+  height: calc(100vh - 120rpx);
+  
+  &.full-height {
+    height: 100vh;
+  }
+}
+
+.form-container {
+  padding: 20rpx;
+  padding-bottom: 160rpx; // 为底部按钮留出空间
+  background-color: #f5f5f5;
+  min-height: 100%;
+}
+
+.section {
+  background-color: #ffffff;
+  border-radius: 12rpx;
+  padding: 24rpx;
+  margin-bottom: 24rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
+  
+  .section-title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 24rpx;
+    padding: 0 12rpx;
+    
+    .title-line {
+      width: 8rpx;
+      height: 32rpx;
+      background: #1890ff;
+      border-radius: 4rpx;
+      margin-right: 16rpx;
+    }
+    
+    .title-text {
+      font-size: 32rpx;
+      font-weight: 600;
+      color: #262626;
+    }
+  }
+}
+
+.node-field {
+  margin-top: 20rpx;
+  
+  &:first-child {
+    margin-top: 0;
+  }
+
+  .field-label-title {
+    font-size: 30rpx;
+    font-weight: bold;
+    color: #303133;
+    margin-bottom: 12rpx;
+    padding-bottom: 8rpx;
+    border-bottom: 2rpx solid #e4e7ed;
+  }
+
+  .textarea-field {
+    width: 100%;
+    min-height: 120rpx;
+    padding: 20rpx;
+    border: 1rpx solid #e4e7ed;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+    line-height: 1.5;
+  }
+  
+  .reject-label {
+    color: #ef4444;
+  }
+  
+  .reject-reason-field {
+    width: 100%;
+    min-height: 80rpx;
+    padding: 20rpx;
+    background-color: #fef2f2;
+    border: 1rpx solid #fecaca;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+    line-height: 1.5;
+    color: #dc2626;
+    word-break: break-all;
+  }
+}
+
+.item-list {
+  .item-row {
+    border: 1rpx solid #e4e7ed;
+    border-radius: 8rpx;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    background-color: #fafafa;
+    
+    .item-header {
+      position: relative;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 16rpx;
+      padding-bottom: 12rpx;
+      border-bottom: 1rpx solid #e4e7ed;
+      
+      .item-index {
+        font-size: 28rpx;
+        font-weight: bold;
+        color: #303133;
+      }
+      
+      .delete-icon {
+        position: absolute;
+        top: -10rpx;
+        right: -10rpx;
+        width: 40rpx;
+        height: 40rpx;
+        line-height: 40rpx;
+        text-align: center;
+        background: #f56c6c;
+        color: #fff;
+        border-radius: 50%;
+        font-size: 36rpx;
+        font-weight: bold;
+        cursor: pointer;
+        z-index: 10;
+        
+        &:active {
+          background: #e53e3e;
+          transform: scale(0.95);
+        }
+      }
+    }
+    
+    .item-content {
+      position: relative;
+      
+      .item-field-wrapper {
+        margin-bottom: 16rpx;
+        
+        .item-field {
+          display: flex;
+          align-items: center;
+          padding: 0;
+          background: transparent;
+          border: none;
+          cursor: pointer;
+          position: relative;
+          
+          .field-label {
+            width: 100rpx;
+            font-size: 28rpx;
+            color: #606266;
+            margin-right: 0;
+            flex-shrink: 0;
+            text-align: left;
+            padding-right: 12rpx;
+            display: flex;
+            align-items: center;
+            justify-content: flex-start;
+            box-sizing: border-box;
+            white-space: nowrap;
+            
+            .required-mark {
+              color: #f56c6c;
+              margin-right: 4rpx;
+              font-size: 28rpx;
+              line-height: 1;
+              width: 20rpx;
+              flex-shrink: 0;
+            }
+            
+            > text {
+              white-space: nowrap;
+            }
+          }
+          
+          .field-value-wrapper {
+            flex: 1;
+            position: relative;
+            min-height: 64rpx;
+            
+            .field-value {
+              display: block;
+              width: 100%;
+              font-size: 28rpx;
+              color: #303133;
+              text-align: left;
+              min-height: 64rpx;
+              line-height: 64rpx;
+              padding: 0 48rpx 0 24rpx;
+              background: #ffffff;
+              border: 1rpx solid #dcdfe6;
+              border-radius: 4rpx;
+              box-sizing: border-box;
+              
+              &.placeholder-text {
+                color: #c0c4cc;
+              }
+            }
+            
+            .dropdown-icon {
+              position: absolute;
+              right: 16rpx;
+              top: 50%;
+              transform: translateY(-50%);
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              pointer-events: none;
+              z-index: 2;
+              width: 32rpx;
+              height: 32rpx;
+              
+              .arrow-down {
+                font-size: 20rpx;
+                color: #909399;
+                line-height: 1;
+              }
+            }
+          }
+        }
+      }
+      
+      .stock-tip {
+        margin-top: 12rpx;
+        padding: 12rpx 16rpx;
+        background: #f0f9ff;
+        border-radius: 6rpx;
+        display: flex;
+        align-items: center;
+        
+        .stock-label {
+          font-size: 24rpx;
+          color: #606266;
+          margin-right: 8rpx;
+        }
+        
+        .stock-value {
+          font-size: 24rpx;
+          color: #1890ff;
+          font-weight: 500;
+          
+          &.stock-warning {
+            color: #f56c6c;
+          }
+        }
+      }
+      
+      .quantity-field-wrapper {
+        // 确保数量字段与物品字段对齐
+        :deep(.forms-item-row) {
+          padding: 0;
+          margin: 0;
+          display: flex;
+          align-items: center;
+        }
+        
+        :deep(.label-container) {
+          width: 100rpx;
+          flex: 0 0 100rpx;
+          white-space: nowrap;
+          padding-right: 12rpx;
+          box-sizing: border-box;
+        }
+        
+        :deep(.label-text) {
+          white-space: nowrap;
+        }
+        
+        // 确保输入框容器与物品字段的 field-value-wrapper 对齐
+        :deep(.flex-1) {
+          flex: 1;
+          position: relative;
+        }
+        
+        // 给数量输入框添加边框样式，与物品字段保持一致
+        // 只在外层容器添加边框，避免双重边框
+        :deep(.uni-easyinput) {
+          width: 100% !important;
+          border: 1rpx solid #dcdfe6 !important;
+          border-radius: 4rpx !important;
+          background: #ffffff !important;
+          min-height: 64rpx !important;
+          box-sizing: border-box !important;
+        }
+        
+        :deep(.uni-easyinput__content-input),
+        :deep(.uni-input),
+        :deep(input) {
+          border: none !important;
+          border-radius: 0 !important;
+          background: transparent !important;
+          padding: 0 24rpx !important;
+          min-height: 64rpx !important;
+          line-height: 64rpx !important;
+          font-size: 28rpx !important;
+          color: #303133 !important;
+          box-sizing: border-box !important;
+          width: 100% !important;
+        }
+        
+        // 移除 uni-easyinput 默认的边框
+        :deep(.uni-easyinput__content) {
+          border: none !important;
+        }
+      }
+    }
+  }
+  
+  .add-item-btn {
+    width: 100%;
+    padding: 20rpx;
+    background: #f0f9ff;
+    color: #409eff;
+    border: 1rpx dashed #b3d8ff;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+  }
+}
+
+/* 固定在底部的按钮组 */
+.fixed-bottom {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: #ffffff;
+  padding: 24rpx;
+  box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.08);
+  z-index: 1;
+  
+  &.hide-bottom {
+    display: none !important;
+    height: 0 !important;
+    padding: 0 !important;
+  }
+  
+  .button-group {
+    display: flex;
+    gap: 24rpx;
+    
+    .save-btn,
+    .submit-btn {
+      flex: 1;
+      height: 88rpx;
+      line-height: 88rpx;
+      border: none;
+      border-radius: 16rpx;
+      font-size: 32rpx;
+      font-weight: 600;
+      transition: all 0.3s;
+      
+      &:disabled {
+        opacity: 0.6;
+      }
+      
+      &:active:not(:disabled) {
+        transform: scale(0.98);
+      }
+    }
+    
+    .save-btn {
+      background: #f3f4f6;
+      color: #374151;
+      
+      &:active:not(:disabled) {
+        background: #e5e7eb;
+      }
+    }
+    
+    .submit-btn {
+      background: #3b82f6;
+      color: #ffffff;
+      box-shadow: 0 4rpx 16rpx rgba(59, 130, 246, 0.3);
+      
+      &:active:not(:disabled) {
+        background: #1d4ed8;
+      }
+    }
+  }
+}
+
+// 加载遮罩层样式
+.loading-mask {
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.35);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 999;
+}
+
+.loading-content {
+  min-width: 200rpx;
+  padding: 24rpx 32rpx;
+  background: rgba(0, 0, 0, 0.7);
+  border-radius: 16rpx;
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
+
+.loading-text {
+  color: #fff;
+  font-size: 28rpx;
+}
+
+.loading-icon {
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/view/routine/inv/invsq/detail.vue b/src/pages/view/routine/inv/invsq/detail.vue
new file mode 100644
index 0000000..aa39b62
--- /dev/null
+++ b/src/pages/view/routine/inv/invsq/detail.vue
@@ -0,0 +1,572 @@
+<template>
+  <BasicLayout>
+    <view v-if="loading" class="loading-mask">
+      <view class="loading-content">
+        <uni-icons type="spinner-cycle" size="24" color="#fff" class="loading-icon"></uni-icons>
+        <text class="loading-text">{{ loadingText }}</text>
+      </view>
+    </view>
+    
+    <scroll-view scroll-y class="detail-scroll">
+      <view class="detail-container">
+        <!-- 申请信息区域 -->
+        <view class="section">
+          <view class="section-title">
+            <view class="title-line"></view>
+            <text class="title-text">申请信息</text>
+          </view>
+          
+          <view class="info-item">
+            <text class="info-label">申请人</text>
+            <text class="info-value">{{ detailData.applyUserName }}</text>
+          </view>
+          
+          <view class="info-item">
+            <text class="info-label">申请日期</text>
+            <text class="info-value">{{ formatDate(detailData.applyDate) }}</text>
+          </view>
+          
+          <view class="info-item">
+            <text class="info-label">申请原因</text>
+            <text class="info-value">{{ detailData.applyReason || '无' }}</text>
+          </view>
+          
+          <view class="info-item">
+            <text class="info-label">申请状态</text>
+            <text class="info-value status-text" :class="getStatusClass(detailData)">
+              {{ getStatusText(detailData) }}
+            </text>
+          </view>
+          
+          <view class="info-item" v-if="detailData.resultTime">
+            <text class="info-label">处理时间</text>
+            <text class="info-value">{{ formatDate(detailData.resultTime) }}</text>
+          </view>
+        </view>
+        
+        <!-- 申请明细区域 -->
+        <view class="section">
+          <view class="section-title">
+            <view class="title-line"></view>
+            <text class="title-text">申请明细</text>
+          </view>
+          
+          <view class="item-list" v-if="detailData.items && detailData.items.length > 0">
+            <view 
+              v-for="(item, index) in detailData.items" 
+              :key="index" 
+              class="item-row"
+            >
+              <view class="item-header">
+                <text class="item-index">第{{ index + 1 }}项</text>
+              </view>
+              
+              <view class="item-detail">
+                <view class="info-item">
+                  <text class="info-label">物品</text>
+                  <text class="info-value">{{ item.itemName || '无' }}</text>
+                </view>
+                
+                <view class="info-item">
+                  <text class="info-label">单位</text>
+                  <text class="info-value">{{ item.unitName || '无' }}</text>
+                </view>
+                
+                <view class="info-item">
+                  <text class="info-label">数量</text>
+                  <text class="info-value">{{ item.applyQty || 0 }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view v-else class="empty-tip">
+            <text>暂无明细数据</text>
+          </view>
+        </view>
+        
+      </view>
+    </scroll-view>
+    
+    <!-- 固定在底部的按钮组 -->
+    <view class="fixed-bottom" v-if="showActions">
+      <view class="button-group">
+        <!-- 暂存：只有删除按钮 -->
+        <button 
+          v-if="currentStatus === 'DRAFT'" 
+          class="delete-btn" 
+          @click="handleDelete"
+        >
+          删除
+        </button>
+        
+        <!-- 审批中：只有撤回按钮 -->
+        <button 
+          v-if="currentStatus === 'A'" 
+          class="withdraw-btn" 
+          @click="handleWithdraw"
+        >
+          撤回申请
+        </button>
+        
+        <!-- 驳回：只有重新提交按钮 -->
+        <button 
+          v-if="currentStatus === 'C'" 
+          class="resubmit-btn" 
+          @click="handleResubmit"
+        >
+          重新提交
+        </button>
+      </view>
+    </view>
+  </BasicLayout>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import { invApplyFindFullByIdApi, invApplyDeleteApi, invApplyWithdrawApi, invApplyReSubmitApi } from '@/api/base/invApplyApi';
+import { showToast } from "@/utils/uniapp";
+import dayjs from "dayjs";
+
+// 响应式数据
+const detailData = ref<any>({});
+const loading = ref(false);
+const loadingText = ref('加载中...');
+
+// 格式化日期
+const formatDate = (dateStr: string | Date) => {
+  if (!dateStr) return '';
+  return dayjs(dateStr).format('YYYY-MM-DD');
+};
+
+// 判断状态：暂存、审批中、同意、驳回（仅基于 spJd 和 spResult，不使用 billStatus）
+const getStatus = (data: any) => {
+  const spJd = data.spJd;
+  const spResult = data.spResult;
+  
+  // 驳回：spResult === 'C'
+  if (spResult === 'C') {
+    return 'C'; // 驳回
+  }
+  
+  // 同意/完结：spJd === 'Z' 或 spResult === 'B'
+  if (spJd === 'Z' || spResult === 'B') {
+    return 'B'; // 同意
+  }
+  
+  // 审批中：spJd === 'A' 或 spResult === 'A'
+  if (spJd === 'A' || spResult === 'A') {
+    return 'A'; // 审批中
+  }
+  
+  // 暂存：spJd 和 spResult 均为空（null 或空字符串）
+  if ((!spJd || spJd === '') && (!spResult || spResult === '')) {
+    return 'DRAFT'; // 暂存
+  }
+  
+  // 默认返回暂存
+  return 'DRAFT';
+};
+
+// 获取状态文本
+const getStatusText = (data: any) => {
+  const status = getStatus(data);
+  switch (status) {
+    case 'DRAFT': return '暂存';
+    case 'A': return '审批中';
+    case 'B': return '同意';
+    case 'C': return '驳回';
+    default: return '未知';
+  }
+};
+
+// 获取状态样式类
+const getStatusClass = (data: any) => {
+  const status = getStatus(data);
+  switch (status) {
+    case 'DRAFT': return 'status-draft';
+    case 'A': return 'status-pending';
+    case 'B': return 'status-approved';
+    case 'C': return 'status-rejected';
+    default: return '';
+  }
+};
+
+// 计算当前状态
+const currentStatus = computed(() => {
+  return getStatus(detailData.value);
+});
+
+// 判断是否显示按钮
+const showActions = computed(() => {
+  const status = currentStatus.value;
+  // 同意状态不显示按钮
+  return status !== 'B';
+});
+
+// 加载详情数据
+const loadDetailData = async (id: string) => {
+  try {
+    loading.value = true;
+    loadingText.value = '加载中...';
+    
+    const res: any = await invApplyFindFullByIdApi({ id });
+    
+    // 后端接口直接返回 InvApply 对象，也可能包装在 ReturnMsg 中
+    let data = null;
+    if (res && res.resultCode === 1 && res.result) {
+      // 包装在 ReturnMsg 中的情况
+      data = res.result;
+    } else if (res && res.id) {
+      // 直接返回对象的情况
+      data = res;
+    }
+    
+    if (data) {
+      detailData.value = data;
+    } else {
+      showToast({
+        title: '获取详情失败',
+        icon: 'none'
+      });
+    }
+  } catch (error: any) {
+    console.error('加载详情失败:', error);
+    showToast({
+      title: '加载详情失败: ' + (error?.message || '未知错误'),
+      icon: 'none',
+      duration: 3000
+    });
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 删除申请
+const handleDelete = async () => {
+  uni.showModal({
+    title: '确认删除',
+    content: '确定要删除这个申请吗？',
+    success: async (res) => {
+      if (res.confirm) {
+        try {
+          const deleteRes: any = await invApplyDeleteApi({ ids: detailData.value.id });
+          if (deleteRes && deleteRes.resultCode === 1) {
+            showToast({
+              title: '删除成功',
+              icon: 'success'
+            });
+            
+            // 返回上一页
+            setTimeout(() => {
+              uni.navigateBack();
+            }, 800);
+          } else {
+            showToast({
+              title: deleteRes?.message || '删除失败',
+              icon: 'none'
+            });
+          }
+        } catch (error) {
+          console.error('删除失败:', error);
+          showToast({
+            title: '删除失败',
+            icon: 'none'
+          });
+        }
+      }
+    }
+  });
+};
+
+// 撤回申请
+const handleWithdraw = async () => {
+  uni.showModal({
+    title: '确认撤回',
+    content: '确定要撤回该申请吗？撤回后将无法恢复。',
+    success: async (res) => {
+      if (res.confirm) {
+        try {
+          uni.showLoading({ title: '撤回中...' });
+          const result: any = await invApplyWithdrawApi({
+            id: detailData.value.id,
+            spRemark: '申请人撤回'
+          });
+          
+          uni.hideLoading();
+          
+          // 判断成功：resultCode === 1 或 resultCode === 0
+          if (result && (result.resultCode === 1 || result.resultCode === 0)) {
+            showToast({
+              title: result.message || '撤回成功',
+              icon: 'success',
+              duration: 1500
+            });
+            // 延迟返回，确保提示信息显示
+            setTimeout(() => {
+              uni.navigateBack({
+                delta: 1
+              });
+            }, 500);
+          } else {
+            console.warn('撤回失败，返回结果:', result);
+            showToast({
+              title: result?.message || result?.msg || '撤回失败',
+              icon: 'none'
+            });
+          }
+        } catch (error) {
+          uni.hideLoading();
+          console.error('撤回失败，异常信息:', error);
+          showToast({
+            title: '撤回失败',
+            icon: 'none'
+          });
+        }
+      }
+    }
+  });
+};
+
+// 重新提交
+const handleResubmit = () => {
+  if (!detailData.value.id) {
+    showToast({
+      title: '缺少申请ID',
+      icon: 'none'
+    });
+    return;
+  }
+  // 跳转到申请页面，传递ID和重新提交标识
+  uni.navigateTo({
+    url: `/pages/view/routine/inv/invsq/Apply?id=${detailData.value.id}&resubmit=true`
+  });
+};
+
+// 页面加载
+onLoad(async (options: any) => {
+  if (options && options.id) {
+    await loadDetailData(options.id);
+  }
+});
+</script>
+
+<style scoped lang="scss">
+.detail-scroll {
+  height: 100vh;
+  background-color: #f5f5f5;
+}
+
+.detail-container {
+  padding: 20rpx;
+  padding-bottom: 160rpx; // 为底部按钮留出空间
+}
+
+.section {
+  background-color: #ffffff;
+  border-radius: 12rpx;
+  padding: 24rpx;
+  margin-bottom: 24rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
+  
+  .section-title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 24rpx;
+    padding: 0 12rpx;
+    
+    .title-line {
+      width: 8rpx;
+      height: 32rpx;
+      background: #1890ff;
+      border-radius: 4rpx;
+      margin-right: 16rpx;
+    }
+    
+    .title-text {
+      font-size: 32rpx;
+      font-weight: 600;
+      color: #262626;
+    }
+  }
+}
+
+.info-item {
+  display: flex;
+  padding: 16rpx 0;
+  border-bottom: 1rpx solid #f0f0f0;
+  
+  &:last-child {
+    border-bottom: none;
+  }
+  
+  .info-label {
+    width: 160rpx;
+    font-size: 28rpx;
+    color: #606266;
+    flex-shrink: 0;
+  }
+  
+  .info-value {
+    flex: 1;
+    font-size: 28rpx;
+    color: #303133;
+    word-break: break-all;
+    
+    &.status-text {
+    &.status-draft {
+      color: #6b7280;
+    }
+    
+    &.status-pending {
+      color: #f59e0b;
+    }
+    
+    &.status-approved {
+      color: #10b981;
+    }
+    
+    &.status-rejected {
+      color: #ef4444;
+    }
+    }
+    
+    &.total-value {
+      font-weight: bold;
+      color: #ff6b35;
+    }
+  }
+}
+
+.item-list {
+  .item-row {
+    border: 1rpx solid #e4e7ed;
+    border-radius: 8rpx;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    background-color: #fafafa;
+    
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 16rpx;
+      padding-bottom: 12rpx;
+      border-bottom: 1rpx solid #e4e7ed;
+      
+      .item-index {
+        font-size: 28rpx;
+        font-weight: bold;
+        color: #303133;
+      }
+    }
+    
+    .item-detail {
+      .info-item {
+        padding: 12rpx 0;
+        border-bottom: 1rpx dashed #f0f0f0;
+        
+        &:last-child {
+          border-bottom: none;
+        }
+      }
+    }
+  }
+}
+
+/* 固定在底部的按钮组 */
+.fixed-bottom {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: #ffffff;
+  padding: 24rpx;
+  box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.08);
+  z-index: 1;
+  
+  .button-group {
+    display: flex;
+    gap: 24rpx;
+    
+    button {
+      flex: 1;
+      height: 88rpx;
+      line-height: 88rpx;
+      border: none;
+      border-radius: 16rpx;
+      font-size: 32rpx;
+      font-weight: 600;
+      transition: all 0.3s;
+      
+      &.edit-btn {
+        background: #9ca3af;
+        color: #ffffff;
+      }
+      
+      &.delete-btn {
+        background: #f87171;
+        color: #ffffff;
+      }
+      
+      &.withdraw-btn {
+        background: linear-gradient(135deg, #ff9800 0%, #ffa726 100%);
+        color: #ffffff;
+        box-shadow: 0 4rpx 16rpx rgba(255, 152, 0, 0.35);
+      }
+      
+      &.resubmit-btn {
+        background: linear-gradient(135deg, #f5222d 0%, #ff4d4f 100%);
+        color: #ffffff;
+        box-shadow: 0 4rpx 16rpx rgba(245, 34, 45, 0.35);
+      }
+      
+      &:active {
+        transform: scale(0.98);
+      }
+    }
+  }
+}
+
+// 加载遮罩层样式
+.loading-mask {
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.35);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 999;
+}
+
+.loading-content {
+  min-width: 200rpx;
+  padding: 24rpx 32rpx;
+  background: rgba(0, 0, 0, 0.7);
+  border-radius: 16rpx;
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
+
+.loading-text {
+  color: #fff;
+  font-size: 28rpx;
+}
+
+.loading-icon {
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
+}
+
+.empty-tip {
+  padding: 40rpx;
+  text-align: center;
+  color: #909399;
+  font-size: 28rpx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/view/routine/inv/invsq/index.vue b/src/pages/view/routine/inv/invsq/index.vue
new file mode 100644
index 0000000..c1c3286
--- /dev/null
+++ b/src/pages/view/routine/inv/invsq/index.vue
@@ -0,0 +1,549 @@
+<template>
+  <BasicLayout>
+    <view class="container">
+      <!-- 顶部状态筛选（固定） -->
+      <view class="query-section">
+        <view class="search-card">
+          <view class="filter-row">
+            <view class="filter-item">
+              <picker mode="selector" :range="statusOptions" range-key="text" :value="selectedStatusIndex" @change="onStatusChange">
+                <view class="picker-text">{{ selectedStatusText || '全部状态' }}</view>
+              </picker>
+            </view>
+            <view class="filter-actions">
+              <u-button text="查询" type="primary" size="small" @click="handleSearch" />
+              <u-button text="重置" type="info" size="small" @click="handleReset" />
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 主体内容滚动区 -->
+      <scroll-view scroll-y class="content-scroll">
+        <uni-card :is-shadow="false" is-full>
+          <view class="header">
+            <text class="total-text">申请总数: {{ applyList.length }}</text>
+          </view>
+        </uni-card>
+
+        <uni-card :is-shadow="false" is-full margin="10px 0 0 0">
+          <view class="list-header">
+            <text class="applicant-header">申请人</text>
+            <text class="date-header">日期</text>
+            <text class="qty-header">数量</text>
+            <text class="status-header">状态</text>
+          </view>
+          <view v-if="loading" class="loading-container">
+            <text class="loading-text">加载中...</text>
+          </view>
+          <view
+            v-else
+            class="list-item"
+            v-for="item in applyList"
+            :key="item.id"
+            @click="handleViewDetail(item)"
+          >
+            <view class="row-cols">
+              <text class="applicant-col">{{ item.applyUserName || '-' }}</text>
+              <text class="date-col">{{ formatDate(item.applyDate) || '-' }}</text>
+              <text class="qty-col">{{ item.totalQty ?? 0 }}</text>
+              <view class="status-col">
+                <text class="status-badge" :class="getStatusClass(item)">{{ getStatusText(item) }}</text>
+                <u-icon name="arrow-right" size="16" color="#999"></u-icon>
+              </view>
+            </view>
+          </view>
+          <view v-if="!loading && applyList.length === 0" class="empty-container">
+            <text class="empty-text">暂无申请记录</text>
+          </view>
+        </uni-card>
+      </scroll-view>
+    </view>
+    
+    <template #bottom>
+      <view class="white-bg-color py-5">
+        <view class="flex-row items-center pb-10 pt-5">
+          <u-button
+            text="新增申请"
+            class="ml-15 mr-15"
+            type="primary"
+            @click="handleAdd"
+          />
+        </view>
+      </view>
+    </template>
+  </BasicLayout>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted } from "vue";
+import { onLoad, onShow } from "@dcloudio/uni-app";
+import { invApplyFindPageApi, invApplyFindAllApi } from "@/api/base/invApplyApi";
+import { useUserStore } from "@/store/modules/user";
+import dayjs from "dayjs";
+
+const { getJs } = useUserStore();
+
+// 状态选项
+const statusOptions = [
+  { value: null, text: '全部状态' },
+  { value: 'DRAFT', text: '暂存' },
+  { value: 'A', text: '审批中' },
+  { value: 'B', text: '同意' },
+  { value: 'C', text: '驳回' }
+];
+
+// 响应式数据
+const applyList = ref<any[]>([]);
+const loading = ref(false);
+const loadingStatus = ref('more'); // more/loading/noMore
+const pageParams = reactive({
+  page: 1,
+  rows: 10,
+  billStatus: null,
+  spResult: null
+});
+
+const selectedStatus = ref<string | null>(null);
+const selectedStatusText = ref('全部状态');
+const selectedStatusIndex = ref(0);
+
+// 获取申请列表
+const getApplyList = async (reset = false) => {
+  if (reset) {
+    pageParams.page = 1;
+    loadingStatus.value = 'more';
+  }
+
+  if (loading.value) return;
+  
+  loading.value = true;
+  
+  try {
+    const params = {
+      ...pageParams,
+      applyUserId: getJs?.id // 只查询当前用户的数据
+    };
+    
+    const res: any = await invApplyFindPageApi(params);
+    const list = res?.result?.rows || res?.rows || [];
+    
+    if (reset) {
+      applyList.value = list;
+    } else {
+      applyList.value = [...applyList.value, ...list];
+    }
+    
+    // 判断是否还有更多数据
+    if (list.length < pageParams.rows) {
+      loadingStatus.value = 'noMore';
+    } else {
+      loadingStatus.value = 'more';
+    }
+  } catch (error) {
+    console.error('获取申请列表失败:', error);
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 状态选择变化
+const onStatusChange = (e: any) => {
+  const index = e.detail.value;
+  selectedStatusIndex.value = index;
+  const selectedOption = statusOptions[index];
+  selectedStatus.value = selectedOption.value;
+  selectedStatusText.value = selectedOption.text;
+};
+
+// 查询
+const handleSearch = () => {
+  const status = selectedStatus.value;
+  // 如果是特殊状态值，需要转换
+  if (status === 'DRAFT') {
+    pageParams.billStatus = 0;
+    pageParams.spResult = null;
+  } else {
+    pageParams.billStatus = null;
+    pageParams.spResult = status;
+  }
+  pageParams.page = 1;
+  getApplyList(true);
+};
+
+// 重置
+const handleReset = () => {
+  selectedStatusIndex.value = 0;
+  selectedStatus.value = null;
+  selectedStatusText.value = '全部状态';
+  pageParams.spResult = null;
+  pageParams.billStatus = null;
+  pageParams.page = 1;
+  getApplyList(true);
+};
+
+// 判断状态：暂存、审批中、同意、驳回（仅基于 spJd 和 spResult，不使用 billStatus）
+const getStatus = (item: any) => {
+  const spJd = item.spJd;
+  const spResult = item.spResult;
+  
+  // 驳回：spResult === 'C'
+  if (spResult === 'C') {
+    return 'C'; // 驳回
+  }
+  
+  // 同意/完结：spJd === 'Z' 或 spResult === 'B'
+  if (spJd === 'Z' || spResult === 'B') {
+    return 'B'; // 同意
+  }
+  
+  // 审批中：spJd === 'A' 或 spResult === 'A'
+  if (spJd === 'A' || spResult === 'A') {
+    return 'A'; // 审批中
+  }
+  
+  // 暂存：spJd 和 spResult 均为空（null 或空字符串）
+  if ((!spJd || spJd === '') && (!spResult || spResult === '')) {
+    return 'DRAFT'; // 暂存
+  }
+  
+  // 默认返回暂存
+  return 'DRAFT';
+};
+
+// 获取状态文本
+const getStatusText = (item: any) => {
+  const status = getStatus(item);
+  switch (status) {
+    case 'DRAFT': return '暂';
+    case 'A': return '审';
+    case 'B': return '同';
+    case 'C': return '驳';
+    default: return '未知';
+  }
+};
+
+// 获取状态样式类
+const getStatusClass = (item: any) => {
+  const status = getStatus(item);
+  switch (status) {
+    case 'DRAFT': return 'status-draft';
+    case 'A': return 'status-pending';
+    case 'B': return 'status-approved';
+    case 'C': return 'status-rejected';
+    default: return 'status-default';
+  }
+};
+
+// 格式化日期
+const formatDate = (dateStr: string) => {
+  if (!dateStr) return '';
+  return dayjs(dateStr).format('YYYY-MM-DD');
+};
+
+// 查看详情或编辑
+const handleViewDetail = (item: any) => {
+  const status = getStatus(item);
+  
+  // 暂存和驳回状态，跳转到申请页面进行编辑
+  if (status === 'DRAFT' || status === 'C') {
+    uni.navigateTo({
+      url: `/pages/view/routine/inv/invsq/Apply?id=${item.id}${status === 'C' ? '&resubmit=true' : ''}`
+    });
+  } else {
+    // 其他状态，跳转到详情页
+    uni.navigateTo({
+      url: `/pages/view/routine/inv/invsq/detail?id=${item.id}`
+    });
+  }
+};
+
+// 新增申请
+const handleAdd = () => {
+  uni.navigateTo({
+    url: '/pages/view/routine/inv/invsq/Apply'
+  });
+};
+
+// 页面加载
+onLoad(() => {
+  getApplyList(true);
+});
+
+// 页面显示时刷新列表（从详情页返回时）
+onShow(() => {
+  getApplyList(true);
+});
+
+// 上拉加载（uni-app 页面生命周期）
+const onReachBottom = () => {
+  if (loadingStatus.value !== 'more') return;
+  
+  pageParams.page++;
+  getApplyList();
+};
+</script>
+
+<style scoped lang="scss">
+.container {
+  background-color: #f8f8f8;
+  min-height: 100vh;
+  padding: 15px;
+  box-sizing: border-box;
+}
+
+/* 顶部查询区域（固定） */
+.query-section {
+  position: sticky;
+  top: 0;
+  z-index: 10;
+  padding-bottom: 10rpx;
+  background: linear-gradient(180deg, #f8f8f8 70%, rgba(248, 248, 248, 0));
+}
+
+.search-card {
+  background-color: #ffffff;
+  border-radius: 12px;
+  padding: 16rpx 20rpx;
+  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
+  border: 1rpx solid #f0f0f0;
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 0;
+  font-size: 16px;
+}
+
+.total-text {
+  color: #333;
+  font-weight: bold;
+}
+
+.loading-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 40rpx 0;
+}
+
+.loading-text {
+  color: #999;
+  font-size: 28rpx;
+}
+
+.empty-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 60rpx 0;
+}
+
+.empty-text {
+  color: #999;
+  font-size: 28rpx;
+}
+
+/* 时间筛选样式 */
+.filter-row {
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+  padding: 4rpx 0;
+  flex-wrap: wrap;
+}
+
+.filter-item {
+  flex: 1;
+  min-width: 200rpx;
+}
+
+.picker-text {
+  background-color: #f8f9fa;
+  border: 1rpx solid #e9ecef;
+  border-radius: 8rpx;
+  padding: 14rpx 16rpx;
+  font-size: 28rpx;
+  color: #495057;
+  text-align: center;
+}
+
+.filter-actions {
+  display: flex;
+  gap: 12rpx;
+  flex: 1;
+  min-width: 240rpx;
+
+  :deep(.u-button) {
+    flex: 1;
+  }
+}
+
+.content-scroll {
+  height: calc(100vh - 240rpx); // 留出顶部筛选和底部按钮空间
+  padding: 10rpx 0 50rpx;
+}
+
+// Remove default card padding if needed
+::v-deep .uni-card .uni-card__content {
+  padding: 10px 15px !important; // Overwrite default padding
+}
+
+.list-header {
+  display: flex;
+  justify-content: space-between;
+  padding: 10px 0;
+  border-bottom: 1px solid #eee;
+  color: #666;
+  font-size: 14px;
+}
+
+.status-header {
+  flex: 1;
+  text-align: center;
+}
+
+.applicant-header {
+  flex: 1.2;
+}
+
+.date-header {
+  flex: 1.2;
+  text-align: center;
+}
+
+.qty-header {
+  flex: 0.8;
+  text-align: center;
+}
+
+.list-item {
+  display: flex;
+  flex-direction: column;
+  padding: 12px 0;
+  border-bottom: 1px solid #eee;
+  font-size: 14px;
+
+  &:last-child {
+    border-bottom: none;
+  }
+}
+
+.flex-row {
+  display: flex;
+}
+
+.items-center {
+  align-items: center;
+}
+
+.justify-between {
+  justify-content: space-between;
+}
+
+.w-full {
+  width: 100%;
+}
+
+.row-cols {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.applicant-col {
+  flex: 1.2;
+  color: #333;
+  font-weight: 500;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.date-col {
+  flex: 1.2;
+  text-align: center;
+  color: #666;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.qty-col {
+  flex: 0.8;
+  text-align: center;
+  color: #333;
+  font-weight: 500;
+}
+
+.status-col {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 8px;
+}
+
+.status-badge {
+  flex: 1;
+  text-align: center;
+  font-size: 12px;
+  padding: 4px 8px;
+  border-radius: 12px;
+  margin-right: 8px;
+  
+  &.status-draft {
+    background: #f3f4f6;
+    color: #6b7280;
+  }
+  
+  &.status-pending {
+    background: #fef3c7;
+    color: #f59e0b;
+  }
+  
+  &.status-approved {
+    background: #d1fae5;
+    color: #10b981;
+  }
+  
+  &.status-rejected {
+    background: #fee2e2;
+    color: #ef4444;
+  }
+  
+  &.status-default {
+    background: #f3f4f6;
+    color: #6b7280;
+  }
+}
+
+
+.white-bg-color {
+  background-color: #ffffff;
+}
+
+.py-5 {
+  padding-top: 20rpx;
+  padding-bottom: 20rpx;
+}
+
+.pb-10 {
+  padding-bottom: 40rpx;
+}
+
+.pt-5 {
+  padding-top: 20rpx;
+}
+
+.ml-15 {
+  margin-left: 60rpx;
+}
+
+.mr-15 {
+  margin-right: 60rpx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/view/routine/wj/wjList.vue b/src/pages/view/routine/wj/wjList.vue
index 86c070c..20cfe6a 100644
--- a/src/pages/view/routine/wj/wjList.vue
+++ b/src/pages/view/routine/wj/wjList.vue
@@ -139,7 +139,8 @@ const loadQuestionnaireList = async () => {
   try {
     const params: any = {
       page: 1,
-      rows: 100
+      rows: 100,
+      quStatus: 'A' // 只查询已发布的问卷
     };
     
     // 添加时间范围查询
diff --git a/src/pages/view/routine/yishiyice/push.vue b/src/pages/view/routine/yishiyice/push.vue
index 2166ae2..7a88eac 100644
--- a/src/pages/view/routine/yishiyice/push.vue
+++ b/src/pages/view/routine/yishiyice/push.vue
@@ -115,7 +115,8 @@
 import { ref, reactive, computed } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import { kccyFindByKcjbIdApi } from "@/api/base/kccyApi";
-import { rwPushJsApi, rwGetPushedJsIdsApi } from "@/api/base/rwApi";
+import { rwPushJsApi } from "@/api/base/rwApi";
+import { executedInfoByRwIdApi } from "@/api/base/rwzxApi";
 
 // 接口类型定义
 interface TaskInfo {
@@ -239,14 +240,14 @@ const loadCourseMembers = async () => {
   try {
     console.log('开始加载课程成员，课程ID:', courseId.value);
     
-    // 并发请求：获取成员列表和已推送教师ID
-    const [memberResponse, pushedResponse] = await Promise.all([
+    // 并发请求：获取成员列表和任务执行记录（用于判断是否已推送）
+    const [memberResponse, executionResponse] = await Promise.all([
       kccyFindByKcjbIdApi({ kcjbId: courseId.value }),
-      rwGetPushedJsIdsApi({ rwId: taskInfo.value.id })
+      executedInfoByRwIdApi({ rwId: taskInfo.value.id })
     ]);
     
     console.log('课程成员API响应:', memberResponse);
-    console.log('已推送教师API响应:', pushedResponse);
+    console.log('任务执行记录API响应:', executionResponse);
     
     // 处理成员数据
     let memberData = [];
@@ -266,14 +267,28 @@ const loadCourseMembers = async () => {
     
     memberList.value = memberData;
     
-    // 处理已推送教师ID
-    if (pushedResponse && pushedResponse.resultCode === 1) {
-      pushedJsIds.value = pushedResponse.result || [];
-      console.log('已推送的教师ID:', pushedJsIds.value);
-    } else {
-      pushedJsIds.value = [];
+    // 处理任务执行记录，提取已推送的教师ID（iszx = 1）
+    let executionData = [];
+    if (executionResponse) {
+      if (executionResponse.hasOwnProperty('resultCode')) {
+        if (executionResponse.resultCode === 1 || executionResponse.resultCode === 0) {
+          executionData = executionResponse.result || executionResponse.rows || executionResponse.data || [];
+        }
+      } else if (executionResponse.rows || executionResponse.data) {
+        executionData = executionResponse.rows || executionResponse.data || [];
+      } else if (Array.isArray(executionResponse)) {
+        executionData = executionResponse;
+      }
     }
     
+    // 从任务执行记录中提取已推送的教师ID（iszx = 1）
+    pushedJsIds.value = executionData
+      .filter((item: any) => item.iszx === 1) // 筛选 iszx = 1（已推送）的记录
+      .map((item: any) => item.rwzxfzr) // 提取教师ID
+      .filter((jsId: string) => jsId != null && jsId.trim() !== ''); // 过滤空值
+    
+    console.log('已推送的教师ID（基于iszx字段）:', pushedJsIds.value);
+    
     // 默认勾选未推送的成员，不勾选已推送的成员
     memberList.value.forEach(member => {
       const isPushed = pushedJsIds.value.includes(member.jsId);
diff --git a/src/pages/view/routine/yishiyice/rw/detail.vue b/src/pages/view/routine/yishiyice/rw/detail.vue
index fe6e5db..9397925 100644
--- a/src/pages/view/routine/yishiyice/rw/detail.vue
+++ b/src/pages/view/routine/yishiyice/rw/detail.vue
@@ -140,7 +140,6 @@
 <script lang="ts" setup>
 import { ref, reactive, computed, onUnmounted } from "vue";
 import { onLoad as onPageLoad, onShow } from "@dcloudio/uni-app";
-import { rwFindPageSummaryApi } from "@/api/base/rwApi";
 import { kccyFindByKcjbIdApi } from "@/api/base/kccyApi";
 import { jycyFindByJyjbIdApi } from "@/api/base/jycyApi";
 import { getTeacherTasksApi } from "@/api/base/rwzxApi";
diff --git a/src/static/base/home/invly.png b/src/static/base/home/invly.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce38c951566aca0d8947c039a01a971ecee4a780
GIT binary patch
literal 7578
zcmZ`;^<Pv^7bX^1N_Q8KP+;jVsB}t8hlHe((y}NW(kZ)icQ;6PODrkf-4fEcbiL~z
z@cwY`oX^bMGxNFUnRDhj2cf1SM@&FPfPsNQtROG_9^Ll;dw{s;cbRT^1_lNQLqS?n
z(+%^$06&eir|Gf8L;Z>RCit(2eIcF*7QqH38RwrPlyC3uB+`;s{Tt$&V%Sp=WA~)=
z`5qw6sXXt)6!N8YP7IKz#@KL6?KCWe`~X$DL7m(CUvR(5?Coq$U{Csddh*epskP7f
zp_7h|*SXhYiI0x6vuoYkGgW#h_`eWeMtOCsEldPPG$Y&w2jT|-%KOJ*$kD{0+kSrZ
z3_srh0IPb52qX9eA1ekbR{Y=R0%7!EV?fKRX%@6_m6wy3d<0$l>>t*+F)CH3xh?WK
zUPT_C26x@;h9xIr`SZ>F%jsCacuaDQR57YMXcVs%Pr&;f(&7TtL<<xVG!+PW^URrA
z#llCP=I$@4B$dYBu3fGSX4wXAlRm79P7tMkc!#n2Y})B+&QYdsVCz=7B`}9+@lr?L
zi)bw@s9!A;_=2DzkvOx?nD)+{-pwESQSX+*WQIq=%o0v?9^NscoqeL;_}VLr+}JK1
z`jNio^@kaKUoH@RfV2dZb8N%rs7Q$LJDgge$Jt*E+W;HmBG8Rqo}twbW0TkB&=O~y
zU!SjE%ip-(n%Dl#q87kx-B8xpq3Fwlz%uWcmOrN~dCOkwtHoO&r;>ABc%vdnh4j>$
zOo4D&##hy;#&Z@3Q5jw(kFdpymZVoB@T&-yH<yc3T-)NB1^TxXb*DQG1vKX?kkK1Q
zla+JArswq;fEKJSMGNl5Sz@5IL6xsUf2brmM@2hc7n(OcyzMYqs;l3ilDyNBnOJa_
zk$~hG!VGVgIRK23H#o7gBnr1_ZzUi|R<ryS2`CgF0=JG+5e)KWglqIGw)sg&Ko~*O
z|E1dzU@CwLqliOR-dsvS@<yKfI{oBDTR8tTT5kUZrb5&kTa1bOiGO(Lm7^(hL~H-k
zirKi=PCJ+YIF)*>@Z3NOy$av1d8ap8C-P|>;}<7lw9eVAM4Vep%u8SwT$pI=XO>SD
zX$cN47EIz$**Gn6QQL+G$>%S)i&`A>O8UIJDAlVp4)g20K+c1$dX5)nxJ7gN(c@c>
zJTStb^(HrzLNH3HP6oue8Er0wTViq^Z5hgVYVH&TJYyx>&2xps&fHWpV;Q5)KEH#N
zmX{xQ#ZN~`1Y&>#jlMFY8nDz~in-*}{0<bL7`LHq8S8eM1$I$lM~K=KTldlLKa`O6
z57pCkXr4#bvpRkl*TLVYmW+S4`dN8UD@A9!hTJb=@7>FT>D>%|w6T(zmEGrdu8wpb
zKSg;h<P}(h=J>ccI9C&#!l5ott8mL{{vcFcv?eS4V_c1;x|6c5&}KR~l1%Cny{25x
z;*E2-Q)?tkYPJi9{>E6ztZkgVSq(3nXSj{kF0g-s`8t_W4mpzTdp8{iRWU8Fd&o){
z3`}E}`*Td~*E`k9$>pAPnfnk%Oe(2{BP=zf#>OMGl#npXh>`nD(wJJs+@~~Z!SBo^
z5Ww6h3u@t*5U2nz88;>C9SEVAMdB1WI*;jDDHpkbh1^PhFUfTsHw3;I;z`cCghP?z
zl(QHzvIqZ>2H0~c(0OpJN%J*rJD!<^)T?th%0<Ok3<N+hZJ{7ie>d!RpJmoSQ2>1X
zc*WoYX|(B8c=O9U=+H=OWQ%_?k3b_W-Ad8G4-JpJQMP#eKa^-RxtDwGd1Ru|gu;(j
zRvSeNQ;vs9tGDRy^Hkwx{_e79MZ*h;<{mU?42|kU^NzhkLvBghDB<uMS`aaknUD|w
zM*-|fygt<LpoLRUGA)a&A@iqL<={YY!-0La&g(?(ph$k=bOn1FY(GA5<_hfH9O&~U
zME!Tt7M0{6S9Mq|t=-pf9M<ywVYrx)tXOg_0RS*l0B&2_H~<x0V?dHX|M}~NrN>38
z5=~vQ-c3!s*^DkkOtN}cH*x4;OM!ZKw?}lh#@k;c^rg#mgzbkS#=ndtyca$!2P2Q-
z*<Sr>ZgQ!dc2@9uQxSERDn@e6=m!H--FE#@qd2Qp<$T(j{G)}xm6VjlfC0WN+Q0vr
zM2t`||7tlB>V-SX=Rda$to@LDe=x&(uJyfR<;%Q!{BM*Y`z+Ap5)}IC=E;D#Ds-%4
z51>k65&%XoiM!}gvgU+H=s#HDd4Dub<=311^l(7vXI`~KTjEPW0Np}DG0Hef?D2Qo
z_WOk#b;oB!>Qq$Q^wa$4BLW2jE{k^8I!kWME?wEM)I}fcO{Cd`O%9v8G%5u-GmQc`
z(0}b9qX#nLNw=yge>nC&Ig+lP<C??S!o3@{iFHcWC`r+XfS^ytr08vqr0{tSHR&%^
znz_4y0Qw|?Qv3eowY7m-)qrIN`OJa=00i?nxJWIYQ9h_+z~<Z!9ecc{YEad0(dK0X
zs95}X`p?JYX5=T5(L?dy)7f$Bc|pf${ipCC6G{jPj(_063JHq=dZHoLpD5pN^nW`W
zm7@$_#i&CtpQ2&8kv$ky;Pw;^tK(@zZNC&+k6RIU9_z|K|K;IK|N0Ds)yV`8mPjbL
zB1g}9oJp^3#r=m+46_e`KL4O*yR7gF=8N7iu|$FldeSU#<Ah~yumr4vV&{Iv-21ij
zIKT1>gaIaA)6cSWL-Nx(u{w8px{kcK_OX|PqY7VHof)!I$hBeVs6q~}hHF56>e$N)
zfUAV79x=QZ5mxwHAM%X+Rt2E6Z)YU`u+OzCf1w06%SLhAII->3SjA0}YR`$<?zZHN
zM+%rm4_vj;TT1Wjgdr-lHBNrL9;S7!PdoW8WZ)y?`E7ugKGcCHWzs_A25<NAi&*(8
zbdY=VM)^)<xDWL=YFqgr(|;AX(JR@Ta=P1owM<w|V#XQxMT>$rj(o~M^ZoNClW=M5
zH(`1+T*zHO@7x}A+AQkiElB+Pp%L@}cjW50d7#e<lck-sT{O}y)>cHwGsKJ1T~cC?
zshnB;1>c8Qe}0a@XoM`+<ojzNZ*7%ToQ?~UxvlLRMBL_QOj6~WOe=Sv{BhJr?_Ol0
z!|879butMpm+4Kb{ws&4^3F;laKlsq6u*tp_bbA)s@=$;MsI@p)W5PQt1EG;#r3=1
z*zWo{O9O)dT-Knj5uDy&M2708!EArGu(<*01N{*zDwgJFc_eLA)7_acK<9keG;qzC
zVq~aZkd}!Gz&I}?x}ct0?WGlV)vG9HGJ#jolk-D*bQTQrRs?ZaO4IO$_m^EKd7H0{
zaqy1+C=U9*?7JVS9{C|SeJHw1{}vkQ0qCUY_+*Sv)JkKC6y-{5%HyH&8s9tnqwqM0
zJUzykO&xA5$KFg=Pbcs4xuxPRd}TS)Fjhm{r*MeB>%!D12Vz+^cY1F5CqqaolYRuQ
z^31&Et5FFF#SUkllqn59o;SfYdEUf{E77_N3G!DTvzTEqq~#1J40^{tV;*GJE5t$z
zbDw07%FB3Qz=&Cb)5tJvxSos87R0$~_<c`J>YpRsJd=e2{j;aqT9xoqWl?xd35axd
z(~p-up)@j6IKH4Zd~ZcO{i~laaA?YR@9)WD;;iY-^>WJ$K=MSOmT(IJRf@y+hkH+@
z8pIb$kw6TpyKsFvYG$%FpMcoK^L+xGvPrmE)QDrJsJ|v&kEQf0$;EM?X4l&op9~qO
zxYQ`55J<FyF)va|XTq|v#ozPGsK+@Hnskvx@IW!{AfqLhDx24nmQzt7A(L)lKl+8I
zoTE4Hq$%~oNsi(HbZT8Hwdb3|Bw9Hq5=*FjXK|d4dNTFTwro6$-a8!GPl{JhP>eP3
zxe6=cH*Wdh4+>&ej*-ycet$7zLSf;o1qXZ>LE-_FvzA%2f~zQXYWECi+LdS$Kj|pL
z0F2n@tZP==BN@8Pqxp@&y*Y^=#Wy(Nwo1Py<8Rj`cwR&I!@NRL?3%DLxf~3L)t%9?
z|6Re=+m|Z4b=ScDrfzrXTIcUP`Q%k-a06kTh3Z61GXLxNCIi@T?dGLzlvdO<XhroJ
zv}YLH3iyUqUF14op+0lJuDR{{5q6`Kt?AA`7#94IM<e<{1bGil8}!zJ4e;~TTSQ7P
zjE5J0TL&Y8S_t$G|LR-+Ax68J>U^%Wzx!g(t1TY&U$GgIE}T{7-gZOwY_sSL^YW`B
zS)cQJ4hi~z8n_B`$9NDLB;ImT7lA~6D1igtKo7}_;1>jxvn?kUan9V$!!_`lOm34&
zxCY@SFW#QdyR>D${YpIf^+SRkCB*nD>3d-U>)FLF?bq?(!27}k<)0;W7LOtK9#X|a
z9NlH}Ni!);YD(s#omCpoH9i=CO1YA0D6I`D``|AhL`ZM2NxBA5+1X|n9veuk)k3G+
z&{%`IC+>dGZ=qGWXQ#WP*2}QKn7>a6m?r-|*Suh-+R&1|gIi-dvp!xR=fsfLfH)s2
zh8s#1LDmf?V$Wurz9S8IAx<Z0Zvu~@TkgrVuWD`h)=hB2P$}|aGs@@EVPNPU{!^B>
z-mc_+?%uMVuuG~<psR9N#kw-pu{Wb*caz56#P4|41-%pM2vLY)e(KA*1wMZ}69TU0
zFDDY`zW>6xB6Sg?(ZBnA_rOp<80#o!Z%+I!P%R@JK5lpAD7dxS_98bH?2~O}lU5o$
zE1+xAf5q?4avH)J(@fG;e0^(OJha5EV!cUORXUT>RtpJ@SLB|LwoKP*R1$G+@%%VR
zC5$?k3!X_y4y+mI9(r%M6{hk>l_t3W537ZnUP>uH(>Cooio)SSa2GkU{ieI@Gm%Vu
z5d8K@UTeqo?~iQ4?XAkv<>0)8(N!YVdfKdfZdH=PV2Uc!UpNW{s}M{V--)r4wS+2_
z!(*O(4&j`KZIc(y;)8S4??0{GCZvw@`NzSmnD$(M-aHK$Gaaf=Iu|*M4C*(g#lqvO
zH~aY|vw4MY{f(8r&bs4ifys57tZMweo1|BkrRJ)KACr6|lh;xQ-(smmBv+X&g;|Iq
zs6*!TYy8%}Ee(n)5tJ(<jUtxU@*^=wR^@FoDv#*^o6QY1En?3tHgzF&>$W$y9A0*e
z?mbUxp2EMaleW;CTBpsvB?k$2m7Ggy8yO;UB*1_ynhJiKdjelU68eB#U?oy9caN_n
z)XL^v<ZogW7Aga)iotWJKLq7Km~GUIEgAKRhn5l!3r}4;#gawQUd49`0cJ2a8$U~b
zJYdJFF->Gm6AkyE?6#S>SKV+@E)S8x@KTMk)4S>Tj=67WhV-@}DSAIF3(zLnc?s7Q
zE<oCvAnjEHBY26u>_)~k%r;ly$S#BKVxsRbn}l%d)twOMTFTkXAF_oN`2MNdJdHgW
z-5=imzzy`>xsRi8hHzB{j(F1FytYpX3Y{rNUL}XcZNe#zI%@D6cWDZX{<Ldm9ZCdd
zTZlAsxQED#6=Wvz<jihw-k82$yQ@d%2&Dey0?hsz{g-^LEqUnv<l@EWL~GgF7h*3M
zwbM(r3pwzsU19DV`nDq2(2qZGI^?d!m)&GpPD>X|=GrJ+n<lO98Zd+T>0Q9}qsBR%
zj#L4-)p%4w0XCt}tLb>1s(_1(2bo`b&ndr2{TvLFIUb@M_TdWer>ASubwar5O)5`W
zn1fF#2u&F?a<1OYqwroGQS+*aVu`hy2P>|ErC~7IT!#zNG;tsVc>)0UU1g}Un6R+v
z3)!7WI6vn-_%eLN(=7I6aWiOZa~xrzEY4!N%f)*FtMqbp4d|=vD#v~M<Ssm=#u%P3
zxPs?z1gmiO7OT8!Pgk|nlm&UT{b{JTW4mXler1nacNjK#+?B3+g~`IM?JT~;n}gr~
z+Y0s68JTKSS<{v7n(KtWf!L_qC;Vj(5v+3>td8&wp<8J1o39ugoQ_1c)1lW`>Om~y
zW)6PadNFVh7HmM4>>oZ<)_cAT{!{=a-<U<Pgdj9buc<<|b$j~X@Y?SByiUmp!OmcT
z*Pj+dQxrbvka@d{?q{BzB1YYp`xOr-Kk@`4l4Vt#B=g^dZ0VhS3*c)``MgB$E+FHP
z0?kJHSMbDh-pj2nnAu|paMs><U@ZS}QBX3s%<j|0t#U2^C*Ak*qU>$;`A;*KafDE#
zlYmdw+0>Tl>QAnZDC@%JiWf?Uyfe7^aiuQ4{)(7*Pl*b-<9<GMuGT4J5G9Z!z6ahL
zi`W59bgQy&AA2AH&O0#8ESB0C6vEq8ZJ!2WX{+{{orav!v_|~VB&m0#@BDd@tWO3r
z(EaHtqh)xOU0YH%az4{;<`Bp<$;!3JLtka5Gh4>i?c1xV%@S|OwDG7RTmQh+W8k%t
zA4WDgcmK;+wIqc^nurN0qvtb3t7g10a@=>X@H~t6Q?IV_(8b!5zl+c?-8jk8qO-<?
zAp)%B7mDUFQG{>Hk|%35U0OSw+)P$fzJ3CI9rmVm5n*1z4klKKx@qqWpz3X|^7nZM
zJnJDf`jIebN5o{vtnv%VZ+5iu#b*U4>w-$VR@zWUQ>*o*!7*+3JP8K1N?0h}oSCed
zM7e3&5z|JbnxA34<~ePLM%13Da$&n~?AY6b)iNfYS>siV<bv-p$$#rKFVgI|z1)lV
zJl_8o|8*uN*}hwE@hNzg$V7<lb@aSJYi9$@WW_j6VI#i=9XgJo8$I^XPnw?+HsnQO
zD_918<f*V9@lk#9+RaZLNva>_Gg{^$89^fLyO34x@hoBl<ZDZ}s$Pc45gfZG)c{|u
zUF2%}ETiK`>kqsRm-HQrtR$?Y35p%Fm-l$X1<4Fh@mF@F$lXU=y-urY>6wrX(|y)Q
z{$a`ey*>~8cc6T}Knp>p52voytd(Fkv3||)!a4CwFumam^1UpNWVhAt;JUXJ2C6Gv
zOT$<Uv82DVTC=;ihc{rYd;dw+nq3h2-n?MTo+28KD5?zROB)EeesHJ1p&5zU_*CE1
zGl60-WIlb0by<wfAI4?L`#Ah1mYM<Bysn2h6<#;?Ir4mpgLw7{sD_eZ;mP*#FV`+r
zw5N3%1nC0inu>Og%UZXPs%>jIhXDNbZJOq7%W>jNgYp0htR))7e9Oc^mJX@eBkKme
zL9uV8CV&;`R7z8-XuX#+YZ9`0_&H29!Lc7fFX5UZkHheHlQGG`?XB_$!#io&s+h^_
zdxuG3f9bHop6O!ahVgDrw=Hc2?$m<;;myQSC4I@%6|LMUfuYF!{AZRUJ*fG{F`~1-
zA5^9q@SLkdhmuy7zU|phd+IH7{VZXICw1WnaW{TX`dSlj8b|#6+2=+cJ!M;VntRb^
zb9;l0Gq<{=AntYm76*6rMR(Mn6v$_NaZNJGE}k6$e%?|&0te|AXIm1=9Aa-?MYA`v
zLz;j05a>j_y{45gJHf<Co3znaif}k%)o(E_N`f{fecdJw(LEj6BO{dKFFGh*uX%Q$
zF|-%q_Lq>@;J_HgOx-il@1_c^OaW)cMeesZd6&YWCIbqxHtbMZK(WkRHyddJv1)y2
zM$YUR(%`a;aBy8(zcpeJMn$>DhBf*lFJ~4W(ig1HmzUNR?*Iv{?bh2lEcnlprXKID
zHD!H6Qk``7aGyy~`_jbS_<}zlW}lZ9ex<;eA4z5a-Lw_UvlK_F#%g?%=$lN=5^Yhu
zkOlg+?c9XH2hY&CcP+<^%w;m>%JjWo=SlZ=h<z3xAUiX2t>Ct~im!3+KtyG)F4KSO
zgvxa(&422pj}?k8BTS2DQ>EGW>v&Te8)~0JwRfq5_{A*WSxvKt8Kfi}R+WVIy!s_q
zt=WBuxhBR(YeWY%HYrma551%HhawI0_;*nwZYY^v1^p~xa}6PPmH@`b!uUoV6Es*T
zEmQ{8*(S9EJAOPfmCK$L+@Gc#KGx3b3`ibihM#0BE!)v}i~GCLz3A3*S5&4U<zYs1
z;LY;ePl89ggb!mziI`IJ#n4{wx`!FF*B#|>XvMJL>G4wa!N-htYjMhPVCWQ+iNb`*
z;6KjE#-)rsx!5x?rPoUQu+o{_Y`HR4Q7xIsqNOPfT37JiM#>>g`sOZrO=;4ov_@!%
zhiy2TTZa@Gs;hr=*qg?N;@}uJ6Olnrp0R{PD;mjF*lUZ;knT2!zGQ}D@RNtKS5Zt>
zwLRMisuYG*(#*yrkN1RuIgE<+oDt6>B1(~$GEF}?hr<SlyotZ)TQ>ZD`7_NMk#X!o
z?+&b{Sp0R`La;IHdh+eE5QJ=@^2qA5;wjvJ^eyvyss)zLV(3lZRY2D08qy7nAg%2G
zix-len@xo$+S^^+@_#j6o?JX7*wp@XwxMWWhP~X)IqVtsS(?Ki?(FiD&HjEzNa`{B
z^DfKVUejBQyC(sj#9j4lL{ufus9a3V4q2QwN{K!87)_jT87@c;RC_Lzub>v8Ul~nY
zP4qm!xzKqha_9UOTv3qTXz{!+elDqex*O#NbL6rggjni0_IekgFFO{OUGreowjYvw
zS3gpqU9#h`|LF^1E!MvhdMY~oJ=+R;_z_mHwRwVOUvCIX-0p@b+t}r^Ie)A1{`u6@
zDE2xSMqRyr9FGi~eo4~zGnR+Boy}>R_`V`aJelkMt8(@O?xM~o;pDz|f^qj6lkl`;
zfgBdo7W|)bt|aUQ!IeJ=&4ALL1le&wlL+bNqxelUA5T5)f7~{WUKB16D68ybGAgMI
zf_DA=cT`)mXac`C=^uDV;DQQUx{42K-`8hJDw`uYUd0zAnyPLbc)k@YI8MiAePc3w
zc3qJH#jzOW_XkR!Aqp<hY+&O)EU~AZ9MBy;{}FaE@xFd5Y_|@Xq#NNQRqP~K56UC4
zoa-J+V$YD1iX)Pg?a=lIW+6?w^julxJc?L4&$)i;D_K;~M@U9<R+Dp?MvLd1hUPoe
zr^VNR9x=>_+*6r}M3EG2<iy-;aNwK@2s6g5L|d!j4Q}`!vZ`bJPj@+Lu<eKU_3++E
zSaB|esd#rK45CvSjn1EE!^LsV^ov{1bUDFxfl#axvdPGMyM2EL((i&w=sgF5Z_5(~
zMd-yawTCjE=qvp;iQeZtNZ}B}V$FEMo}k@}M~m49q|YJ|MI@=Ohdrtscu4nF7}yT%
z<3(!9URzA@2j>E=C*nO{-7t(4Z@KFj6_gEd?2y!I)>|m;&LUYpz!`v3fzYlq&r6Sf
z&*r&{?<bS3pMq<<egUV#pjd!OxM2jLv6PL6gv*4Y2=g)KZ5}?2L{<R+{IG$gTMG2f
zpL6-pY=!snxSF`yEs{aa(H|({(0Dr}WJ|VKj-M+$#M;aVhmoyy`g?E<kog0J&rXXv
zDVplUCLn)uG6{wA<N=CwYgCef>P<;v&ujE75r<R*R3>-IlVg3!`1i3?@vNbzTv+80
z>9vH&eb=>!7B}x-^SHmR3F4=sEncy;f1nRZpa<`gVCIjK^2r<bp7$uPZ>mknf$*?k
ztAkXYm9*sSju=G6)kFXhNzf<Tud=9bO2300>GgDwYmJhhsiNU-Ki|eN$k3}j!EyoT
zrE!NA9H!A6u4#fq5!4lqAw9oTdO;&)2;Us<LF@;~4h;af(wQpOA?%f8Oo$FGxGkzH
zzS~h&y49a;N--L!iDn!?`c_ayvP*@SKOwBjs6fP)^|`DoGWGW$lQ|YktPdHcDnvTz
z`d|3hp^DfEGc0^~;Bwbpw(cG`SuTIDh~8tw$_Jgik_;Tb)}2hfPHGq6YJPWcNoN8M
z*z5^m^2&=1X2QCc?U)42@8U#LPL6iER9y}xf-U9NwpTUt&}A&+msssk_z4A|F(=FB
z3KucGK-m&RlG!aU^yE}7>9n6a#s`9l2Rb2^3_RXg=;EbsNU7@ILWdSX^xZ=SsT2)F
zSEMR{8>GPZ71CK0=(<x+RP-qX6RNffz{KGGXEbyQn1K3Q=@B~rT71h4#rzLl!jflo
z+Nx@nL)Q$BQhfngr2pzwW5pXuLsUe72U-k_$44#kpip#$755*V!p6YV-O#iVclAa0
OU?|9_NSD7g_WvIc3w37z

literal 0
HcmV?d00001

diff --git a/src/static/base/home/invout.png b/src/static/base/home/invout.png
new file mode 100644
index 0000000000000000000000000000000000000000..52bafdc3d80f98f6f5a7847f0227d32038b55815
GIT binary patch
literal 10067
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
T_|&VBJph=bJhW2WFzEjQ)aO7N

literal 0
HcmV?d00001

diff --git a/src/static/base/home/invsp.png b/src/static/base/home/invsp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4bf8a54ed050a7033df65197ea872ebdfd82ebc
GIT binary patch
literal 7417
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
UAXPB+6x9Mi$f?0AWZnk;4**B-MF0Q*

literal 0
HcmV?d00001

diff --git a/src/static/base/home/jctjqd.png b/src/static/base/home/jctjqd.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dce0b90f9349465d2159955c42d32c35cf098f
GIT binary patch
literal 7055
zcmV;A8*t=_P)<h;3K|Lk000e1NJLTq007AV0077c1^@s6LYl>(000mGNkl<ZcmeEP
z378bswLa%|&j1QB#%SV_#L(5?63wFVOZ4SEaf9v#6c^N(1>=HZLgF5wdzP*SgBX>#
z;gVpC8Wlx!=x$I9e2MYJm-uCQ#t7XFK23aIp3!JTftl_)@6^D+49rs1T~%GxbLzXd
ztLol!&+^|ob?&XL704n82m*s5AWkwUJW?qL0Em;wQ6LBmfq*#45CBQFARta6$ABO(
z1Og5@$q-VcS`Y{@0^%eA?mSW58wA8jyun$d1Q-Evk^py}sO}8{;w0YSEK&lDfWMq1
zz(9)Xjf;RdN#pjdSmqD{;v^0MDQp@S0dbPX?OU<TAq2!p90F3<G%f-S=_HNYU1C{1
z5D+J+2kIg-PzZ>V1gg74*?J%#PErrlMP{H75GM&#cZss~KtP;iVAQ2X5a>pr+ex(f
zxqY=vewNmrZL^xYTg#6iFbojrb`q%Iav-`L6t-H*!vGjDQ4r`sK#gnb_$UA!+fyKG
zK|m1bi+}>vbYR~i*%Jf=f!+ux1H1O_T_D>|BOv^Oj(`FRQP7PL{RIIx5!g0ycT<A!
z76by0fI>wQNdn%9qQ1KbNF;F=U*X;W2yi5kIY}V;QIxD30t(9Ix(OG-f<O=u;QJ&J
zNrKQ(qGSCKP!dP#2fj!S1_Cm14@N%)Qp<x|^9O5s$MH^QldqS6C^X~}u$O?>Tb38{
z$LjgGrssYa4%0?}&>E++$=7^Z-3wbx84^iM6eK%}03w{l43FaMUNWCpcaM7?&N6ZD
z1BdK5fdG$A8tSQXjwD@9;37N(ft?5-jN7>r{4Ji7gygZ5;P<0g;35JXNnGSEtQ!@9
zVPzLPiQFj}Ry{7p+D1So?zSP52Ez>jjwHj)WU*Heu!jIo+({<x_AnFbVTOQ2l3~{2
z{xUZh+Q|DP!RRN^vW^IFB$1nmcJMc!8FDK}(z%Q6=pwY<AfUhq%bdg_)|#Gw$<h}t
z&F6}$$cS*4mdTsXJz3O9$h<&6-Y2nzG97M<yc%MnN42)xhpK5RZQMbChg<G27OpiQ
z&<qFF(0ceab=hLRnP|vx%Vm(OV83q_ZKR1y2uLJx3D{cLqPz%K3w(~Z<(r8zad#Zm
z8X1a{)Ci!%%{h|DC18g!t(jc~lu<JiVc-}73PTb}97EG7MoQ+1PC;ph&p@;sNd~Ht
z@_HeF5=p>Mi-OKhKj|a7Fak0sVGw+j6v%MPN8Pba6_iK<ep+O><)_}*u1i_wB-@ej
z$BHNJ@;-?_x?-mmGThpUg&($TMiM`$-1s`647b2fi^7V0QpisoV(Nk+iS8y2e#sI^
z{L&M>^iUE>dZAJOO?DEw<6i%6=&M0jMQ$ecMWnuaJaLyh?)B}0-K8rC$zv(I!&0{r
zRhN5-bu%|0g2NI?{M1t%Nu)#k)FGxWD8nri2H#|!llVp#QDi#;GThn@gilr+Nn}pq
zlfKxYMps#)`wlRCu)&c;u5S6DANr_(BLhBhCn)wYDBwE^0_-CJ$9_Qd(Pkuxq_Z<L
zJ$Hwe$vqWG=T=AbT$b0%BANU{oR>uO{9;}&;`I%YbY5qAJ)&oMJIiI+#k{|S+ds(d
zALDfgub<}injN`4+cu!G{Z%OVOMk^dEmNpuxaGIb3xV}W64i4*Lc}F(!=*ql1rbg}
zfH<$GA<?;<XCTl_UeD(B)rgct#3TapHgXxx<oy}k{;S;n3|>#>^~t<Gen(d7BHp%~
zkV1De@!OmmA}IiQpTuuHX(y5pz<1o&pAI-={_1_K$|<BKuBeo|CID0h%!Yv{0pO|Z
zyyvkE7xVTN2+#rm%K_jW@X?|mERh6!wrp+k-^9JMy!8M(Fl}r<^-smrl(hrp4Xv?f
zi>cUCg_guarBwW$Vk&lXAr;q)srWR`djrCk5%3ybcd*=dIoB;I*jhK)B6t7<6oh?u
z$6bZ70v;~KWc)XURBR!yrxJD^!On7vhvNH)QW$RHXxFD~xb67PUMyGq)h7f?i*w>H
z*9)jp^0e34SuQ6PIsy@%@LCU^lSnA>8uX#$g+}=*lDt!FiBBI&XD{kYb0@x3NXAd+
zdCZppag7%;O&JP95=l%T{FIf=OTaGbzPx*W;G%$PSo1vQg<>*xLN#rxX~U7Enr70*
zO$0V~)ql7}L^rU5OmoxDpzv1mNg@ArRjA$*ccP0*Es1OWhfIAm;^CHD0(J&^=eS^V
zJtIkFLa`-ruXEM}pOcbXiT>-vFf`ZY60pL`K}Ei|;RGV%7d$ye(>soj=(#Jk_H5g(
zIg-hp9Z9b^>XX;6*xLztZt~zr;=dbLZW<f}-l45!&o2RoL(LyupPcfyTJVWv^3$T3
z++CWU`(358>0bb$H3)EHe}AEe1P>#s-!+%j+gc`9ilnnEBJ4P|$akx)+)Q)}*&6u1
z4<kH{Bnb4aSLU4bRy8Ug*7oS=XeN7!rssdnmu8m{!NttyD9+Xs!B|90n2w|Ax!*=J
z`PqJoFbd>mBKU1lqr8hGd~n`fNF~e%ByGc>>G{^q(C9x9;hg|<tZfGUH#nNFtS#aQ
z^GD`?dH*EdmhvTFxtZuK<U>f~YPF@yo8cBgzL1Q~WRbR#HgDw@_yEqcW0;T7M{G5=
zPW%bxe^XS?Wwmt2m#sH*o|2u!d8Wd#HUyeslo!LT|E?&y)UKwQp1TwbV>KVZlkB#w
zhMvzBalp`8c9v8%?VV_&<k>AJV04y8cvB}I8_x3FjT^#(jmgCS>{dQV0XxV~x%v*y
zdvo?OH8UXTXgas-$c3x+^ir@XOTiWyZka&%DZhQd7*`_+B0Nz{#vim}^L7XMhMhJ}
z(-Ok8_qUXnN7`2H=QQuZ_(>!g44pdFh2P!ECr<Z-R{(Fa!(GedZ)f_tIta_}P6&7s
zhAK~v*H?YIyTF4V<$(+lVH1HpaNn9E$$%meZrPBGJvU(eE)|h<ZUGR@+NHSOyI-n6
z`KjpjE5>@Eh{CWr-19<|$gqmQsQtIN6-nME=(HR~G=1e|JT$w;s@~qx;b*9<7I-0(
z=OkOakRvi|ATZ{Q_uO)ly!ir?6;;N!J$(S7ag`O?I?|k}>G|v2mM_CCw-K&_|5`ZS
zo#7S&-`lXJP$krL72g3r*cx>`sc3#g&$@a!S}C92ao6<R1Dc+HNz-%WXwKv|MfLoD
z@#VyY_3YX~Ww(PXkz_=dvg9P=(ks3KfWElf4VD&6TOzBHh$D&rE&-cQjIurF0np*R
zb~X|0NkCuZ%ZXR<RhzS%W$s^YgqZzv`=qz6XlS778D?1_uR9F_d{LX1pXin%JaHe!
zukTh2=bg}ro@xc|cPAM2;z5S_X`WsM{cny<XOG~TshoqA3^G5g=Zem1i_F_y0k$@#
zYdON##$ngiAqxFw*RuZhLx`vKR~~?}GY)Rce%uW`75eZ)Xl@u9B%VhdFb190*D#EY
zR(SGc=t3)WKBW0bI0UXl6UWb3J_IjtDsBGXkxo0wTgA5czlH)LI&WoyX+Ft0kcl1q
zI5!j*CvgMS8hL&|Z#vp9>~R~cs6>V_!3v#y8gE)4p}m*AEUKl@2cNI8sOzvHEAKUe
zk89`5B|u9<EtcrYn4bB1lMu!oI&bCvP78DNjODa)!<Apx8}B*XFJ#F{5Fyx3!Us&*
za6X#w#C-%YZ%IBvV4u;=jz$tdwA9B$7<eZkqkOc}UFq-{%W3t7C%?+5CP$qFi7dXT
zM2-(t8leXjHr4Y(XpI1&^EPzRW=Bt6gkaH0V2tzDILNV1tQ2gnlVlM)AOgnbu)~oA
z_83rDuL>6Wk6yd7xg7ze!ZIh>j)iYlW!UO$Bq3{&gn-`i4G2C`ggfH{AE_g%m<Ws>
z;cO%U%fl^{NMd%tE}5NVmlD~nI|60sbhclJti2aP4G>8}@O!5_P+?hyTTX*oD?jQC
z@${fpF1^|#jy>wGyPA5H^t;Iu{J=*NBiuZslk{u+AccI!l9~G;_|&D!XmZ#|*ot@l
zao~7f4Vn}Le7HsQ+J^6+{Mw*KR#B-`lSGm#aC5bZ0cGX107W>YlOU;8PRsR{pK?5k
znEE^3875Q7wIMLFOF28-Vs#9nLwGf4THiA1S4{9%&cRG%{J{;y)n>Vw=mxGe@vOKI
zNf3sPB&O0x@UXcKV15q`y59}G704A}H*l?qCxxA#lK`kAtte&K_@asxe%{gG{e||)
zmR<?4tJ46(ExT-l-bn-~?EG*GfIe&G_101<{tE<H=cGMe@Io?v=9V0VGI4hc+p75*
zo1LGyo60nWm8F-e48(v<;PKHyOX3C7MmI7?lK0)<D?DpJV1z4?gkuTNNmkUVbivJh
z&*W7rw0@vLg|5s+dTdjwYb5pT$l4zWRG`8qFBfznu;e7Kw#QxtgW6rtz<HJkmlx(v
z$~w<@Cr5WWV<&&vssaIb<|N&Ud{WEgzSO-n#80UuaUUVxHw0N-tNHA{sF;l3;<geB
z-TY&Hx3zCj{<OuVNMhn;(DCNVN-ia1=M#cohh4ApMTYNz2a7}!4?wmn!o^4efa*WM
z#)1ltu|e(`DUA#r?UgWb60eZ9A*U&%&<43pQkpa_({Z5HM#VYtHz5SR`W!5waa`%@
ziT`KShFa;A>Xg@aYX#Bi_QqBhhg+<yK@jDY<;0Hia`8`_!T|VZsPD4Xbl6gI^7CG*
zA(6yOw5`f=FOqCQq%(`DDQm5&vV(5v^hz-m`wU-5{_&17Z#PN`D-qLSy%h_fRP!kE
zTBu!l!;RhmS0c&V>>v{h$;9Ke;8{#1F67Dl)wS@bqV3w|%BIh)Pfqz;6>V#7!jWXi
zPsG+NL>SmZfE<q`_&S2|Z|oqyw5Lh`)Rks>fFsJc`>%Dp^aCKc;^nsKn;hqCk)aB0
z-9sXYMX<agYpNhRC5t<ET{zVA`9f;)Uuxw!UeAx$GPyb7t*{aRZv$_ZJpf^~X8!Y8
zCU>4UBKu0=NYb}J_Uey-0ftlk^7~RMe#k3xPI{{rtHxzk9urAt7gd0M&1dy_0Qgz(
zcKHa4JC9{Qz|Qhqq&;^w?|YWiyPk;>L6#A4V7SGh=(%Dl{sqf2`yu25@|1|4ecT}9
z1w@?9B>Ql#cRCIgJglX2Pet{WmL9XIRbiz@mN_EV$|ex)1EZutwNBjW`9doGm1+$h
zt9L{rdVVptUxk3D^V)w2VG4oqOeB+E!VdF!Hx+a$th=e>@Z)VLtk!4*{B1FnsOryb
zj&EHP=IC*)g3zxKXlAuKc-an#W&q+ZBYJKww2~{wvr=33BrlB;SwkZb0;8(VMu6uE
zsaREyk!b0a(_as7ex9}a0q1==2Pn~KwmqYTSN<xhubS+%;@lbUIL%Y|)rbHo<UY5@
zgaB7pJH+DXaU-Dd2n+q9J*j@9reg^z9g%eI&ath}IQF-8C8KH6000X(Nkl<ZN{t##
zelvC0>ton+5+cf$Qn8cm;x>N4lVc)!_91R}CFh1ojNT<G+_^g1p0$lhe;{xq>91JI
z21daB8UnK3F9?s9S`xO07-Q#W$5lF;UPi!k-M6S75->^%vsxzm^;)GX_~$=s<st1I
zMu0mPt+Fg8<7Zl>?V*e6*~zMc=Eoim>M3i`brTTYAIaoudOARcTRuEGs-3u7F(sPG
zCke2_3T>m%Ai=GXOg34qJ=Vi|wGyPAZ3M{XoW!aCc97XTf6=YdHxeBZ>U^2Fs=1d6
zjq0LC0;3^psg&Py+K%YF{0w%GMNab#5<ecp-WW}1FR`n$L=t<5y=jkp5bD9IMucA<
ztlDlJpFvL}gO=EB*NF6lc&C=hUtz~K725ovVH-&pus7_0#b+XOvTLV_eOiL0Me~(e
z`z`xzF*cJun)SZ3-^$@yNc6*~o=aIZpCgGkCr7IanRLb0M4P#GH6#3_)DpkjmJFl^
zZPD8&UJFpU*?zMDTC|c<gg0{S$2m*tg#br}bX3n<dM-_c_uPx=d$sn-W-%4#6JTWm
zA2g0;gYXy{8TuGsI=#TIsfA=>F@#{h9-Rn7#}S2&CKWoufbck@T>ex=b$z^C-n#de
zJvZ%9EWZ%iYrp-Pn=7NnghS0A4OO}h3_*FUs#FeDRQVhqz{l{-^{*&WpX0K9+2#qw
zmMQ;fSFeHSqv3p->uh};h3SV);sZY&S-6V(b8wS6k_=8z&sy_cY^U>vme_A=`O=0t
z6zb8bl$`i{sb%7erMVMd+K@V>u%UhGYa8dD`uA7cr@iynE2eLT_IBgNnMZfM+%{p8
z`A)~Wwo~6&mzuh9ecO~**0)Ug<9gO*eKPjk`j$z5<T6M9icOoBpU4Nn+<Nw(|7FwR
zYKvi>NCs6^{r&HQ)=Q<&5$I37BNwjP6O5rdzrVJ_t&D(X@(JZ@gW0V@qdWP8GZ=}~
z1r31@wp7{yu&SqlVK^=Zq{lCK`hbB<_w{gVAf=^zU<AxZPPn$Jn`Yc@m?rwP(OI4~
zknu`=Xdj6r1ECYZasvEj0M)L$$^<Yga{WrJKSel_1owX=`!i@bmqjwGj%E98Kk&$H
zBmwM=<x0QNM1|komz_v3Y6Jun7}Z9RMljz28*tXATk}Wm%7`P$u0^sRL<FMxibIKv
z89~(DM>>yCVPm&w!cJoU?<WZHV?HuWRAB@N6h{$k=1oa8Ab^19d}`j~`}by{!ux#8
z_HaunagyF3)_eQl)-@ky9oR|uS5mDA?A2_HoZ6d-f<o_IYuiLL!5XDdd4WJvc*_Ya
zN1o4O5S&Ta*GZc9*<?GCup%GU+OuuEmgEBjxC2cm@qs3dp#tL>kIY-~nI3C+PSUe!
zbFHvd)AN7h{G^u2-(xxrZ?|dbTzf>%r6cLA9@TRhGjrKIuA8r=v)5~S?gwU$q;m@*
zdiI8BI=7JbZ|u&Q{0}ufdlS>&%yqXgpIaiC{GzCy`w^Gjs_EI=G(CTtmdW0(>A5?Y
z$DK^KII8CtM>Dy*xa@8%lf6gNv-fIx{$4GU`?03yeiF%Kmqhj4eP-tUpK5ykeofE*
zOfx^iye&V-d>)GGxu0{{!`$v+P0v5VG9T6S+)^!_eT>T<i|F~sqv_l-E_*^tXP0Z4
z{BquYlIfn}bqCwLg7sa&e6m_5m(%oYp6ga>nfywwU!`SoPqUn7Snt)*OwRlW^s`zf
z{|l~L!<qSHZ)YAe#?H@<v)3DB`$G`+_zy#B15WL+T8-L&EIUrmuH7~9t$dmaL>B@(
z4FI(QLJI<<5HZP&=bD+z<^a%jfcSluaIKjU;Ti<Inh>tyee(|SmCWY~0K6O!zQ=Xn
zMS$-j(QM}N9WMJe0A9v?E(1dI3dE&|a0vp=B%ql@a4`T}#B~<}-~~)~0T6r(0M19k
z8O-CGX6F5GaNXAd(0pFU{7Si*zsh{h<@$2~;B0PpHq%T8gtK`6Oh7z?%g#Wc(^=nX
zTy`3loyz)}Ku!gODO@%g5fiL$g89UmJ_dl3xNaiTO$2~bxa?$>a}pw)$oihhWhZc*
zIdnDu?34N6EJR$QDry<mSxS-2ies7ZQ=BC^hyX$;4%?UNBgu9KvT_3fI$YB`Ovf3L
zIT|W4B#{tQgTRr8wLLo8Y^dPH7tOWgpdx@^Mz)}8?_<4b^w#hm-8UB1nEl7`=)lLi
zifRKQa8T<?^M5-I9grZX6+Y2h0d8{=pXeiM?1BK6@wHuwcH3<ZQDnD5DR2w{!@%x8
zD^hC@e^VlfW3W2J2w`iXee#B(xFLWz$xtBGP|p`pwnvhsHE@xp?jS()iY3M<k;D>C
z)e{}5&Cl(t;IOkKl2i|(OD)lolSm|S3H}{yX*5)5x&mkeS$u|oVKI`(aBI+xbEFd0
zVeBN1uo5N?B7g{aOY8{xeUr{oTOqQHfP%I*vP><6t|P!hs9Osyi5G?vbbRZYFd!T-
z6rI%9j(`F_ZPm_3IMj>)LI)AdETrPIt?+sSH<^#eTOk#i8WB+3o&e!;L^@NE`u7Up
zA)R64BgIr4C3}cLGCtMLXICrKBu>HyuNTR55-29)w-l0z$Je(^`qjo%Y~5?uO_smE
z@&f%DWKdH@oTLW)Y&3;#C$ZB&X#Ige6RJ*sXwvvvh?4}gkJrtO{Rx2NBeib#AK}a5
zByNN3B7X#2<0AWE&l(Y*Ev6>jE>05QLxB)2znm3dGwY_hqOOZf;o>AF3IWZ<WNaxQ
zP7kR1{#KjlqIIdM8%-shaT1f0<hmfx?I?ieYs72oqCg`G<r7b_C2?<$Y2qY3NCbFY
zOvRq!ds-7Xs$9lqlsHSO4uQ4M44>F`;@QbSoMa~!f#2fJy#qq<WdNK&hH(M`oM;$$
z5`u9uf;t%$odN(8!N5rb6e9!Tq#$kpCQzx#2s8x@m<q_*j7~_WF^_3H_c<NGID;<~
zoPm7PnR%QAe6|Imvzf;^gm4ZKp34*6uOiWTfbg~MO!##``UVkvlMrVR(fO$Gd<6Oy
z5L^I&7XlA!K&gvZ&c#eOlj|;F9+v`u`LT~#fXI$d-{!jSFpc?9klBd%U8egUAY9H@
z_^x0cR|4XdTz?fITungNAi=eW%KYfa_W|)brkeu@a|sOd10_l3kwSnLE^7s#HZZ8&
zJkb=djqmmad2tf%jYdk_{;n>zw$wU#O(_-s#fH|{vxU^;)rHig)rGl<XZS#Py4V_9
zRZ1mRmRjTa(%g7{Ln@Xl%$<}iq!KHNt?>@Nx!h4Sqf;{RWGNM2UP{KEU>?f~sn{~}
zrZe++j2&_*4@n+n9*>lg@kdH6v4;!E*v|_siHC~G_=DZKCH6ounfO_$C4PS?8T)Ce
zC2?P2ZtOmmv!vJ(|4A_w`*D$nHO0A;?k%O__mo=VcXQoc%wsXjxU)MaV|Nr&iQBpE
zHm14N%q-_eOt+}WH^I5?X6A8IF&Vpw>wZ{D#&0a85(^70@f!-sNjDTz@dd?X><7hE
z;(Df^UrJ4$S4zd_6_T+`Ar;rTEX{T8#X<heR-B}fJVb191p!|<i7OTgQ$e6c1jI>d
z1W=kcJ_6z-jo-&&VT}lglhg>HG;e$a#7P>zkHx|o5okmwsSy%sE(r8RK%As69<nD0
z?1q3i$!?HHfgsQq0dbPPc*ve0up0v6B)dT(1%g0d1jI@D;?ZkQHU)ug2#Awx!$E!p
zfdLT^Cm9eLsSpIVAs|k&4F~xZ1O`MvoMb>~q(TtbhJZN9HXPjh70!W2K%6A-T_^^)
tjlll{00960LQxUI00006Nkl<Z0{~XJZx~~O5wQRO002ovPDHLkV1k6Qa9scZ

literal 0
HcmV?d00001

diff --git a/src/types/jweixin-js-sdk.d.ts b/src/types/jweixin-js-sdk.d.ts
new file mode 100644
index 0000000..65b42b2
--- /dev/null
+++ b/src/types/jweixin-js-sdk.d.ts
@@ -0,0 +1,54 @@
+/**
+ * 微信 JS-SDK 类型声明
+ * 为 jweixin-js-sdk npm 包提供 TypeScript 类型支持
+ */
+
+declare module 'jweixin-js-sdk' {
+  interface ConfigOptions {
+    debug?: boolean;
+    appId: string;
+    timestamp: number;
+    nonceStr: string;
+    signature: string;
+    jsApiList: string[];
+  }
+
+  interface ShareData {
+    title: string;
+    desc?: string;
+    link: string;
+    imgUrl?: string;
+    success?: () => void;
+    cancel?: () => void;
+    fail?: (res: any) => void;
+    complete?: (res: any) => void;
+  }
+
+  interface ErrorRes {
+    errMsg: string;
+  }
+
+  interface WxJSSDK {
+    config(options: ConfigOptions): void;
+    ready(callback: () => void): void;
+    error(callback: (res: ErrorRes) => void): void;
+    updateAppMessageShareData(data: ShareData): void;
+    updateTimelineShareData(data: ShareData): void;
+    checkJsApi(params: {
+      jsApiList: string[];
+      success?: (res: { checkResult: Record<string, boolean> }) => void;
+      fail?: (res: ErrorRes) => void;
+      complete?: (res: any) => void;
+    }): void;
+  }
+
+  const wx: WxJSSDK;
+  export default wx;
+}
+
+
+
+
+
+
+
diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts
index 11103e0..3716584 100644
--- a/src/utils/request/index.ts
+++ b/src/utils/request/index.ts
@@ -124,7 +124,8 @@ export function get<T = any>(
             reject(res);
           }
         } else {
-          if (res.rows) {
+          // 检查是否是直接返回的对象（有 id 字段，说明是实体对象）
+          if (res.rows || res.id) {
             resolve(res);
           } else {
             showToast(res.message || "接口异常");
diff --git a/src/utils/wechatShare.ts b/src/utils/wechatShare.ts
new file mode 100644
index 0000000..39ea412
--- /dev/null
+++ b/src/utils/wechatShare.ts
@@ -0,0 +1,313 @@
+/**
+ * 微信分享工具类
+ * 用于在微信浏览器内实现分享功能
+ */
+import { wxConfigApi } from '@/api/system/login';
+// #ifdef H5
+// jweixin-js-sdk 是 UMD 格式，使用动态导入
+let wx: any;
+// #endif
+
+/**
+ * 检测是否在微信浏览器环境
+ */
+export function isWeixinBrowser(): boolean {
+  // #ifdef H5
+  return /MicroMessenger/i.test(navigator.userAgent);
+  // #endif
+  // #ifndef H5
+  return false;
+  // #endif
+}
+
+/**
+ * 获取当前页面完整URL（去掉hash部分）
+ * 微信签名需要使用不含hash的URL
+ */
+export function getCurrentUrl(): string {
+  // #ifdef H5
+  if (typeof window === 'undefined') {
+    return '';
+  }
+  
+  // 获取基础URL（协议 + 域名 + 路径）
+  const protocol = window.location.protocol;
+  const host = window.location.host;
+  const pathname = window.location.pathname;
+  const search = window.location.search;
+  
+  // 组合完整URL（不含hash）
+  return `${protocol}//${host}${pathname}${search}`;
+  // #endif
+  // #ifndef H5
+  return '';
+  // #endif
+}
+
+/**
+ * 微信分享配置接口返回的数据结构
+ */
+interface WxConfigResult {
+  appId: string;
+  timestamp: number;
+  nonceStr: string;
+  signature: string;
+  jsapi_ticket?: string;
+}
+
+/**
+ * 分享内容配置
+ */
+export interface ShareConfig {
+  title: string;
+  desc?: string;
+  link: string;
+  imgUrl?: string;
+}
+
+/**
+ * 初始化微信分享
+ * @param shareConfig 分享内容配置
+ * @param debug 是否开启调试模式
+ */
+export async function initWechatShare(
+  shareConfig: ShareConfig,
+  debug: boolean = false
+): Promise<void> {
+  // #ifdef H5
+  // 检查是否在微信浏览器环境
+  if (!isWeixinBrowser()) {
+    console.warn('当前不在微信浏览器环境，无法使用微信分享功能');
+    return;
+  }
+
+  // 动态加载微信JS-SDK
+  try {
+    // 先检查全局变量是否存在
+    if (typeof window !== 'undefined') {
+      wx = (window as any).wx || (window as any).jWeixin;
+      
+      // 如果全局变量存在且有效，直接使用
+      if (wx && typeof wx.config === 'function') {
+        // 全局变量已存在，直接使用
+      }
+    }
+    
+    // 如果全局变量不存在或无效，使用 script 标签动态加载（使用 CDN）
+    if (!wx || typeof wx.config !== 'function') {
+      // 检查是否已经加载过 script
+      const existingScript = document.querySelector('script[data-jweixin]');
+      if (existingScript) {
+        // 等待一下，然后从全局获取
+        await new Promise(resolve => setTimeout(resolve, 300));
+        wx = (window as any).wx || (window as any).jWeixin;
+      } else {
+        // 动态创建 script 标签从 CDN 加载
+        await new Promise<void>((resolve, reject) => {
+          const script = document.createElement('script');
+          script.type = 'text/javascript';
+          script.async = true;
+          script.setAttribute('data-jweixin', 'true');
+          script.src = 'https://res.wx.qq.com/open/js/jweixin-1.6.0.js';
+          
+          script.onload = () => {
+            // 等待一下，确保 UMD 模块执行完成并设置全局变量
+            setTimeout(() => {
+              wx = (window as any).wx || (window as any).jWeixin;
+              
+              if (wx && typeof wx.config === 'function') {
+                resolve();
+              } else {
+                reject(new Error('微信JS-SDK加载失败：wx对象无效'));
+              }
+            }, 200);
+          };
+          
+          script.onerror = () => {
+            reject(new Error('微信JS-SDK脚本加载失败'));
+          };
+          
+          document.head.appendChild(script);
+        });
+      }
+    }
+    
+  } catch (error) {
+    console.error('加载微信JS-SDK失败:', error);
+    uni.showToast({
+      title: '分享功能初始化失败',
+      icon: 'none',
+      duration: 2000
+    });
+    return;
+  }
+
+  // 检查微信JS-SDK是否加载成功
+  if (typeof wx === 'undefined' || !wx) {
+    console.error('微信JS-SDK未加载，请检查npm包是否正确安装');
+    uni.showToast({
+      title: '分享功能初始化失败',
+      icon: 'none',
+      duration: 2000
+    });
+    return;
+  }
+  
+  // 验证 wx 对象是否有效
+  if (typeof wx.config !== 'function') {
+    console.error('❌ wx.config 不是函数！');
+    console.error('wx 对象:', wx);
+    console.error('wx 对象的属性:', Object.keys(wx || {}));
+    uni.showToast({
+      title: '微信JS-SDK配置失败',
+      icon: 'none',
+      duration: 2000
+    });
+    return;
+  }
+
+  try {
+    // 获取当前页面URL（去掉hash）
+    const currentUrl = getCurrentUrl();
+    if (!currentUrl) {
+      console.error('无法获取当前页面URL');
+      return;
+    }
+
+    console.log('获取微信签名配置，URL:', currentUrl);
+
+    // 调用后端接口获取签名配置
+    const response = await wxConfigApi({ url: currentUrl });
+    
+    if (!response || response.resultCode !== 1 || !response.result) {
+      console.error('获取微信签名配置失败:', response);
+      uni.showToast({
+        title: '分享配置获取失败',
+        icon: 'none',
+        duration: 2000
+      });
+      return;
+    }
+
+    const configData: WxConfigResult = response.result;
+
+    // 配置微信JS-SDK
+    wx.config({
+      debug: debug, // 开启调试模式，在微信内打开调试信息
+      appId: configData.appId,
+      timestamp: configData.timestamp,
+      nonceStr: configData.nonceStr,
+      signature: configData.signature,
+      jsApiList: [
+        'updateAppMessageShareData', // 分享给朋友
+        'updateTimelineShareData'    // 分享到朋友圈
+      ]
+    });
+
+    // 配置成功后的回调
+    wx.ready(() => {
+      // 确保图片URL是完整的网络URL
+      let finalImgUrl = shareConfig.imgUrl || '';
+      if (finalImgUrl && !finalImgUrl.startsWith('http://') && !finalImgUrl.startsWith('https://')) {
+        // 如果不是完整URL，尝试转换为完整URL
+        if (typeof window !== 'undefined') {
+          const baseUrl = window.location.protocol + '//' + window.location.host;
+          finalImgUrl = finalImgUrl.startsWith('/') ? baseUrl + finalImgUrl : baseUrl + '/' + finalImgUrl;
+        }
+      }
+      
+      console.log('设置分享内容 - 标题:', shareConfig.title);
+      console.log('设置分享内容 - 链接:', shareConfig.link);
+      console.log('设置分享内容 - 封面图URL:', finalImgUrl);
+      
+      // 设置分享给朋友的内容
+      wx.updateAppMessageShareData({
+        title: shareConfig.title,
+        desc: shareConfig.desc || shareConfig.title,
+        link: shareConfig.link,
+        imgUrl: finalImgUrl,
+        success: () => {
+          console.log('✅ 分享给朋友配置成功');
+        },
+        cancel: () => {
+          // 用户取消分享
+        },
+        fail: (res: any) => {
+          console.error('❌ 分享给朋友配置失败:', res);
+        }
+      });
+
+      // 设置分享到朋友圈的内容
+      wx.updateTimelineShareData({
+        title: shareConfig.title,
+        link: shareConfig.link,
+        imgUrl: finalImgUrl,
+        success: () => {
+          console.log('✅ 分享到朋友圈配置成功');
+        },
+        cancel: () => {
+          // 用户取消分享
+        },
+        fail: (res: any) => {
+          console.error('❌ 分享到朋友圈配置失败:', res);
+        }
+      });
+    });
+
+    // 配置失败的回调
+    wx.error((res: any) => {
+      console.error('微信JS-SDK配置失败:', res);
+      uni.showToast({
+        title: '分享功能配置失败',
+        icon: 'none',
+        duration: 2000
+      });
+    });
+
+  } catch (error) {
+    console.error('初始化微信分享失败:', error);
+    uni.showToast({
+      title: '分享功能初始化失败',
+      icon: 'none',
+      duration: 2000
+    });
+  }
+  // #endif
+  // #ifndef H5
+  console.warn('非H5环境，不支持微信分享功能');
+  // #endif
+}
+
+/**
+ * 构建分享链接
+ * @param baseUrl 基础URL
+ * @param params 参数对象
+ */
+export function buildShareLink(baseUrl: string, params: Record<string, string>): string {
+  // #ifdef H5
+  try {
+    // 尝试使用 URL 构造函数（现代浏览器）
+    if (typeof URL !== 'undefined') {
+      const url = new URL(baseUrl);
+      Object.keys(params).forEach(key => {
+        url.searchParams.set(key, params[key]);
+      });
+      return url.toString();
+    }
+  } catch (e) {
+    // URL 构造函数不可用，使用字符串拼接方式
+  }
+  
+  // 降级方案：使用字符串拼接
+  const separator = baseUrl.includes('?') ? '&' : '?';
+  const queryString = Object.keys(params)
+    .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`)
+    .join('&');
+  
+  return `${baseUrl}${separator}${queryString}`;
+  // #endif
+  // #ifndef H5
+  return baseUrl;
+  // #endif
+}
+
diff --git a/vite.config.ts b/vite.config.ts
index e289683..fc1f1b9 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -16,19 +16,6 @@ export default defineConfig({
             },
         },
     },
-    build: {
-        // 确保文件名包含hash（Vite默认已包含，这里显式配置）
-        rollupOptions: {
-            output: {
-                // 确保文件名包含hash，文件名变化就代表新版本
-                entryFileNames: `assets/[name]-[hash].js`,
-                chunkFileNames: `assets/[name]-[hash].js`,
-                assetFileNames: `assets/[name]-[hash].[ext]`
-            }
-        },
-        // 生成manifest文件，用于版本管理（可选）
-        manifest: true
-    },
     plugins: [
         //c 为class 例如 class="wi-10"
         //w 为样式style 例如 width:10rpx
@@ -71,5 +58,25 @@ export default defineConfig({
             '@': resolve(__dirname, './src'),
             '#': resolve(__dirname, './types')
         }
+    },
+    optimizeDeps: {
+        include: ['jweixin-js-sdk']
+    },
+    build: {
+        // 确保文件名包含hash（Vite默认已包含，这里显式配置）
+        rollupOptions: {
+            output: {
+                // 确保文件名包含hash，文件名变化就代表新版本
+                entryFileNames: `assets/[name]-[hash].js`,
+                chunkFileNames: `assets/[name]-[hash].js`,
+                assetFileNames: `assets/[name]-[hash].[ext]`
+            }
+        },
+        // 生成manifest文件，用于版本管理（可选）
+        manifest: true,
+        commonjsOptions: {
+            include: [/jweixin-js-sdk/, /node_modules/],
+            transformMixedEsModules: true
+        }
     }
 });