Merge branch 'master' into yeji-5-11

2026-05-12 10:43:04 +08:00
parent a3892001d3 7add364e20
commit 0c1709d589
306 changed files with 738 additions and 302 deletions
@@ -104,3 +104,8 @@ export function orderActionLogStats(params?: { start_time?: string; end_time?: s
 export function orderBatchAssignAssistant(params: { order_ids: number[]; assistant_id: number }) {
    return request.post({ url: '/order.order/assignAssistant', params })
 }
+
+/** 设置/取消支付单豁免权 */
+export function orderSetExempt(params: { id: number; is_exempt: 0 | 1 }) {
+    return request.post({ url: '/order.order/setExempt', params })
+}
@@ -911,11 +911,12 @@
                                        <span class="text-red-500">¥{{ row.amount }}</span>
                                    </template>
                                </el-table-column>
-                                <el-table-column label="状态" width="82" align="center">
+                                <el-table-column label="状态" width="100" align="center">
                                    <template #default="{ row }">
                                        <el-tag :type="payOrderStatusTag(row.status)" size="small">
                                            {{ row.status_desc || orderStatusText(row.status) }}
                                        </el-tag>
+                                        <el-tag v-if="row.is_exempt === 1" type="warning" size="small" class="ml-1">豁免</el-tag>
                                    </template>
                                </el-table-column>
                                <el-table-column prop="creator_name" label="创建人" width="80" show-overflow-tooltip />
@@ -968,11 +969,12 @@
                                        <span class="text-red-500">¥{{ row.amount }}</span>
                                    </template>
                                </el-table-column>
-                                <el-table-column label="状态" width="82" align="center">
+                                <el-table-column label="状态" width="100" align="center">
                                    <template #default="{ row }">
                                        <el-tag :type="payOrderStatusTag(row.status)" size="small">
                                            {{ row.status_desc || orderStatusText(row.status) }}
                                        </el-tag>
+                                        <el-tag v-if="row.is_exempt === 1" type="warning" size="small" class="ml-1">豁免</el-tag>
                                    </template>
                                </el-table-column>
                                <el-table-column prop="creator_name" label="创建人" width="80" show-overflow-tooltip />
@@ -925,11 +925,12 @@
                                        <span class="text-red-500">¥{{ row.amount }}</span>
                                    </template>
                                </el-table-column>
-                                <el-table-column label="状态" width="82" align="center">
+                                <el-table-column label="状态" width="100" align="center">
                                    <template #default="{ row }">
                                        <el-tag :type="payOrderStatusTag(row.status)" size="small">
                                            {{ row.status_desc || orderStatusText(row.status) }}
                                        </el-tag>
+                                        <el-tag v-if="row.is_exempt === 1" type="warning" size="small" class="ml-1">豁免</el-tag>
                                    </template>
                                </el-table-column>
                                <el-table-column prop="creator_name" label="创建人" width="80" show-overflow-tooltip />
@@ -982,11 +983,12 @@
                                        <span class="text-red-500">¥{{ row.amount }}</span>
                                    </template>
                                </el-table-column>
-                                <el-table-column label="状态" width="82" align="center">
+                                <el-table-column label="状态" width="100" align="center">
                                    <template #default="{ row }">
                                        <el-tag :type="payOrderStatusTag(row.status)" size="small">
                                            {{ row.status_desc || orderStatusText(row.status) }}
                                        </el-tag>
+                                        <el-tag v-if="row.is_exempt === 1" type="warning" size="small" class="ml-1">豁免</el-tag>
                                    </template>
                                </el-table-column>
                                <el-table-column prop="creator_name" label="创建人" width="80" show-overflow-tooltip />
@@ -395,8 +395,13 @@
                                <el-tooltip placement="top" effect="dark" :show-after="200">
                                    <template #content>
                                        <div style="max-width: 300px; line-height: 1.7; font-size: 12px">
+<<<<<<< HEAD
                                            按订单<b>创建时间</b>统计（剔除履约已取消），金额与<b>接诊诊单</b>列一致：仅按<b>订单创建人</b>的人事部门落在本展示行（含下级）计入，多行命中时取最深的展示部门。与<b>医助排行榜诊金</b>同口径。<br />
                                            <b>不受渠道筛选影响</b>。与侧栏按部门打开的业务订单列表对齐。<br />
+=======
+                                            按订单<b>创建时间</b>统计（剔除履约已取消），金额与<b>接诊诊单</b>列一致：<b>创建人</b>人事部门优先，无创建人时回退诊单<b>医助</b>；落在本展示行（含下级）即计入，同表多行命中时取最深的展示部门。<br />
+                                            <b>不受渠道筛选影响</b>。与侧栏按部门打开的业务订单列表可对齐。<br />
+>>>>>>> master
                                            点击金额可查看对应业务订单明细（侧栏默认「合计业绩」全量列表）。
                                        </div>
                                    </template>
@@ -445,7 +450,12 @@
                                <el-tooltip placement="top" effect="dark" :show-after="200">
                                    <template #content>
                                        <div style="max-width: 320px; line-height: 1.7; font-size: 12px">
+<<<<<<< HEAD
                                            <b>业务订单条数</b>（非取消）：订单 <b>create_time</b> 落入区间、<b>fulfillment_status ≠ 4</b>；按<b>订单创建人</b>的人事部门落在该部门子树即计入（表格多行命中时取最深的展示部门）。与<b>合计业绩 / 医助排行榜接诊诊单</b>同口径。选定渠道时本列仍为全量。
+=======
+                                            <b>业务订单条数</b>（非取消）：订单 <b>create_time</b> 落入区间、<b>fulfillment_status ≠ 4</b>；与列表筛选
+                                            <b>assistant_dept_id</b> 时一致——<b>创建人</b>人事部门优先，无创建人则诊单 <b>医助</b>；落在该部门子树即计入（表格多行命中时取最深的展示部门）。与侧栏勾选「与表格业绩对齐」时的集合可能略有差异。选定渠道时本列仍为全量。
+>>>>>>> master
                                        </div>
                                    </template>
                                    <el-icon class="col-info"><InfoFilled /></el-icon>
@@ -1080,6 +1090,7 @@
                            </template>
                        </el-table-column>
                        <el-table-column prop="doctor_name" label="开方人" width="88" show-overflow-tooltip />
+                        <el-table-column prop="assistant_name" label="诊单医助" width="88" show-overflow-tooltip />
                        <el-table-column prop="creator_name" label="创建人" width="88" show-overflow-tooltip />
                    </el-table>
                    <el-empty v-if="!orderDrawerLoading && orderDrawerLists.length === 0" description="暂无业务订单" />
@@ -2102,7 +2113,15 @@ const orderDrawerSplitPerfCache = ref<{
 } | null>(null)

 type OrderDrawerFilter =
-    | { mode: 'dept'; deptId: number; deptName: string; start: string; end: string }
+    | {
+          mode: 'dept'
+          deptId: number
+          deptName: string
+          start: string
+          end: string
+          /** 当前业绩表各展示行 dept_id，用于侧栏与「接诊诊单」列对齐（创建人优先 + 最深展示行） */
+          yejiTableRowDeptIds?: number[]
+      }
    | {
          mode: 'assistant'
          assistantId: number
@@ -2637,6 +2656,14 @@ function buildOrderDrawerListParams(): Record<string, any> | null {
    }
    if (f.mode === 'dept') {
        params.assistant_dept_id = f.deptId
+<<<<<<< HEAD
+=======
+        /** 与 YejiStatsLogic 最深展示行 + 创建人优先归属一致 */
+        if (f.yejiTableRowDeptIds && f.yejiTableRowDeptIds.length > 0) {
+            params.yeji_table_row_dept_ids = f.yejiTableRowDeptIds.join(',')
+        }
+        /** 勿传 yeji_drawer_match_table_performance：该参数按「业绩归因」医助收窄，与看板列表摊行不一致 */
+>>>>>>> master
        if (selectedDeptIds.value.length > 0) {
            params.dept_ids = selectedDeptIds.value.join(',')
        }
@@ -2742,9 +2769,14 @@ function openOrderDrawerByDept(tb: YejiTable, row: YejiRow, opts?: { listTab?: '
        deptName: row.dept_name,
        start: tb.start_date,
        end: tb.end_date,
+        yejiTableRowDeptIds: tb.rows.map(r => r.dept_id).filter((id): id is number => typeof id === 'number' && id > 0),
    }
    orderDrawerTitle.value = `业务订单 · ${row.dept_name}`
+<<<<<<< HEAD
    orderDrawerHint.value = `创建时间：${tb.start_date} ～ ${tb.end_date} · 与「合计业绩 / 接诊诊单」同口径：订单创建人人事部门 ∈ 本部门子树 · 不含履约已取消`
+=======
+    orderDrawerHint.value = `创建时间：${tb.start_date} ～ ${tb.end_date} · 与「接诊诊单」同口径：**创建人**人事部门优先，无创建人则诊单医助；同表多行间取最深归属 · 不含履约已取消`
+>>>>>>> master
    orderDrawerPage.value = 1
    orderDrawerVisible.value = true
    void fetchOrderDrawerPage()
@@ -2765,6 +2797,7 @@ function openOrderDrawerByYejiTableScope(
        deptName: '当前展示合计',
        start: tb.start_date,
        end: tb.end_date,
+        yejiTableRowDeptIds: tb.rows.map(r => r.dept_id).filter((id): id is number => typeof id === 'number' && id > 0),
    }
    orderDrawerTitle.value = '业务订单 · 当前展示合计'
    orderDrawerHint.value = `创建时间：${tb.start_date} ～ ${tb.end_date} · 已选展示部门 1 个根节点（含其下全部展示行）· 不含履约已取消`
@@ -180,11 +180,12 @@
                    </template>
                </el-table-column>

-                <el-table-column label="订单状态" width="100">
+                <el-table-column label="订单状态" width="120">
                    <template #default="{ row }">
                        <el-tag :type="getStatusTag(row.status)">
                            {{ getStatusText(row.status) }}
                        </el-tag>
+                        <el-tag v-if="row.is_exempt === 1" type="warning" size="small" class="ml-1">豁免</el-tag>
                    </template>
                </el-table-column>

@@ -270,6 +271,14 @@
                        >
                            删除
                        </el-button>
+                        <el-button
+                            v-perms="['order.order/setExempt']"
+                            :type="row.is_exempt === 1 ? 'warning' : 'default'"
+                            link
+                            @click="handleToggleExempt(row)"
+                        >
+                            {{ row.is_exempt === 1 ? '取消豁免' : '设为豁免' }}
+                        </el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -779,7 +788,8 @@ import {
    orderActionLogs,
    orderActionLogStats,
    orderBatchAssignAssistant,
-    orderSplit
+    orderSplit,
+    orderSetExempt
 } from '@/api/order'
 import { getAssistants } from '@/api/tcm'
 import { generateOrderQrcode } from '@/api/tcm'
@@ -1494,6 +1504,19 @@ const handleDelete = async (row: any) => {
    }
 }

+const handleToggleExempt = async (row: any) => {
+    const newVal: 0 | 1 = row.is_exempt === 1 ? 0 : 1
+    const actionText = newVal === 1 ? '设为豁免' : '取消豁免'
+    try {
+        await feedback.confirm(`确定要${actionText}该支付单吗？豁免后关联此单的业务订单将跳过定金门槛校验。`)
+        await orderSetExempt({ id: row.id, is_exempt: newVal })
+        feedback.msgSuccess(`${actionText}成功`)
+        getLists()
+    } catch (error) {
+        // 用户取消操作
+    }
+}
+
 // 小程序码相关
 const qrcodeDialogVisible = ref(false)
 const qrcodeLoading = ref(false)
@@ -151,12 +151,14 @@
                stripe
            >
                <el-table-column type="selection" width="48" align="center" />
-                <el-table-column label="ID" min-width="50">
+                <el-table-column label="ID" min-width="70">
                    <template #default="{ row }">
                        <div class="patient-cell">
-                            <!-- <div class="patient-avatar">{{ (row.patient_name || '患').charAt(0) }}</div> -->
                            <div class="patient-info">
-                                <div class="patient-name">{{ row.id }}</div>
+                                <div class="patient-name">
+                                    {{ row.id }}
+                                    <el-tag v-if="row.assign_read_at === null && row.assistant_id > 0" type="danger" size="small" effect="dark" class="ml-1">NEW</el-tag>
+                                </div>
                            </div>
                        </div>
                    </template>
@@ -1352,7 +1354,7 @@ const handleSingleAssign = (row: any) => {
    currentRow.value = row
    batchAssignIds.value = []
    // 确保类型一致，转换为数字
-    assignForm.value.assistant_id = row.assistant_id ? Number(row.assistant_id) : null
+    assignForm.value.assistant_id = Number(row.assistant_id) > 0 ? Number(row.assistant_id) : null
    assignDialogVisible.value = true
 }

@@ -130,6 +130,7 @@
                        </div>
                        <div class="dh5-card-sub">
                            #{{ row.id }} · {{ row.diagnosis_date_text || formatDateTime(row.create_time) }}
+                            <span v-if="row.assign_read_at === null && row.assistant_id > 0" class="dh5-tag-new">NEW</span>
                        </div>
                    </div>
                    <div class="dh5-card-tags">
@@ -1672,6 +1673,18 @@ $dh5-card-bg: #ffffff;
    flex-wrap: wrap;
 }

+.dh5-tag-new {
+    display: inline-block;
+    background: #ef4444;
+    color: #fff;
+    font-size: 10px;
+    font-weight: 700;
+    padding: 1px 4px;
+    border-radius: 3px;
+    margin-left: 4px;
+    vertical-align: middle;
+}
+
 .dh5-meta-gender,
 .dh5-meta-age {
    font-size: 12px;
@@ -97,12 +97,14 @@
                stripe
            >
                <el-table-column type="selection" width="48" align="center" />
-                <el-table-column label="ID" min-width="50">
+                <el-table-column label="ID" min-width="70">
                    <template #default="{ row }">
                        <div class="patient-cell">
-                            <!-- <div class="patient-avatar">{{ (row.patient_name || '患').charAt(0) }}</div> -->
                            <div class="patient-info">
-                                <div class="patient-name">{{ row.id }}</div>
+                                <div class="patient-name">
+                                    {{ row.id }}
+                                    <el-tag v-if="row.assign_read_at === null && row.assistant_id > 0" type="danger" size="small" effect="dark" class="ml-1">NEW</el-tag>
+                                </div>
                            </div>
                        </div>
                    </template>
@@ -1088,7 +1090,7 @@ const handleSingleAssign = (row: any) => {
    assignMode.value = 'single'
    currentRow.value = row
    // 确保类型一致，转换为数字
-    assignForm.value.assistant_id = row.assistant_id ? Number(row.assistant_id) : null
+    assignForm.value.assistant_id = Number(row.assistant_id) > 0 ? Number(row.assistant_id) : null
    assignDialogVisible.value = true
 }