From 41e33d6bb6770c71d5ca1e7cbe0b442804e50b7f Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Mon, 27 Apr 2026 17:58:34 +0800
Subject: [PATCH] feat(Antis.Erp.Plat): 待办中心按审核设置与 Dashboard 并行查询；出库/退货序列号弹窗；抖音及多模块调整

---
 Antis.Erp.Plat/antis-ncc-admin/src/api/home.js                                               |  10 +++++++++-
 Antis.Erp.Plat/antis-ncc-admin/src/layout/components/AppMain.vue                             |   1 -
 Antis.Erp.Plat/antis-ncc-admin/src/router/index.js                                           |   4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/utils/douyinErpBase.js                                    |  46 +++++++++++++++++++++++++++++++++++++++++++++-
 Antis.Erp.Plat/antis-ncc-admin/src/utils/wtRejectApproval.js                                 |   9 +++++++++
 Antis.Erp.Plat/antis-ncc-admin/src/views/basic/todoCenter/index.vue                          | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/CreateWaybill.vue                   |  47 +++++++++++++++--------------------------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/OrderList.vue                       |  26 ++++++++++++++++++++------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/Form.vue                                    |  15 ++++++++++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/Form.vue                                    |   5 ++++-
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/PurchaseInboundOrderSelect.vue              |  20 +++++++++++++++++++-
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/Form.vue                                 |  18 ++++++++----------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/detail-view.vue                          |  10 ++++++++++
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/index.vue                                |  16 ++++++++++++++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/Form.vue                                 |  19 +++++++++----------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/index.vue                                |  16 ++++++++++++++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtDgtchsb/index.vue                                 |   2 +-
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtFysrd_qtsr/Form.vue                               |   8 ++++++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtFysrd_qtsr/index.vue                              |  20 +++++++++-----------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/Form.vue                                      | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/detail-view.vue                               | 273 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/index.vue                                     |  78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtPl/Form.vue                                       |  64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtPl/index.vue                                      |  12 ++++++++----
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtPp/index.vue                                      |   4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtShrysz/djmcOptions.js                             |   2 ++
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue                                    |  77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/SerialNumberSelect.vue                      |  26 +++++++++++++++++++++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/detail-view.vue                             | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue                                   |  50 ++++++++++++++++++++++++++++++++++++++++----------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/detail-view.vue                             | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/Form.vue                               |  46 ++++++++++++++++++++++++++++------------------
 Antis.Erp.Plat/douyin/frontend/src/utils/config.ts                                           |  35 +++++++++++++++++++++++++++++++++++
 Antis.Erp.Plat/douyin/frontend/src/views/CreateWaybillView.vue                               |  41 +++++++++++++++++------------------------
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/OrderService.cs    |  70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlCrInput.cs           |   8 ++++++--
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlInfoOutput.cs        |   8 ++++++--
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlListOutput.cs        |   8 ++++++--
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdInfoOutput.cs     |  10 ++++++++++
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListQueryInput.cs |   5 +++++
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtPlEntity.cs         |  10 +++++++---
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtXsckdEntity.cs      |   2 +-
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/BillSummary/WtBillSummaryService.cs  |  12 +++++++++++-
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCwdjService.cs                     |  79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtFysrdService.cs                    | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtHyService.cs                       |   5 +++--
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtPlService.cs                       | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs                    | 301 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtYskzjjsService.cs                  | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
 Antis.Erp.Plat/netcore/src/Modularity/VisualDev/NCC.VisualDev/DashboardService.cs            | 320 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
 Antis.Erp.Plat/sy/css/pos-unified.css                                                        | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
 Antis.Erp.Plat/sy/home.html                                                                  | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 Antis.Erp.Plat/sy/orders.html                                                                |   2 +-
 53 files changed, 2749 insertions(+), 544 deletions(-)
 create mode 100644 Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/detail-view.vue

diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/api/home.js b/Antis.Erp.Plat/antis-ncc-admin/src/api/home.js
index f2f1b32..d9fc569 100755
--- a/Antis.Erp.Plat/antis-ncc-admin/src/api/home.js
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/api/home.js
@@ -28,7 +28,7 @@ export function getFlowTodo() {
     method: 'get'
   })
 }
-// 获取我的待办事项
+// 获取我的待办事项（djmc；includeStats=true 时同包 stats，与列表一次查库）
 export function getMyFlowTodo(data) {
   return request({
     url: '/api/visualdev/Dashboard/MyFlowTodo',
@@ -37,6 +37,14 @@ export function getMyFlowTodo(data) {
   })
 }
 
+/** 仅左侧条数（会全量查待办）；待办中心优先用 getMyFlowTodo({ includeStats: true }) */
+export function getMyFlowTodoStats() {
+  return request({
+    url: '/api/visualdev/Dashboard/MyFlowTodoStats',
+    method: 'get'
+  })
+}
+
 // 获取数据统计
 export function getCountData() {
   return request({
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/layout/components/AppMain.vue b/Antis.Erp.Plat/antis-ncc-admin/src/layout/components/AppMain.vue
index 81975b3..3feb36b 100755
--- a/Antis.Erp.Plat/antis-ncc-admin/src/layout/components/AppMain.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/layout/components/AppMain.vue
@@ -19,7 +19,6 @@
 // 此处改为默认缓存所有页面，仅用 exclude 尊重 meta.noCache；路由 name 与组件 name 不一致的 noCache 路由需把组件 name 列在下面。
 const NO_CACHE_COMPONENT_NAMES = [
   'DouyinLogisticsOrders',
-  'DouyinLogisticsCreateWaybill',
   'wtMdfzManage'
 ]
 
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/router/index.js b/Antis.Erp.Plat/antis-ncc-admin/src/router/index.js
index 0bd3785..a08eb08 100755
--- a/Antis.Erp.Plat/antis-ncc-admin/src/router/index.js
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/router/index.js
@@ -83,14 +83,14 @@ export const constantRoutes = [{
         name: 'create-waybill-merged',
         hidden: true,
         component: () => import('@/views/douyinLogistics/CreateWaybill'),
-        meta: { title: '合并发货单', noCache: true }
+        meta: { title: '合并发货单', noCache: false }
       },
       {
         path: 'create-waybill/:id',
         name: 'create-waybill',
         hidden: true,
         component: () => import('@/views/douyinLogistics/CreateWaybill'),
-        meta: { title: '编辑发货单', noCache: true }
+        meta: { title: '编辑发货单', noCache: false }
       }
     ]
   }
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/utils/douyinErpBase.js b/Antis.Erp.Plat/antis-ncc-admin/src/utils/douyinErpBase.js
index 78cd935..db19eb9 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/utils/douyinErpBase.js
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/utils/douyinErpBase.js
@@ -1,4 +1,10 @@
-/** ERP 站点根地址（与抖音独立前端 VITE_ERP_BASE_URL 一致），用于拼接商品主图等相对路径 */
+/**
+ * 抖音物流 / 发货单页：拼接 ERP 商品图等静态资源根地址。
+ * - 图片相对路径需拼 `VUE_APP_BASE_API`（与上传/文件服务一致）。
+ * - 历史或开发机落库成绝对地址 `http://localhost:2011/...` 时，线上会失效，需把主机替换为当前环境 API 根。
+ */
+
+/** 对外站点名（如官网）；仅作无 API 根时的回退 */
 export function getErpBaseUrl() {
   const v = process.env.VUE_APP_ERP_PUBLIC_BASE
   if (v) return String(v).replace(/\/$/, '')
@@ -7,3 +13,41 @@ export function getErpBaseUrl() {
   }
   return 'https://www.ponggame.cn'
 }
+
+/** 与后台同源的文件/API 根（商品图、上传目录），优先 env，其次浏览器当前 origin */
+export function getErpAssetBaseUrl() {
+  const v = process.env.VUE_APP_BASE_API
+  if (v) return String(v).replace(/\/$/, '')
+  if (typeof window !== 'undefined' && window.location && window.location.origin) {
+    return String(window.location.origin).replace(/\/$/, '')
+  }
+  return getErpBaseUrl()
+}
+
+/**
+ * 商品主图等：补全相对路径，并修正开发机 localhost / 错误落库的绝对地址
+ */
+export function resolveProductPicUrl(pic) {
+  const s0 = (pic || '').trim()
+  if (!s0) return ''
+
+  if (/^https?:\/\//i.test(s0)) {
+    try {
+      const u = new URL(s0)
+      // 开发机或历史错误写死的内网/本机：替换为当前部署的 API 根
+      if (/^(localhost|127\.0\.0\.1|0\.0\.0\.0)$/i.test(u.hostname)) {
+        const base = getErpAssetBaseUrl().replace(/\/$/, '')
+        return `${base}${u.pathname || ''}${u.search || ''}${u.hash || ''}`
+      }
+    } catch (e) {
+      return s0
+    }
+    return s0
+  }
+
+  if (s0.startsWith('//')) return `https:${s0}`
+
+  const base = getErpAssetBaseUrl().replace(/\/$/, '')
+  if (s0.startsWith('/')) return `${base}${s0}`
+  return s0
+}
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtRejectApproval.js b/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtRejectApproval.js
index 92679df..fe86a0b 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtRejectApproval.js
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtRejectApproval.js
@@ -46,6 +46,15 @@ export function postApproveGeneric(id, remark) {
   })
 }
 
+/** 赠送单/获赠单：撤回审核回草稿 */
+export function postWtXsckdWithdrawAudit(id) {
+  return request({
+    url: `/api/Extend/WtXsckd/WithdrawAudit/${id}`,
+    method: 'POST',
+    data: {}
+  })
+}
+
 /**
  * 审核通过（销售出库）
  */
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/basic/todoCenter/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/basic/todoCenter/index.vue
index 4dcd6d1..31f9810 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/basic/todoCenter/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/basic/todoCenter/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="NCC-common-layout todo-center-page">
-    <div class="NCC-common-layout-center">
+    <div class="NCC-common-layout-center todo-center-inner">
       <div class="NCC-common-head">
         <div>
           <span class="page-title">
@@ -10,27 +10,66 @@
             />
             待办中心
           </span>
-          <span class="page-desc"
-            >同价调拨单、销售/预售出库、销售/预售退货、采购入库单、委托代销发/退/结算、赠送单、商品调价单、收款单、费用单、现金费用单、待摊费用摊销等待办（与首页待办数据源一致）</span
+          <el-tooltip
+            effect="dark"
+            placement="bottom-start"
+            :open-delay="400"
+            popper-class="todo-center-desc-tooltip"
           >
+            <div slot="content" class="todo-center-desc-popper">
+              待办与首页同源。左侧「单据类型」来自「审核人员设置」中已配置的单据名称（wt_shrysz.djmc），顺序与审核设置页一致；若某类待办不在配置中，将归入「其他」。
+            </div>
+            <span class="page-desc page-desc--hint"
+              >左侧按审核设置中的单据类型筛选，右侧列表可分页处理</span
+            >
+          </el-tooltip>
         </div>
         <div class="NCC-common-head-right">
-          <el-tooltip effect="dark" content="刷新" placement="top">
+          <el-tooltip effect="dark" content="刷新列表与条数" placement="top">
             <el-link
               icon="icon-ym icon-ym-Refresh NCC-common-head-icon"
               :underline="false"
-              @click="loadData"
+              @click="refreshAll"
             />
           </el-tooltip>
         </div>
       </div>
-      <div class="NCC-common-layout-main NCC-flex-main">
+      <div class="todo-center-body">
+        <aside class="todo-center-aside">
+          <div class="todo-center-aside__head">
+            <span class="todo-center-aside__title">单据类型</span>
+            <span class="todo-center-aside__sub">审核人员设置</span>
+          </div>
+          <div class="todo-center-aside__scroll">
+            <ul class="todo-cat-list">
+              <li
+                v-for="row in todoNavRows"
+                :key="'nav-' + row.djmc"
+                :class="[
+                  'todo-cat-list__item',
+                  { 'is-active': selectedDjmc === row.djmc }
+                ]"
+                @click="selectDjmc(row.djmc)"
+              >
+                <span class="todo-cat-list__label" :title="row.djmc === 'all' ? '全部待办' : rowLabelTitle(row)">{{
+                  row.label
+                }}</span>
+                <span
+                  class="todo-cat-list__count"
+                  :class="{ 'is-zero': !row.count }"
+                  >{{ row.count }}</span
+                >
+              </li>
+            </ul>
+          </div>
+        </aside>
+        <div class="NCC-common-layout-main NCC-flex-main todo-center-main">
         <el-table
           v-loading="loading"
           :data="list"
           border
           stripe
-          empty-text="暂无待办"
+          empty-text="该分类下暂无待办"
         >
           <el-table-column
             type="index"
@@ -40,9 +79,24 @@
             :index="tableIndexMethod"
           />
           <el-table-column
+            label="单据类型"
+            width="126"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-tag
+                type="info"
+                size="mini"
+                effect="plain"
+                class="todo-bill-type-tag"
+                >{{ displayBillType(scope.row) }}</el-tag
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
             prop="fullName"
             label="待办事项"
-            min-width="280"
+            min-width="240"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -80,6 +134,7 @@
           :page-sizes="[10, 20, 50, 100]"
           @pagination="loadData"
         />
+        </div>
       </div>
     </div>
 
@@ -173,6 +228,36 @@
       </template>
     </WtXsckdDetailView>
 
+    <WtHzdDetailView
+      v-if="processVisible && processBillType === '获赠单'"
+      ref="processDlg"
+      @close="onProcessDialogClose"
+      @loaded="onProcessLoaded"
+    >
+      <template slot="footer">
+        <el-button @click="closeProcessDialog">关闭</el-button>
+        <el-button
+          v-if="canLevel1Approve"
+          type="warning"
+          @click="handleLevel1Approve"
+          >一级审核</el-button
+        >
+        <el-button
+          v-if="canLevel2Approve"
+          type="success"
+          @click="handleLevel2Approve"
+          >二级审核</el-button
+        >
+        <el-button
+          v-if="canAuditReject"
+          type="danger"
+          plain
+          @click="handleReject"
+          >审核不通过</el-button
+        >
+      </template>
+    </WtHzdDetailView>
+
     <WtXsthdDetailView
       v-if="processVisible && processBillType === '销售退货单'"
       ref="processDlg"
@@ -580,6 +665,23 @@
       </template>
     </WtCwdjSkdDetailView>
 
+    <WtCwdjFkdDetailView
+      v-if="processVisible && processBillType === '付款单'"
+      ref="processDlg"
+      @close="onProcessDialogClose"
+      @loaded="onProcessLoaded"
+    >
+      <template slot="footer">
+        <el-button @click="closeProcessDialog">关闭</el-button>
+        <el-button
+          v-if="canLevel1Approve"
+          type="warning"
+          @click="handleLevel1Approve"
+          >审核</el-button
+        >
+      </template>
+    </WtCwdjFkdDetailView>
+
     <WtCwdjFydDetailView
       v-if="processVisible && processBillType === '费用单'"
       ref="processDlg"
@@ -626,6 +728,7 @@ import WtYsckdDetailView from "@/views/wtYsckd/detail-view.vue";
 import WtYsthdDetailView from "@/views/wtYsthd/detail-view.vue";
 import WtCgrkdDetailView from "@/views/wtCgrkd/detail-view.vue";
 import WtCwdjSkdDetailView from "@/views/wtCwdj_skd/detail-view.vue";
+import WtCwdjFkdDetailView from "@/views/wtCwdj_fkd/detail-view.vue";
 import WtCwdjFydDetailView from "@/views/wtCwdj_fyd/detail-view.vue";
 import WtPriceAdjustDetailView from "@/views/wtPriceAdjust/detail-view.vue";
 import WtXswtdxfhdDetailView from "@/views/wtXswtdxfhd/detail-view.vue";
@@ -636,6 +739,7 @@ import WtYskzjjsHyDetailView from "@/views/wtYskzjjs_hy/detail-view.vue";
 import WtYskzjjsZkDetailView from "@/views/wtYskzjjs_zk/detail-view.vue";
 import WtYskzjjsXjDetailView from "@/views/wtYskzjjs_xj/detail-view.vue";
 import WtCzdDetailView from "@/views/wtCzd/detail-view.vue";
+import WtHzdDetailView from "@/views/wtHzd/detail-view.vue";
 import {
   promptApprovalRemark,
   postApproveGeneric,
@@ -656,6 +760,7 @@ const BILL_TYPES = [
   "预售退货单",
   "销售出库单",
   "赠送单",
+  "获赠单",
   "销售退货单",
   "采购入库单",
   "拆装单",
@@ -664,6 +769,7 @@ const BILL_TYPES = [
   "费用单",
   "待摊费用摊销",
   "收款单",
+  "付款单",
   "商品调价单",
   "会员到期收款",
   "其他应收单"
@@ -679,6 +785,7 @@ export default {
     WtYsthdDetailView,
     WtCgrkdDetailView,
     WtCwdjSkdDetailView,
+    WtCwdjFkdDetailView,
     WtCwdjFydDetailView,
     WtPriceAdjustDetailView,
     WtXswtdxfhdDetailView,
@@ -688,13 +795,19 @@ export default {
     WtYskzjjsHyDetailView,
     WtYskzjjsZkDetailView,
     WtYskzjjsXjDetailView,
-    WtCzdDetailView
+    WtCzdDetailView,
+    WtHzdDetailView
   },
   data() {
     return {
       loading: false,
       list: [],
       total: 0,
+      /** getMyFlowTodoStats：total、items[]（djmc/label/count） */
+      statsTotal: 0,
+      statsItems: [],
+      /** 与 wt_shrysz.djmc 一致，或 all、_other_ */
+      selectedDjmc: "all",
       listQuery: {
         currentPage: 1,
         pageSize: 20
@@ -710,6 +823,13 @@ export default {
     };
   },
   computed: {
+    todoNavRows() {
+      const head = [
+        { djmc: "all", label: "全部", count: this.statsTotal }
+      ];
+      const rest = Array.isArray(this.statsItems) ? this.statsItems : [];
+      return head.concat(rest);
+    },
     canLevel1Approve() {
       const s = this.getAuditStatus(this.processDetail);
       return !s || s === "待审核";
@@ -723,9 +843,42 @@ export default {
     }
   },
   created() {
-    this.loadData();
+    // 一次请求带左侧条数，避免与列表各跑一遍全量待办
+    this.loadData({ includeStats: true });
   },
   methods: {
+    selectDjmc(djmc) {
+      if (djmc === this.selectedDjmc) return;
+      this.selectedDjmc = djmc;
+      this.listQuery.currentPage = 1;
+      this.loadData();
+    },
+    rowLabelTitle(row) {
+      if (!row) return "";
+      if (row.djmc && row.djmc !== "all" && row.djmc !== "_other_") {
+        return `配置键：${row.djmc}`;
+      }
+      return row.label || "";
+    },
+    displayBillType(row) {
+      if (row && row.billType != null && String(row.billType).trim() !== "") {
+        return String(row.billType).trim();
+      }
+      return this.resolveBillType(row);
+    },
+    applyStatsFromPayload(stats) {
+      if (!stats) return;
+      const t = stats.total;
+      this.statsTotal = typeof t === "number" ? t : 0;
+      this.statsItems = Array.isArray(stats.items)
+        ? stats.items
+        : Array.isArray(stats.Items)
+          ? stats.Items
+          : [];
+    },
+    refreshAll() {
+      this.loadData({ includeStats: true });
+    },
     cellText(v) {
       if (v === null || v === undefined || v === "") return "无";
       return v;
@@ -763,16 +916,27 @@ export default {
         (this.listQuery.currentPage - 1) * this.listQuery.pageSize + index + 1
       );
     },
-    loadData() {
+    loadData(options) {
+      const opt = options || {};
+      const includeStats = opt.includeStats === true;
       this.loading = true;
-      return getMyFlowTodo({
+      const params = {
         currentPage: this.listQuery.currentPage,
-        pageSize: this.listQuery.pageSize
-      })
+        pageSize: this.listQuery.pageSize,
+        djmc: this.selectedDjmc
+      };
+      if (includeStats) {
+        params.includeStats = true;
+      }
+      return getMyFlowTodo(params)
         .then(res => {
-          const raw = (res.data && res.data.list) || [];
+          const d = (res && res.data) || {};
+          if (d.stats) {
+            this.applyStatsFromPayload(d.stats);
+          }
+          const raw = d.list || [];
           this.list = Array.isArray(raw) ? raw : [];
-          const pg = res.data && res.data.pagination;
+          const pg = d.pagination;
           this.total =
             (pg && typeof pg.total === "number"
               ? pg.total
@@ -788,7 +952,7 @@ export default {
             );
             if (this.listQuery.currentPage > lastPage) {
               this.listQuery.currentPage = lastPage;
-              return this.loadData();
+              return this.loadData(opt);
             }
           }
         })
@@ -854,6 +1018,9 @@ export default {
       if (t === "收款单") {
         return { msg: "确认审核该收款单？", title: "审核确认" };
       }
+      if (t === "付款单") {
+        return { msg: "确认审核该付款单？", title: "审核确认" };
+      }
       if (t === "费用单") {
         return { msg: "确认审核该费用单？", title: "审核确认" };
       }
@@ -911,6 +1078,9 @@ export default {
       if (t === "委托代销结算单") {
         return { msg: "确认审核该委托代销结算单？", title: "审核确认" };
       }
+      if (t === "获赠单") {
+        return { msg: "确认审核该获赠单？通过后即按单据更新库存与成本。", title: "审核确认" };
+      }
       return { msg: "确认执行一级审核？", title: "审核确认" };
     },
     level2Confirm() {
@@ -969,6 +1139,9 @@ export default {
       if (t === "委托代销结算单") {
         return { msg: "确认审核该委托代销结算单？", title: "审核确认" };
       }
+      if (t === "获赠单") {
+        return { msg: "确认执行二级审核该获赠单？通过后即按单据更新库存与成本。", title: "二级审核确认" };
+      }
       return { msg: "确认执行二级审核？", title: "审核确认" };
     },
     handleLevel1Approve() {
@@ -993,6 +1166,21 @@ export default {
               return { data: { success, message } };
             });
           }
+          if (this.processBillType === "付款单") {
+            return request({
+              url: `/api/Extend/WtCwdj/Actions/ApprovePayment/${id}`,
+              method: "POST",
+              data: {}
+            }).then(res => {
+              const d = (res && res.data) || {};
+              const success =
+                typeof d.success === "boolean"
+                  ? d.success
+                  : String(res && res.code) === "200";
+              const message = d.message || res.msg || (success ? "审核通过" : "审核失败");
+              return { data: { success, message } };
+            });
+          }
           if (this.processBillType === "费用单") {
             return request({
               url: `/api/Extend/WtCwdj/Actions/ApproveExpense/${id}`,
@@ -1044,7 +1232,7 @@ export default {
               message: res.data.message || "操作成功"
             });
             this.pendingCloseWhenApproved = true;
-            this.loadData();
+            this.refreshAll();
             this.$nextTick(() => {
               if (this.$refs.processDlg) this.$refs.processDlg.init(id);
             });
@@ -1081,7 +1269,7 @@ export default {
               message: res.data.message || "操作成功"
             });
             this.pendingCloseWhenApproved = true;
-            this.loadData();
+            this.refreshAll();
             this.$nextTick(() => {
               if (this.$refs.processDlg) this.$refs.processDlg.init(id);
             });
@@ -1116,7 +1304,7 @@ export default {
               message: res.data.message || "已标记审核不通过"
             });
             this.pendingCloseAfterReject = true;
-            this.loadData();
+            this.refreshAll();
             this.$nextTick(() => {
               if (this.$refs.processDlg) this.$refs.processDlg.init(id);
             });
@@ -1135,6 +1323,12 @@ export default {
 
 <style scoped lang="scss">
 .todo-center-page {
+  .todo-center-inner {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    min-height: 0;
+  }
   .page-title {
     font-size: 16px;
     font-weight: 600;
@@ -1147,8 +1341,119 @@ export default {
     color: #909399;
     vertical-align: middle;
   }
+  .page-desc--hint {
+    border-bottom: 1px dashed #c0c4cc;
+    cursor: help;
+  }
   .cell-nowrap {
     white-space: nowrap;
   }
+  .todo-bill-type-tag {
+    max-width: 100%;
+  }
+  .todo-center-body {
+    display: flex;
+    flex: 1;
+    min-height: 0;
+    margin-top: 0;
+  }
+  .todo-center-aside {
+    width: 212px;
+    flex-shrink: 0;
+    border: 1px solid #e4e7ed;
+    border-radius: 8px;
+    background: #fff;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.04);
+    margin-right: 14px;
+    display: flex;
+    flex-direction: column;
+    min-height: 220px;
+  }
+  .todo-center-aside__head {
+    padding: 12px 12px 8px;
+    border-bottom: 1px solid #f0f2f5;
+  }
+  .todo-center-aside__title {
+    display: block;
+    font-size: 14px;
+    font-weight: 600;
+    color: #303133;
+    line-height: 1.3;
+  }
+  .todo-center-aside__sub {
+    display: block;
+    margin-top: 4px;
+    font-size: 12px;
+    color: #909399;
+  }
+  .todo-center-aside__scroll {
+    flex: 1;
+    min-height: 0;
+    overflow-y: auto;
+  }
+  .todo-cat-list {
+    list-style: none;
+    margin: 0;
+    padding: 6px 0 10px;
+  }
+  .todo-cat-list__item {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+    gap: 8px;
+    margin: 2px 8px;
+    padding: 8px 10px 8px 12px;
+    border-radius: 6px;
+    cursor: pointer;
+    font-size: 13px;
+    line-height: 1.4;
+    color: #303133;
+    border-left: 3px solid transparent;
+    transition: background 0.12s, border-color 0.12s, color 0.12s;
+    &:hover {
+      background: #f5f9ff;
+      border-left-color: #b3d8ff;
+    }
+    &.is-active {
+      background: linear-gradient(90deg, #ecf5ff 0%, #f5f9ff 100%);
+      border-left-color: #409eff;
+      color: #1a4a7a;
+      font-weight: 500;
+      .todo-cat-list__count {
+        background: #409eff;
+        color: #fff;
+      }
+      .todo-cat-list__count.is-zero {
+        background: #c0c4cc;
+        color: #fff;
+      }
+    }
+  }
+  .todo-cat-list__label {
+    flex: 1;
+    min-width: 0;
+    word-break: break-all;
+  }
+  .todo-cat-list__count {
+    flex-shrink: 0;
+    min-width: 22px;
+    padding: 0 6px;
+    height: 20px;
+    line-height: 20px;
+    text-align: center;
+    font-size: 12px;
+    font-weight: 500;
+    color: #606266;
+    background: #f0f2f5;
+    border-radius: 10px;
+    &.is-zero {
+      color: #c0c4cc;
+      background: #f4f4f5;
+    }
+  }
+  .todo-center-main {
+    flex: 1;
+    min-width: 0;
+  }
 }
 </style>
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/CreateWaybill.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/CreateWaybill.vue
index a9d0fa2..e0e1313 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/CreateWaybill.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/CreateWaybill.vue
@@ -164,24 +164,16 @@
                       :key="index"
                       class="order-product-item"
                     >
-                      <!-- 商品明细：显示抖音图，没有则显示"暂无图片" -->
                       <el-image
-                        v-if="item.douyin_pic || item.product_pic"
-                        :src="item.douyin_pic || item.product_pic"
+                        v-if="orderProductThumb(item)"
+                        :src="orderProductThumb(item)"
                         class="product-thumb"
                         fit="cover"
-                        :preview-src-list="[item.douyin_pic || item.product_pic]"
+                        :preview-src-list="[orderProductThumb(item)]"
                       />
                       <div class="product-thumb-placeholder" v-else>暂无图片</div>
                       <div class="product-info">
-                        <div class="product-name">{{ item.product_name }}</div>
-                        <div class="product-name-erp">
-                          ERP：{{ item.erp_spmc || '-' }}
-                        </div>
-                        <div v-if="getSkuCode(item)" class="product-sku">
-                          <span class="sku-label">SKUID：</span>{{ getSkuCode(item) }}
-                          <span v-if="formatSpec(item.spec)" class="sku-spec">({{ formatSpec(item.spec) }})</span>
-                        </div>
+                        <div class="product-name product-name--erp-only">{{ item.erp_spmc || item.product_name || '—' }}</div>
                         <div class="product-meta">
                           <span>×{{ item.item_num }}</span>
                           <span>¥{{ Number(item.goods_price || 0).toFixed(2) }}</span>
@@ -298,11 +290,11 @@
                     <template slot-scope="scope">
                       <!-- 商品清单：显示 ERP 图，没有则显示"暂无图片" -->
                       <el-image
-                        v-if="scope.row.erp_pic"
-                        :src="scope.row.erp_pic"
+                        v-if="resolveProductPicUrl(scope.row.erp_pic)"
+                        :src="resolveProductPicUrl(scope.row.erp_pic)"
                         style="width: 50px; height: 50px; border-radius: 4px;"
                         fit="cover"
-                        :preview-src-list="[scope.row.erp_pic]"
+                        :preview-src-list="[resolveProductPicUrl(scope.row.erp_pic)]"
                         lazy
                       />
                       <div v-else class="cell-no-image">暂无图片</div>
@@ -310,12 +302,7 @@
                   </el-table-column>
                   <el-table-column label="商品名称" min-width="200" show-overflow-tooltip>
                     <template slot-scope="scope">
-                      <div class="product-name-cell">
-                        <div class="product-name-main">{{ scope.row.product_name || '无' }}</div>
-                        <div class="product-name-erp">
-                          ERP：{{ scope.row.erp_spmc || '-' }}
-                        </div>
-                      </div>
+                      <span class="product-name-erp-only">{{ scope.row.erp_spmc || scope.row.product_name || '—' }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="抖音ID" width="150">
@@ -635,7 +622,7 @@ import router from '@/router'
 import { Message as ElMessage, MessageBox as ElMessageBox } from 'element-ui'
 import { getOrderDetail, getMergedOrderDetail, searchProducts as searchProductsAPI, manualCreateWaybill, getProductInfo as getProductInfoAPI, getWarehouses, getProductCategories, updateSellerRemark, getDefaults, getCustomers, getPaymentAccounts, getUsers, getUsersByOrganize, getShopSettings, checkStock, getStockCostBreakdown, printWaybill } from '@/api/douyinLogistics'
 import { getDouyinLogisticsBaseOrigin } from '@/utils/douyinLogisticsAxios'
-import { getErpBaseUrl } from '@/utils/douyinErpBase'
+import { getErpAssetBaseUrl, resolveProductPicUrl } from '@/utils/douyinErpBase'
 import request from '@/utils/request'
 import { getDepartmentSelector } from '@/api/permission/department'
 import SerialNumberSelect from './components/SerialNumberSelect.vue'
@@ -671,15 +658,10 @@ const currentSerialRow = ref(null)
 // 商品信息缓存（用于存储序列号类型）
 const productCache = new Map()
 
-/** 商品主图：补全 ERP 相对路径，避免 el-image 请求失败 */
-const resolveProductPicUrl = (pic) => {
-  const s = (pic || '').trim()
-  if (!s) return ''
-  if (/^https?:\/\//i.test(s)) return s
-  if (s.startsWith('//')) return `https:${s}`
-  const base = getErpBaseUrl().replace(/\/$/, '')
-  if (s.startsWith('/')) return `${base}${s}`
-  return s
+/** 订单信息区缩略图：优先 ERP 图，并统一走 resolve 修正错误域名 */
+const orderProductThumb = (item) => {
+  if (!item) return ''
+  return resolveProductPicUrl(item.erp_pic || item.product_pic || item.douyin_pic)
 }
 
 /** 金额展示：分转元，无数据时显示「无」 */
@@ -1260,7 +1242,7 @@ const addProduct = async (product) => {
       const images = typeof product.spzt === 'string' ? JSON.parse(product.spzt) : product.spzt
       if (Array.isArray(images) && images.length > 0 && images[0].url) {
         const url = images[0].url
-        productPic = url.startsWith('http') ? url : `${getErpBaseUrl()}${url.startsWith('/') ? '' : '/'}${url}`
+        productPic = url.startsWith('http') ? url : `${getErpAssetBaseUrl()}${url.startsWith('/') ? '' : '/'}${url}`
       }
     } catch (e) {
       console.warn('解析商品主图失败:', e)
@@ -2006,6 +1988,7 @@ onMounted(() => {
       productPageIndex,
       productPageSize,
       productTotal,
+      orderProductThumb,
       addProduct,
       handleSubmit,
       handleCancel,
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/OrderList.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/OrderList.vue
index 3b83c87..c370cd5 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/OrderList.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/OrderList.vue
@@ -110,7 +110,7 @@
             <el-form-item label="商品名称">
               <el-input v-model="filterForm.productName" placeholder="商品关键词" clearable class="filter-w--product" />
             </el-form-item>
-            <el-form-item label="抖音SKU名称">
+            <el-form-item label="抖音SKU">
               <el-input v-model="filterForm.skuName" placeholder="SKU名称关键词" clearable class="filter-w--sku" />
             </el-form-item>
             <el-form-item label="同步时间">
@@ -304,10 +304,16 @@
                 <div v-if="row.trackingNumber" style="color: #409eff; font-weight: 500;">
                   {{ row.trackingNumber }}
                 </div>
-                <div v-if="row.logisticsCompany" style="color: #909399; font-size: 11px; margin-top: 2px;">
+                <div
+                  v-if="row.logisticsCompany && !isDefaultShunfengLogisticsLabel(row.logisticsCompany)"
+                  style="color: #909399; font-size: 11px; margin-top: 2px;"
+                >
                   {{ row.logisticsCompany }}
                 </div>
-                <div v-if="!row.trackingNumber && !row.logisticsCompany" style="color: #909399;">
+                <div
+                  v-if="!row.trackingNumber && (!row.logisticsCompany || isDefaultShunfengLogisticsLabel(row.logisticsCompany))"
+                  style="color: #909399;"
+                >
                   -
                 </div>
               </div>
@@ -379,7 +385,7 @@
                 <div v-if="row.sellerWords" style="color: #67c23a; white-space: pre-line;" :title="row.sellerWords">
                   <span style="color: #909399; font-size: 10px;">卖家：</span>{{ row.sellerWords }}
                 </div>
-                <div v-if="row.status === 1" style="margin-top: 4px;">
+                <div v-if="row.status === 0 || row.status === 1" style="margin-top: 4px;">
                   <el-button type="text" size="mini" @click="openRemarkDialog(row)">编辑并回传抖音</el-button>
                 </div>
                 <div v-if="!row.buyerWords && !row.sellerWords" style="color: #909399;">
@@ -1281,8 +1287,8 @@ const handleManualShip = async () => {
 }
 
 const openRemarkDialog = (order) => {
-  if (!order || order.status !== 1) {
-    ElMessage.warning('仅已发货订单支持备注回传')
+  if (!order || (order.status !== 0 && order.status !== 1)) {
+    ElMessage.warning('仅待发货、已发货订单支持备注回传')
     return
   }
   remarkForm.value = {
@@ -1358,6 +1364,13 @@ const handleCreateSalesOrder = async (order) => {
 }
 
 
+/** 列表「物流信息」列：本系统/库表默认的顺丰文案不展示，仅非顺丰或其它物流公司时显示第二行。 */
+const isDefaultShunfengLogisticsLabel = (name) => {
+  const t = (name == null ? '' : String(name)).trim()
+  if (!t) return false
+  return t === '顺丰' || t === '顺丰速运' || t.toLowerCase() === 'shunfeng' || t.toLowerCase() === 'sf'
+}
+
 /** 运单来源：1本系统顺丰打单 2 本系统其他物流 3 抖音同步（后端 TrackingOrigin / TrackingOriginDisplay） */
 const getTrackingOriginMeta = (order) => {
   const raw = order.trackingOriginDisplay != null && order.trackingOriginDisplay !== ''
@@ -1544,6 +1557,7 @@ onMounted(() => {
       handlePageChange,
       formatDateTime,
       getStatusText,
+      isDefaultShunfengLogisticsLabel,
       getTrackingOriginMeta,
       getStatusType,
       formatProductSpec,
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/Form.vue
index a495575..a643590 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/Form.vue
@@ -507,6 +507,7 @@
 			 */
 			async applyOutboundCostPrice(row, silent = false) {
 				if (!row || !row.spbh || !row.ckck) return
+				let appliedPositive = false
 				try {
 					const spbh = encodeURIComponent(String(row.spbh))
 					const ck = encodeURIComponent(String(row.ckck))
@@ -519,8 +520,7 @@
 						const p = Number(payload.data)
 						if (!isNaN(p) && p > 0) {
 							this.$set(row, 'dj', p.toFixed(4))
-							this.calculateRowAdjustedCost(row)
-							this.$forceUpdate()
+							appliedPositive = true
 						}
 					} else if (!silent && payload && payload.msg) {
 						this.$message.warning(payload.msg)
@@ -528,6 +528,15 @@
 				} catch (e) {
 					if (!silent) console.error(e)
 				}
+				// 未查询到有效成本单价时，成本单价列默认显示 0（与 toFixed(4) 展示一致）
+				if (!appliedPositive) {
+					this.$set(row, 'dj', '0.0000')
+					this.calculateRowAdjustedCost(row)
+					this.$forceUpdate()
+				} else {
+					this.calculateRowAdjustedCost(row)
+					this.$forceUpdate()
+				}
 			},
 			/** 组装提交体：变价系数转数值、显式 isDraft、去掉前端临时字段 */
 			buildPayload(isDraft) {
@@ -812,7 +821,7 @@
 							dw: undefined,
 							kucun: sl,
 							sl,
-							dj: cbj ? Number(cbj).toFixed(4) : undefined,
+							dj: Number(cbj || 0).toFixed(4),
 							je: undefined,
 							bjhcb: undefined,
 							bjhcbManual: false,
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/Form.vue
index 3bb9c45..89b96f0 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/Form.vue
@@ -1009,7 +1009,10 @@
 				this.$refs.serialNumberSelect.open(
 					row.spbh,
 					latestWarehouse,
-					row.selectedSerialNumbers || []
+					row.selectedSerialNumbers || [],
+					this.dataForm.djlx || '采购退货单',
+					undefined,
+					true
 				);
 			},
 
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/PurchaseInboundOrderSelect.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/PurchaseInboundOrderSelect.vue
index 60bc34c..fdbf707 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/PurchaseInboundOrderSelect.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/PurchaseInboundOrderSelect.vue
@@ -1,4 +1,5 @@
 <template>
+  <div class="purchase-inbound-select-root">
   <el-dialog
     title="选择采购入库单"
     :visible.sync="visible"
@@ -99,6 +100,11 @@
         </el-table-column>
         <el-table-column prop="jsr" label="经手人" min-width="120" />
         <el-table-column prop="djzt" label="状态" width="100" />
+        <el-table-column label="操作" width="100" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click.stop="openOrderDetail(scope.row)">查看明细</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
 
@@ -119,14 +125,18 @@
       <el-button type="primary" @click="confirmSelection">确定（已选择{{ selectedOrders.length }}张）</el-button>
     </div>
   </el-dialog>
+  <WtCgrkdDetailView ref="cgrkdDetailView" />
+  </div>
 </template>
 
 <script>
 import request from '@/utils/request'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
+import WtCgrkdDetailView from '../wtCgrkd/detail-view.vue'
 
 export default {
   name: 'PurchaseInboundOrderSelect',
+  components: { WtCgrkdDetailView },
   data() {
     return {
       visible: false,
@@ -216,9 +226,10 @@ export default {
           query.pageSize = 1000
         }
         if (this.query.djrq && this.query.djrq.length === 2) query.djrq = `${this.query.djrq[0]},${this.query.djrq[1]}`
+        // 只传 gys：采购入库主表「供应商」在 xsckd.Gys。若再传 kh，后端会 AND Kh.Contains(同 id)，
+        // 与入库单实际 Kh（会员/客户）不一致，导致列表被筛成空，往来单位筛选失效。
         if (this.query.gys) {
           query.gys = this.query.gys
-          query.kh = this.query.gys
         }
         if (this.query.jsr) query.jsr = this.query.jsr
         if (this.query.spbh) query.spbh = this.query.spbh
@@ -267,6 +278,13 @@ export default {
     handleRowClick(row) {
       this.$refs.orderTable.toggleRowSelection(row)
     },
+    openOrderDetail(row) {
+      if (!row || !row.id) return
+      this.$nextTick(() => {
+        const ref = this.$refs.cgrkdDetailView
+        if (ref) ref.init(row.id)
+      })
+    },
     handleSizeChange(size) {
       this.pagination.pageSize = size
       this.pagination.currentPage = 1
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/Form.vue
index dbcbd10..a7324ea 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/Form.vue
@@ -23,7 +23,7 @@
 					</el-col>
 					<el-col :span="8">
 						<el-form-item label="经手人" prop="jsr">
-							<el-input :value="jsrDisplayText" readonly placeholder="由明细所选账号带出" />
+							<el-input :value="jsrDisplayText" readonly placeholder="当前登录用户（保存后落库）" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="16">
@@ -189,16 +189,14 @@
 				return '编辑'
 			},
 			jsrDisplayText() {
-				const rows = Array.isArray(this.dataForm.wtCwdjmxList) ? this.dataForm.wtCwdjmxList : []
-				for (let i = 0; i < rows.length; i++) {
-					const r = rows[i]
-					if (r && r.zhbh) {
-						const opt = (this.zhbhOptions || []).find(o => o && o.id === r.zhbh)
-						if (opt && opt.fullName) return opt.fullName
-					}
+				if (this.dataForm && this.dataForm.id && this.dataForm.jsr != null && this.dataForm.jsr !== '') {
+					return String(this.dataForm.jsr)
 				}
-				const j = this.dataForm.jsr
-				return (j != null && j !== '') ? String(j) : '—'
+				const u = this.$store.getters.userInfo
+				if (u) {
+					return (u.userName && String(u.userName).trim()) || (u.realName && String(u.realName).trim()) || (u.userId && String(u.userId).trim()) || '—'
+				}
+				return '—'
 			},
 		},
         watch: {},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/detail-view.vue
index 4c2f792..860e105 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/detail-view.vue
@@ -107,6 +107,12 @@
         <span></span>
       </div>
     </div>
+
+    <template slot="footer">
+      <slot name="footer">
+        <el-button @click="close">关闭</el-button>
+      </slot>
+    </template>
   </el-dialog>
 </template>
 
@@ -138,6 +144,9 @@ export default {
     this.loadOptions()
   },
   methods: {
+    close() {
+      this.visible = false
+    },
     cellText(v) {
       if (v === null || v === undefined || v === '') return ''
       return v
@@ -194,6 +203,7 @@ export default {
         if (!Array.isArray(this.detail.wtCwdjmxList)) {
           this.$set(this.detail, 'wtCwdjmxList', [])
         }
+        this.$emit('loaded', this.detail)
       }).catch(() => {
         this.$message.error('加载详情失败')
         this.visible = false
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/index.vue
index 301aa10..02a1b3a 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/index.vue
@@ -24,7 +24,7 @@
 					<template v-if="showAll">
 					<el-col :span="6">
 						<el-form-item label="经手人">
-							<el-input v-model="query.jsr" placeholder="账户名称等" clearable />
+							<el-input v-model="query.jsr" placeholder="经手人" clearable />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
@@ -67,7 +67,12 @@
 					<el-table-column label="往来单位" prop="wldw" align="left">
 							<template slot-scope="scope">{{ scope.row.wldw | dynamicText(wldwOptions) }}</template>
 					</el-table-column>
-					<el-table-column prop="jsr" label="经手人" align="left" />
+					<el-table-column label="金额" prop="fsje" align="right" width="120" show-overflow-tooltip>
+						<template slot-scope="scope">
+							{{ formatFsje(scope.row.fsje) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="jsr" label="经手人" align="left" min-width="120" show-overflow-tooltip />
 					<el-table-column prop="djzt" label="审核状态" align="left" width="110">
 						<template slot-scope="scope">
 							<el-tag v-if="scope.row.djzt === '已审核'" type="success">已审核</el-tag>
@@ -133,6 +138,7 @@
                     { prop: 'id', label: '单据编号' },
                     { prop: 'ldrq', label: '录单日期' },
                     { prop: 'wldw', label: '往来单位' },
+                    { prop: 'fsje', label: '金额' },
                     { prop: 'jsr', label: '经手人' },
                     { prop: 'zy', label: '摘要' },
 				],
@@ -149,6 +155,12 @@
 			this.getskzhOptions();
 		},
 		methods: {
+			formatFsje(v) {
+				if (v === null || v === undefined || v === '') return '—'
+				const n = Number(v)
+				if (Number.isNaN(n)) return v
+				return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+			},
 			isDraftRow(row) {
 				return row && String(row.djzt || '').trim() === '草稿'
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/Form.vue
index 95944e1..ba4f915 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/Form.vue
@@ -23,7 +23,7 @@
 					</el-col>
 					<el-col :span="8">
 						<el-form-item label="经手人" prop="jsr">
-							<el-input :value="jsrDisplayText" readonly placeholder="由明细所选账号带出" />
+							<el-input :value="jsrDisplayText" readonly placeholder="当前登录用户（保存后落库）" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="16">
@@ -188,16 +188,15 @@
 				return '编辑'
 			},
 			jsrDisplayText() {
-				const rows = Array.isArray(this.dataForm.wtCwdjmxList) ? this.dataForm.wtCwdjmxList : []
-				for (let i = 0; i < rows.length; i++) {
-					const r = rows[i]
-					if (r && r.zhbh) {
-						const opt = (this.zhbhOptions || []).find(o => o && o.id === r.zhbh)
-						if (opt && opt.fullName) return opt.fullName
-					}
+				// 经手人=录单/操作用户；服务端 GetInfo 已解析为真实姓名
+				if (this.dataForm && this.dataForm.id && this.dataForm.jsr != null && this.dataForm.jsr !== '') {
+					return String(this.dataForm.jsr)
 				}
-				const j = this.dataForm.jsr
-				return (j != null && j !== '') ? String(j) : '—'
+				const u = this.$store.getters.userInfo
+				if (u) {
+					return (u.userName && String(u.userName).trim()) || (u.realName && String(u.realName).trim()) || (u.userId && String(u.userId).trim()) || '—'
+				}
+				return '—'
 			},
 		},
         watch: {},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/index.vue
index 38c25bc..30dd488 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/index.vue
@@ -24,7 +24,7 @@
 					<template v-if="showAll">
 					<el-col :span="6">
 						<el-form-item label="经手人">
-							<el-input v-model="query.jsr" placeholder="账户名称等" clearable />
+							<el-input v-model="query.jsr" placeholder="经手人" clearable />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
@@ -67,7 +67,12 @@
 					<el-table-column label="往来单位" prop="wldw" align="left">
 							<template slot-scope="scope">{{ scope.row.wldw | dynamicText(wldwOptions) }}</template>
 					</el-table-column>
-					<el-table-column prop="jsr" label="经手人" align="left" />
+					<el-table-column label="金额" prop="fsje" align="right" width="120" show-overflow-tooltip>
+						<template slot-scope="scope">
+							{{ formatFsje(scope.row.fsje) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="jsr" label="经手人" align="left" min-width="120" show-overflow-tooltip />
 					<el-table-column prop="djzt" label="审核状态" align="left" width="110">
 						<template slot-scope="scope">
 							<el-tag v-if="scope.row.djzt === '已审核'" type="success">已审核</el-tag>
@@ -133,6 +138,7 @@
                     { prop: 'id', label: '单据编号' },
                     { prop: 'ldrq', label: '录单日期' },
                     { prop: 'wldw', label: '往来单位' },
+                    { prop: 'fsje', label: '金额' },
                     { prop: 'jsr', label: '经手人' },
                     { prop: 'zy', label: '摘要' },
 				],
@@ -149,6 +155,12 @@
 			this.getskzhOptions();
 		},
 		methods: {
+			formatFsje(v) {
+				if (v === null || v === undefined || v === '') return '—'
+				const n = Number(v)
+				if (Number.isNaN(n)) return v
+				return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+			},
 			isDraftRow(row) {
 				return row && String(row.djzt || '').trim() === '草稿'
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtDgtchsb/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtDgtchsb/index.vue
index 60dd206..9785dd5 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtDgtchsb/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtDgtchsb/index.vue
@@ -29,7 +29,7 @@
 					<template v-if="showAll">
 					<el-col :span="6">
 						<el-form-item label="单据编号">
-							<el-input v-model="query.djbh" placeholder="CHD/XSCKD…" clearable />
+							<el-input v-model="query.djbh" placeholder="CKD/销售单号…" clearable />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFysrd_qtsr/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFysrd_qtsr/Form.vue
index a5a91a3..77d428f 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFysrd_qtsr/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFysrd_qtsr/Form.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="90%">
 		<el-row :gutter="15" class="" >
 				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
@@ -194,7 +194,11 @@
 				this.$nextTick(() => {
 					this.$refs['elForm'].resetFields();
 					if (!id) {
-						this.dataForm.djlx = '其他收入单';
+						this.dataForm.djlx = '其他收入单'
+						const u = this.$store.getters.userInfo
+						if (u && (u.userId || u.id)) {
+							this.dataForm.jsr = u.userId || u.id
+						}
 					}
 					if (this.dataForm.id) {
 						request({
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFysrd_qtsr/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFysrd_qtsr/index.vue
index 0547a90..17ec1bc 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFysrd_qtsr/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFysrd_qtsr/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<div class="NCC-common-layout">
 		<div class="NCC-common-layout-center">
 			<el-row class="NCC-common-search-box" :gutter="16">
@@ -15,6 +15,13 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
+						<el-form-item label="收款账户">
+							<el-select v-model="query.jszh" placeholder="收款账户" clearable filterable style="width:100%">
+								<el-option v-for="(item, index) in jszhOptions" :key="index" :label="item.fullName" :value="item.id"  />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
 						<el-form-item label="分支机构">
 							<comSelect v-model="query.fzjg" placeholder="请选择分支机构" />
 						</el-form-item>
@@ -31,13 +38,6 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="收款账户">
-							<el-select v-model="query.jszh" placeholder="收款账户" clearable >
-								<el-option v-for="(item, index) in jszhOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
 						<el-form-item label="金额">
 							<el-input v-model="query.je" placeholder="金额" clearable />	
 						</el-form-item>
@@ -103,9 +103,7 @@
 					<el-table-column prop="fzjg" label="分支机构" align="left" />
 					<el-table-column prop="bm" label="部门" align="left" />
 					<el-table-column prop="jsr" label="经手人" align="left" />
-					<el-table-column label="收款账户" prop="jszh" align="left">
-							<template slot-scope="scope">{{ scope.row.jszh | dynamicText(jszhOptions) }}</template>
-					</el-table-column>
+					<el-table-column label="收款账户" prop="jszh" align="left" min-width="120" show-overflow-tooltip />
 					<el-table-column prop="je" label="金额" align="left" />
 					<el-table-column prop="zdr" label="制单人" align="left" />
 					<el-table-column prop="shr" label="审核人" align="left" />
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/Form.vue
index 43123c2..4eaad49 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/Form.vue
@@ -285,6 +285,9 @@
 				<el-button @click="saveDraft">保存草稿</el-button>
 				<el-button type="primary" @click="submitForAudit">提交审核</el-button>
 			</template>
+			<template v-else-if="isDetail && canWithdrawAudit">
+				<el-button type="warning" @click="withdrawToDraft">撤回为草稿</el-button>
+			</template>
 		</span>
 		<!-- 商品条码选择弹窗 -->
 		<BarcodeSelect ref="barcodeSelect" @select="handleBarcodeSelect" />
@@ -299,6 +302,7 @@
 	import SerialNumberSelect from './SerialNumberSelect.vue'
 	import { getAccountSelector } from '@/api/extend/wtAccount'
 	import { validateMxNoEmptyProductRows } from '@/utils/validateBillMxEmptyRows'
+	import { postWtXsckdWithdrawAudit } from '@/utils/wtRejectApproval'
 	export default {
 		components: { BarcodeSelect, SerialNumberSelect },
 		props: [],
@@ -360,6 +364,11 @@
 				const z = this.auditStatusText
 				return z === '待审核' || z === '已审核' || z === '一级已审' || z === '待二级' || z === '一级已审/待二级'
 			},
+			/** 详情查看时：已提交、待一/二级审核可撤回为草稿 */
+			canWithdrawAudit() {
+				const z = this.auditStatusText
+				return z === '待审核' || z === '一级已审' || z === '待二级' || z === '一级已审/待二级'
+			},
 			formDisabled() {
 				return !!this.isDetail || this.isBillLockedForEdit
 			},
@@ -369,6 +378,7 @@
 				const z = this.auditStatusText
 				if (z === '已审核') return '查看（已审核）'
 				if (z === '待审核' || z === '一级已审' || z === '待二级' || z === '一级已审/待二级') return '查看（待审核）'
+				if (z === '审核不通过') return '编辑（审核不通过）'
 				if (z === '草稿') return '编辑'
 				return '编辑'
 			},
@@ -544,8 +554,14 @@
 				if (md && md.length) {
 					row.spmc = md[0].F_Spmc;
 				}
-				if (row.spbh && row.ckck) {
-					this.getStockQuantity(row);
+				// 获赠单账面库存按「入库仓」查询，与报损等按出库仓不同
+				if (row.spbh) {
+					if (!row.rkck && this.dataForm.rkck) {
+						row.rkck = this.dataForm.rkck;
+					}
+					if (row.rkck) {
+						this.getStockQuantity(row);
+					}
 				}
 				if (row.spbh) {
 					const productId = String(row.spbh);
@@ -564,12 +580,12 @@
 
 
 			getcjckOptions(){
-				previewDataInterface('681758216954053893').then(res => {
+				return previewDataInterface('681758216954053893').then(res => {
 					this.cjckOptions = res.data
 				});
 			},
 			getrkckOptions(){
-				previewDataInterface('681758216954053893').then(res => {
+				return previewDataInterface('681758216954053893').then(res => {
 					this.rkckOptions = res.data
 				});
 			},
@@ -594,10 +610,31 @@
 			// 	});
 			// },
 			getckckOptions(){
-				previewDataInterface('681758216954053893').then(res => {
+				return previewDataInterface('681758216954053893').then(res => {
 					this.ckckOptions = res.data
 				});
 			},
+			/**
+			 * 详情接口可能把 cjck/rkck/明细仓字段由 ID 替换为展示名；
+			 * 编辑/详情页 el-select 与 GetStockQuantity 需 ID，这里做名称 → ID 反查。
+			 */
+			resolveIdByName(val, options) {
+				if (val == null || val === '') return val;
+				const v = String(val).trim();
+				if (!options || !options.length) return val;
+				if (options.some(o => o && String(o.F_Id) === v)) return val;
+				const hit = options.find(o => o && (o.F_mdmc === v || o.F_ckmc === v || o.F_name === v));
+				return hit ? hit.F_Id : val;
+			},
+			async ensureWarehouseOptionsReady() {
+				const tasks = [];
+				if (!this.cjckOptions || !this.cjckOptions.length) tasks.push(this.getcjckOptions());
+				if (!this.rkckOptions || !this.rkckOptions.length) tasks.push(this.getrkckOptions());
+				if (!this.ckckOptions || !this.ckckOptions.length) tasks.push(this.getckckOptions());
+				if (tasks.length > 0) {
+					try { await Promise.all(tasks); } catch (e) { /* 选项失败时仍尝试继续 */ }
+				}
+			},
 			// getspbhOptions(){
 			// 	previewDataInterface('675937572047815941').then(res => {
 			// 		this.spbhOptions = res.data
@@ -642,6 +679,23 @@
 			goBack() {
                 this.$emit('refresh')
             },
+			withdrawToDraft() {
+				const id = this.dataForm && this.dataForm.id
+				if (!id) return
+				this.$confirm('撤回后单据将变为草稿，可继续修改并再次提交审核。是否继续？', '撤回确认', { type: 'warning' })
+					.then(() => postWtXsckdWithdrawAudit(id))
+					.then(res => {
+						const d = (res && res.data) || {}
+						if (d.success === true) {
+							this.$message.success(d.message || '已撤回为草稿')
+							this.visible = false
+							this.$emit('refresh', true)
+						} else {
+							this.$message.error(d.message || '撤回失败')
+						}
+					})
+					.catch(() => {})
+			},
 			init(id, isDetail) {
 				var _this = this;
 				console.log('id',id,'detail',isDetail)
@@ -663,7 +717,7 @@
 						request({
 							url: '/api/Extend/WtXsckd/' +id,
 							method: 'get'
-						}).then(res =>{
+						}).then(async res =>{
 							_this.dataForm = res.data;
 							// 后端 GetInfo 将 kh 返回为展示名（如"神码"/"门店散客"），真正的 Id 放在 khId
 							// el-select 的 value 需用 Id，这里回读时以 khId 覆盖
@@ -672,22 +726,40 @@
 							}
 							console.log('编辑时加载的数据:', _this.dataForm);
 							console.log('明细数据:', _this.dataForm.wtXsckdMxList);
-							
-							// 为每个明细项添加productQuery字段
+
+							await _this.ensureWarehouseOptionsReady();
+							_this.dataForm.cjck = _this.resolveIdByName(_this.dataForm.cjck, _this.cjckOptions);
+							_this.dataForm.rkck = _this.resolveIdByName(_this.dataForm.rkck, _this.rkckOptions);
+
 							if (_this.dataForm.wtXsckdMxList) {
 								_this.dataForm.wtXsckdMxList.forEach(item => {
 									if (!item.hasOwnProperty('productQuery')) {
 										_this.$set(item, 'productQuery', '');
 									}
+									if (!item.hasOwnProperty('loadingStock')) {
+										_this.$set(item, 'loadingStock', false);
+									}
+									if (!item.hasOwnProperty('kucun')) {
+										_this.$set(item, 'kucun', undefined);
+									}
+									_this.$set(item, 'rkck', _this.resolveIdByName(item.rkck, _this.rkckOptions));
+									_this.$set(item, 'ckck', _this.resolveIdByName(item.ckck, _this.ckckOptions));
 								});
 							}
-							
-							// 初始化时计算总金额
+
 							_this.calculateTotalAmount();
-							// 同步明细表出库仓库
 							_this.syncDetailWarehouses();
-							// 恢复序列号信息
+							_this.syncDetailInboundWarehouses();
 							_this.restoreSerialNumbers();
+
+							// 账面库存不落库，重新打开（含详情/只读）需按商品+入库仓拉取
+							if (_this.dataForm.wtXsckdMxList) {
+								_this.dataForm.wtXsckdMxList.forEach(item => {
+									if (item.spbh && item.rkck) {
+										_this.getStockQuantity(item, { silent: true });
+									}
+								});
+							}
 						})
 					} else {
 						_this.dataForm.djrq = Date.now()
@@ -983,10 +1055,13 @@
 				}
 			},
 			
-			// 获取库存数量
-			async getStockQuantity(row) {
+			// 获取库存数量（silent：批量初始化时关闭提示，避免刷屏）
+			async getStockQuantity(row, opts = {}) {
+				const silent = opts.silent === true;
 				if (!row.spbh || !row.rkck) {
-					this.$message.warning('请先选择商品和入库仓库');
+					if (!silent) {
+						this.$message.warning('请先选择商品和入库仓库');
+					}
 					return;
 				}
 				
@@ -1039,7 +1114,7 @@
 						});
 						this.fillAvgCostForRow(row);
 					} else {
-						if (response.msg !== '操作成功') {
+						if (!silent && response.msg !== '操作成功') {
 							this.$message.error(response.msg || '获取库存失败');
 						}
 						// 使用$set确保响应式更新
@@ -1049,7 +1124,7 @@
 					}
 				} catch (error) {
 					console.error('获取库存失败:', error);
-					if (!error || error.message !== '操作成功') {
+					if (!silent && (!error || error.message !== '操作成功')) {
 						this.$message.error('获取库存失败，请重试');
 					}
 					row.kucun = 0;
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/detail-view.vue
new file mode 100644
index 0000000..14cfbce
--- /dev/null
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/detail-view.vue
@@ -0,0 +1,273 @@
+<template>
+	<el-dialog
+		title="获赠单详情"
+		:close-on-click-modal="false"
+		:visible.sync="visible"
+		class="NCC-dialog NCC-dialog_center"
+		lock-scroll
+		append-to-body
+		modal-append-to-body
+		width="1200px"
+		top="6vh"
+		@close="handleClose"
+	>
+		<div v-loading="loading" class="hzd-detail-wrap">
+			<template v-if="detail">
+				<div class="detail-top">
+					<div class="detail-top__id">
+						<i class="el-icon-document detail-top__icon detail-top__icon--primary" />
+						<span class="cell-nowrap">{{ cellText(detail.id) }}</span>
+					</div>
+					<el-tag v-if="auditStatus(detail) === '草稿'" type="info" size="medium">草稿</el-tag>
+					<el-tag v-else-if="auditStatus(detail) === '待审核'" type="warning" size="medium">待审核</el-tag>
+					<el-tag v-else-if="auditStatus(detail) === '一级已审'" size="medium">一级已审</el-tag>
+					<el-tag v-else-if="auditStatus(detail) === '一级已审/待二级'" type="warning" size="medium">一级已审/待二级</el-tag>
+					<el-tag v-else-if="auditStatus(detail) === '待二级'" type="warning" size="medium">待二级</el-tag>
+					<el-tag v-else-if="auditStatus(detail) === '审核不通过'" type="danger" size="medium">审核不通过</el-tag>
+					<el-tag v-else-if="auditStatus(detail) === '已审核'" type="success" size="medium">已审核</el-tag>
+					<el-tag v-else type="warning" size="medium">{{ cellText(auditStatus(detail)) }}</el-tag>
+				</div>
+
+				<el-descriptions :column="2" border size="small" class="detail-descriptions">
+					<el-descriptions-item label="单据编号">{{ cellText(detail.id) }}</el-descriptions-item>
+					<el-descriptions-item label="单据日期">{{ formatDate(detail.djrq) }}</el-descriptions-item>
+					<el-descriptions-item label="入库仓库">{{ labelFromOptions(detail.rkck, rkckOptions) }}</el-descriptions-item>
+					<el-descriptions-item label="经手人">{{ cellText(detail.jsr) }}</el-descriptions-item>
+					<el-descriptions-item label="往来单位">{{ cellText(detail.kh) }}</el-descriptions-item>
+					<el-descriptions-item label="单据类型">{{ cellText(detail.djlx || '获赠单') }}</el-descriptions-item>
+					<el-descriptions-item label="一级审核人">{{ cellText(detail.shr1) }}</el-descriptions-item>
+					<el-descriptions-item label="二级审核人">{{ cellText(detail.shr2) }}</el-descriptions-item>
+					<el-descriptions-item label="备注" :span="2">{{ cellText(detail.bz) }}</el-descriptions-item>
+					<el-descriptions-item label="审批备注" :span="2">{{ cellText(detail.spbz) }}</el-descriptions-item>
+				</el-descriptions>
+
+				<div class="detail-section-head">
+					<i class="el-icon-s-order detail-section-head__icon" />
+					<span>明细</span>
+				</div>
+				<el-table
+					:data="detail.wtXsckdMxList || []"
+					size="small"
+					border
+					stripe
+					show-summary
+					:summary-method="getSummaries"
+					class="detail-mx-table"
+					empty-text=""
+				>
+					<el-table-column type="index" width="52" label="#" align="center" />
+					<el-table-column label="入库仓库" min-width="120" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">{{ labelFromOptions(scope.row.rkck, rkckOptions) }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="商品" min-width="180" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">{{ cellText(scope.row.spmc) }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="账面库存" width="96" align="right">
+						<template slot-scope="scope">
+							<span class="cell-nowrap">{{ resolveBookStock(scope.row) }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="sl" label="数量" width="96" align="right" />
+					<el-table-column prop="je" label="金额" width="100" align="right" />
+				</el-table>
+			</template>
+		</div>
+		<span v-if="$slots.footer" slot="footer" class="dialog-footer hzd-detail-footer">
+			<slot name="footer" />
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+import request from '@/utils/request'
+import { previewDataInterface } from '@/api/systemData/dataInterface'
+
+export default {
+	name: 'WtHzdDetailView',
+	data() {
+		return {
+			visible: false,
+			loading: false,
+			detail: null,
+			rkckOptions: []
+		}
+	},
+	created() {
+		this.loadOptions()
+	},
+	methods: {
+		isBlankValue(v) {
+			if (v === null || v === undefined) return true
+			const text = String(v).trim()
+			return text === '' || text === '无' || text === 'null' || text === 'undefined'
+		},
+		cellText(v) {
+			if (this.isBlankValue(v)) return ''
+			return String(v)
+		},
+		auditStatus(row) {
+			if (!row) return ''
+			const s = String(row.djzt || row.shzt || '').trim()
+			if (!s) return '待审核'
+			return s
+		},
+		resolveBookStock(row) {
+			if (!row || typeof row !== 'object') return ''
+			const candidates = [
+				row.kucun,
+				row.Kucun,
+				row.kc,
+				row.Kc
+			]
+			for (let i = 0; i < candidates.length; i++) {
+				if (!this.isBlankValue(candidates[i])) return String(candidates[i])
+			}
+			return ''
+		},
+		/** 账面库存按商品 + 入库仓查询（与编辑页 getStockQuantity 一致） */
+		async enrichMxBookStock(detail) {
+			if (!detail || !Array.isArray(detail.wtXsckdMxList)) return
+			const rows = detail.wtXsckdMxList
+			await Promise.all(
+				rows.map(async row => {
+					const spbh = row.spbh != null ? row.spbh : row.Spbh
+					const wh = row.rkck != null ? row.rkck : row.Rkck
+					if (this.isBlankValue(spbh) || this.isBlankValue(wh)) return
+					try {
+						const url = `/api/Extend/WtXsckd/GetStockQuantity?productId=${encodeURIComponent(String(spbh).trim())}&warehouseId=${encodeURIComponent(String(wh).trim())}`
+						const response = await request({ url, method: 'get' })
+						const inner = response && response.data
+						if (inner && inner.success) {
+							const qty = inner.data != null ? inner.data : 0
+							this.$set(row, 'kucun', qty)
+						}
+					} catch (e) {
+						// 静默
+					}
+				})
+			)
+		},
+		formatDate(ts) {
+			if (!ts) return ''
+			const d = new Date(Number(ts))
+			if (isNaN(d.getTime())) return ''
+			const y = d.getFullYear()
+			const m = String(d.getMonth() + 1).padStart(2, '0')
+			const day = String(d.getDate()).padStart(2, '0')
+			return `${y}-${m}-${day}`
+		},
+		labelFromOptions(value, options) {
+			if (this.isBlankValue(value)) return ''
+			const found = (options || []).find(
+				o => o.F_Id === value || String(o.F_Id) === String(value) || o.id === value || String(o.id) === String(value)
+			)
+			const text = found ? (found.F_mdmc || found.fullName || value) : value
+			return this.cellText(text)
+		},
+		getSummaries(param) {
+			const { columns, data } = param
+			const sums = []
+			columns.forEach((column, index) => {
+				if (index === 0) {
+					sums[index] = '合计'
+					return
+				}
+				if (column.property === 'sl' || column.property === 'je') {
+					sums[index] = data.reduce((t, r) => t + (Number(r[column.property]) || 0), 0)
+				} else {
+					sums[index] = ''
+				}
+			})
+			return sums
+		},
+		handleClose() {
+			this.detail = null
+			this.$emit('close')
+		},
+		close() {
+			this.visible = false
+		},
+		loadOptions() {
+			previewDataInterface('681758216954053893').then(res => {
+				this.rkckOptions = res.data || []
+			})
+		},
+		init(id) {
+			if (!id) return
+			this.visible = true
+			this.loading = true
+			request({
+				url: '/api/Extend/WtXsckd/' + id,
+				method: 'GET'
+			})
+				.then(res => {
+					const detail = res.data || {}
+					detail.wtXsckdMxList = Array.isArray(detail.wtXsckdMxList) ? detail.wtXsckdMxList : []
+					this.detail = detail
+					this.$emit('loaded', detail)
+					this.enrichMxBookStock(detail)
+				})
+				.catch(() => {
+					this.$message.error('加载详情失败')
+					this.visible = false
+				})
+				.finally(() => {
+					this.loading = false
+				})
+		}
+	}
+}
+</script>
+
+<style scoped lang="scss">
+.cell-nowrap {
+	white-space: nowrap;
+}
+.hzd-detail-wrap {
+	margin-bottom: 30px;
+}
+.detail-top {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 14px;
+	padding-bottom: 12px;
+	border-bottom: 1px solid #ebeef5;
+}
+.detail-top__id {
+	display: inline-flex;
+	align-items: center;
+	gap: 8px;
+	font-size: 15px;
+	font-weight: 600;
+	color: #303133;
+}
+.detail-top__icon--primary {
+	color: #409eff;
+}
+.detail-descriptions {
+	margin-bottom: 12px;
+}
+.detail-section-head {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	margin: 10px 0;
+	font-size: 14px;
+	font-weight: 600;
+	color: #303133;
+}
+.detail-section-head__icon {
+	color: #409eff;
+}
+.hzd-detail-footer {
+	display: inline-flex;
+	flex-wrap: wrap;
+	align-items: center;
+	gap: 8px;
+}
+</style>
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/index.vue
index de07085..60d75c4 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/index.vue
@@ -113,6 +113,7 @@
 						<template slot-scope="scope">
 							<el-tag v-if="scope.row.djzt === '已审核'" type="success">已审核</el-tag>
 							<el-tag v-else-if="scope.row.djzt === '草稿'" type="info">草稿</el-tag>
+							<el-tag v-else-if="scope.row.djzt === '审核不通过'" type="danger">审核不通过</el-tag>
 							<el-tag v-else type="warning">{{ scope.row.djzt || '待审核' }}</el-tag>
 						</template>
 					</el-table-column>
@@ -121,13 +122,15 @@
 							<ncc-table-summary-cell :row="scope.row" fields="zy,Zy" />
 						</template>
 					</el-table-column>
-					<el-table-column label="操作" fixed="right" width="260">
+					<el-table-column label="操作" fixed="right" width="320">
 							<template slot-scope="scope">
 							<el-button type="text" @click="openDetail(scope.row.id)">查看</el-button>
-							<el-button type="text" v-if="isDraftRow(scope.row)" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" v-if="isEditableRow(scope.row)" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
 							<el-button type="text" v-if="isPendingAudit(scope.row)" @click="handleApprove(scope.row.id)" style="color:#409EFF">审核</el-button>
+							<el-button type="text" v-if="isPendingAudit(scope.row)" @click="handleReject(scope.row.id)" style="color:#F56C6C">不通过</el-button>
+							<el-button type="text" v-if="isWithdrawable(scope.row)" @click="handleWithdraw(scope.row.id)" style="color:#E6A23C">撤回</el-button>
 							<el-button type="text" v-if="scope.row.djzt === '已审核'" @click="handleReverse(scope.row.id)" style="color:#E6A23C">反审</el-button>
-							<el-button type="text" v-if="isDraftRow(scope.row)" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除</el-button>
+							<el-button type="text" v-if="isEditableRow(scope.row)" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除</el-button>
 						</template>
 					</el-table-column>
 				</NCC-table>
@@ -143,6 +146,12 @@
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import {
+		promptApprovalRemark,
+		postApproveGeneric,
+		postRejectGeneric,
+		postWtXsckdWithdrawAudit
+	} from '@/utils/wtRejectApproval'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -197,12 +206,19 @@
 			this.getkhOptions();
 		},
 		methods: {
-			isDraftRow(row) {
-				return row && String(row.djzt || '').trim() === '草稿'
+			/** 草稿、审核不通过：可编辑、可删（与后端可删/可改口径一致） */
+			isEditableRow(row) {
+				const z = row && String(row.djzt || '').trim()
+				return z === '草稿' || z === '审核不通过'
 			},
 			isPendingAudit(row) {
 				const z = row && String(row.djzt || '').trim()
-				return z === '待审核' || z === ''
+				return z === '待审核' || z === '' || z === '一级已审' || z === '待二级' || z === '一级已审/待二级'
+			},
+			/** 已提交待审或待二级：可撤回为草稿 */
+			isWithdrawable(row) {
+				const z = row && String(row.djzt || '').trim()
+				return z === '待审核' || z === '一级已审' || z === '待二级' || z === '一级已审/待二级'
 			},
 			openDetail(id) {
 				this.formVisible = true
@@ -211,16 +227,48 @@
 				})
 			},
 			handleApprove(id) {
-				this.$confirm('确认审核该获赠单？', '提示', { type: 'warning' }).then(() => {
-					request({
-						url: `/api/Extend/WtXsckd/ApproveGeneric/${id}`,
-						method: 'POST',
-						data: {}
-					}).then(res => {
-						this.$message({ type: 'success', message: res.msg || '审核成功', duration: 1200 })
-						this.initData()
+				this.$confirm('确认审核该获赠单？', '提示', { type: 'warning' })
+					.then(() => promptApprovalRemark(this, '审批备注'))
+					.then(remark => postApproveGeneric(id, remark))
+					.then(res => {
+						const d = (res && res.data) || {}
+						if (d.success === true) {
+							this.$message.success(d.message || '审核成功')
+							this.initData()
+						} else {
+							this.$message.error(d.message || '审核失败')
+						}
 					})
-				}).catch(() => {})
+					.catch(() => {})
+			},
+			handleReject(id) {
+				promptApprovalRemark(this, '审核不通过')
+					.then(reason => postRejectGeneric(id, reason))
+					.then(res => {
+						const d = (res && res.data) || {}
+						if (d.success === true) {
+							this.$message.success(d.message || '已处理')
+							this.initData()
+						} else {
+							this.$message.error(d.message || '操作失败')
+						}
+					})
+					.catch(() => {})
+			},
+			handleWithdraw(id) {
+				if (!id) return
+				this.$confirm('撤回后单据将变为草稿，可继续修改并再次提交审核。是否继续？', '撤回确认', { type: 'warning' })
+					.then(() => postWtXsckdWithdrawAudit(id))
+					.then(res => {
+						const d = (res && res.data) || {}
+						if (d.success === true) {
+							this.$message.success(d.message || '已撤回为草稿')
+							this.initData()
+						} else {
+							this.$message.error(d.message || '撤回失败')
+						}
+					})
+					.catch(() => {})
 			},
 			handleReverse(id) {
 				if (!id) return
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPl/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPl/Form.vue
index b0adbd7..559e9de 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPl/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPl/Form.vue
@@ -1,7 +1,7 @@
-<template>
-	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="700px">
 		<el-row :gutter="15" class="" >
-				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right" :disabled="!!isDetail" :rules="rules">
 					<el-col :span="24" v-if="false" >
 						<el-form-item label="分类编号" prop="id">
 							<el-input v-model="dataForm.id" placeholder="请输入" clearable :style='{"width":"100%"}' >
@@ -22,6 +22,16 @@
 							</el-radio-group>
 						</el-form-item>
 					</el-col>
+					<el-col :span="24" v-show="dataForm.sfmdfl === '1'">
+						<el-form-item label="显示门店组" prop="mdfzIds">
+							<div class="wt-pl-mdfz-panel">
+								<el-checkbox-group v-model="dataForm.mdfzIds">
+									<el-checkbox v-for="(item, index) in mdfzOptions" :key="index" :label="item.id">{{ item.fzmc }}</el-checkbox>
+								</el-checkbox-group>
+							</div>
+							<p class="wt-pl-form-tip">不选表示全部门店组均展示；仅当「是否门店分类」为是时可配置。</p>
+						</el-form-item>
+					</el-col>
 					<el-col :span="24">
 						<el-form-item label="序号" prop="xh">
 							<el-input-number v-model="dataForm.xh" :min="0" :max="999999" :step="1" :controls-position="'right'" placeholder="数值越小越靠前" :style='{"width":"100%"}' />
@@ -38,8 +48,6 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	export default {
 		components: {},
 		props: [],
@@ -48,23 +56,35 @@
 				loading: false,
 				visible: false,
 				isDetail: false,
+				mdfzOptions: [],
 				dataForm: {
 					id:'',
 					plmc:undefined,
 					sfmdfl:'0',
 					xh:undefined,
+					mdfzIds: [],
 				},
 				rules: {
 				},
 			}
 		},
 		computed: {},
-        watch: {},
+        watch: {
+			'dataForm.sfmdfl'(v) {
+				if (v !== '1') this.dataForm.mdfzIds = []
+			}
+		},
         created() {
+			this.getMdfzOptions()
 		},
 		mounted() {
         },
 		methods: {
+			getMdfzOptions() {
+				request({ url: '/api/Extend/WtMdfz/Actions/Selector', method: 'get' })
+					.then(res => { this.mdfzOptions = res.data || [] })
+					.catch(() => { this.mdfzOptions = [] })
+			},
 			goBack() {
                 this.$emit('refresh')
             },
@@ -78,9 +98,21 @@
 						request({
 							url: '/api/Extend/WtPl/' + this.dataForm.id,
 							method: 'get'
-						}).then(res =>{
-							this.dataForm = res.data;
+						}).then(res => {
+							const d = res.data || {}
+							this.dataForm = {
+								...d,
+								mdfzIds: Array.isArray(d.mdfzIds) ? d.mdfzIds : []
+							}
 						})
+					} else {
+						this.dataForm = {
+							id: '',
+							plmc: undefined,
+							sfmdfl: '0',
+							xh: undefined,
+							mdfzIds: []
+						}
 					}
 				})
 			},
@@ -126,3 +158,19 @@
 		}
 	}
 </script>
+<style scoped>
+.wt-pl-mdfz-panel {
+	max-height: 200px;
+	overflow-y: auto;
+	padding: 8px 12px;
+	border: 1px solid #ebeef5;
+	border-radius: 4px;
+	background: #fafafa;
+}
+.wt-pl-form-tip {
+	margin: 6px 0 0;
+	font-size: 12px;
+	color: #909399;
+	line-height: 1.5;
+}
+</style>
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPl/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPl/index.vue
index 17c5caa..e105088 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPl/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPl/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<div class="NCC-common-layout">
 		<div class="NCC-common-layout-center">
 			<el-row class="NCC-common-search-box" :gutter="16">
@@ -35,7 +35,7 @@
 						<screenfull isContainer />
 					</div>
 				</div>
-                <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+                <NCC-table v-loading="listLoading" :data="list" has-c :hasNO="false" @selection-change="handleSelectionChange">
 					<el-table-column prop="xh" label="序号" align="center" width="80">
 						<template slot-scope="scope">
 							<span>{{ scope.row.xh === null || scope.row.xh === undefined ? '-' : scope.row.xh }}</span>
@@ -50,6 +50,11 @@
 							<el-tag v-else type="info" size="mini">-</el-tag>
 						</template>
 					</el-table-column>
+					<el-table-column prop="mdfzNames" label="显示门店组" align="left" min-width="160" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span>{{ scope.row.mdfzNames != null && scope.row.mdfzNames !== '' ? scope.row.mdfzNames : '—' }}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="操作" fixed="right" width="100">
 							<template slot-scope="scope">
 							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
@@ -66,10 +71,8 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
-    import { previewDataInterface } from '@/api/systemData/dataInterface'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -94,6 +97,7 @@
                     { prop: 'id', label: '分类编号' },
                     { prop: 'plmc', label: '品类名称' },
                     { prop: 'sfmdfl', label: '是否门店分类' },
+                    { prop: 'mdfzNames', label: '显示门店组' },
 				],
 			}
         },
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPp/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPp/index.vue
index 16157fb..6a39f73 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPp/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPp/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<div class="NCC-common-layout">
 		<div class="NCC-common-layout-center">
 			<el-row class="NCC-common-search-box" :gutter="16">
@@ -28,7 +28,7 @@
 						<screenfull isContainer />
 					</div>
 				</div>
-                <NCC-table v-loading="listLoading" :data="list">
+                <NCC-table v-loading="listLoading" :data="list" :hasNO="false">
 					<el-table-column prop="xh" label="序号" align="center" width="80">
 						<template slot-scope="scope">
 							<span>{{ scope.row.xh === null || scope.row.xh === undefined ? '-' : scope.row.xh }}</span>
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtShrysz/djmcOptions.js b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtShrysz/djmcOptions.js
index 2d7094e..4e85fb0 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtShrysz/djmcOptions.js
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtShrysz/djmcOptions.js
@@ -14,6 +14,7 @@ export const djmcOptions = [
   { fullName: "委托代销结算单", id: "委托代销结算单" },
   { fullName: "商品调价单", id: "商品调价单" },
   { fullName: "收款单", id: "收款单" },
+  { fullName: "付款单", id: "付款单" },
   // 费用单：财务单据 wt_cwdj.djlx，与「现金费用单」（wt_yskzjjs）无关
   { fullName: "费用单", id: "费用单" },
   { fullName: "现金费用单", id: "现金费用单" },
@@ -22,6 +23,7 @@ export const djmcOptions = [
   { fullName: "其他应收单", id: "其他应收单" },
   { fullName: "转款单", id: "转款单" },
   { fullName: "赠送单", id: "赠送单" },
+  { fullName: "获赠单", id: "获赠单" },
   // 会员到期退款：界面称「会员到期收款」；wt_shrysz.djmc / wt_yskzjjs.djlx 须为「会员到期退款」
   { fullName: "会员到期收款", id: "会员到期退款" },
   { fullName: "拆装单", id: "拆装单" }
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue
index da4a75b..677fc68 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue
@@ -7,14 +7,14 @@
 							<el-input v-model="dataForm.id" placeholder="系统自动生成" clearable readonly :style='{"width":"100%"}' />
 						</el-form-item>
 					</el-col>
-					<el-col :span="12" v-if="dataForm.id && yddhHasValue">
-						<el-form-item label="运单号" prop="yddh">
-							<el-input v-model="dataForm.yddh" disabled :style='{"width":"100%"}' />
+					<el-col :span="12" v-if="dataForm.id">
+						<el-form-item label="抖音订单号" prop="dyddh">
+							<el-input :value="displayDouyinOrWaybillText(dataForm.dyddh)" disabled :style='{"width":"100%"}' />
 						</el-form-item>
 					</el-col>
-					<el-col :span="12" v-if="dataForm.id && dyddhHasValue">
-						<el-form-item label="抖音订单号" prop="dyddh">
-							<el-input v-model="dataForm.dyddh" disabled :style='{"width":"100%"}' />
+					<el-col :span="12" v-if="dataForm.id">
+						<el-form-item label="物流运单号" prop="yddh">
+							<el-input :value="displayDouyinOrWaybillText(dataForm.yddh)" disabled :style='{"width":"100%"}' />
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
@@ -51,7 +51,21 @@
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="会员手机号码" prop="hysjh">
-							<el-input v-model="dataForm.hysjh" placeholder="请输入会员手机号码" clearable :style='{"width":"100%"}'></el-input>
+							<el-autocomplete
+								v-model="dataForm.hysjh"
+								:fetch-suggestions="queryMemberPhoneSuggestions"
+								placeholder="输入姓名/手机号搜索并选择后仅带出会员手机号；往来单位请单独选择"
+								clearable
+								:trigger-on-focus="false"
+								:debounce="300"
+								:style='{"width":"100%"}'
+								@select="onMemberFromSearchSelect"
+							>
+								<template slot-scope="{ item }">
+									<span>{{ item.xm || '-' }}</span>
+									<span style="color:#909399;margin-left:8px;">{{ item.sjh || '' }}</span>
+								</template>
+							</el-autocomplete>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12" v-if="false">
@@ -355,14 +369,6 @@
 			}
 		},
 		computed: {
-			yddhHasValue() {
-				const v = this.dataForm.yddh
-				return v != null && String(v).trim() !== ''
-			},
-			dyddhHasValue() {
-				const v = this.dataForm.dyddh
-				return v != null && String(v).trim() !== ''
-			},
 			totalKucun() {
 				return (this.dataForm.wtXsckdMxList || []).reduce((sum, row) => sum + (parseFloat(row.kucun) || 0), 0)
 			},
@@ -395,6 +401,47 @@
 		mounted() {
         },
 		methods: {
+			displayDouyinOrWaybillText(v) {
+				if (v == null || v === undefined || String(v).trim() === '') return '—'
+				return String(v)
+			},
+			/** 会员体系：按关键字搜 wt_hy，选择后只写入「会员手机号码」，不覆盖「往来单位」（kh 仍为 WtWldw 等独立维护） */
+			queryMemberPhoneSuggestions(queryString, cb) {
+				const q = (queryString || '').trim()
+				// 允许单字检索（如姓氏），与会员列表页行为一致
+				if (q.length < 1) {
+					cb([])
+					return
+				}
+				request({
+					url: '/api/Extend/WtHy',
+					method: 'get',
+					// 勿传 sidx: ''：后端会用它做 OrderBy，空串会导致排序/SQL 异常，列表为空
+					data: { keyword: q, currentPage: 1, pageSize: 20, sort: 'desc', sidx: 'id' }
+				})
+					.then((res) => {
+						const list =
+							(res.data && res.data.list) ||
+							(res.data && res.data.data && res.data.data.list) ||
+							[]
+						cb(
+							list.map((m) => ({
+								value: (m.sjh && String(m.sjh).trim()) || m.xm || m.id,
+								id: m.id,
+								xm: m.xm,
+								sjh: m.sjh
+							}))
+						)
+					})
+					.catch(() => {
+						cb([])
+					})
+			},
+			onMemberFromSearchSelect(item) {
+				if (!item) return
+				// 只同步会员在册手机号，不修改 dataForm.kh，避免「往来单位」被改成会员主键
+				this.dataForm.hysjh = (item.sjh && String(item.sjh).trim()) || this.dataForm.hysjh
+			},
 			/** ERP 新建/保存销售出库单时固定为「后台」，避免与收银台「门店」混淆 */
 			ensureBackendSalesSource() {
 				if (this.dataForm.djlx === '销售出库单') {
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/SerialNumberSelect.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/SerialNumberSelect.vue
index 1df4ba0..f3d7642 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/SerialNumberSelect.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/SerialNumberSelect.vue
@@ -127,7 +127,9 @@ export default {
       currentDocumentType: '',
       productCodeDisplay: '' // 商品编码（用于界面显示，如 206466）
       ,
-      scanSerialNumber: ''
+      scanSerialNumber: '',
+      /** 为 true 时：扫码在库表中未找到仍允许加入（线下序列号/机身码等） */
+      allowManualSerialWhenMissing: false
     }
   },
   computed: {
@@ -141,12 +143,20 @@ export default {
   },
   methods: {
     // 打开弹窗
-    open(productCode, warehouse, selectedSerialNumbers = [], documentType = null, productCodeDisplay = null) {
+    open(
+      productCode,
+      warehouse,
+      selectedSerialNumbers = [],
+      documentType = null,
+      productCodeDisplay = null,
+      allowManualSerialWhenMissing = false
+    ) {
       this.visible = true
       this.currentProductCode = productCode
       this.currentWarehouse = warehouse
       this.currentDocumentType = documentType
       this.productCodeDisplay = productCodeDisplay || ''
+      this.allowManualSerialWhenMissing = !!allowManualSerialWhenMissing
       this.searchForm.productCode = productCode
       this.searchForm.warehouse = warehouse
       this.searchForm.serialNumber = '' // Reset serial number when opening
@@ -166,6 +176,7 @@ export default {
       this.selectedSerialNumbers = []
       this.productCodeDisplay = ''
       this.scanSerialNumber = ''
+      this.allowManualSerialWhenMissing = false
     },
 
     // 获取仓库选项
@@ -286,7 +297,16 @@ export default {
       this.$nextTick(() => {
         const ok = trySelectBySerial(sn)
         if (!ok) {
-          this.$message.warning(`未找到序列号：${sn}`)
+          if (this.allowManualSerialWhenMissing) {
+            if (!this.selectedSerialNumbers.includes(sn)) {
+              this.selectedSerialNumbers.push(sn)
+            }
+            this.$message.success(
+              `已添加序列号（未在库中匹配，按线下/手工录入）：${sn}`
+            )
+          } else {
+            this.$message.warning(`未找到序列号：${sn}`)
+          }
         }
         this.scanSerialNumber = ''
       })
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/detail-view.vue
index d5e549c..f0d28b5 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/detail-view.vue
@@ -61,6 +61,18 @@
 							{{ formatLy(detail.ly) }}
 						</span>
 					</el-descriptions-item>
+					<el-descriptions-item label="抖音订单号">
+						<span class="cell-nowrap">
+							<i class="el-icon-s-order desc-icon desc-icon--info" />
+							{{ cellTextOrDash(resolvedDyddh) }}
+						</span>
+					</el-descriptions-item>
+					<el-descriptions-item label="物流运单号">
+						<span class="cell-nowrap">
+							<i class="el-icon-truck desc-icon desc-icon--primary" />
+							{{ cellTextOrDash(resolvedYddh) }}
+						</span>
+					</el-descriptions-item>
 					<el-descriptions-item label="出库仓库">
 						<span class="cell-nowrap">
 							<i class="el-icon-s-home desc-icon desc-icon--muted" />
@@ -91,18 +103,6 @@
 							{{ cellText(detail.kh) }}
 						</span>
 					</el-descriptions-item>
-					<el-descriptions-item v-if="detail.yddh" label="运单号">
-						<span class="cell-nowrap">
-							<i class="el-icon-truck desc-icon desc-icon--primary" />
-							{{ cellText(detail.yddh) }}
-						</span>
-					</el-descriptions-item>
-					<el-descriptions-item v-if="detail.dyddh" label="抖音订单号">
-						<span class="cell-nowrap">
-							<i class="el-icon-s-order desc-icon desc-icon--info" />
-							{{ cellText(detail.dyddh) }}
-						</span>
-					</el-descriptions-item>
 				</el-descriptions>
 
 				<div class="detail-section-head">
@@ -121,6 +121,24 @@
 					:empty-text="''"
 				>
 					<el-table-column type="index" width="52" label="#" align="center" />
+					<el-table-column label="类型" width="80" align="center">
+						<template slot-scope="scope">
+							<el-tag
+								v-if="isGiftMxLine(scope.row)"
+								size="mini"
+								type="warning"
+								effect="plain"
+								class="mx-line-type-tag"
+							>赠送</el-tag>
+							<el-tag
+								v-else
+								size="mini"
+								type="success"
+								effect="plain"
+								class="mx-line-type-tag"
+							>购买</el-tag>
+						</template>
+					</el-table-column>
 					<el-table-column label="出库仓库" min-width="118" show-overflow-tooltip>
 						<template slot-scope="scope">
 							<span class="cell-nowrap mx-cell">
@@ -168,15 +186,25 @@
 					</el-table-column>
 					<el-table-column label="序列号" min-width="168">
 						<template slot-scope="scope">
-							<div v-if="scope.row.selectedSerialNumbers && scope.row.selectedSerialNumbers.length" class="sn-tags">
-								<el-tag
-									v-for="(sn, idx) in scope.row.selectedSerialNumbers"
-									:key="idx"
-									size="mini"
-									type="warning"
-									class="sn-tag"
-								>{{ sn }}</el-tag>
-							</div>
+							<template v-if="serialList(scope.row).length">
+								<div class="sn-tags">
+									<el-tag
+										v-for="(sn, idx) in serialPreview(scope.row)"
+										:key="idx"
+										size="mini"
+										type="warning"
+										class="sn-tag"
+									>{{ sn }}</el-tag>
+									<el-button
+										v-if="serialList(scope.row).length > snInlineMax"
+										type="text"
+										class="sn-more-btn"
+										@click="openSerialDialog(scope.row)"
+									>
+										共 {{ serialList(scope.row).length }} 个，点击查看
+									</el-button>
+								</div>
+							</template>
 							<span v-else class="text-muted"></span>
 						</template>
 					</el-table-column>
@@ -233,7 +261,7 @@
 						</span>
 					</el-descriptions-item>
 					<el-descriptions-item label="备注" :span="2">
-						<span class="detail-bz">{{ cellText(detail.bz) }}</span>
+						<span class="detail-bz">{{ displayRemarkBz }}</span>
 					</el-descriptions-item>
 					<el-descriptions-item label="审批备注" :span="2">
 						<span class="detail-bz">{{ cellText(detail.spbz) }}</span>
@@ -329,6 +357,27 @@
 				<span></span>
 			</div>
 		</div>
+
+		<el-dialog
+			title="序列号列表"
+			:visible.sync="serialDialogVisible"
+			width="560px"
+			append-to-body
+			class="NCC-dialog xsckd-sn-list-dialog"
+			@closed="serialDialogList = []"
+		>
+			<div class="sn-dialog-hint">共 {{ serialDialogList.length }} 条</div>
+			<div class="sn-dialog-tags">
+				<el-tag
+					v-for="(sn, idx) in serialDialogList"
+					:key="idx"
+					size="small"
+					type="warning"
+					class="sn-dialog-tag"
+				>{{ sn }}</el-tag>
+			</div>
+		</el-dialog>
+
 		<span v-if="$slots.footer" slot="footer" class="dialog-footer xsckd-detail-footer-slot">
 			<slot name="footer" />
 		</span>
@@ -354,7 +403,12 @@ export default {
 			loading: false,
 			detail: null,
 			cjckOptions: [],
-			skzhOptions: []
+			skzhOptions: [],
+			/** 明细格内最多直接展示的序列号个数，超出则仅预览前若干 + 点击查看（与采购退货单详情一致） */
+			snInlineMax: 8,
+			snPreviewCount: 4,
+			serialDialogVisible: false,
+			serialDialogList: []
 		}
 	},
 	computed: {
@@ -471,9 +525,87 @@ export default {
 			const { list, rawFallback } = parseWtMxJsonArray(this.detail.fkmx)
 			if (list.length > 0) return ''
 			return rawFallback || ''
+		},
+		/** 抖音来源：备注中不再展示「抖音订单：…」类行（单号在基本信息「抖音订单号」与 dyddh 字段展示） */
+		displayRemarkBz() {
+			return this.stripDouyinOrderPrefixFromRemark(this.detail && this.detail.bz, this.detail && this.detail.ly)
+		},
+		/** 主表 dyddh；老数据可能只在备注「抖音订单：xxx」中 */
+		resolvedDyddh() {
+			const d = this.detail
+			if (!d) return ''
+			const raw = d.dyddh != null && String(d.dyddh).trim() !== '' ? String(d.dyddh).trim() : ''
+			if (raw) return raw
+			return this.parseDouyinOrderNoFromRemark(d.bz || '') || ''
+		},
+		resolvedYddh() {
+			const d = this.detail
+			if (!d) return ''
+			const v = d.yddh
+			return v != null && String(v).trim() !== '' ? String(v).trim() : ''
 		}
 	},
 	methods: {
+		serialList(row) {
+			if (!row) return []
+			const raw = row.selectedSerialNumbers != null
+				? row.selectedSerialNumbers
+				: (row.serialNumbers != null ? row.serialNumbers : (row.serialNumber != null ? row.serialNumber : row.xlh))
+			if (Array.isArray(raw)) {
+				return raw.map(s => (s == null ? '' : String(s)).trim()).filter(Boolean)
+			}
+			if (raw == null || raw === '') return []
+			const text = String(raw).trim()
+			if (!text) return []
+			if ((text.startsWith('[') && text.endsWith(']')) || (text.startsWith('{') && text.endsWith('}'))) {
+				try {
+					const arr = JSON.parse(text)
+					if (Array.isArray(arr)) return arr.map(s => (s == null ? '' : String(s)).trim()).filter(Boolean)
+				} catch (e) {}
+			}
+			return text.split(/[\n,，;；\s]+/).map(s => s.trim()).filter(Boolean)
+		},
+		serialPreview(row) {
+			const all = this.serialList(row)
+			if (all.length <= this.snInlineMax) return all
+			return all.slice(0, this.snPreviewCount)
+		},
+		openSerialDialog(row) {
+			this.serialDialogList = this.serialList(row).slice()
+			this.serialDialogVisible = true
+		},
+		parseDouyinOrderNoFromRemark(bz) {
+			if (bz == null || bz === '') return ''
+			const m = String(bz).match(/抖音订单[：:]\s*([^\r\n]+)/)
+			return m && m[1] ? m[1].trim() : ''
+		},
+		stripDouyinOrderPrefixFromRemark(bz, ly) {
+			if (bz == null || bz === '') return ''
+			const src = String(bz)
+			if (ly !== '抖音订单') return src
+			const lines = src.split(/\r?\n/)
+			const kept = lines.filter((line) => {
+				const t = line.trim()
+				if (!t) return false
+				if (/^抖音订单[：:]/.test(t)) return false
+				return true
+			})
+			return kept.join('\n').trim()
+		},
+		isGiftMxLine(row) {
+			if (!row) return false
+			if (row.mdxx != null && String(row.mdxx).trim() === '赠品') return true
+			if (row.isGift === true) return true
+			// 历史/接口未落库 mdxx：抖音单常见「单价与金额均为 0」的赠品行
+			const d = this.detail
+			if (d && d.ly === '抖音订单') {
+				const dj = parseFloat(row.dj)
+				const je = parseFloat(row.je)
+				const sl = parseFloat(row.sl) || 0
+				if (sl > 0 && !isNaN(dj) && !isNaN(je) && dj === 0 && je === 0) return true
+			}
+			return false
+		},
 		labelFromOptions(value, options) {
 			if (value === null || value === undefined || value === '') return ''
 			const opts = options || []
@@ -489,6 +621,10 @@ export default {
 			if (v === null || v === undefined || v === '') return ''
 			return v
 		},
+		cellTextOrDash(v) {
+			if (v === null || v === undefined || String(v).trim() === '') return '—'
+			return v
+		},
 		formatMoneyCol(v) {
 			if (v === null || v === undefined || v === '') return ''
 			const n = Number(v)
@@ -542,6 +678,8 @@ export default {
 			return sums
 		},
 		handleClose() {
+			this.serialDialogVisible = false
+			this.serialDialogList = []
 			this.detail = null
 			this.$emit('close')
 		},
@@ -628,6 +766,11 @@ export default {
 	color: #409eff;
 }
 
+.mx-line-type-tag {
+	min-width: 44px;
+	text-align: center;
+}
+
 .collect-stat-card {
 	height: 100px;
 	padding: 12px;
@@ -754,6 +897,29 @@ export default {
 .sn-tag {
 	margin: 0 !important;
 }
+.sn-more-btn {
+	padding: 0 4px !important;
+	margin-left: 2px;
+	vertical-align: middle;
+	font-size: 12px;
+}
+.sn-dialog-hint {
+	font-size: 12px;
+	color: #909399;
+	margin: -6px 0 10px;
+}
+.sn-dialog-tags {
+	max-height: min(420px, 60vh);
+	overflow-y: auto;
+	display: flex;
+	flex-wrap: wrap;
+	gap: 6px;
+	align-content: flex-start;
+	padding: 2px 0;
+}
+.sn-dialog-tag {
+	margin: 0 !important;
+}
 
 .detail-bz {
 	white-space: pre-wrap;
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue
index 30dcfec..90c443b 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue
@@ -20,6 +20,16 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
+					<el-col :span="6">
+						<el-form-item label="抖音订单号">
+							<el-input v-model="query.dyddh" placeholder="抖音订单号（模糊）" clearable />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="物流运单号">
+							<el-input v-model="query.yddh" placeholder="物流运单号（模糊）" clearable />
+						</el-form-item>
+					</el-col>
 					<template v-if="showAll">
 					<el-col :span="6">
 						<el-form-item label="经手人">
@@ -111,6 +121,12 @@
 				>
 					<el-table-column prop="id" label="单据编号" align="left" min-width="150" show-overflow-tooltip />
 					<el-table-column prop="djrq" label="单据日期" align="left" min-width="110" :formatter="ncc.tableDateFormat" show-overflow-tooltip />
+					<el-table-column prop="dyddh" label="抖音订单号" align="left" min-width="160" show-overflow-tooltip>
+						<template slot-scope="scope">{{ displayText(scope.row.dyddh) || '—' }}</template>
+					</el-table-column>
+					<el-table-column prop="yddh" label="物流运单号" align="left" min-width="140" show-overflow-tooltip>
+						<template slot-scope="scope">{{ displayText(scope.row.yddh) || '—' }}</template>
+					</el-table-column>
 					<el-table-column label="出库仓库" prop="cjck" align="left" min-width="120" show-overflow-tooltip>
 						<template slot-scope="scope">{{ displayText(formatCjckDisplay(scope.row)) }}</template>
 					</el-table-column>
@@ -148,13 +164,7 @@
 						<template slot-scope="scope">{{ displayText(scope.row.gzr) }}</template>
 					</el-table-column>
 					<el-table-column prop="bz" label="备注" align="left" min-width="120" show-overflow-tooltip>
-						<template slot-scope="scope">{{ displayText(scope.row.bz) }}</template>
-					</el-table-column>
-					<el-table-column prop="dyddh" label="抖音订单号" align="left" min-width="160" show-overflow-tooltip>
-						<template slot-scope="scope">{{ displayText(scope.row.dyddh) }}</template>
-					</el-table-column>
-					<el-table-column prop="yddh" label="物流运单号" align="left" min-width="140" show-overflow-tooltip>
-						<template slot-scope="scope">{{ displayText(scope.row.yddh) }}</template>
+						<template slot-scope="scope">{{ displayText(formatListRemarkBz(scope.row)) }}</template>
 					</el-table-column>
 					<el-table-column label="摘要" align="left" min-width="200" show-overflow-tooltip>
 						<template slot-scope="scope">
@@ -294,6 +304,24 @@
 			this.getskzhOptions();
 		},
 		methods: {
+			/** 与详情一致：抖音单备注列不显示「抖音订单：…」行（单号见 dyddh 列） */
+			formatListRemarkBz(row) {
+				if (!row) return ''
+				const bz = row.bz
+				if (bz == null || bz === '') return ''
+				const ly = row.ly != null && row.ly !== '' ? String(row.ly).trim() : ''
+				if (ly !== '抖音订单') return String(bz)
+				return String(bz)
+					.split(/\r?\n/)
+					.filter((line) => {
+						const t = line.trim()
+						if (!t) return false
+						if (/^抖音订单[：:]/.test(t)) return false
+						return true
+					})
+					.join('\n')
+					.trim()
+			},
 			displayText(val) {
 				if (val == null || String(val).trim() === '') return ''
 				return String(val)
@@ -540,11 +568,13 @@
 						method: 'post'
 					})
 				}).then((res) => {
-					if (res && res.success) {
-						this.$message.success(res.message || '反审成功')
+					// 与 request 拦截器一致：业务结果在 res.data（见 wtCgrkd/index 反审处理）
+					const d = (res && res.data) || {}
+					if (d.success) {
+						this.$message.success(d.message || '反审成功')
 						this.initData()
 					} else {
-						this.$message.error((res && res.message) || '反审失败')
+						this.$message.error(d.message || (res && res.message) || '反审失败')
 					}
 				}).catch(() => {})
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/detail-view.vue
index 99a139f..2ac1ba9 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/detail-view.vue
@@ -145,15 +145,25 @@
 					</el-table-column>
 					<el-table-column label="序列号" min-width="168">
 						<template slot-scope="scope">
-							<div v-if="scope.row.selectedSerialNumbers && scope.row.selectedSerialNumbers.length" class="sn-tags">
-								<el-tag
-									v-for="(sn, idx) in scope.row.selectedSerialNumbers"
-									:key="idx"
-									size="mini"
-									type="warning"
-									class="sn-tag"
-								>{{ sn }}</el-tag>
-							</div>
+							<template v-if="serialList(scope.row).length">
+								<div class="sn-tags">
+									<el-tag
+										v-for="(sn, idx) in serialPreview(scope.row)"
+										:key="idx"
+										size="mini"
+										type="warning"
+										class="sn-tag"
+									>{{ sn }}</el-tag>
+									<el-button
+										v-if="serialList(scope.row).length > snInlineMax"
+										type="text"
+										class="sn-more-btn"
+										@click="openSerialDialog(scope.row)"
+									>
+										共 {{ serialList(scope.row).length }} 个，点击查看
+									</el-button>
+								</div>
+							</template>
 							<span v-else class="text-muted"></span>
 						</template>
 					</el-table-column>
@@ -198,6 +208,27 @@
 				<span></span>
 			</div>
 		</div>
+
+		<el-dialog
+			title="序列号列表"
+			:visible.sync="serialDialogVisible"
+			width="560px"
+			append-to-body
+			class="NCC-dialog xsthd-sn-list-dialog"
+			@closed="serialDialogList = []"
+		>
+			<div class="sn-dialog-hint">共 {{ serialDialogList.length }} 条</div>
+			<div class="sn-dialog-tags">
+				<el-tag
+					v-for="(sn, idx) in serialDialogList"
+					:key="idx"
+					size="small"
+					type="warning"
+					class="sn-dialog-tag"
+				>{{ sn }}</el-tag>
+			</div>
+		</el-dialog>
+
 		<span v-if="$slots.footer" slot="footer" class="dialog-footer xsthd-detail-footer-slot">
 			<slot name="footer" />
 		</span>
@@ -266,6 +297,34 @@ export default {
 		}
 	},
 	methods: {
+		serialList(row) {
+			if (!row) return []
+			const raw = row.selectedSerialNumbers != null
+				? row.selectedSerialNumbers
+				: (row.serialNumbers != null ? row.serialNumbers : (row.serialNumber != null ? row.serialNumber : row.xlh))
+			if (Array.isArray(raw)) {
+				return raw.map(s => (s == null ? '' : String(s)).trim()).filter(Boolean)
+			}
+			if (raw == null || raw === '') return []
+			const text = String(raw).trim()
+			if (!text) return []
+			if ((text.startsWith('[') && text.endsWith(']')) || (text.startsWith('{') && text.endsWith('}'))) {
+				try {
+					const arr = JSON.parse(text)
+					if (Array.isArray(arr)) return arr.map(s => (s == null ? '' : String(s)).trim()).filter(Boolean)
+				} catch (e) {}
+			}
+			return text.split(/[\n,，;；\s]+/).map(s => s.trim()).filter(Boolean)
+		},
+		serialPreview(row) {
+			const all = this.serialList(row)
+			if (all.length <= this.snInlineMax) return all
+			return all.slice(0, this.snPreviewCount)
+		},
+		openSerialDialog(row) {
+			this.serialDialogList = this.serialList(row).slice()
+			this.serialDialogVisible = true
+		},
 		openLinkedXsckd() {
 			const id = this.resolvedYcddhId
 			if (!id) return
@@ -348,6 +407,8 @@ export default {
 			return sums
 		},
 		handleClose() {
+			this.serialDialogVisible = false
+			this.serialDialogList = []
 			this.detail = null
 			this.userNameLabels = {}
 			this.userNameResolveDone = false
@@ -624,6 +685,29 @@ export default {
 .sn-tag {
 	margin: 0 !important;
 }
+.sn-more-btn {
+	padding: 0 4px !important;
+	margin-left: 2px;
+	vertical-align: middle;
+	font-size: 12px;
+}
+.sn-dialog-hint {
+	font-size: 12px;
+	color: #909399;
+	margin: -6px 0 10px;
+}
+.sn-dialog-tags {
+	max-height: min(420px, 60vh);
+	overflow-y: auto;
+	display: flex;
+	flex-wrap: wrap;
+	gap: 6px;
+	align-content: flex-start;
+	padding: 2px 0;
+}
+.sn-dialog-tag {
+	margin: 0 !important;
+}
 
 .detail-bz {
 	white-space: pre-wrap;
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/Form.vue
index b2ca0ee..fea224f 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/Form.vue
@@ -100,6 +100,24 @@
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { getAccountSelector } from '@/api/extend/wtAccount'
 const FYXM_DICT_ID = '816913803978474757'
+/** 新建/重置用，避免编辑后整单替换再点「新增」仍残留 wldw、skzh 等字段 */
+function createEmptyCashForm() {
+	return {
+		id: undefined,
+		djrq: undefined,
+		jsr: undefined,
+		wtYskzjjsMxList: [],
+		fkzh: undefined,
+		fkje: undefined,
+		skzh: undefined,
+		skje: undefined,
+		djlx: '现金费用单',
+		wldw: undefined,
+		zy: undefined,
+		bz: undefined,
+		djzt: undefined
+	}
+}
 	export default {
 		components: {},
 		props: [],
@@ -109,17 +127,7 @@ const FYXM_DICT_ID = '816913803978474757'
 				visible: false,
 				isDetail: false,
 				pendingDjzt: '待审核',
-				dataForm: {
-					id: undefined,
-					djrq: undefined,
-					jsr: undefined,
-					wtYskzjjsMxList: [],
-					fkzh: undefined,
-					fkje: undefined,
-					skzh: undefined,
-					skje: undefined,
-					djlx: undefined,
-				},
+				dataForm: createEmptyCashForm(),
 				rules: {
 				},
 				fyxmmcOptions: [],
@@ -182,30 +190,32 @@ const FYXM_DICT_ID = '816913803978474757'
                 this.$emit('refresh')
             },
 			init(id, isDetail) {
-				this.dataForm.id = id || 0;
-                this.visible = true;
+				this.visible = true;
                 this.isDetail = isDetail || false;
 				this.pendingDjzt = '待审核'
+				const billId = id && String(id) !== '0' ? id : null
 				this.$nextTick(() => {
-					this.$refs['elForm'].resetFields();
-					if (this.dataForm.id) {
+					if (this.$refs['elForm']) {
+						this.$refs['elForm'].resetFields();
+					}
+					if (billId) {
 						request({
-							url: '/api/Extend/WtYskzjjs/' + this.dataForm.id,
+							url: '/api/Extend/WtYskzjjs/' + billId,
 							method: 'get'
-						}).then(res =>{
+						}).then(res => {
 							this.dataForm = res.data;
 							if (!this.dataForm.wtYskzjjsMxList) {
 								this.$set(this.dataForm, 'wtYskzjjsMxList', []);
 							}
 						})
 					} else {
+						this.dataForm = createEmptyCashForm();
 						this.dataForm.djrq = Date.now();
 						if (this.$store && this.$store.getters && this.$store.getters.userInfo) {
 							this.dataForm.jsr = this.$store.getters.userInfo.userId || this.$store.getters.userInfo.id;
 						}
 						this.dataForm.djlx = '现金费用单';
 						this.dataForm.djzt = '草稿';
-						this.dataForm.wtYskzjjsMxList = [];
 					}
 				})
 			},
diff --git a/Antis.Erp.Plat/douyin/frontend/src/utils/config.ts b/Antis.Erp.Plat/douyin/frontend/src/utils/config.ts
index 521ad36..59754f5 100644
--- a/Antis.Erp.Plat/douyin/frontend/src/utils/config.ts
+++ b/Antis.Erp.Plat/douyin/frontend/src/utils/config.ts
@@ -42,3 +42,38 @@ export const getErpBaseUrl = (): string => {
   }
   return getBackendBaseUrl().replace(/\/$/, '')
 }
+
+/** 与后台上传/文件服务同源，优先 VITE_API_BASE_URL 去 /api 后的根 */
+export const getErpAssetBaseUrl = (): string => {
+  const env = import.meta.env.VITE_API_BASE_URL
+  if (env != null && String(env).trim() !== '') {
+    const s = String(env).trim().replace(/\/+$/, '')
+    const noApi = s.replace(/\/api\/?$/i, '')
+    if (noApi) return noApi
+  }
+  return getErpBaseUrl()
+}
+
+/**
+ * 商品主图：相对路径补全；绝对地址若为 localhost/开发机落库，替换为当前部署的 ERP 根（避免线上仍请求 localhost:2011）
+ */
+export const resolveProductPicUrl = (pic: string | undefined | null): string => {
+  const s0 = (pic ?? '').trim()
+  if (!s0) return ''
+  if (/^https?:\/\//i.test(s0)) {
+    try {
+      const u = new URL(s0)
+      if (/^(localhost|127\.0\.0\.1|0\.0\.0\.0)$/i.test(u.hostname)) {
+        const base = getErpAssetBaseUrl().replace(/\/$/, '')
+        return `${base}${u.pathname || ''}${u.search || ''}${u.hash || ''}`
+      }
+    } catch {
+      return s0
+    }
+    return s0
+  }
+  if (s0.startsWith('//')) return `https:${s0}`
+  const base = getErpAssetBaseUrl().replace(/\/$/, '')
+  if (s0.startsWith('/')) return `${base}${s0}`
+  return s0
+}
diff --git a/Antis.Erp.Plat/douyin/frontend/src/views/CreateWaybillView.vue b/Antis.Erp.Plat/douyin/frontend/src/views/CreateWaybillView.vue
index 3bddce6..6895590 100644
--- a/Antis.Erp.Plat/douyin/frontend/src/views/CreateWaybillView.vue
+++ b/Antis.Erp.Plat/douyin/frontend/src/views/CreateWaybillView.vue
@@ -150,22 +150,17 @@
                       :key="index"
                       class="order-product-item"
                     >
-                      <!-- 商品明细：显示抖音图，没有则显示"暂无图片" -->
                       <el-image
-                        v-if="item.douyin_pic || item.product_pic"
-                        :src="item.douyin_pic || item.product_pic"
+                        v-if="orderProductThumb(item)"
+                        :src="orderProductThumb(item)"
                         class="product-thumb"
                         fit="cover"
-                        :preview-src-list="[item.douyin_pic || item.product_pic]"
+                        :preview-src-list="[orderProductThumb(item)]"
                         preview-teleported
                       />
                       <div class="product-thumb-placeholder" v-else>暂无图片</div>
                       <div class="product-info">
-                        <div class="product-name">{{ item.product_name }}</div>
-                        <div v-if="getSkuCode(item)" class="product-sku">
-                          <span class="sku-label">SKUID：</span>{{ getSkuCode(item) }}
-                          <span v-if="formatSpec(item.spec)" class="sku-spec">({{ formatSpec(item.spec) }})</span>
-                        </div>
+                        <div class="product-name product-name--erp-only">{{ item.erp_spmc || item.product_name || '—' }}</div>
                         <div class="product-meta">
                           <span>×{{ item.item_num }}</span>
                           <span>¥{{ Number(item.goods_price || 0).toFixed(2) }}</span>
@@ -262,18 +257,22 @@
                     <template #default="{ row }">
                       <!-- 商品清单：显示 ERP 图，没有则显示"暂无图片" -->
                       <el-image
-                        v-if="row.erp_pic"
-                        :src="row.erp_pic"
+                        v-if="resolveProductPicUrl(row.erp_pic)"
+                        :src="resolveProductPicUrl(row.erp_pic)"
                         style="width: 50px; height: 50px; border-radius: 4px;"
                         fit="cover"
-                        :preview-src-list="[row.erp_pic]"
+                        :preview-src-list="[resolveProductPicUrl(row.erp_pic)]"
                         preview-teleported
                         lazy
                       />
                       <div v-else class="cell-no-image">暂无图片</div>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="product_name" label="商品名称" min-width="180" show-overflow-tooltip />
+                  <el-table-column label="商品名称" min-width="180" show-overflow-tooltip>
+                    <template #default="{ row }">
+                      <span class="product-name-erp-only">{{ row.erp_spmc || row.product_name || '—' }}</span>
+                    </template>
+                  </el-table-column>
                   <el-table-column label="抖音ID" width="150">
                     <template #default="{ row }">
                       <div v-if="getSkuCode(row)" style="color: #409eff;">
@@ -527,7 +526,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Refresh, InfoFilled } from '@element-plus/icons-vue'
 import { getOrderDetail, getMergedOrderDetail, searchProducts as searchProductsAPI, manualCreateWaybill, getProductInfo as getProductInfoAPI, getWarehouses, getProductCategories, updateSellerRemark, getDefaults, getCustomers, getPaymentAccounts, getUsers, getShopSettings, checkStock } from '@/api/order'
-import { getErpBaseUrl } from '@/utils/config'
+import { getErpAssetBaseUrl, resolveProductPicUrl } from '@/utils/config'
 import SerialNumberSelect from '@/components/SerialNumberSelect.vue'
 
 const route = useRoute()
@@ -546,15 +545,9 @@ const currentSerialRow = ref<any | null>(null)
 // 商品信息缓存（用于存储序列号类型）
 const productCache = new Map<string, any>()
 
-/** 商品主图：补全 ERP 相对路径，避免 el-image 请求失败 */
-const resolveProductPicUrl = (pic: string | undefined | null): string => {
-  const s = (pic || '').trim()
-  if (!s) return ''
-  if (/^https?:\/\//i.test(s)) return s
-  if (s.startsWith('//')) return `https:${s}`
-  const base = getErpBaseUrl().replace(/\/$/, '')
-  if (s.startsWith('/')) return `${base}${s}`
-  return s
+const orderProductThumb = (item: any): string => {
+  if (!item) return ''
+  return resolveProductPicUrl(item.erp_pic || item.product_pic || item.douyin_pic)
 }
 
 /** 金额展示：分转元，无数据时显示「无」 */
@@ -991,7 +984,7 @@ const addProduct = async (product: any) => {
       const images = typeof product.spzt === 'string' ? JSON.parse(product.spzt) : product.spzt
       if (Array.isArray(images) && images.length > 0 && images[0].url) {
         const url = images[0].url
-        productPic = url.startsWith('http') ? url : `${getErpBaseUrl()}${url.startsWith('/') ? '' : '/'}${url}`
+        productPic = url.startsWith('http') ? url : `${getErpAssetBaseUrl()}${url.startsWith('/') ? '' : '/'}${url}`
       }
     } catch (e) {
       console.warn('解析商品主图失败:', e)
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/OrderService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/OrderService.cs
index 0a31fb6..b83e4bc 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/OrderService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/OrderService.cs
@@ -831,8 +831,12 @@ public class OrderService
 
         if (!string.IsNullOrWhiteSpace(skuName))
         {
-            // SKU 名称在商品明细 JSON（ProductItems）中，按关键词模糊筛选。
-            query = query.Where(o => o.ProductItems != null && o.ProductItems.Contains(skuName));
+            // 仅匹配 ProductItems 数组里每条商品的 SKU 标识字段，不在整段 JSON / product_name 上 Contains。
+            // 用 JSON_EXTRACT 固定下标展开（避免依赖 MySQL 8 的 JSON_TABLE，兼容 5.7；单行最多取前若干条子商品）。
+            var skuLike = "%" + EscapeMySqlLikePattern(skuName.Trim()) + "%";
+            query = query.Where(
+                "ProductItems IS NOT NULL AND JSON_VALID(ProductItems) AND (" + SkuNameFilterJsonExtractOrSql + ")",
+                new { skuLike });
         }
 
         // hasWaybill 在「同人同址合并」之后处理：否则只有子单有 waybills/运单号时，SQL 会整组拆散，列表里筛不出已建运单的合并单
@@ -917,6 +921,52 @@ public class OrderService
     }
 
     /// <summary>
+    /// 转义 MySQL LIKE 模式中的 \、%、_，配合 LIKE ... ESCAPE '\\' 使用。
+    /// </summary>
+    private static string EscapeMySqlLikePattern(string s)
+    {
+        return s
+            .Replace("\\", "\\\\", StringComparison.Ordinal)
+            .Replace("%", "\\%", StringComparison.Ordinal)
+            .Replace("_", "\\_", StringComparison.Ordinal);
+    }
+
+    /// <summary>抖音单条订单 ProductItems 数组中参与 SKU 关键词筛选的最大行数（0-based 下标 0..Max-1）。</summary>
+    private const int SkuNameFilterMaxProductItemRows = 50;
+
+    private static readonly string SkuNameFilterJsonExtractOrSql = BuildSkuNameFilterJsonExtractOrSql();
+
+    private static string BuildSkuNameFilterJsonExtractOrSql()
+    {
+        var sb = new StringBuilder();
+        for (var i = 0; i < SkuNameFilterMaxProductItemRows; i++)
+        {
+            if (i > 0) sb.Append(" OR ");
+            sb.Append('(');
+            AppendJsonSkuFieldLike(sb, i, "sku_id");
+            sb.Append(" OR ");
+            AppendJsonSkuFieldLike(sb, i, "out_sku_id");
+            sb.Append(" OR ");
+            AppendJsonSkuFieldLike(sb, i, "skuid");
+            sb.Append(" OR ");
+            AppendJsonSkuFieldLike(sb, i, "outer_sku_id");
+            sb.Append(')');
+        }
+
+        return sb.ToString();
+    }
+
+    private static void AppendJsonSkuFieldLike(StringBuilder sb, int arrayIndex, string fieldName)
+    {
+        // CAST 兼容 JSON 中为字符串或数字
+        sb.Append("IFNULL(CAST(JSON_EXTRACT(ProductItems, '$[");
+        sb.Append(arrayIndex);
+        sb.Append("].");
+        sb.Append(fieldName);
+        sb.Append("') AS CHAR(512)),'') LIKE @skuLike ESCAPE '\\\\'");
+    }
+
+    /// <summary>
     /// 构造订单列表缓存 Key：包含所有影响"候选结果集"的过滤条件和版本号。
     /// 不包含 sortBy/sortOrder/pageIndex/pageSize，这些在内存里处理。
     /// </summary>
@@ -2065,7 +2115,7 @@ public class OrderService
 
             // 5. 通过SKU ID关联商品档案，获取商品编码
             var missingProducts = new List<string>();
-            var resolvedItems = new List<(string spbh, string sptm, string spmc, string ckck, int sl, decimal dj, decimal je, List<string> selectedSerials)>();
+            var resolvedItems = new List<(string spbh, string sptm, string spmc, string ckck, int sl, decimal dj, decimal je, List<string> selectedSerials, bool isGift)>();
 
             foreach (var item in productItems)
             {
@@ -2122,7 +2172,11 @@ public class OrderService
                 }
 
                 var selectedSerials = ParseSelectedSerialNumbersFromWaybillItem(item);
-                
+                // 抖音常出现「行单价/实付为 0」的赠品/活动赠品行，但 payload 可能不带 isGift，仅 goods_price=0
+                var isGift = item["isGift"]?.ToObject<bool>() == true
+                    || string.Equals(item["isGift"]?.ToString(), "true", StringComparison.OrdinalIgnoreCase)
+                    || goodsPrice == 0L;
+
                 resolvedItems.Add((
                     detailSpbh,
                     productInfo.Spbm ?? "",
@@ -2131,7 +2185,8 @@ public class OrderService
                     itemNum > 0 ? itemNum : 1,
                     goodsPrice > 0 ? goodsPrice / 100.0m : 0m,
                     (goodsPrice * itemNum) / 100.0m,
-                    selectedSerials
+                    selectedSerials,
+                    isGift
                 ));
             }
 
@@ -2271,7 +2326,7 @@ public class OrderService
                 dj = r.dj,
                 je = r.je,
                 djlx = finalDjlx,
-                mdxx = "",
+                mdxx = r.isGift ? "赠品" : "",
                 selectedSerialNumbers = r.selectedSerials
             }).ToList();
 
@@ -2432,7 +2487,8 @@ public class OrderService
                 zdr = "",
                 shr = "",
                 gzr = "",
-                bz = $"抖音订单：{finalDouyinOrderIds}",
+                // 抖音单号与运单已写入 dyddh / yddh，主表备注不再写「抖音订单：…」避免与详情/列表展示重复
+                bz = "",
                 djlx = finalDjlx,
                 kh = defaultKh,
                 gys = "",
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlCrInput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlCrInput.cs
index 6848431..7eb8141 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlCrInput.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlCrInput.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace NCC.Extend.Entitys.Dto.WtPl
@@ -27,6 +27,10 @@ namespace NCC.Extend.Entitys.Dto.WtPl
         /// 序号 - 自定义排序（升序），留空按默认排序
         /// </summary>
         public int? xh { get; set; }
-        
+
+        /// <summary>
+        /// 展示门店分组（<c>wt_mdfz.F_Id</c> 多选；与商品套装可售范围一致。空=全部门店组均展示）
+        /// </summary>
+        public List<string> mdfzIds { get; set; }
     }
 }
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlInfoOutput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlInfoOutput.cs
index 393bec0..c502fe1 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlInfoOutput.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlInfoOutput.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace NCC.Extend.Entitys.Dto.WtPl
@@ -27,6 +27,10 @@ namespace NCC.Extend.Entitys.Dto.WtPl
         /// 序号 - 自定义排序（升序）
         /// </summary>
         public int? xh { get; set; }
-        
+
+        /// <summary>
+        /// 展示门店分组
+        /// </summary>
+        public List<string> mdfzIds { get; set; }
     }
 }
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlListOutput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlListOutput.cs
index cf0ae92..e131461 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlListOutput.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPlListOutput.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace NCC.Extend.Entitys.Dto.WtPl
 {
@@ -26,6 +26,10 @@ namespace NCC.Extend.Entitys.Dto.WtPl
         /// 序号 - 自定义排序（升序）
         /// </summary>
         public int? xh { get; set; }
-        
+
+        /// <summary>
+        /// 展示门店分组名称（多选、顿号拼接）
+        /// </summary>
+        public string mdfzNames { get; set; }
     }
 }
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdInfoOutput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdInfoOutput.cs
index fc2d632..baa22cf 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdInfoOutput.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdInfoOutput.cs
@@ -157,6 +157,16 @@ namespace NCC.Extend.Entitys.Dto.WtXsckd
         /// 单据来源
         /// </summary>
         public string ly { get; set; }
+
+        /// <summary>
+        /// 物流运单号（与主表 wt_xsckd.yddh 一致）
+        /// </summary>
+        public string yddh { get; set; }
+
+        /// <summary>
+        /// 抖音订单号（与主表 wt_xsckd.dyddh 一致）
+        /// </summary>
+        public string dyddh { get; set; }
         
         /// <summary>
         /// 收款明细
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListQueryInput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListQueryInput.cs
index 4b70ebb..d115629 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListQueryInput.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListQueryInput.cs
@@ -98,6 +98,11 @@ namespace NCC.Extend.Entitys.Dto.WtXsckd
         /// 抖音订单号（模糊）
         /// </summary>
         public string dyddh { get; set; }
+
+        /// <summary>
+        /// 物流运单号（模糊，主表 yddh）
+        /// </summary>
+        public string yddh { get; set; }
         
         /// <summary>
         /// 供应商
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtPlEntity.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtPlEntity.cs
index 5862823..80b26ec 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtPlEntity.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtPlEntity.cs
@@ -1,4 +1,4 @@
-using NCC.Common.Const;
+using NCC.Common.Const;
 using SqlSugar;
 using System;
 
@@ -34,7 +34,11 @@ namespace NCC.Extend.Entitys
         /// </summary>
         [SugarColumn(ColumnName = "F_Xh", IsNullable = true)]
         public int? Xh { get; set; }
-        
-     
+
+        /// <summary>
+        /// 门店端展示所属门店分组（<c>wt_mdfz.F_Id</c> 的 JSON 数组，与可售范围口径一致；为空表示不限制即全部分组可见）
+        /// </summary>
+        [SugarColumn(ColumnName = "F_MdfzIds", IsNullable = true, ColumnDataType = "text")]
+        public string MdfzIds { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtXsckdEntity.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtXsckdEntity.cs
index b3e9d6a..e58c5b2 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtXsckdEntity.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtXsckdEntity.cs
@@ -132,7 +132,7 @@ namespace NCC.Extend.Entitys
         public string Spbz { get; set; }
         
         /// <summary>
-        /// 原销售出库单编号（退货类单据：对应原 CHD 单号；可与备注「原订单号：」同步）
+        /// 原销售出库单编号（退货类单据：对应原销售出库单 CKD… 单号，历史可能为 CHD…；可与备注「原订单号：」同步）
         /// </summary>
         [SugarColumn(ColumnName = "ycddh", IsNullable = true, Length = 64)]
         public string Ycddh { get; set; }
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/BillSummary/WtBillSummaryService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/BillSummary/WtBillSummaryService.cs
index 377aea3..b3a934f 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/BillSummary/WtBillSummaryService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/BillSummary/WtBillSummaryService.cs
@@ -442,7 +442,7 @@ namespace NCC.Extend.BillSummary
         }
 
         /// <summary>
-        /// 按 wt_yskzjjs 主键拼装摘要（自然语句 + 句末经手人；转款单对齐「转款到【账户】等共金额元：经手人」）
+        /// 按 wt_yskzjjs 主键拼装摘要（自然语句 + 句末经手人；转款单对齐「转款到【账户】等共金额元：经手人」；qt 线「其他收入单」主表为其他应收单时按明细展示为「其他收入单」）
         /// </summary>
         /// <param name="billId">应收款增加减少 F_Id</param>
         public async Task<string> ComputeWtYskzjjsZyByBillIdAsync(string billId)
@@ -583,6 +583,16 @@ namespace NCC.Extend.BillSummary
                 amtPart = $"金额{WtBillSummaryFormat.Money(0)}元";
 
             var lxShow = string.IsNullOrEmpty(lx) ? "应收款增减" : lx;
+            // qt 落库主表 djlx 为「其他应收单」、明细 mxlx 为「其他收入单」时，摘要对外统一称「其他收入单」
+            if (string.Equals(lx, "其他应收单", StringComparison.Ordinal))
+            {
+                var mxLxs = await _db.Queryable<WtYskzjjsMxEntity>()
+                    .Where(m => m.Djbh == id)
+                    .Select(m => m.Mxlx)
+                    .ToListAsync();
+                if (mxLxs.Any(s => !string.IsNullOrWhiteSpace(s) && s.Trim() == "其他收入单"))
+                    lxShow = "其他收入单";
+            }
             var body = $"{WtBillSummaryFormat.Bracket(wldwDisp)}{lxShow}{amtPart}";
             if (!string.IsNullOrWhiteSpace(e.Hysjh))
                 body += $" 手机{WtBillSummaryFormat.Bracket(e.Hysjh.Trim())}";
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCwdjService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCwdjService.cs
index 736a174..88b0cbb 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCwdjService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCwdjService.cs
@@ -24,6 +24,7 @@ using NCC.DataEncryption;
 using NCC.ClayObject;
 using NCC.Extend.WtDjzy;
 using NCC.Extend.BillSummary;
+using NCC.System.Entitys.Permission;
 
 namespace NCC.Extend.WtCwdj
 {
@@ -73,6 +74,7 @@ namespace NCC.Extend.WtCwdj
             var wtCwdjmxList = await _db.Queryable<WtCwdjmxEntity>().Where(w => w.Djbh == entity.Id).ToListAsync();
             output.wtCwdjmxList = wtCwdjmxList.Adapt<List<WtCwdjmxInfoOutput>>();
             output.billZy = await _billSummaryService.ComputeWtCwdjZyByBillIdAsync(entity.Id);
+            output.jsr = await ResolveCwdjJsrIdToRealNameForDisplayAsync(entity.Jsr) ?? output.jsr;
             return output;
         }
 
@@ -113,6 +115,7 @@ namespace NCC.Extend.WtCwdj
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
             var cwdjPageRows = data.list?.ToList() ?? new List<WtCwdjListOutput>();
             await _billSummaryService.EnrichWtCwdjListBillZyAsync(cwdjPageRows);
+            await EnrichWtCwdjListJsrRealNameAsync(cwdjPageRows);
                 return PageResult<WtCwdjListOutput>.SqlSugarPageResult(data);
         }
 
@@ -165,8 +168,11 @@ namespace NCC.Extend.WtCwdj
                 entity.Djzt = "待审核";
 
             if (IsReceiptOrPaymentBill(resolvedDjlx))
-                entity.Jsr = await ResolveJsrAccountNameFromMxInputAsync(input.wtCwdjmxList);
-            
+            {
+                // 经手人=当前操作用户，不从明细账户带出（账户仅在明细/摘要中体现）
+                entity.Jsr = (userInfo != null && !string.IsNullOrWhiteSpace(userInfo.userId)) ? userInfo.userId.Trim() : entity.Jsr;
+            }
+
             // 生成每日递增单号，前缀根据djlx判断
             var today = DateTime.Now.ToString("yyyyMMdd");
             string prefix = "CW"; // 默认前缀
@@ -322,6 +328,7 @@ namespace NCC.Extend.WtCwdj
                     shzt = it.Djzt,
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
             await _billSummaryService.EnrichWtCwdjListBillZyAsync(data);
+            await EnrichWtCwdjListJsrRealNameAsync(data);
                 return data;
         }
 
@@ -415,6 +422,7 @@ namespace NCC.Extend.WtCwdj
         [HttpPut("{id}")]
         public async Task Update(string id, [FromBody] WtCwdjUpInput input)
         {
+            var userInfo = await _userManager.GetUserInfo();
             var existingHeader = await _db.Queryable<WtCwdjEntity>().FirstAsync(p => p.Id == id);
             _ = existingHeader ?? throw NCCException.Oh(ErrorCode.COM1005);
             ThrowIfExpenseBillCannotEdit(existingHeader);
@@ -448,7 +456,12 @@ namespace NCC.Extend.WtCwdj
                 entity.Fsje = input.wtCwdjmxList.Sum(x => x.ybje);
                 if (entity.Fsje <= 0) throw NCCException.Bah("发生金额必须大于0");
                 if (IsReceiptOrPaymentBill(djlxForMx))
-                    entity.Jsr = await ResolveJsrAccountNameFromMxInputAsync(input.wtCwdjmxList);
+                {
+                    // 经手人保持首次保存的录单用户，不因改账户而变成账号名
+                    entity.Jsr = string.IsNullOrWhiteSpace(existingHeader.Jsr)
+                        ? ((userInfo != null && !string.IsNullOrWhiteSpace(userInfo.userId)) ? userInfo.userId.Trim() : entity.Jsr)
+                        : existingHeader.Jsr;
+                }
 
                 //更新财务单据记录
                 await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
@@ -639,19 +652,59 @@ namespace NCC.Extend.WtCwdj
         private static bool IsReceiptOrPaymentBill(string djlx) =>
             IsReceiptBill(djlx) || IsPaymentBill(djlx);
 
-        /// <summary>经手人存所选明细首行账号的账户名称（<c>WtAccount.AccountName</c>）。</summary>
-        private async Task<string> ResolveJsrAccountNameFromMxInputAsync(List<WtCwdjmxCrInput> mxList)
+        /// <summary>与 Create/Update 中明细 zhmc 拼接规则一致。</summary>
+        private static string BuildCwdjAccountDisplayName(WtAccountEntity acc)
         {
-            if (mxList == null || mxList.Count == 0) return null;
-            var firstZhbh = mxList.Select(x => x?.zhbh).FirstOrDefault(z => !string.IsNullOrWhiteSpace(z));
-            if (string.IsNullOrWhiteSpace(firstZhbh)) return null;
-            var tid = firstZhbh.Trim();
-            var accList = await _db.Queryable<WtAccountEntity>().Where(a => a.Id == tid).Take(1).ToListAsync();
-            if (accList.Count == 0) throw NCCException.Bah("明细账号不存在，请重新选择");
-            var acc = accList[0];
+            if (acc == null) return null;
             var name = (acc.AccountName ?? string.Empty).Trim();
+            var code = (acc.AccountCode ?? string.Empty).Trim();
+            if (!string.IsNullOrEmpty(code) && !string.IsNullOrEmpty(name)) return $"{code} {name}";
             if (!string.IsNullOrEmpty(name)) return name;
-            return (acc.AccountCode ?? string.Empty).Trim();
+            return code;
+        }
+
+        /// <summary>主表 <c>F_Jsr</c> 存用户 Id 时，详情/列表显示为 <c>BASE_USER.F_Realname</c>；无法解析时回退为原值（兼容历史将账户文案写入经手人的数据）。</summary>
+        private async Task<string> ResolveCwdjJsrIdToRealNameForDisplayAsync(string jsrRaw)
+        {
+            if (string.IsNullOrWhiteSpace(jsrRaw)) return null;
+            var id = jsrRaw.Trim();
+            var names = await _db.Queryable<UserEntity>()
+                .Where(u => u.Id == id)
+                .Select(u => u.RealName)
+                .Take(1)
+                .ToListAsync();
+            if (names.Count == 0 || string.IsNullOrWhiteSpace(names[0])) return null;
+            return names[0].Trim();
+        }
+
+        /// <summary>列表/导出：经手人由用户 Id 解析为真实姓名。</summary>
+        private async Task EnrichWtCwdjListJsrRealNameAsync(List<WtCwdjListOutput> rows)
+        {
+            if (rows == null || rows.Count == 0) return;
+            var ids = rows
+                .Select(r => (r.jsr ?? string.Empty).Trim())
+                .Where(s => !string.IsNullOrEmpty(s))
+                .Distinct()
+                .ToList();
+            if (ids.Count == 0) return;
+            var mapRows = await _db.Queryable<UserEntity>()
+                .In(u => u.Id, ids)
+                .Select(u => new { u.Id, u.RealName })
+                .ToListAsync();
+            var map = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var u in mapRows)
+            {
+                if (string.IsNullOrEmpty(u.Id) || string.IsNullOrWhiteSpace(u.RealName)) continue;
+                map[u.Id.Trim()] = u.RealName.Trim();
+            }
+            foreach (var row in rows)
+            {
+                if (row == null) continue;
+                var key = (row.jsr ?? string.Empty).Trim();
+                if (string.IsNullOrEmpty(key)) continue;
+                if (map.TryGetValue(key, out var real) && !string.IsNullOrEmpty(real))
+                    row.jsr = real;
+            }
         }
 
         /// <summary>
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtFysrdService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtFysrdService.cs
index ffe0950..004e06c 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtFysrdService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtFysrdService.cs
@@ -1,4 +1,4 @@
-using NCC.Common.Core.Manager;
+using NCC.Common.Core.Manager;
 using NCC.Common.Enum;
 using NCC.Common.Extension;
 using NCC.Common.Filter;
@@ -22,6 +22,7 @@ using NCC.Common.Model.NPOI;
 using NCC.Common.Configuration;
 using NCC.DataEncryption;
 using NCC.ClayObject;
+using NCC.System.Entitys.Permission;
 
 namespace NCC.Extend.WtFysrd
 {
@@ -75,6 +76,60 @@ namespace NCC.Extend.WtFysrd
                 WtFysrdWorkflowHelper.ApplyCounterpartyToEntity(entity, input.wldw, input.fkdw, input.kh, input.gys);
         }
 
+        /// <summary>
+        /// 单号：前缀+yyyyMMdd+4 位流水（其他收入单为 QTSRD，现金费用单为 XF，其它为 FY）。流水按「同一单据类型 djlx + 同日前缀」独立递增（不与其它 djlx/其它表混排）。
+        /// </summary>
+        private static string ResolveFysrdIdPrefix(string djlx)
+        {
+            if (string.IsNullOrEmpty(djlx)) return "FY";
+            if (djlx.Contains("现金费用单")) return "XF";
+            if (string.Equals(djlx, WtFysrdWorkflowHelper.BillName, StringComparison.Ordinal)
+                || WtFysrdWorkflowHelper.IsOtherIncomeDjlx(djlx)) return "QTSRD";
+            return "FY";
+        }
+
+        private async Task<string> NextFysrdBillIdAsync(string normalizedDjlx)
+        {
+            var today = DateTime.Now.ToString("yyyyMMdd");
+            var prefix = ResolveFysrdIdPrefix(normalizedDjlx);
+            var head = prefix + today;
+            // 其他收入 QTSRD：与 WtYskzjjs 中「其他应收单（含 qt 归并的其它收入单）」共用同日流水，避免两表出同号
+            List<string> ids;
+            if (string.Equals(prefix, "QTSRD", StringComparison.Ordinal))
+            {
+                var a = await _db.Queryable<WtFysrdEntity>()
+                    .Where(x => x.Id != null && x.Id.StartsWith(head))
+                    .Select(x => x.Id)
+                    .ToListAsync();
+                var b = await _db.Queryable<WtYskzjjsEntity>()
+                    .Where(x => x.Id != null && x.Id.StartsWith(head))
+                    .Select(x => x.Id)
+                    .ToListAsync();
+                ids = a.Concat(b).ToList();
+            }
+            else
+            {
+                // 非 QTSRD：仅按「同单据类型 + 同日前缀」在费用单表内递增（兼容旧版单号长度）
+                ids = await _db.Queryable<WtFysrdEntity>()
+                    .Where(x => x.Djlx == normalizedDjlx)
+                    .Where(x => x.Id != null && x.Id.StartsWith(head))
+                    .Select(x => x.Id)
+                    .ToListAsync();
+            }
+            var maxSerial = 0;
+            foreach (var bid in ids)
+            {
+                if (string.IsNullOrEmpty(bid) || bid.Length < head.Length + 4) continue;
+                if (!bid.StartsWith(head, StringComparison.Ordinal)) continue;
+                var tail = bid.Substring(bid.Length - 4);
+                if (int.TryParse(tail, out var n) && n > maxSerial) maxSerial = n;
+            }
+            var serial = maxSerial + 1;
+            if (serial > 9999)
+                throw NCCException.Bah("当日该类型单号流水已超过 9999，请联系管理员");
+            return $"{head}{serial:D4}";
+        }
+
         private async Task EnrichWldwForListAsync(IEnumerable<WtFysrdListOutput> rows)
         {
             if (rows == null) return;
@@ -149,7 +204,7 @@ namespace NCC.Extend.WtFysrd
         public async Task<dynamic> GetList([FromQuery] WtFysrdListQueryInput input)
         {
             _fysrdWorkflow.EnsureFysrdAuditColumns();
-            var sidx = input.sidx == null ? "id" : input.sidx;
+            var sidx = string.IsNullOrWhiteSpace(input.sidx) ? "id" : input.sidx;
             List<string> queryDjrq = input.djrq != null ? input.djrq.Split(',').ToObeject<List<string>>() : null;
             DateTime? startDjrq = queryDjrq != null ? Ext.GetDateTime(queryDjrq.First()) : null;
             DateTime? endDjrq = queryDjrq != null ? Ext.GetDateTime(queryDjrq.Last()) : null;
@@ -176,12 +231,12 @@ namespace NCC.Extend.WtFysrd
                     djrq=it.Djrq,
                     fzjg=it.Fzjg,
                     bm=it.Bm,
-                    jsr=it.Jsr,
-                    jszh=it.Jszh,
+                    jsr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Jsr).Select(u => u.RealName),
+                    jszh = SqlFunc.Subqueryable<WtAccountEntity>().Where(a => a.Id == it.Jszh).Select(a => a.AccountName),
                     je=it.Je,
-                    zdr=it.Zdr,
-                    shr=it.Shr,
-                    gzr=it.Gzr,
+                    zdr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Zdr).Select(u => u.RealName),
+                    shr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Shr).Select(u => u.RealName),
+                    gzr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Gzr).Select(u => u.RealName),
                     bz=it.Bz,
                     zy=it.Zy,
                     djlx=it.Djlx,
@@ -202,77 +257,39 @@ namespace NCC.Extend.WtFysrd
         public async Task Create([FromBody] WtFysrdCrInput input)
         {
             _fysrdWorkflow.EnsureFysrdAuditColumns();
-            var userInfo = await _userManager.GetUserInfo();
             var entity = input.Adapt<WtFysrdEntity>();
             NormalizeHeaderFromInput(input, entity);
             entity.Djlx = WtFysrdWorkflowHelper.NormalizeOtherIncomeDjlx(entity.Djlx) ?? entity.Djlx;
             entity.Djzt = "草稿";
-            // 生成每日递增单号
-            var today = DateTime.Now.ToString("yyyyMMdd");
-            var prefix = "FY";
-            // 根据单据类型设置前缀
-            if (!string.IsNullOrEmpty(entity.Djlx)) {
-                if (entity.Djlx.Contains("现金费用单")) prefix = "XF";
-                else if (string.Equals(entity.Djlx, WtFysrdWorkflowHelper.BillName, StringComparison.Ordinal)
-                    || WtFysrdWorkflowHelper.IsOtherIncomeDjlx(entity.Djlx)) prefix = "QT";
-                else prefix = "FY"; // 默认费用单前缀
-            }
-            var maxId = await _db.Queryable<WtFysrdEntity>()
-                .Where(x => x.Id.StartsWith(prefix + today))
-                .OrderBy(x => x.Id, OrderByType.Desc)
-                .Select(x => x.Id)
-                .FirstAsync();
-            int serial = 1;
-            if (!string.IsNullOrEmpty(maxId) && maxId.Length >= prefix.Length + 8 + 4)
-            {
-                var serialStr = maxId.Substring(prefix.Length + 8, 4);
-                int.TryParse(serialStr, out serial);
-                serial++;
-            }
-            try
+
+            for (var attempt = 0; attempt < 10; attempt++)
             {
-                //开启事务
-                _db.BeginTran();
-                int tryCount = 0;
-                while (true)
-                {
-                    try
-                    {
-                        entity.Id = $"{prefix}{today}{serial.ToString("D4")}";
-                //新增费用单记录
-                var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
-                var wtFysrdMxEntityList = input.wtFysrdMxList.Adapt<List<WtFysrdMxEntity>>();
-                if(wtFysrdMxEntityList != null)
+                try
                 {
-                    foreach (var item in wtFysrdMxEntityList)
-                    {
-                        item.Id = YitIdHelper.NextId().ToString();
-                        item.Djbh = newEntity.Id;
-                    }
-                    await _db.Insertable(wtFysrdMxEntityList).ExecuteCommandAsync();
-                }
-                //关闭事务
-                _db.CommitTran();
-                        break;
-                    }
-                    catch (Exception ex)
+                    _db.BeginTran();
+                    entity.Id = await NextFysrdBillIdAsync(entity.Djlx);
+                    var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
+                    var wtFysrdMxEntityList = input.wtFysrdMxList.Adapt<List<WtFysrdMxEntity>>();
+                    if (wtFysrdMxEntityList != null)
                     {
-                        if (ex.Message.Contains("Duplicate entry") && tryCount < 10)
+                        foreach (var item in wtFysrdMxEntityList)
                         {
-                            serial++;
-                            tryCount++;
-                            continue;
+                            item.Id = YitIdHelper.NextId().ToString();
+                            item.Djbh = newEntity.Id;
                         }
-                        _db.RollbackTran();
-                        throw NCCException.Bah($"保存失败: {ex.Message}");
+                        await _db.Insertable(wtFysrdMxEntityList).ExecuteCommandAsync();
                     }
+                    _db.CommitTran();
+                    return;
+                }
+                catch (Exception ex)
+                {
+                    try { _db.RollbackTran(); } catch { /* ignore */ }
+                    var msg = ex.Message ?? "";
+                    if (msg.Contains("Duplicate", StringComparison.OrdinalIgnoreCase) && attempt < 9)
+                        continue;
+                    throw NCCException.Bah($"保存失败: {msg}");
                 }
-            }
-            catch (Exception)
-            {
-                //回滚事务
-                _db.RollbackTran();
-                throw NCCException.Oh(ErrorCode.COM1000);
             }
         }
 
@@ -285,7 +302,7 @@ namespace NCC.Extend.WtFysrd
         public async Task<dynamic> GetNoPagingList([FromQuery] WtFysrdListQueryInput input)
         {
             _fysrdWorkflow.EnsureFysrdAuditColumns();
-            var sidx = input.sidx == null ? "id" : input.sidx;
+            var sidx = string.IsNullOrWhiteSpace(input.sidx) ? "id" : input.sidx;
             List<string> queryDjrq = input.djrq != null ? input.djrq.Split(',').ToObeject<List<string>>() : null;
             DateTime? startDjrq = queryDjrq != null ? Ext.GetDateTime(queryDjrq.First()) : null;
             DateTime? endDjrq = queryDjrq != null ? Ext.GetDateTime(queryDjrq.Last()) : null;
@@ -312,12 +329,12 @@ namespace NCC.Extend.WtFysrd
                     djrq=it.Djrq,
                     fzjg=it.Fzjg,
                     bm=it.Bm,
-                    jsr=it.Jsr,
-                    jszh=it.Jszh,
+                    jsr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Jsr).Select(u => u.RealName),
+                    jszh = SqlFunc.Subqueryable<WtAccountEntity>().Where(a => a.Id == it.Jszh).Select(a => a.AccountName),
                     je=it.Je,
-                    zdr=it.Zdr,
-                    shr=it.Shr,
-                    gzr=it.Gzr,
+                    zdr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Zdr).Select(u => u.RealName),
+                    shr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Shr).Select(u => u.RealName),
+                    gzr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Gzr).Select(u => u.RealName),
                     bz=it.Bz,
                     zy=it.Zy,
                     djlx=it.Djlx,
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtHyService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtHyService.cs
index c77f73a..508f81c 100755
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtHyService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtHyService.cs
@@ -153,7 +153,8 @@ namespace NCC.Extend.WtHy
         [HttpGet("")]
         public async Task<dynamic> GetList([FromQuery] WtHyListQueryInput input)
         {
-            var sidx = input.sidx == null ? "id" : input.sidx;
+            // 与前端 el-autocomplete 等场景兼容：sidx 传空串时不得参与 OrderBy，否则分页 SQL 异常
+            var sidx = string.IsNullOrWhiteSpace(input.sidx) ? "id" : input.sidx;
             List<string> querySr = input.sr != null ? input.sr.Split(',').ToObeject<List<string>>() : null;
             DateTime? startSr = querySr != null ? Ext.GetDateTime(querySr.First()) : null;
             DateTime? endSr = querySr != null ? Ext.GetDateTime(querySr.Last()) : null;
@@ -253,7 +254,7 @@ namespace NCC.Extend.WtHy
         [NonAction]
         public async Task<dynamic> GetNoPagingList([FromQuery] WtHyListQueryInput input)
         {
-            var sidx = input.sidx == null ? "id" : input.sidx;
+            var sidx = string.IsNullOrWhiteSpace(input.sidx) ? "id" : input.sidx;
             List<string> querySr = input.sr != null ? input.sr.Split(',').ToObeject<List<string>>() : null;
             DateTime? startSr = querySr != null ? Ext.GetDateTime(querySr.First()) : null;
             DateTime? endSr = querySr != null ? Ext.GetDateTime(querySr.Last()) : null;
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtPlService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtPlService.cs
index 8e29f46..ec41d1f 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtPlService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtPlService.cs
@@ -1,4 +1,4 @@
-using NCC.Common.Core.Manager;
+using NCC.Common.Core.Manager;
 using NCC.Common.Enum;
 using NCC.Common.Extension;
 using NCC.Common.Filter;
@@ -22,6 +22,7 @@ using NCC.Common.Model.NPOI;
 using NCC.Common.Configuration;
 using NCC.DataEncryption;
 using NCC.ClayObject;
+using Newtonsoft.Json;
 
 namespace NCC.Extend.WtPl
 {
@@ -37,6 +38,7 @@ namespace NCC.Extend.WtPl
         private readonly IUserManager _userManager;
 
         private static bool _xhColumnChecked;
+        private static bool _mdfzIdsColumnChecked;
 
         /// <summary>
         /// 初始化一个<see cref="WtPlService"/>类型的新实例
@@ -77,6 +79,97 @@ namespace NCC.Extend.WtPl
         }
 
         /// <summary>
+        /// 确保 wt_pl 存在 <c>F_MdfzIds</c>（门店端展示用门店分组 JSON 数组）
+        /// </summary>
+        private void EnsureMdfzIdsColumn()
+        {
+            if (_mdfzIdsColumnChecked) return;
+            lock (typeof(WtPlService))
+            {
+                if (_mdfzIdsColumnChecked) return;
+                try
+                {
+                    if (!_db.DbMaintenance.IsAnyTable("wt_pl")) { _mdfzIdsColumnChecked = true; return; }
+                    var columns = _db.DbMaintenance.GetColumnInfosByTableName("wt_pl");
+                    var columnNames = columns.Select(c => c.DbColumnName.ToLower()).ToHashSet();
+                    if (!columnNames.Contains("f_mdfzids"))
+                    {
+                        _db.Ado.ExecuteCommand(
+                            "ALTER TABLE `wt_pl` ADD COLUMN `F_MdfzIds` text NULL COMMENT '门店端展示门店分组(wt_mdfz.F_Id JSON数组)'");
+                    }
+                }
+                catch (Exception ex) { Console.WriteLine($"EnsureMdfzIdsColumn(wt_pl): {ex.Message}"); }
+                _mdfzIdsColumnChecked = true;
+            }
+        }
+
+        private static List<string> ParseMdfzIdsFromJson(string json)
+        {
+            if (string.IsNullOrWhiteSpace(json)) return new List<string>();
+            try
+            {
+                var list = JsonConvert.DeserializeObject<List<string>>(json);
+                return list?.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()).Distinct(StringComparer.Ordinal).ToList()
+                       ?? new List<string>();
+            }
+            catch
+            {
+                return new List<string>();
+            }
+        }
+
+        private static string MdfzIdsToJsonStorage(List<string> ids, string sfmdfl)
+        {
+            if (sfmdfl != "1" || ids == null || ids.Count == 0) return null;
+            return JsonConvert.SerializeObject(ids.Distinct(StringComparer.Ordinal).ToList());
+        }
+
+        private async Task EnrichWtPlMdfzNamesAsync(IEnumerable<WtPlListOutput> rows)
+        {
+            var rowList = rows == null ? new List<WtPlListOutput>() : rows.ToList();
+            if (rowList.Count == 0) return;
+            var plIds = rowList.Select(x => x.id).Where(x => !string.IsNullOrEmpty(x)).Distinct().ToList();
+            if (plIds.Count == 0) return;
+            var heads = await _db.Queryable<WtPlEntity>().In(p => p.Id, plIds)
+                .Select(p => new { p.Id, p.Sfmdfl, p.MdfzIds })
+                .ToListAsync();
+            var headMap = heads.ToDictionary(x => x.Id, x => x, StringComparer.Ordinal);
+
+            var allFz = new HashSet<string>(StringComparer.Ordinal);
+            foreach (var h in heads)
+            {
+                foreach (var m in ParseMdfzIdsFromJson(h.MdfzIds))
+                    allFz.Add(m);
+            }
+            var fzDict = new Dictionary<string, string>(StringComparer.Ordinal);
+            if (allFz.Count > 0)
+            {
+                var list = await _db.Queryable<WtMdfzEntity>().In(f => f.Id, allFz.ToList()).ToListAsync();
+                foreach (var f in list)
+                {
+                    if (!string.IsNullOrEmpty(f.Id)) fzDict[f.Id] = string.IsNullOrEmpty(f.Fzmc) ? f.Id : f.Fzmc;
+                }
+            }
+
+            foreach (var r in rowList)
+            {
+                if (string.IsNullOrEmpty(r.id) || !headMap.TryGetValue(r.id, out var h)) continue;
+                if (h.Sfmdfl != "1")
+                {
+                    r.mdfzNames = "—";
+                    continue;
+                }
+                var parts = ParseMdfzIdsFromJson(h.MdfzIds);
+                if (parts.Count == 0)
+                {
+                    r.mdfzNames = "全部门店组";
+                    continue;
+                }
+                r.mdfzNames = string.Join("、", parts.Select(i => fzDict.TryGetValue(i, out var nm) ? nm : i));
+            }
+        }
+
+        /// <summary>
         /// 获取商品分类
         /// </summary>
         /// <param name="id">参数</param>
@@ -85,8 +178,11 @@ namespace NCC.Extend.WtPl
         public async Task<dynamic> GetInfo(string id)
         {
             EnsureXhColumn();
+            EnsureMdfzIdsColumn();
             var entity = await _db.Queryable<WtPlEntity>().FirstAsync(p => p.Id == id);
             var output = entity.Adapt<WtPlInfoOutput>();
+            output.mdfzIds = ParseMdfzIdsFromJson(entity.MdfzIds);
+            if (output.mdfzIds == null) output.mdfzIds = new List<string>();
             return output;
         }
 
@@ -99,6 +195,7 @@ namespace NCC.Extend.WtPl
         public async Task<dynamic> GetList([FromQuery] WtPlListQueryInput input)
         {
             EnsureXhColumn();
+            EnsureMdfzIdsColumn();
             // 默认按「序号」升序，空序号的排到最后，同序号按主键 id 倒序
             var defaultOrder = "ISNULL(xh) ASC, xh ASC, id DESC";
             var orderBy = string.IsNullOrEmpty(input.sidx) ? defaultOrder : (input.sidx + " " + input.sort);
@@ -113,7 +210,8 @@ namespace NCC.Extend.WtPl
                     sfmdfl=it.Sfmdfl,
                     xh=it.Xh,
                 }).MergeTable().OrderBy(orderBy).ToPagedListAsync(input.currentPage, input.pageSize);
-                return PageResult<WtPlListOutput>.SqlSugarPageResult(data);
+            await EnrichWtPlMdfzNamesAsync(data.list);
+            return PageResult<WtPlListOutput>.SqlSugarPageResult(data);
         }
 
         /// <summary>
@@ -125,9 +223,11 @@ namespace NCC.Extend.WtPl
         public async Task Create([FromBody] WtPlCrInput input)
         {
             EnsureXhColumn();
+            EnsureMdfzIdsColumn();
             var userInfo = await _userManager.GetUserInfo();
             var entity = input.Adapt<WtPlEntity>();
             entity.Id = YitIdHelper.NextId().ToString();
+            entity.MdfzIds = MdfzIdsToJsonStorage(input.mdfzIds, input.sfmdfl);
             var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
         }
@@ -141,6 +241,7 @@ namespace NCC.Extend.WtPl
         public async Task<dynamic> GetNoPagingList([FromQuery] WtPlListQueryInput input)
         {
             EnsureXhColumn();
+            EnsureMdfzIdsColumn();
             var defaultOrder = "ISNULL(xh) ASC, xh ASC, id DESC";
             var orderBy = string.IsNullOrEmpty(input.sidx) ? defaultOrder : (input.sidx + " " + input.sort);
             var data = await _db.Queryable<WtPlEntity>()
@@ -153,7 +254,8 @@ namespace NCC.Extend.WtPl
                     sfmdfl=it.Sfmdfl,
                     xh=it.Xh,
                 }).MergeTable().OrderBy(orderBy).ToListAsync();
-                return data;
+            await EnrichWtPlMdfzNamesAsync(data);
+            return data;
         }
 
         /// <summary>
@@ -175,7 +277,7 @@ namespace NCC.Extend.WtPl
             {
                 exportData = await this.GetNoPagingList(input);
             }
-            List<ParamsModel> paramList = "[{\"value\":\"序号\",\"field\":\"xh\"},{\"value\":\"分类编号\",\"field\":\"id\"},{\"value\":\"品类名称\",\"field\":\"plmc\"},]".ToList<ParamsModel>();           
+            List<ParamsModel> paramList = "[{\"value\":\"序号\",\"field\":\"xh\"},{\"value\":\"分类编号\",\"field\":\"id\"},{\"value\":\"品类名称\",\"field\":\"plmc\"},{\"value\":\"是否门店分类\",\"field\":\"sfmdfl\"},{\"value\":\"展示门店组\",\"field\":\"mdfzNames\"},]".ToList<ParamsModel>();           
             ExcelConfig excelconfig = new ExcelConfig();
             excelconfig.FileName = "商品分类.xls";
             excelconfig.HeadFont = "微软雅黑";
@@ -241,14 +343,18 @@ namespace NCC.Extend.WtPl
         public async Task Update(string id, [FromBody] WtPlUpInput input)
         {
             EnsureXhColumn();
-            var entity = input.Adapt<WtPlEntity>();
-            var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
-            // xh 允许清空为 null：单独显式写入（避开 IgnoreColumns:ignoreAllNullColumns 忽略 null 的行为）
-            await _db.Updateable<WtPlEntity>()
-                .SetColumns(it => it.Xh == input.xh)
+            EnsureMdfzIdsColumn();
+            var isOk = await _db.Updateable<WtPlEntity>()
+                .SetColumns(it => new WtPlEntity
+                {
+                    Plmc = input.plmc,
+                    Sfmdfl = input.sfmdfl,
+                    Xh = input.xh,
+                    MdfzIds = MdfzIdsToJsonStorage(input.mdfzIds, input.sfmdfl)
+                })
                 .Where(it => it.Id == id)
                 .ExecuteCommandAsync();
+            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
         }
 
         /// <summary>
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs
index 70e93da..1e080a7 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs
@@ -1205,7 +1205,7 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单')
         }
 
         /// <summary>
-        /// 从备注中解析原销售出库单号（如：原订单号：CHD202603300001）
+        /// 从备注中解析原销售出库单号（如：原订单号：CKD202603300001；历史单号可能为 CHD 前缀）
         /// </summary>
         private static string TryParseYcddhFromRemark(string bz)
         {
@@ -1961,6 +1961,8 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单')
             output.skmx = entity.Skmx;
             output.fkmx = entity.Fkmx;
             output.sy_pch = entity.SyPch;
+            output.yddh = entity.Yddh;
+            output.dyddh = entity.Dyddh;
             EnrichInfoOutputYcddhFromRemarkIfNeeded(output, entity);
             output.cjckId = entity.Cjck;
             
@@ -2235,6 +2237,7 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单')
                     (xsckd.Hysjh != null && xsckd.Hysjh.Contains(input.hysjh)) || 
                     (hy.Sjh != null && hy.Sjh.Contains(input.hysjh)))
                 .WhereIF(!string.IsNullOrEmpty(input.dyddh), (xsckd, hy) => xsckd.Dyddh != null && xsckd.Dyddh.Contains(input.dyddh))
+                .WhereIF(!string.IsNullOrEmpty(input.yddh), (xsckd, hy) => xsckd.Yddh != null && xsckd.Yddh.Contains(input.yddh.Trim()))
                 .WhereIF(!string.IsNullOrEmpty(input.djlx), (xsckd, hy) => xsckd.Djlx.Contains(input.djlx))
                 .WhereIF(!string.IsNullOrEmpty(input.ly), (xsckd, hy) => xsckd.Ly.Equals(input.ly))
                 .WhereIF(!string.IsNullOrEmpty(input.djzt), (xsckd, hy) => xsckd.Djzt.Contains(input.djzt))
@@ -2688,6 +2691,16 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单')
                 if (!string.IsNullOrWhiteSpace(row.zdr))
                     row.jsr = row.zdr;
             }
+
+            // 销售/零售出库：经手人列仍为空时回退显示制单人（收银台/抖音等常将业绩挂在制单账号，避免反审后列表经手人空白）
+            foreach (var row in items)
+            {
+                var lx = row.djlx?.Trim() ?? "";
+                if (lx != "销售出库单" && lx != "零售单") continue;
+                if (!string.IsNullOrWhiteSpace(row.jsr)) continue;
+                if (!string.IsNullOrWhiteSpace(row.zdr))
+                    row.jsr = row.zdr;
+            }
         }
 
         /// <summary>
@@ -2705,6 +2718,12 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单')
                 else if (await _db.Queryable<WtHyEntity>().Where(h => h.Id == j).AnyAsync())
                     jsrLookup = entity.Zdr;
             }
+            else if ((string.Equals(entity.Djlx, "销售出库单", StringComparison.Ordinal) || string.Equals(entity.Djlx, "零售单", StringComparison.Ordinal))
+                     && string.IsNullOrWhiteSpace(jsrLookup) && !string.IsNullOrWhiteSpace(entity.Zdr))
+            {
+                // 与列表经手人列回退一致：未单独存经手人时用制单人展示，便于对账/提成核对
+                jsrLookup = entity.Zdr;
+            }
 
             var ids = new[] { jsrLookup, entity.Zdr, entity.Shr, entity.Shr1, entity.Shr2, entity.Gzr, entity.Fhr }
                 .Where(s => !string.IsNullOrWhiteSpace(s))
@@ -2956,20 +2975,21 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单')
             entity.SyPch = NormalizeSyPch(input.sy_pch);
             Console.WriteLine($"[Create] 会员手机号码: input.hysjh={input.hysjh}, entity.Hysjh={entity.Hysjh}");
             
-            // 生成每日递增单号，前缀根据djlx判断
+            // 生成每日递增单号，前缀根据djlx判断（销售出库 CKD、销售退货 THD；零售单与销售出库单同前缀）
             var today = DateTime.Now.ToString("yyyyMMdd");
-            string prefix = "CHD";
+            string prefix = "CKD";
             if (!string.IsNullOrEmpty(input.djlx)) {
                 if (input.djlx.Contains("采购入库单")) prefix = "RK";
                 else if (input.djlx.Contains("预售出库单")) prefix = "YC";
                 else if (input.djlx.Contains("预售退货单")) prefix = "YT";
+                else if (input.djlx.Contains("销售退货单")) prefix = "THD";
                 else if (input.djlx.Contains("采购退货单")) prefix = "CT";
-                else if (input.djlx.Contains("销售出库单")) prefix = "CHD";
+                else if (input.djlx.Contains("销售出库单") || input.djlx.Contains("零售单")) prefix = "CKD";
                 else if (input.djlx.Contains("委托代销发货单")) prefix = "WF";
                 else if (input.djlx.Contains("委托代销退货单")) prefix = "WT";
                 else if (input.djlx.Contains("委托代销结算单")) prefix = "WJ";
                 else if (input.djlx.Contains("现金费用单")) prefix = "XF";
-                else if (input.djlx.Contains("其他收入单")) prefix = "QT";
+                else if (input.djlx.Contains("其他收入单")) prefix = "QTSRD";
                 else if (input.djlx.Contains("盘点单")) prefix = "PDD";
                 else if (input.djlx.Contains("报损单")) prefix = "BSD";
                 else if (input.djlx.Contains("赠送单")) prefix = "ZSD";
@@ -2979,14 +2999,9 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单')
                 else if (input.djlx.Contains("报溢单")) prefix = "BYD";
                 // 可扩展其它类型
             }
-            // 查询今日最大单号 - ✅ 获取所有今天的单号，然后在内存中按序列号排序
+            // 查询本类型当日最大流水号：仅同一 prefix + 日期 内递增（不与出库/调拨/入库等其它类型混用序号）
             var allTodayOrders = await _db.Queryable<WtXsckdEntity>()
-                .Where(x => (x.Id.StartsWith("CHD") || x.Id.StartsWith("YC") || x.Id.StartsWith("CT") || 
-                           x.Id.StartsWith("RK") || x.Id.StartsWith("WF") || x.Id.StartsWith("WT") ||
-                           x.Id.StartsWith("WJ") || x.Id.StartsWith("XF") || x.Id.StartsWith("QT") ||
-                           x.Id.StartsWith("PDD") || x.Id.StartsWith("BSD") || x.Id.StartsWith("ZSD") || x.Id.StartsWith("TJD") ||
-                           x.Id.StartsWith("BJD") || x.Id.StartsWith("HZD") || x.Id.StartsWith("BYD")) &&
-                       x.Id.Contains(today))  // 包含今天的日期
+                .Where(x => x.Id.StartsWith(prefix + today))
                 .Select(x => x.Id)
                 .ToListAsync();
             
@@ -3476,6 +3491,7 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单')
                     (xsckd.Hysjh != null && xsckd.Hysjh.Contains(input.hysjh)) ||
                     (hy.Sjh != null && hy.Sjh.Contains(input.hysjh)))
                 .WhereIF(!string.IsNullOrEmpty(input.dyddh), (xsckd, hy) => xsckd.Dyddh != null && xsckd.Dyddh.Contains(input.dyddh))
+                .WhereIF(!string.IsNullOrEmpty(input.yddh), (xsckd, hy) => xsckd.Yddh != null && xsckd.Yddh.Contains(input.yddh.Trim()))
                 .WhereIF(!string.IsNullOrEmpty(input.djlx), (xsckd, hy) => xsckd.Djlx.Contains(input.djlx))
                 .WhereIF(!string.IsNullOrEmpty(input.ly), (xsckd, hy) => xsckd.Ly.Equals(input.ly))
                 .WhereIF(!string.IsNullOrEmpty(input.djzt), (xsckd, hy) => xsckd.Djzt.Contains(input.djzt))
@@ -3541,19 +3557,20 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单')
         public async Task<dynamic> GenerateBillNo([FromQuery] string djlx)
         {
             var today = DateTime.Now.ToString("yyyyMMdd");
-            string prefix = "CHD";
+            string prefix = "CKD";
             if (!string.IsNullOrEmpty(djlx))
             {
                 if (djlx.Contains("采购入库单")) prefix = "RK";
                 else if (djlx.Contains("预售出库单")) prefix = "YC";
                 else if (djlx.Contains("预售退货单")) prefix = "YT";
+                else if (djlx.Contains("销售退货单")) prefix = "THD";
                 else if (djlx.Contains("采购退货单")) prefix = "CT";
-                else if (djlx.Contains("销售出库单")) prefix = "CHD";
+                else if (djlx.Contains("销售出库单") || djlx.Contains("零售单")) prefix = "CKD";
                 else if (djlx.Contains("委托代销发货单")) prefix = "WF";
                 else if (djlx.Contains("委托代销退货单")) prefix = "WT";
                 else if (djlx.Contains("委托代销结算单")) prefix = "WJ";
                 else if (djlx.Contains("现金费用单")) prefix = "XF";
-                else if (djlx.Contains("其他收入单")) prefix = "QT";
+                else if (djlx.Contains("其他收入单")) prefix = "QTSRD";
                 else if (djlx.Contains("盘点单")) prefix = "PDD";
                 else if (djlx.Contains("报损单")) prefix = "BSD";
                 else if (djlx.Contains("赠送单")) prefix = "ZSD";
@@ -3564,7 +3581,7 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单')
             }
 
             var allTodayOrders = await _db.Queryable<WtXsckdEntity>()
-                .Where(x => x.Id.StartsWith(prefix) && x.Id.Contains(today))
+                .Where(x => x.Id.StartsWith(prefix + today))
                 .Select(x => x.Id)
                 .ToListAsync();
 
@@ -5985,58 +6002,70 @@ LIMIT {offset}, {pageSize}";
 
             var code = productCode.Trim();
 
-            // 标准化 productCode：允许前端传 F_Id / F_Spbm / F_Dyspid 任一种，统一到序列号表使用的 F_Id
-            // 序列号表 spbh 字段存的是 wt_sp.F_Id（商品主键）
-            var productCodeEncode = "";
-            var normalizedSpbh = code;
-            var spRow = await _db.Queryable<WtSpEntity>()
+            // 标准化 productCode：允许前端传 F_Id / F_Spbm / F_Dyspid 任一种，统一到商品主表 F_Id；序列号表 spbh 须对应该 Id
+            var spList = await _db.Queryable<WtSpEntity>()
                 .Where(p => p.Id == code || p.Spbm == code || p.Dyspid == code)
-                .Select(p => new { p.Id, p.Spbm })
-                .FirstAsync();
-            if (spRow != null)
+                .ToListAsync();
+            if (spList == null || spList.Count == 0)
+                return new { serialNumbers = new List<object>() };
+
+            WtSpEntity sp;
+            if (spList.Count == 1)
             {
-                if (!string.IsNullOrEmpty(spRow.Id)) normalizedSpbh = spRow.Id;
-                if (!string.IsNullOrEmpty(spRow.Spbm)) productCodeEncode = spRow.Spbm;
+                sp = spList[0];
             }
+            else
+            {
+                // 多匹配时：优先 Id 精确、再 F_Spbm 精确，避免 F_Id/编码混用时误用另一条商品
+                sp = spList.FirstOrDefault(p => p.Id == code)
+                     ?? spList.FirstOrDefault(p => string.Equals(p.Spbm, code, StringComparison.Ordinal))
+                     ?? spList[0];
+            }
+            if (sp == null || string.IsNullOrEmpty(sp.Id))
+                return new { serialNumbers = new List<object>() };
+
+            var normalizedSpId = sp.Id.Trim();
+            var productCodeEncode = (sp.Spbm ?? string.Empty).Trim();
 
-            // 使用标准化后的 F_Id 查询序列号表；避免 StringComparison 重载在 SqlSugar 下翻译不稳定
-            var baseQuery = _db.Queryable<WtSerialNumberEntity>()
-                .Where(s => s.Spbh == normalizedSpbh);
+            // 与 wt_sp 内连接，仅返回 spbh=商品主键且能在商品表对上的在库行，避免脏数据/错误 spbh 混入其它货号
+            var joinQ = _db.Queryable<WtSerialNumberEntity, WtSpEntity>(
+                    (s, p) => new JoinQueryInfos(JoinType.Inner, s.Spbh == p.Id))
+                .Where((s, p) => p.Id == normalizedSpId);
 
             // 根据单据类型决定查询状态
-            // 退货单：查询已售出的序列号（Status = 1），因为要退货
-            // 出库单、发货单、结算单：查询在库的序列号（Status = 0），因为要出库
             if (documentType == "销售退货单" || documentType == "预售退货单" || documentType == "委托代销退货单")
-            {
-                baseQuery = baseQuery.Where(s => s.Status == 1); // 已售出
-            }
+                joinQ = joinQ.Where((s, p) => s.Status == 1);
             else if (documentType == "采购退货单")
-            {
-                baseQuery = baseQuery.Where(s => s.Status == 0 || s.Status == 3);
-            }
+                joinQ = joinQ.Where((s, p) => s.Status == 0 || s.Status == 3);
             else
-            {
-                baseQuery = baseQuery.Where(s => s.Status == 0 || s.Status == 3);
-            }
+                joinQ = joinQ.Where((s, p) => s.Status == 0 || s.Status == 3);
 
-            // 构建带仓库过滤的查询
-            var queryWithWarehouse = baseQuery;
-            if (!string.IsNullOrEmpty(warehouse))
-            {
-                var warehouseTrim = warehouse.Trim();
-                queryWithWarehouse = queryWithWarehouse.Where(s => s.InWarehouse == warehouseTrim);
-            }
             if (!string.IsNullOrEmpty(serialNumber))
             {
-                queryWithWarehouse = queryWithWarehouse.Where(s => s.SerialNumber.Contains(serialNumber));
+                var snTrim = serialNumber.Trim();
+                joinQ = joinQ.Where((s, p) => s.SerialNumber.Contains(snTrim));
             }
 
-            // 先按商品+仓库过滤，如果没有结果，再退回到只按商品查询，避免因为仓库编码不一致导致查不到数据
-            var list1 = await queryWithWarehouse
-                .Select(s => new {
+            var hasWarehouse = !string.IsNullOrEmpty(warehouse);
+            var warehouseTrim = hasWarehouse ? warehouse.Trim() : null;
+
+            // 销售/预售/委托等「指定出库仓库」的出库单：不要跨仓回退，避免可选条数＞本仓账面库存、与其它仓串行
+            var isOutboundWithWarehouse = hasWarehouse
+                && (string.Equals(documentType, "销售出库单", StringComparison.Ordinal)
+                    || string.Equals(documentType, "预售出库单", StringComparison.Ordinal)
+                    || (documentType != null && documentType.Contains("委托", StringComparison.Ordinal) && (documentType.Contains("发货", StringComparison.Ordinal) || documentType.Contains("结算", StringComparison.Ordinal))));
+
+            // 先按本仓库
+            var qWh = hasWarehouse
+                ? joinQ.Where((s, p) => s.InWarehouse == warehouseTrim)
+                : joinQ;
+
+            var list1 = await qWh
+                .Select((s, p) => new
+                {
                     serialNumber = s.SerialNumber,
                     productCode = s.Spbh,
-                    productName = s.Spmc,
+                    productName = p.Spmc,
                     warehouse = s.InWarehouse,
                     status = s.Status,
                     inTime = s.InTime,
@@ -6044,31 +6073,32 @@ LIMIT {offset}, {pageSize}";
                 })
                 .ToListAsync();
 
-            var serialNumbers = list1.Select(s => new {
-                s.serialNumber,
-                s.productCode,
-                productCodeEncode,
-                s.productName,
-                s.warehouse,
-                s.status,
-                s.inTime,
-                s.outTime
-            }).ToList();
+            var serialNumbers = list1
+                .Where(x => x.productCode == normalizedSpId) // 内存再收一道，防 ORM/类型歧义
+                .Select(s => new
+                {
+                    s.serialNumber,
+                    s.productCode,
+                    productCodeEncode,
+                    productName = s.productName,
+                    s.warehouse,
+                    s.status,
+                    s.inTime,
+                    s.outTime
+                })
+                .ToList();
 
-            // 如果按仓库过滤没有查到，但指定了仓库参数，则回退为忽略仓库，只按商品和状态查询
-            if (!serialNumbers.Any() && !string.IsNullOrEmpty(warehouse))
+            if (!serialNumbers.Any() && hasWarehouse && !isOutboundWithWarehouse)
             {
-                var fallbackQuery = baseQuery;
-                if (!string.IsNullOrEmpty(serialNumber))
-                {
-                    fallbackQuery = fallbackQuery.Where(s => s.SerialNumber.Contains(serialNumber));
-                }
+                // joinQ 已含状态与序列号模糊条件，此处仅去掉仓库限制做跨仓补偿（出库单见 isOutboundWithWarehouse 禁止补偿）
+                var fallbackQ = joinQ;
 
-                var list2 = await fallbackQuery
-                    .Select(s => new {
+                var list2 = await fallbackQ
+                    .Select((s, p) => new
+                    {
                         serialNumber = s.SerialNumber,
                         productCode = s.Spbh,
-                        productName = s.Spmc,
+                        productName = p.Spmc,
                         warehouse = s.InWarehouse,
                         status = s.Status,
                         inTime = s.InTime,
@@ -6076,16 +6106,20 @@ LIMIT {offset}, {pageSize}";
                     })
                     .ToListAsync();
 
-                serialNumbers = list2.Select(s => new {
-                    s.serialNumber,
-                    s.productCode,
-                    productCodeEncode,
-                    s.productName,
-                    s.warehouse,
-                    s.status,
-                    s.inTime,
-                    s.outTime
-                }).ToList();
+                serialNumbers = list2
+                    .Where(x => x.productCode == normalizedSpId)
+                    .Select(s => new
+                    {
+                        s.serialNumber,
+                        s.productCode,
+                        productCodeEncode,
+                        productName = s.productName,
+                        s.warehouse,
+                        s.status,
+                        s.inTime,
+                        s.outTime
+                    })
+                    .ToList();
             }
 
             return new { serialNumbers = serialNumbers };
@@ -7035,6 +7069,15 @@ LIMIT {offset}, {pageSize}";
                 if (!isAuthorized)
                     return new { success = false, message = "您没有反审权限，只有一级或二级审核人可以反审" };
 
+                if (string.Equals(entity.Djlx, "销售出库单", StringComparison.Ordinal)
+                    || string.Equals(entity.Djlx, "零售单", StringComparison.Ordinal)
+                    || string.Equals(entity.Djlx, "预售出库单", StringComparison.Ordinal))
+                {
+                    var thCsv = await GetLinkedReturnBillIdsCsvAsync(id, entity.Djlx);
+                    if (!string.IsNullOrEmpty(thCsv))
+                        return new { success = false, message = $"该单据已存在关联退货单（{thCsv}），无法反审" };
+                }
+
                 _db.BeginTran();
                 try
                 {
@@ -7077,6 +7120,53 @@ LIMIT {offset}, {pageSize}";
                         if (zsdMx.Count > 0)
                             await RollbackSpCostOnDelete(entity);
                     }
+                    else if ((string.Equals(entity.Djzt, "已审核", StringComparison.Ordinal)
+                              || string.Equals(entity.Djzt, "一级已审", StringComparison.Ordinal)
+                              || string.Equals(entity.Djzt, "一级已审/待二级", StringComparison.Ordinal))
+                             && !IsGiftAuditDocument(entity.Djlx)
+                             && !string.Equals(entity.Djlx, "采购入库单", StringComparison.Ordinal)
+                             && !string.Equals(entity.Djlx, "同价调拨单", StringComparison.Ordinal))
+                    {
+                        // 与审核不通过 RejectDocument 中 wasNotDraft 块对称：已生效单据反审需先冲回库存/成本/会员/序列号
+                        var lx0 = entity.Djlx ?? "";
+                        if (lx0 == "销售出库单" || lx0 == "零售单" || lx0 == "预售出库单" || lx0 == "委托代销发货单"
+                            || lx0.Contains("报损单"))
+                        {
+                            if (IsStockOutboundDocumentForSerialRevert(lx0))
+                                await RevertSerialNumbersForDeletedOutboundAsync(entity.Id);
+                            await DeleteWtXlhTrackingForDocumentAsync(entity.Id);
+                            await RollbackSpCostOnDelete(entity);
+                            if (lx0 == "销售出库单" || lx0 == "零售单" || lx0 == "预售出库单")
+                                await TryReverseSalesOutboundMemberAndCommissionAsync(entity, "反审");
+                        }
+                        else if (lx0 == "销售退货单" || lx0 == "预售退货单" || (lx0.Contains("委托代销退货单")))
+                        {
+                            await RevertSerialNumbersForDeletedReturnAsync(entity);
+                            await DeleteWtXlhTrackingForDocumentAsync(entity.Id);
+                            await RollbackSpCostOnDelete(entity);
+                            if (lx0 == "销售退货单" || lx0 == "预售退货单")
+                                await TryReverseReturnMemberRefundAsync(entity, "反审");
+                        }
+                        else if (lx0.Contains("报溢单"))
+                        {
+                            await DeleteWtXlhTrackingForDocumentAsync(entity.Id);
+                            await RollbackSpCostOnDelete(entity);
+                        }
+                        else if (lx0 == "采购退货单")
+                        {
+                            await RollbackSpCostOnDelete(entity);
+                        }
+                        else if (string.Equals(lx0, "变价调拨单", StringComparison.Ordinal))
+                        {
+                            var mxRev = await _db.Queryable<WtXsckdMxEntity>().Where(d => d.Djbh == id).ToListAsync();
+                            if (mxRev.Count > 0)
+                            {
+                                EnsureBjsxColumn();
+                                EnsureBjhcbColumn();
+                                await RollbackVariablePriceTransferCost(entity, mxRev);
+                            }
+                        }
+                    }
 
                     var backToDraft = string.Equals(entity.Djlx, "同价调拨单", StringComparison.Ordinal)
                         || string.Equals(entity.Djlx, "采购入库单", StringComparison.Ordinal)
@@ -7110,6 +7200,44 @@ LIMIT {offset}, {pageSize}";
         }
 
         /// <summary>
+        /// 撤回审核：赠送单/获赠单在「待审核」或一级/二级审核中 → 草稿（未过账，可再次编辑后提交）
+        /// </summary>
+        [HttpPost("WithdrawAudit/{id}")]
+        public async Task<dynamic> WithdrawAudit(string id)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(id))
+                    return new { success = false, message = "单据编号无效" };
+
+                var entity = await _db.Queryable<WtXsckdEntity>().Where(x => x.Id == id).FirstAsync();
+                if (entity == null)
+                    return new { success = false, message = "单据不存在" };
+
+                if (!IsGiftAuditDocument(entity.Djlx))
+                    return new { success = false, message = "仅赠送单/获赠单支持撤回为草稿" };
+
+                var z = entity.Djzt?.Trim() ?? "";
+                if (z != "待审核" && z != "一级已审" && z != "待二级" && z != "一级已审/待二级")
+                    return new { success = false, message = $"当前状态「{entity.Djzt ?? "空"}」不可撤回，仅待审核或待二级审核中的单据可撤回" };
+
+                entity.Djzt = "草稿";
+                entity.Shr = null;
+                entity.Shr1 = null;
+                entity.Shr2 = null;
+                await _db.Updateable(entity)
+                    .UpdateColumns(x => new { x.Djzt, x.Shr, x.Shr1, x.Shr2 })
+                    .ExecuteCommandAsync();
+
+                return new { success = true, message = "已撤回为草稿，可继续编辑" };
+            }
+            catch (Exception ex)
+            {
+                return new { success = false, message = $"撤回失败: {ex.Message}" };
+            }
+        }
+
+        /// <summary>
         /// 获取状态文本
         /// </summary>
         /// <param name="status">状态码</param>
@@ -7490,14 +7618,9 @@ LIMIT {offset}, {pageSize}";
                 
                 // 5. 生成新的销售出库单编号
                 var today = DateTime.Now.ToString("yyyyMMdd");
-                string prefix = "CHD";
+                string prefix = "CKD";
                 var allTodayOrders = await _db.Queryable<WtXsckdEntity>()
-                    .Where(x => (x.Id.StartsWith("CHD") || x.Id.StartsWith("YC") || x.Id.StartsWith("CT") || 
-                               x.Id.StartsWith("RK") || x.Id.StartsWith("WF") || x.Id.StartsWith("WT") ||
-                               x.Id.StartsWith("WJ") || x.Id.StartsWith("XF") || x.Id.StartsWith("QT") ||
-                               x.Id.StartsWith("PDD") || x.Id.StartsWith("BSD") || x.Id.StartsWith("TJD") ||
-                               x.Id.StartsWith("BJD") || x.Id.StartsWith("HZD") || x.Id.StartsWith("BYD")) &&
-                           x.Id.Contains(today))
+                    .Where(x => x.Id.StartsWith(prefix + today))
                     .Select(x => x.Id)
                     .ToListAsync();
                 
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtYskzjjsService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtYskzjjsService.cs
index 0ca48ee..7f6a7b7 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtYskzjjsService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtYskzjjsService.cs
@@ -242,41 +242,42 @@ namespace NCC.Extend.WtYskzjjs
             }
             ThrowIfInvalidForSubmit(input, input?.djzt);
             var entity = input.Adapt<WtYskzjjsEntity>();
-            entity.Id = await BuildCreateBillId(input);
-            try
+            for (var attempt = 0; attempt < 10; attempt++)
             {
-                //开启事务
-                _db.BeginTran();
-                
-                //新增应收款增加减少记录
-                var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
-
-                var wtYskzjjsMxEntityList = input.wtYskzjjsMxList.Adapt<List<WtYskzjjsMxEntity>>();
-                if(wtYskzjjsMxEntityList != null)
+                try
                 {
-                    foreach (var item in wtYskzjjsMxEntityList)
+                    _db.BeginTran();
+                    entity.Id = await BuildCreateBillId(input);
+                    var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
+
+                    var wtYskzjjsMxEntityList = input.wtYskzjjsMxList.Adapt<List<WtYskzjjsMxEntity>>();
+                    if (wtYskzjjsMxEntityList != null)
                     {
-                        item.Id = YitIdHelper.NextId().ToString();
-                        item.Djbh = newEntity.Id;
+                        foreach (var item in wtYskzjjsMxEntityList)
+                        {
+                            item.Id = YitIdHelper.NextId().ToString();
+                            item.Djbh = newEntity.Id;
+                        }
+                        await _db.Insertable(wtYskzjjsMxEntityList).ExecuteCommandAsync();
                     }
-                    await _db.Insertable(wtYskzjjsMxEntityList).ExecuteCommandAsync();
-                }
-
-                await _wtDjzyService.UpsertFromYskzjjsAsync(newEntity.Id);
 
-                //关闭事务
-                _db.CommitTran();
-            }
-            catch (Exception)
-            {
-                //回滚事务
-                _db.RollbackTran();
-                throw NCCException.Oh(ErrorCode.COM1000);
+                    await _wtDjzyService.UpsertFromYskzjjsAsync(newEntity.Id);
+                    _db.CommitTran();
+                    return;
+                }
+                catch (Exception ex)
+                {
+                    try { _db.RollbackTran(); } catch { /* ignore */ }
+                    var msg = ex.Message ?? "";
+                    if (msg.Contains("Duplicate", StringComparison.OrdinalIgnoreCase) && attempt < 9)
+                        continue;
+                    throw NCCException.Oh(ErrorCode.COM1000);
+                }
             }
         }
 
         /// <summary>
-        /// 构建新增单据编号：转款单使用 ZK+日期+流水，其它单据保持原雪花 ID 规则不变。
+        /// 构建新增单据编号：转款单 ZK+日期+流水，现金费用单 XJFYD+日期+流水，其他应收单 QTSRD+日期+流水（与 WtFysrd 其他收入单共用同日序列），其余沿用雪花 ID。
         /// </summary>
         /// <param name="input">新增入参</param>
         private async Task<string> BuildCreateBillId(WtYskzjjsCrInput input)
@@ -304,6 +305,37 @@ namespace NCC.Extend.WtYskzjjs
                 return $"{cashPrefix}{cashToday}{cashSerial:D4}";
             }
 
+            // 其他应收单：与「其他收入单」表（WtFysrd）统一使用 QTSRD+yyyyMMdd+4 位流水。qt 页归并到此处后 djlx 为「其他应收单」，与独立「其他收入单」主表同前缀同序列。
+            if (input != null
+                && !string.IsNullOrWhiteSpace(input.djlx)
+                && input.djlx.Trim().Equals("其他应收单", StringComparison.Ordinal))
+            {
+                const string qtsrd = "QTSRD";
+                var ymd = DateTime.Now.ToString("yyyyMMdd");
+                var head = qtsrd + ymd;
+                var a = await _db.Queryable<WtFysrdEntity>()
+                    .Where(x => x.Id != null && x.Id.StartsWith(head))
+                    .Select(x => x.Id)
+                    .ToListAsync();
+                var b = await _db.Queryable<WtYskzjjsEntity>()
+                    .Where(x => x.Id != null && x.Id.StartsWith(head))
+                    .Select(x => x.Id)
+                    .ToListAsync();
+                var idRows = a.Concat(b);
+                var maxSerial = 0;
+                foreach (var bid in idRows)
+                {
+                    if (string.IsNullOrEmpty(bid) || bid.Length < head.Length + 4) continue;
+                    if (!bid.StartsWith(head, StringComparison.Ordinal)) continue;
+                    var tail = bid.Substring(bid.Length - 4);
+                    if (int.TryParse(tail, out var n) && n > maxSerial) maxSerial = n;
+                }
+                var next = maxSerial + 1;
+                if (next > 9999)
+                    throw NCCException.Bah("当日 QTSRD 单号流水已超过 9999，请联系管理员");
+                return $"{head}{next:D4}";
+            }
+
             if (!IsTransferBill(input))
             {
                 return YitIdHelper.NextId().ToString();
@@ -1069,6 +1101,25 @@ namespace NCC.Extend.WtYskzjjs
                 return;
             }
 
+            if (lx.Contains("现金费用单", StringComparison.Ordinal))
+            {
+                if (input.djrq == null) throw NCCException.Oh("请选择单据日期");
+                if (string.IsNullOrWhiteSpace(input.jsr)) throw NCCException.Oh("请选择经手人");
+                if (string.IsNullOrWhiteSpace(input.fkzh)) throw NCCException.Oh("请选择付款账户");
+                if (input.wtYskzjjsMxList == null || input.wtYskzjjsMxList.Count == 0)
+                    throw NCCException.Oh("请至少添加一条明细");
+                for (var i = 0; i < input.wtYskzjjsMxList.Count; i++)
+                {
+                    var row = input.wtYskzjjsMxList[i];
+                    if (row == null) throw NCCException.Oh($"第 {i + 1} 行明细不能为空");
+                    if (string.IsNullOrWhiteSpace(row.fyxmmc)) throw NCCException.Oh($"第 {i + 1} 行费用项目为必填");
+                    if (row.je <= 0) throw NCCException.Oh($"第 {i + 1} 行原币金额须大于 0");
+                }
+                var sumCash = SumMxJe(input);
+                if (sumCash <= 0) throw NCCException.Oh("明细原币金额合计须大于 0");
+                return;
+            }
+
             if (input.djrq == null) throw NCCException.Oh("请选择单据日期");
             if (string.IsNullOrWhiteSpace(input.jsr)) throw NCCException.Oh("请选择经手人");
             if (string.IsNullOrWhiteSpace(input.wldw)) throw NCCException.Oh("请选择往来单位");
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/VisualDev/NCC.VisualDev/DashboardService.cs b/Antis.Erp.Plat/netcore/src/Modularity/VisualDev/NCC.VisualDev/DashboardService.cs
index da2f45b..c32307e 100755
--- a/Antis.Erp.Plat/netcore/src/Modularity/VisualDev/NCC.VisualDev/DashboardService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/VisualDev/NCC.VisualDev/DashboardService.cs
@@ -107,12 +107,48 @@ namespace NCC.VisualDev
         /// </summary>
         /// <param name="currentPage">页码，从 1 开始</param>
         /// <param name="pageSize">每页条数，默认 20，最大 100</param>
+        /// <param name="djmc">
+        /// 与「审核人员设置」wt_shrysz.djmc 一致；不传或 all=全部；_other_ 为待办 billType 未出现在 wt_shrysz 中的单据
+        /// </param>
+        /// <param name="includeStats">
+        /// 为 true 时一并返回左侧分类条数（与一次 GetExtendBillTodoListAsync 共用，避免与 MyFlowTodoStats 重复查库）
+        /// </param>
         [HttpGet("MyFlowTodo")]
-        public async Task<dynamic> GetMyFlowTodo([FromQuery] int currentPage = 1, [FromQuery] int pageSize = 20)
+        public async Task<dynamic> GetMyFlowTodo(
+            [FromQuery] int currentPage = 1,
+            [FromQuery] int pageSize = 20,
+            [FromQuery] string djmc = null,
+            [FromQuery] bool includeStats = false)
         {
             var userId = _userManager.UserId;
             var userAccount = await ResolveUserAccountForTodoAsync(userId);
-            var all = await GetExtendBillTodoListAsync(userId, userAccount);
+            var allFullTask = GetExtendBillTodoListAsync(userId, userAccount);
+            var djmcsTask = GetOrderedShryszDistinctDjmcsAsync();
+            await Task.WhenAll(allFullTask, djmcsTask);
+            var allFull = await allFullTask;
+            var djmcsFromShrysz = await djmcsTask;
+
+            object statsBlock = null;
+            if (includeStats)
+            {
+                var (navTotal, navItems) = BuildMyFlowTodoNavModel(allFull, djmcsFromShrysz);
+                statsBlock = new { total = navTotal, items = navItems };
+            }
+
+            var all = allFull;
+            if (!string.IsNullOrWhiteSpace(djmc) && !string.Equals(djmc.Trim(), "all", StringComparison.OrdinalIgnoreCase))
+            {
+                var p = djmc.Trim();
+                if (string.Equals(p, "_other_", StringComparison.OrdinalIgnoreCase) && djmcsFromShrysz.Count > 0)
+                {
+                    all = all
+                        .Where(x => !djmcsFromShrysz.Any(
+                            c => BillTypeMatchesShryszDjmc(x.billType, c)))
+                        .ToList();
+                }
+                else
+                    all = all.Where(x => BillTypeMatchesShryszDjmc(x.billType, p)).ToList();
+            }
 
             if (currentPage < 1) currentPage = 1;
             if (pageSize < 1) pageSize = 20;
@@ -130,11 +166,160 @@ namespace NCC.VisualDev
                     total,
                     currentPage,
                     pageSize
-                }
+                },
+                stats = statsBlock
             };
         }
 
         /// <summary>
+        /// 待办中心左侧条数（独立接口保留兼容；与 <see cref="GetMyFlowTodo"/> includeStats 复用同一段逻辑，仍会查库一次）
+        /// </summary>
+        [HttpGet("MyFlowTodoStats")]
+        public async Task<dynamic> GetMyFlowTodoStats()
+        {
+            var userId = _userManager.UserId;
+            var userAccount = await ResolveUserAccountForTodoAsync(userId);
+            var allTask = GetExtendBillTodoListAsync(userId, userAccount);
+            var djmcsTask = GetOrderedShryszDistinctDjmcsAsync();
+            await Task.WhenAll(allTask, djmcsTask);
+            var all = await allTask;
+            var djmcsFromShrysz = await djmcsTask;
+            var (total, items) = BuildMyFlowTodoNavModel(all, djmcsFromShrysz);
+            return new { total, items };
+        }
+
+        /// <summary>左侧「单据类型」+ 条数（基于全量待办，不含 djmc 筛选）</summary>
+        private (int total, List<object> items) BuildMyFlowTodoNavModel(
+            List<FlowTodoOutput> all,
+            List<string> djmcsFromShrysz)
+        {
+            if (all == null) all = new List<FlowTodoOutput>();
+            if (djmcsFromShrysz == null) djmcsFromShrysz = new List<string>();
+
+            var navFromConfig = djmcsFromShrysz.Count > 0;
+            var navKeys = navFromConfig
+                ? djmcsFromShrysz
+                : GetOrderedDistinctBillTypesFromTodoList(all);
+            var items = new List<object>();
+            foreach (var d in navKeys)
+            {
+                var count = all.Count(x => BillTypeMatchesShryszDjmc(x.billType, d));
+                items.Add(new
+                {
+                    djmc = d,
+                    label = ShryszDjmcToDisplayLabel(d),
+                    count
+                });
+            }
+            if (navFromConfig)
+            {
+                var other = all.Count(x => !djmcsFromShrysz.Any(
+                    c => BillTypeMatchesShryszDjmc(x.billType, c)));
+                if (other > 0)
+                {
+                    items.Add(new
+                    {
+                        djmc = "_other_",
+                        label = "其他",
+                        count = other
+                    });
+                }
+            }
+            return (all.Count, items);
+        }
+
+        /// <summary>与 <c>wt_shrysz</c> 中「单据名称」顺序一致，与审核页 djmc 选项同序（<c>wtShrysz/djmcOptions.js</c>）</summary>
+        private static readonly string[] ShryszDjmcCanonicalOrder =
+        {
+            "同价调拨单", "销售出库单", "预售出库单", "销售退货单", "预售退货单", "采购入库单",
+            "委托代销发货单", "委托代销退货单", "委托代销结算单", "商品调价单",
+            "收款单", "付款单", "费用单", "现金费用单", "待摊费用摊销", "其他应收单", "其他收入单", "转款单",
+            "赠送单", "获赠单", "会员到期退款", "拆装单"
+        };
+
+        private async Task<List<string>> GetOrderedShryszDistinctDjmcsAsync()
+        {
+            try
+            {
+                EnsureWtShryszAuditColumnsForTodo();
+                if (!_db.DbMaintenance.IsAnyTable("wt_shrysz")) return new List<string>();
+                var rows = await _db.Ado.SqlQueryAsync<dynamic>(
+                    "SELECT DISTINCT TRIM(djmc) AS djmc FROM wt_shrysz WHERE TRIM(IFNULL(djmc,'')) <> ''");
+                if (rows == null || rows.Count == 0) return new List<string>();
+                var rem = new List<string>();
+                foreach (var r in rows)
+                {
+                    var s = Convert.ToString(r.djmc)?.Trim();
+                    if (string.IsNullOrEmpty(s)) continue;
+                    if (rem.Any(x => string.Equals(x, s, StringComparison.OrdinalIgnoreCase)))
+                        continue;
+                    rem.Add(s);
+                }
+                return OrderShryszDjmcsList(rem);
+            }
+            catch
+            {
+                return new List<string>();
+            }
+        }
+
+        private static List<string> GetOrderedDistinctBillTypesFromTodoList(List<FlowTodoOutput> all)
+        {
+            if (all == null || all.Count == 0) return new List<string>();
+            var rem = all
+                .Select(x => (x.billType ?? string.Empty).Trim())
+                .Where(s => s.Length > 0)
+                .GroupBy(s => s, StringComparer.OrdinalIgnoreCase)
+                .Select(g => g.First())
+                .ToList();
+            return OrderShryszDjmcsList(rem);
+        }
+
+        private static List<string> OrderShryszDjmcsList(List<string> inDb)
+        {
+            if (inDb == null || inDb.Count == 0) return new List<string>();
+            var rem = inDb.ToList();
+            var outl = new List<string>();
+            foreach (var canon in ShryszDjmcCanonicalOrder)
+            {
+                var idx = rem.FindIndex(x => string.Equals(x, canon, StringComparison.OrdinalIgnoreCase));
+                if (idx < 0) continue;
+                outl.Add(rem[idx]);
+                rem.RemoveAt(idx);
+            }
+            rem.Sort(StringComparer.OrdinalIgnoreCase);
+            outl.AddRange(rem);
+            return outl;
+        }
+
+        /// <summary>待办行的 billType 与审核设置中 djmc 是否同一单据（含会员到期：收款/退款、大小写差异）</summary>
+        private static bool BillTypeMatchesShryszDjmc(string billType, string shryszDjmc)
+        {
+            if (string.IsNullOrWhiteSpace(billType) || string.IsNullOrWhiteSpace(shryszDjmc)) return false;
+            var t = billType.Trim();
+            var d = shryszDjmc.Trim();
+            if (string.Equals(t, d, StringComparison.OrdinalIgnoreCase)) return true;
+            if (IsHyDqShoukuan(t) && IsHyDqShoukuan(d)) return true;
+            return false;
+        }
+
+        private static bool IsHyDqShoukuan(string s)
+        {
+            return string.Equals(s, "会员到期收款", StringComparison.OrdinalIgnoreCase)
+                || string.Equals(s, "会员到期退款", StringComparison.OrdinalIgnoreCase);
+        }
+
+        private static string ShryszDjmcToDisplayLabel(string djm)
+        {
+            if (string.IsNullOrWhiteSpace(djm)) return djm;
+            if (string.Equals(djm.Trim(), "会员到期退款", StringComparison.OrdinalIgnoreCase))
+                return "会员到期收款";
+            if (string.Equals(djm, "_other_", StringComparison.OrdinalIgnoreCase))
+                return "其他";
+            return djm.Trim();
+        }
+
+        /// <summary>
         /// 获取未读邮件
         /// </summary>
         [HttpGet("Email")]
@@ -389,7 +574,8 @@ namespace NCC.VisualDev
         }
 
         /// <summary>
-        /// 扩展业务待办：同价调拨单、销售/预售出库、销售/预售退货、采购入库单、委托代销发/退/结算（wt_xsckd）；商品调价单（wt_tjd + wt_shrysz）；拆装单（wt_czd）等
+        /// 扩展业务待办：同价调拨单、销售/预售出库、销售/预售退货、采购入库单、委托代销发/退/结算（wt_xsckd）；商品调价单（wt_tjd + wt_shrysz）；拆装单（wt_czd）等。
+        /// 各单据查询使用 Task.WhenAll 并行，避免串行累加延迟（原约 20+ 次往返易达数秒）。
         /// </summary>
         private async Task<List<FlowTodoOutput>> GetExtendBillTodoListAsync(string userId, string userAccount)
         {
@@ -398,33 +584,42 @@ namespace NCC.VisualDev
             EnsureWtYskzjjsAuditColumnsForTodo();
             EnsureWtCzdAuditColumnsForTodo();
             var roleIds = await ResolveUserRoleIdsForTodoAsync(userId);
-            var list = new List<FlowTodoOutput>();
-            list.AddRange(await QueryWtXsckdAuditTodosAsync("同价调拨单", userId, userAccount, roleIds, null));
-            // 仅单据来源为「后台」或未标记(ly 空)的销售出库单进待办；备注「抖音订单：」同后端免审规则
-            list.AddRange(await QueryWtXsckdAuditTodosAsync("销售出库单", userId, userAccount, roleIds,
-                @"( TRIM(IFNULL(d.ly, '')) = '' OR TRIM(IFNULL(d.ly, '')) = '后台' )
-  AND NOT ( TRIM(IFNULL(d.bz, '')) <> '' AND TRIM(d.bz) LIKE '抖音订单：%' )"));
-            // 与销售出库单一致：收银台/抖音等非后台来源不进入待办
-            list.AddRange(await QueryWtXsckdAuditTodosAsync("预售出库单", userId, userAccount, roleIds,
-                @"( TRIM(IFNULL(d.ly, '')) = '' OR TRIM(IFNULL(d.ly, '')) = '后台' )
-  AND NOT ( TRIM(IFNULL(d.bz, '')) <> '' AND TRIM(d.bz) LIKE '抖音订单：%' )"));
-            list.AddRange(await QueryWtXsckdAuditTodosAsync("销售退货单", userId, userAccount, roleIds, null));
-            list.AddRange(await QueryWtXsckdAuditTodosAsync("预售退货单", userId, userAccount, roleIds, null));
-            list.AddRange(await QueryWtXsckdAuditTodosAsync("采购入库单", userId, userAccount, roleIds, null));
-            list.AddRange(await QueryWtXsckdAuditTodosAsync("委托代销发货单", userId, userAccount, roleIds, null));
-            list.AddRange(await QueryWtXsckdAuditTodosAsync("委托代销退货单", userId, userAccount, roleIds, null));
-            list.AddRange(await QueryWtXsckdAuditTodosAsync("委托代销结算单", userId, userAccount, roleIds, null));
-            list.AddRange(await QueryWtXsckdAuditTodosAsync("赠送单", userId, userAccount, roleIds, null));
-            list.AddRange(await QueryWtTjdAuditTodosAsync(userId, userAccount, roleIds));
-            list.AddRange(await QueryWtFysrdQtsrAuditTodosAsync(userId, userAccount, roleIds));
-            list.AddRange(await QueryWtYskzjjsQtAuditTodosAsync(userId, userAccount, roleIds));
-            list.AddRange(await QueryWtYskzjjsXjAuditTodosAsync(userId, userAccount, roleIds));
-            list.AddRange(await QueryWtYskzjjsHyAuditTodosAsync(userId, userAccount, roleIds));
-            list.AddRange(await QueryWtYskzjjsZkAuditTodosAsync(userId, userAccount, roleIds));
-            list.AddRange(await QueryWtCwdjSkdAuditTodosAsync(userId, userAccount, roleIds));
-            list.AddRange(await QueryWtCwdjFydAuditTodosAsync(userId, userAccount, roleIds));
-            list.AddRange(await QueryWtCwdjDtfytxAuditTodosAsync(userId, userAccount, roleIds));
-            list.AddRange(await QueryWtCzdAuditTodosAsync(userId, userAccount, roleIds));
+            // 仅后台销售/预售出库进待办；抖音订单备注同免审规则
+            const string xsckLyForHoutai = @"( TRIM(IFNULL(d.ly, '')) = '' OR TRIM(IFNULL(d.ly, '')) = '后台' )
+  AND NOT ( TRIM(IFNULL(d.bz, '')) <> '' AND TRIM(d.bz) LIKE '抖音订单：%' )";
+
+            var queryTasks = new Task<List<FlowTodoOutput>>[]
+            {
+                QueryWtXsckdAuditTodosAsync("同价调拨单", userId, userAccount, roleIds, null),
+                QueryWtXsckdAuditTodosAsync("销售出库单", userId, userAccount, roleIds, xsckLyForHoutai),
+                QueryWtXsckdAuditTodosAsync("预售出库单", userId, userAccount, roleIds, xsckLyForHoutai),
+                QueryWtXsckdAuditTodosAsync("销售退货单", userId, userAccount, roleIds, null),
+                QueryWtXsckdAuditTodosAsync("预售退货单", userId, userAccount, roleIds, null),
+                QueryWtXsckdAuditTodosAsync("采购入库单", userId, userAccount, roleIds, null),
+                QueryWtXsckdAuditTodosAsync("委托代销发货单", userId, userAccount, roleIds, null),
+                QueryWtXsckdAuditTodosAsync("委托代销退货单", userId, userAccount, roleIds, null),
+                QueryWtXsckdAuditTodosAsync("委托代销结算单", userId, userAccount, roleIds, null),
+                QueryWtXsckdAuditTodosAsync("赠送单", userId, userAccount, roleIds, null),
+                QueryWtXsckdAuditTodosAsync("获赠单", userId, userAccount, roleIds, null),
+                QueryWtTjdAuditTodosAsync(userId, userAccount, roleIds),
+                QueryWtFysrdQtsrAuditTodosAsync(userId, userAccount, roleIds),
+                QueryWtYskzjjsQtAuditTodosAsync(userId, userAccount, roleIds),
+                QueryWtYskzjjsXjAuditTodosAsync(userId, userAccount, roleIds),
+                QueryWtYskzjjsHyAuditTodosAsync(userId, userAccount, roleIds),
+                QueryWtYskzjjsZkAuditTodosAsync(userId, userAccount, roleIds),
+                QueryWtCwdjSkdAuditTodosAsync(userId, userAccount, roleIds),
+                QueryWtCwdjFkdAuditTodosAsync(userId, userAccount, roleIds),
+                QueryWtCwdjFydAuditTodosAsync(userId, userAccount, roleIds),
+                QueryWtCwdjDtfytxAuditTodosAsync(userId, userAccount, roleIds),
+                QueryWtCzdAuditTodosAsync(userId, userAccount, roleIds)
+            };
+
+            var chunks = await Task.WhenAll(queryTasks);
+            var list = new List<FlowTodoOutput>(512);
+            foreach (var part in chunks)
+            {
+                if (part != null && part.Count > 0) list.AddRange(part);
+            }
             return list.OrderByDescending(x => x.creatorTime).ToList();
         }
 
@@ -523,6 +718,9 @@ namespace NCC.VisualDev
         /// <summary>与 <c>wt_shrysz.djmc</c>、财务单据 djlx 一致</summary>
         private const string CwdjSkdTodoBillName = "收款单";
 
+        /// <summary>与 <c>wt_shrysz.djmc</c>、<c>wt_cwdj.djlx</c> 一致</summary>
+        private const string CwdjFkdTodoBillName = "付款单";
+
         /// <summary>与 <c>wt_shrysz.djmc</c>、<c>wt_cwdj.djlx</c> 一致（财务费用单，非现金费用单）</summary>
         private const string CwdjFydTodoBillName = "费用单";
 
@@ -1154,6 +1352,66 @@ ORDER BY d.ldrq DESC";
         }
 
         /// <summary>
+        /// 付款单待办（wt_cwdj + wt_shrysz），与收款单同为一级审核
+        /// </summary>
+        private async Task<List<FlowTodoOutput>> QueryWtCwdjFkdAuditTodosAsync(string userId, string userAccount, HashSet<string> roleIds)
+        {
+            var result = new List<FlowTodoOutput>();
+            const string sql = @"
+SELECT d.F_Id AS id, d.ldrq, d.djzt,
+  IFNULL(NULLIF(TRIM(s.shr1), ''), s.shr) AS shr1_eff,
+  TRIM(IFNULL(s.shr1Mode, '')) AS shr1Mode_eff,
+  TRIM(IFNULL(s.shrRole1, '')) AS shrRole1_eff
+FROM wt_cwdj d
+LEFT JOIN wt_shrysz s ON TRIM(s.djmc) = @billName
+WHERE TRIM(IFNULL(d.djlx,'')) IN ('付款单')
+  AND IFNULL(d.djzt, '') <> '草稿'
+  AND IFNULL(d.djzt, '') <> '已审核'
+  AND IFNULL(d.djzt, '') <> '审核不通过'
+  AND (
+    d.djzt IN ('待审核')
+    OR d.djzt IS NULL
+    OR TRIM(IFNULL(d.djzt, '')) = ''
+  )
+ORDER BY d.ldrq DESC";
+
+            var rows = await _db.Ado.SqlQueryAsync<dynamic>(sql, new { billName = CwdjFkdTodoBillName });
+            if (rows == null || rows.Count == 0) return result;
+
+            foreach (var row in rows)
+            {
+                var configUsers = Convert.ToString(row.shr1_eff);
+                var configRoles = Convert.ToString(row.shrRole1_eff);
+                var configMode = Convert.ToString(row.shr1Mode_eff)?.Trim() ?? "";
+                if (string.Equals(configMode, "user", StringComparison.OrdinalIgnoreCase))
+                    configRoles = "";
+                else if (string.Equals(configMode, "role", StringComparison.OrdinalIgnoreCase))
+                    configUsers = "";
+                if (!string.IsNullOrWhiteSpace(configUsers) || !string.IsNullOrWhiteSpace(configRoles))
+                {
+                    if (!IsInAuditUsersOrRoles(configUsers, configRoles, userId, userAccount, roleIds))
+                        continue;
+                }
+
+                DateTime? createTime = null;
+                var rawTime = Convert.ToString(row.ldrq);
+                if (DateTime.TryParse(rawTime, out DateTime dt))
+                    createTime = dt;
+
+                var id = Convert.ToString(row.id);
+                result.Add(new FlowTodoOutput
+                {
+                    id = id,
+                    fullName = $"{CwdjFkdTodoBillName} {id} - 一级审核待办",
+                    creatorTime = createTime,
+                    billType = CwdjFkdTodoBillName
+                });
+            }
+
+            return result;
+        }
+
+        /// <summary>
         /// 费用单待办（wt_cwdj.djlx = 费用单 + wt_shrysz），与收款单同为一级审核
         /// </summary>
         private async Task<List<FlowTodoOutput>> QueryWtCwdjFydAuditTodosAsync(string userId, string userAccount, HashSet<string> roleIds)
diff --git a/Antis.Erp.Plat/sy/css/pos-unified.css b/Antis.Erp.Plat/sy/css/pos-unified.css
index 7a3d784..9153a59 100644
--- a/Antis.Erp.Plat/sy/css/pos-unified.css
+++ b/Antis.Erp.Plat/sy/css/pos-unified.css
@@ -678,44 +678,115 @@ body.pos-page--embed .pos-embed-select {
   box-sizing: border-box;
 }
 
-/* ========= 收银首页 home.html：页顶业务提示（WebView 常屏蔽 alert） ========= */
+/* ========= 收银首页 home.html：业务提示（全屏遮罩 + 居中大卡片，与内联样式一致） ========= */
 .pos-page .pos-home-toast {
   position: fixed;
-  top: max(10px, env(safe-area-inset-top, 0px));
-  left: 50%;
-  transform: translateX(-50%);
+  inset: 0;
   z-index: 100050;
   display: flex;
-  align-items: flex-start;
-  gap: 12px;
-  max-width: min(560px, calc(100vw - 24px));
-  padding: 14px 16px;
-  border-radius: 12px;
-  background: #fff;
-  border: 1px solid var(--pos-border);
-  box-shadow: 0 12px 40px rgba(15, 23, 42, 0.15);
+  align-items: center;
+  justify-content: center;
+  padding: max(20px, env(safe-area-inset-top, 0px)) 24px max(20px, env(safe-area-inset-bottom, 0px)) 24px;
   box-sizing: border-box;
+  background: rgba(15, 23, 42, 0.52);
+  backdrop-filter: blur(4px);
+  -webkit-backdrop-filter: blur(4px);
 }
 
-.pos-page .pos-home-toast__text {
-  flex: 1 1 auto;
+.pos-page .pos-home-toast__panel {
+  position: relative;
+  display: block;
+  width: 100%;
+  min-width: min(360px, calc(100vw - 32px));
+  max-width: min(500px, calc(100vw - 32px));
+  max-height: min(72vh, 560px);
+  overflow-x: hidden;
+  overflow-y: auto;
+  padding: 0;
+  border-radius: 20px;
+  background: linear-gradient(180deg, #f8faff 0%, #ffffff 28%, #ffffff 100%);
+  border: 1px solid rgba(226, 232, 240, 0.95);
+  box-shadow:
+    0 0 0 1px rgba(255, 255, 255, 0.6) inset,
+    0 8px 12px -4px rgba(15, 23, 42, 0.08),
+    0 24px 56px -12px rgba(15, 23, 42, 0.28),
+    0 48px 80px -20px rgba(79, 108, 248, 0.12);
+  box-sizing: border-box;
+}
+
+.pos-page .pos-home-toast__accent {
+  display: block;
+  height: 6px;
+  background: linear-gradient(90deg, #4f6cf8 0%, #5c7cfa 35%, #818cf8 70%, #a5b4fc 100%);
+}
+
+.pos-page .pos-home-toast__main {
+  padding: 32px 36px 40px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  gap: 24px;
+  box-sizing: border-box;
+}
+
+.pos-page .pos-home-toast__icon {
+  width: 88px;
+  height: 88px;
+  border-radius: 50%;
+  background: linear-gradient(160deg, #eef2ff 0%, #e0e7ff 45%, #c7d2fe 100%);
+  color: var(--pos-blue-dark);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow:
+    0 0 0 10px rgba(92, 124, 250, 0.12),
+    0 12px 28px rgba(79, 108, 248, 0.28);
+}
+
+.pos-page .pos-home-toast__icon svg {
+  width: 44px;
+  height: 44px;
+  display: block;
+}
+
+.pos-page .pos-home-toast__body {
+  width: 100%;
   min-width: 0;
+}
+
+.pos-page .pos-home-toast__label {
+  margin: 0 0 10px;
   font-size: 14px;
-  line-height: 1.5;
   font-weight: 600;
+  letter-spacing: 0.2em;
+  color: var(--pos-muted);
+}
+
+.pos-page .pos-home-toast__text {
+  margin: 0;
+  font-size: clamp(18px, 2.2vw, 22px);
+  line-height: 1.5;
+  font-weight: 700;
   color: var(--pos-text);
+  letter-spacing: 0.02em;
+  overflow-wrap: anywhere;
+  word-break: break-word;
 }
 
 .pos-page .pos-home-toast__close {
-  flex-shrink: 0;
-  width: 36px;
-  height: 36px;
-  margin: -4px -6px -4px 0;
+  position: absolute;
+  top: 12px;
+  right: 12px;
+  z-index: 2;
+  width: 44px;
+  height: 44px;
+  margin: 0;
   border: none;
-  border-radius: 10px;
-  background: transparent;
+  border-radius: 12px;
+  background: rgba(255, 255, 255, 0.92);
   color: var(--pos-muted);
-  font-size: 22px;
+  font-size: 24px;
   line-height: 1;
   cursor: pointer;
   touch-action: manipulation;
@@ -724,11 +795,14 @@ body.pos-page--embed .pos-embed-select {
   display: inline-flex;
   align-items: center;
   justify-content: center;
+  box-shadow: 0 2px 8px rgba(15, 23, 42, 0.08);
+  transition: background 0.15s ease, color 0.15s ease, box-shadow 0.15s ease;
 }
 
 .pos-page .pos-home-toast__close:hover {
   background: #f1f5f9;
   color: var(--pos-text);
+  box-shadow: 0 4px 12px rgba(15, 23, 42, 0.1);
 }
 
 /* ========= 与 settlement 一致的弹层/卡片圆角（首页等复用 class 时生效） ========= */
diff --git a/Antis.Erp.Plat/sy/home.html b/Antis.Erp.Plat/sy/home.html
index a3c444e..2c95e2e 100755
--- a/Antis.Erp.Plat/sy/home.html
+++ b/Antis.Erp.Plat/sy/home.html
@@ -5,7 +5,7 @@
 		<meta charset="UTF-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<link rel="stylesheet" href="css/style.css?id=1">
-		<link rel="stylesheet" href="css/pos-unified.css">
+		<link rel="stylesheet" href="css/pos-unified.css?v=20260424-3">
 		<script src="./js/vue.min.js"></script>
 		<script src="./axios-1.x/axios-1.x/dist/axios.js"></script>
 		<script src="./axios-1.x/axios-1.x/dist/axios.min.js"></script>
@@ -45,6 +45,12 @@
 				animation: slideUp 0.3s ease;
 			}
 
+			/* 选择会员弹窗：加宽并略放大，与收银视口比例协调 */
+			.modal-content.home-member-picker {
+				max-width: min(720px, 96vw) !important;
+				width: 100%;
+			}
+
 			@keyframes slideUp {
 				from {
 					transform: translateY(20px);
@@ -143,7 +149,7 @@
 			}
 
 			.member-list {
-				max-height: 400px;
+				max-height: min(420px, 50vh);
 				overflow-y: auto;
 				margin-top: 16px;
 				border: 1px solid #f0f0f0;
@@ -268,6 +274,145 @@
 				box-shadow: 0 4px 12px rgba(222, 83, 44, 0.3);
 			}
 
+			/*
+			 * 业务 Toast：全屏遮罩 + 居中大卡（内联保底）。收银台主提示：顶栏渐变、大图标、主文案加粗，整体更「大气」。
+			 */
+			body.pos-page .pos-home-toast {
+				position: fixed !important;
+				top: 0 !important;
+				left: 0 !important;
+				right: 0 !important;
+				bottom: 0 !important;
+				width: 100% !important;
+				height: 100% !important;
+				max-width: none !important;
+				margin: 0 !important;
+				transform: none !important;
+				display: flex !important;
+				align-items: center !important;
+				justify-content: center !important;
+				padding: max(20px, env(safe-area-inset-top, 0px)) 24px max(20px, env(safe-area-inset-bottom, 0px)) 24px !important;
+				box-sizing: border-box !important;
+				background: rgba(15, 23, 42, 0.52) !important;
+				backdrop-filter: blur(4px) !important;
+				-webkit-backdrop-filter: blur(4px) !important;
+				z-index: 100050 !important;
+			}
+
+			body.pos-page .pos-home-toast__panel {
+				position: relative !important;
+				display: block !important;
+				overflow: hidden !important;
+				width: 100% !important;
+				min-width: min(360px, calc(100vw - 32px)) !important;
+				max-width: min(500px, calc(100vw - 32px)) !important;
+				max-height: min(72vh, 560px) !important;
+				overflow-y: auto !important;
+				padding: 0 !important;
+				border-radius: 20px !important;
+				background: linear-gradient(180deg, #f8faff 0%, #ffffff 28%, #ffffff 100%) !important;
+				border: 1px solid rgba(226, 232, 240, 0.95) !important;
+				box-shadow:
+					0 0 0 1px rgba(255, 255, 255, 0.6) inset,
+					0 8px 12px -4px rgba(15, 23, 42, 0.08),
+					0 24px 56px -12px rgba(15, 23, 42, 0.28),
+					0 48px 80px -20px rgba(79, 108, 248, 0.12) !important;
+				box-sizing: border-box !important;
+			}
+
+			body.pos-page .pos-home-toast__accent {
+				display: block !important;
+				height: 6px !important;
+				background: linear-gradient(90deg, #4f6cf8 0%, #5c7cfa 35%, #818cf8 70%, #a5b4fc 100%) !important;
+			}
+
+			body.pos-page .pos-home-toast__main {
+				padding: 32px 36px 40px !important;
+				display: flex !important;
+				flex-direction: column !important;
+				align-items: center !important;
+				text-align: center !important;
+				gap: 24px !important;
+				box-sizing: border-box !important;
+			}
+
+			body.pos-page .pos-home-toast__icon-wrap {
+				flex: 0 0 auto !important;
+			}
+
+			body.pos-page .pos-home-toast__icon {
+				width: 88px !important;
+				height: 88px !important;
+				border-radius: 50% !important;
+				background: linear-gradient(160deg, #eef2ff 0%, #e0e7ff 45%, #c7d2fe 100%) !important;
+				color: #4f6cf8 !important;
+				display: flex !important;
+				align-items: center !important;
+				justify-content: center !important;
+				box-shadow:
+					0 0 0 10px rgba(92, 124, 250, 0.12),
+					0 12px 28px rgba(79, 108, 248, 0.28) !important;
+			}
+
+			body.pos-page .pos-home-toast__icon svg {
+				width: 44px !important;
+				height: 44px !important;
+				display: block !important;
+			}
+
+			body.pos-page .pos-home-toast__body {
+				width: 100% !important;
+				min-width: 0 !important;
+			}
+
+			body.pos-page .pos-home-toast__label {
+				margin: 0 0 10px !important;
+				font-size: 14px !important;
+				font-weight: 600 !important;
+				letter-spacing: 0.2em !important;
+				color: #64748b !important;
+			}
+
+			body.pos-page .pos-home-toast__text {
+				margin: 0 !important;
+				font-size: clamp(18px, 2.2vw, 22px) !important;
+				line-height: 1.5 !important;
+				font-weight: 700 !important;
+				color: #0f172a !important;
+				letter-spacing: 0.02em !important;
+				overflow-wrap: anywhere !important;
+				word-break: break-word !important;
+			}
+
+			body.pos-page .pos-home-toast__close {
+				position: absolute !important;
+				top: 12px !important;
+				right: 12px !important;
+				z-index: 2 !important;
+				width: 44px !important;
+				height: 44px !important;
+				margin: 0 !important;
+				border: none !important;
+				border-radius: 12px !important;
+				background: rgba(255, 255, 255, 0.92) !important;
+				color: #64748b !important;
+				font-size: 24px !important;
+				line-height: 1 !important;
+				cursor: pointer !important;
+				padding: 0 !important;
+				display: inline-flex !important;
+				align-items: center !important;
+				justify-content: center !important;
+				box-shadow: 0 2px 8px rgba(15, 23, 42, 0.08) !important;
+				transition: background 0.15s ease, color 0.15s ease, box-shadow 0.15s ease !important;
+			}
+
+			body.pos-page .pos-home-toast__close:hover {
+				background: #f1f5f9 !important;
+				color: #0f172a !important;
+				box-shadow: 0 4px 12px rgba(15, 23, 42, 0.1) !important;
+			}
+
 		</style>
 	</head>
 
@@ -277,10 +422,30 @@
 			<div
 				v-if="posToastMessage"
 				class="pos-home-toast"
-				role="alert"
+				role="alertdialog"
+				aria-modal="true"
+				aria-live="assertive"
+				@click.self="clearPosToast"
 			>
-				<span class="pos-home-toast__text">{{ posToastMessage }}</span>
-				<button type="button" class="pos-home-toast__close" @click="clearPosToast" aria-label="关闭">&times;</button>
+				<div class="pos-home-toast__panel" @click.stop>
+					<span class="pos-home-toast__accent" aria-hidden="true"></span>
+					<button type="button" class="pos-home-toast__close" @click="clearPosToast" aria-label="关闭">&times;</button>
+					<div class="pos-home-toast__main">
+						<div class="pos-home-toast__icon-wrap">
+							<div class="pos-home-toast__icon" aria-hidden="true">
+								<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" focusable="false">
+									<circle cx="12" cy="12" r="9.25" stroke="currentColor" stroke-width="1.5" fill="none" />
+									<circle cx="12" cy="8" r="1.2" fill="currentColor" />
+									<path d="M12 11.25V16.5" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" />
+								</svg>
+							</div>
+						</div>
+						<div class="pos-home-toast__body">
+							<div class="pos-home-toast__label">温馨提示</div>
+							<p class="pos-home-toast__text">{{ posToastMessage }}</p>
+						</div>
+					</div>
+				</div>
 			</div>
 
 			<!-- 弹出层 -->
diff --git a/Antis.Erp.Plat/sy/orders.html b/Antis.Erp.Plat/sy/orders.html
index 6030d19..b6ad792 100644
--- a/Antis.Erp.Plat/sy/orders.html
+++ b/Antis.Erp.Plat/sy/orders.html
@@ -2206,7 +2206,7 @@
                         ? this.promiseAllLimited(taskFns, 8)
                         : Promise.resolve();
                 },
-                /** 与后端备注「已转换为销售出库单 CHDxxx」一致 */
+                /** 与后端备注「已转换为销售出库单 CKDxxx」一致（历史可能为 CHD） */
                 parsePresaleConvertedChdId(bz) {
                     if (bz == null || bz === '') return '';
                     const m = String(bz).match(/已转换为销售出库单\s+([A-Za-z0-9]+)/);
--
libgit2 0.21.4