更新

admin/src/api/stats.ts

@@ -179,12 +179,3 @@ export function commissionSettlementConfirmFinalize(params: Record<string, any>)
 export function commissionSettlementConfirmRevoke(params: Record<string, any>) {
     return request.post({ url: '/stats.commissionSettlement/confirmRevoke', params })
 }
-
-/** 医助个人业绩概览 */
-export function assistantPerformanceOverview(params: {
-    time_type?: string
-    start_date?: string
-    end_date?: string
-}) {
-    return request.get({ url: '/stats.assistantPerformance/overview', params })
-}

admin/src/api/tcm.ts

@@ -319,16 +319,6 @@ export function prescriptionEdit(params: any) {
     return request.post({ url: '/tcm.prescription/edit', params })
 }
 
-/** 仅修正处方笺患者姓名、手机号与性别（不改审核状态），写入业务订单日志表 */
-export function prescriptionPatchPatient(params: {
-    id: number
-    patient_name: string
-    phone: string
-    gender: number
-}) {
-    return request.post({ url: '/tcm.prescription/patchPatient', params })
-}
-
 // 删除处方
 export function prescriptionDelete(params: { id: number }) {
     return request.post({ url: '/tcm.prescription/delete', params })
@@ -462,26 +452,15 @@ export function prescriptionOrderAddPayOrder(params: {
     order_type: number
     pay_amount: number
     pay_remark?: string
-    completion_request?: number
 }) {
     return request.post({ url: '/tcm.prescriptionOrder/addPayOrder', params })
 }
 
 /** 为「已发货」订单关联已有支付单并重置支付审核为待审核 */
-export function prescriptionOrderLinkPayOrder(params: {
+export function prescriptionOrderLinkPayOrder(params: { id: number; pay_order_id: number }) {
-    id: number
-    pay_order_id?: number
-    pay_order_ids?: number[]
-    completion_request?: number
-}) {
     return request.post({ url: '/tcm.prescriptionOrder/linkPayOrder', params })
 }
 
-/** 已发货/已签收：仅提交完单申请（不新增/关联支付单） */
-export function prescriptionOrderRequestCompletion(params: { id: number }) {
-    return request.post({ url: '/tcm.prescriptionOrder/requestCompletion', params })
-}
-
 /** 将「已发货/已签收」且支付审核通过的订单结案（3=已完成 或 7-12 业务状态） */
 export function prescriptionOrderComplete(params: { id: number; fulfillment_status: number }) {
     return request.post({ url: '/tcm.prescriptionOrder/complete', params })
@@ -511,11 +490,6 @@ export function prescriptionOrderUpdateAmount(params: { id: number; amount: numb
     return request.post({ url: '/tcm.prescriptionOrder/updateAmount', params })
 }
 
-/** 设置发货类型：gancao 甘草药房 / direct 洛阳药房 */
-export function prescriptionOrderSetShipMode(params: { id: number; ship_mode: 'gancao' | 'direct' }) {
-    return request.post({ url: '/tcm.prescriptionOrder/setShipMode', params })
-}
-
 // ========== 处方库 ==========
 
 // 处方库列表

admin/src/views/consumer/prescription/index.vue

@@ -216,15 +216,6 @@
                             <el-button type="primary" link @click="handleView(row)"  v-perms="['cf.prescription/read']">
                                 查看
                             </el-button>
-                            <el-button
-                                v-if="Number(row.void_status) !== 1"
-                                type="primary"
-                                link
-                                v-perms="['tcm.prescription/patchPatient']"
-                                @click="openPatchPatientDialog(row)"
-                            >
-                                改姓名手机
-                            </el-button>
                             <el-button
                                 v-if="!Number(row.has_prescription_order) && Number(row.void_status) !== 1"
                                 type="success"
@@ -407,35 +398,20 @@
                         </div>
 
                         <div class="rx-herbs">
-                            <template v-if="slipMainHerbs.length">
+                            <div
-                                <div class="rx-herb-section-label">主方</div>
+                                v-for="(h, i) in slipHerbsList"
-                                <div
+                                :key="i"
-                                    v-for="(h, i) in slipMainHerbs"
+                                class="rx-herb-cell"
-                                    :key="'main-' + i"
+                            >
-                                    class="rx-herb-cell"
+                                <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
-                                >
+                                <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
-                                    <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
+                            </div>
-                                    <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
-                                </div>
-                            </template>
-                            <template v-if="slipAuxHerbs.length">
-                                <div class="rx-herb-section-label rx-herb-section-label--aux">辅方</div>
-                                <div
-                                    v-for="(h, i) in slipAuxHerbs"
-                                    :key="'aux-' + i"
-                                    class="rx-herb-cell"
-                                >
-                                    <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
-                                    <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
-                                </div>
-                            </template>
                         </div>
                     </div>
 
                     <!-- 服法 / 医嘱 / 备注 / 药房备注 / 出丸 -->
                     <div class="rx-text">
-                        <p>主方服法：{{ rxUsageText }}</p>
+                        <p>服法：{{ rxUsageText }}</p>
-                        <p v-if="rxAuxUsageText">辅方服法：{{ rxAuxUsageText }}</p>
                         <p v-if="rxAdviceText">医嘱：{{ rxAdviceText }}</p>
                         <p v-if="rxRemarkText">备注：{{ rxRemarkText }}</p>
                         <p v-if="rxPharmacyRemarkText" class="rx-text-warn">
@@ -664,87 +640,53 @@
                 <el-form-item label="药材配方" prop="herbs" required>
                     <div class="w-full">
                         <div class="flex flex-wrap items-center gap-2">
-                            <el-button
+                            <el-button type="primary" size="small" @click="addHerb">
-                                type="success"
+                                添加药材
-                                size="small"
+                            </el-button>
-                                v-perms="['cf.prescription/add', 'cf.prescription/edit', 'tcm.prescriptionLibrary/lists']"
+                            <el-button type="success" size="small" @click="openLibraryDialog">
-                                @click="openLibraryDialog"
-                            >
                                 从处方库导入
                             </el-button>
+                        </div>
+                        <div class="mt-2">
                             <el-button type="warning" size="small" plain :icon="EditPen" @click="openPasteRecipeDialog">
                                 导入药方
                             </el-button>
-                            <span class="text-xs text-gray-500">
+                            <span class="text-xs text-gray-500 ml-2 align-middle">
-                                粘贴文本解析药名与剂量；须与药品库名称完全一致才录入（导入至主方）
+                                粘贴文本解析药名与剂量；须与药品库名称完全一致才录入
                             </span>
                         </div>
-
+                        <el-table :data="editForm.herbs" class="mt-2" border>
-                        <div class="herb-formula-block mt-3">
+                            <el-table-column label="序号" type="index" width="60" />
-                            <div class="herb-formula-block__head">
+                            <el-table-column label="药材名称" min-width="220">
-                                <el-tag type="primary" size="small">主方</el-tag>
+                                <template #default="{ row }">
-                                <el-button type="primary" size="small" @click="addHerb('主方')">添加主方药材</el-button>
+                                    <MedicineNameSelect v-model="row.name" class="w-full" />
-                            </div>
+                                </template>
-                            <el-table :data="mainHerbRows" class="mt-2" border empty-text="暂无主方药材">
+                            </el-table-column>
-                                <el-table-column label="序号" type="index" width="60" />
+                            <el-table-column label="剂量(克)" min-width="120">
-                                <el-table-column label="药材名称" min-width="220">
+                                <template #default="{ row, $index }">
-                                    <template #default="{ row }">
+                                    <el-input-number
-                                        <MedicineNameSelect v-model="editForm.herbs[row.index].name" class="w-full" />
+                                        v-model="row.dosage"
-                                    </template>
+                                        :min="0"
-                                </el-table-column>
+                                        :precision="1"
-                                <el-table-column label="剂量(克)" min-width="120">
+                                        :step="0.5"
-                                    <template #default="{ row }">
+                                        placeholder="剂量"
-                                        <el-input-number
+                                        class="w-full"
-                                            v-model="editForm.herbs[row.index].dosage"
+                                    />
-                                            :min="0"
+                                </template>
-                                            :precision="1"
+                            </el-table-column>
-                                            :step="0.5"
+                            <el-table-column label="操作" width="80">
-                                            placeholder="剂量"
+                                <template #default="{ $index }">
-                                            class="w-full"
+                                    <el-button
-                                        />
+                                        type="danger"
-                                    </template>
+                                        link
-                                </el-table-column>
+                                        @click="removeHerb($index)"
-                                <el-table-column label="操作" width="80">
+                                    >
-                                    <template #default="{ row }">
+                                        删除
-                                        <el-button type="danger" link @click="removeHerb(row.index)">删除</el-button>
+                                    </el-button>
-                                    </template>
+                                </template>
-                                </el-table-column>
+                            </el-table-column>
-                            </el-table>
+                           
-                        </div>
+                        </el-table>
-
-                        <div class="herb-formula-block mt-4">
-                            <div class="herb-formula-block__head">
-                                <el-tag type="warning" size="small">辅方</el-tag>
-                                <el-button type="primary" size="small" plain @click="addHerb('辅方')">
-                                    添加辅方药材
-                                </el-button>
-                            </div>
-                            <el-table :data="auxHerbRows" class="mt-2" border empty-text="暂无辅方药材">
-                                <el-table-column label="序号" type="index" width="60" />
-                                <el-table-column label="药材名称" min-width="220">
-                                    <template #default="{ row }">
-                                        <MedicineNameSelect v-model="editForm.herbs[row.index].name" class="w-full" />
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="剂量(克)" min-width="120">
-                                    <template #default="{ row }">
-                                        <el-input-number
-                                            v-model="editForm.herbs[row.index].dosage"
-                                            :min="0"
-                                            :precision="1"
-                                            :step="0.5"
-                                            placeholder="剂量"
-                                            class="w-full"
-                                        />
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="操作" width="80">
-                                    <template #default="{ row }">
-                                        <el-button type="danger" link @click="removeHerb(row.index)">删除</el-button>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
                         <el-alert
                             v-if="editMode === 'edit'"
                             type="warning"
@@ -827,10 +769,8 @@
                         <el-option label="汤剂" value="汤剂" />
                     </el-select>
                 </el-form-item>  </el-col>
-                </el-row>
+                    
-
+                    <!-- 用量字段 -->
-                <div class="usage-formula-title usage-formula-title--main">主方用法</div>
-                <el-row :gutter="20">
                     <el-col :span="8">
                         <el-form-item label="用量" prop="dosage_amount">
                             <!-- 浓缩水丸：1-10g 下拉选择 -->
@@ -932,97 +872,6 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-
-                <template v-if="auxHerbRows.length > 0">
-                    <div class="usage-formula-title usage-formula-title--aux">辅方用法</div>
-                    <el-row :gutter="20">
-                    <el-col :span="8">
-                        <el-form-item label="用量">
-                            <el-select
-                                v-if="editForm.prescription_type === '浓缩水丸'"
-                                v-model="editForm.aux_usage.dosage_amount"
-                                placeholder="请选择用量"
-                                class="w-full"
-                            >
-                                <el-option v-for="n in 10" :key="n" :label="n + 'g'" :value="n" />
-                            </el-select>
-                            <el-select
-                                v-else-if="editForm.prescription_type === '饮片'"
-                                v-model="editForm.aux_usage.dosage_amount"
-                                placeholder="请选择用量"
-                                class="w-full"
-                            >
-                                <el-option label="50ml" :value="50" />
-                                <el-option label="100ml" :value="100" />
-                                <el-option label="120ml" :value="120" />
-                                <el-option label="150ml" :value="150" />
-                                <el-option label="180ml" :value="180" />
-                                <el-option label="200ml" :value="200" />
-                                <el-option label="250ml" :value="250" />
-                            </el-select>
-                            <el-input-number
-                                v-else
-                                v-model="editForm.aux_usage.dosage_amount"
-                                :min="0"
-                                :precision="2"
-                                class="w-full"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col v-if="editForm.prescription_type === '浓缩水丸'" :span="8">
-                        <el-form-item label=" " label-width="12px">
-                            <el-select
-                                v-model="editForm.aux_usage.dosage_bag_count"
-                                placeholder="请选择袋数"
-                                class="w-[120px]"
-                            >
-                                <el-option label="1袋" :value="1" />
-                                <el-option label="2袋" :value="2" />
-                                <el-option label="3袋" :value="3" />
-                                <el-option label="4袋" :value="4" />
-                                <el-option label="5袋" :value="5" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col v-if="editForm.prescription_type === '饮片'" :span="8">
-                        <el-form-item label="是否代煎">
-                            <el-radio-group v-model="editForm.aux_usage.need_decoction">
-                                <el-radio :label="true">代煎</el-radio>
-                                <el-radio :label="false">不代煎</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </el-col>
-                    <el-col v-if="editForm.prescription_type === '饮片'" :span="8">
-                        <el-form-item label="每贴出包数">
-                            <el-select v-model="editForm.aux_usage.bags_per_dose" placeholder="请选择" class="w-full">
-                                <el-option v-for="n in 9" :key="n" :label="n + '包'" :value="n" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="每天几次">
-                            <el-input-number
-                                v-model="editForm.aux_usage.times_per_day"
-                                :min="1"
-                                :max="6"
-                                class="!w-full"
-                                placeholder="每天服用次数"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="服用天数">
-                            <el-input-number
-                                v-model="editForm.aux_usage.usage_days"
-                                :min="1"
-                                :max="365"
-                                placeholder="服用天数"
-                                class="w-full"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    </el-row>
-                </template>
                 
                 <el-form-item label="用法" prop="usage_instruction">
                     <el-input
@@ -1131,48 +980,6 @@
             </template>
         </el-drawer>
 
-        <!-- 修正处方笺姓名 / 手机号（zyt_tcm_prescription，写入订单日志） -->
-        <el-dialog
-            v-model="patchPatientVisible"
-            title="修正姓名、性别与手机号"
-            width="440px"
-            :close-on-click-modal="false"
-            destroy-on-close
-            @closed="resetPatchPatientForm"
-        >
-            <el-form
-                ref="patchPatientFormRef"
-                :model="patchPatientForm"
-                :rules="patchPatientRules"
-                label-width="88px"
-            >
-                <el-form-item label="处方编号">
-                    <span class="text-gray-700">#{{ patchPatientForm.id || '—' }}</span>
-                </el-form-item>
-                <el-form-item label="患者姓名" prop="patient_name">
-                    <el-input v-model="patchPatientForm.patient_name" maxlength="50" show-word-limit placeholder="处方笺展示姓名" />
-                </el-form-item>
-                <el-form-item label="性别" prop="gender">
-                    <el-radio-group v-model="patchPatientForm.gender">
-                        <el-radio :label="1">男</el-radio>
-                        <el-radio :label="0">女</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="手机号" prop="phone">
-                    <el-input v-model="patchPatientForm.phone" maxlength="20" placeholder="处方笺展示手机号" />
-                </el-form-item>
-            </el-form>
-            <p class="text-xs text-gray-500 -mt-2 mb-2">
-                仅更新处方表 patient_name、gender、phone，不改变审核状态；记录写入业务订单操作日志（有关联订单时可在此订单日志中查看）。
-            </p>
-            <template #footer>
-                <el-button @click="patchPatientVisible = false">取消</el-button>
-                <el-button type="primary" :loading="patchPatientSubmitLoading" @click="submitPatchPatient">
-                    保存
-                </el-button>
-            </template>
-        </el-dialog>
-
         <!-- 从消费者处方创建业务订单（zyt_tcm_prescription_order，与支付单 zyt_order 分离） -->
         <el-dialog
             v-model="createOrderVisible"
@@ -1507,17 +1314,16 @@
             </template>
         </el-dialog>
 
-        <!-- 从处方库导入：当前开方医师的全部模板 + 所有人可见的公共模板 -->
+        <!-- 从处方库导入（与诊间 tcm-prescription 一致，按当前处方开方医师 creator_id 筛选） -->
         <el-dialog
             v-model="showLibraryDialog"
             title="从处方库导入"
             width="800px"
             :close-on-click-modal="false"
         >
-            <div class="mb-4 flex gap-3">
+            <div class="mb-4">
                 <el-input
                     v-model="librarySearchName"
-                    class="flex-1"
                     placeholder="请输入处方名称搜索"
                     clearable
                     @keyup.enter="searchLibrary"
@@ -1527,24 +1333,6 @@
                         <el-button :icon="Search" @click="searchLibrary" />
                     </template>
                 </el-input>
-                <el-select
-                    v-model="librarySearchFormulaType"
-                    placeholder="处方类型"
-                    clearable
-                    class="w-[140px]"
-                    @change="searchLibrary"
-                >
-                    <el-option label="全部" value="" />
-                    <el-option label="主方" value="主方" />
-                    <el-option label="辅方" value="辅方" />
-                </el-select>
-            </div>
-            <div class="mb-3 flex flex-wrap items-center gap-x-4 gap-y-2">
-                <span class="text-sm text-gray-600 shrink-0">导入方式</span>
-                <el-radio-group v-model="libraryImportMode">
-                    <el-radio label="replace">覆盖现有药材</el-radio>
-                    <el-radio label="append">追加到末尾</el-radio>
-                </el-radio-group>
             </div>
 
             <el-table
@@ -1555,13 +1343,6 @@
                 @row-click="handleSelectLibraryRow"
             >
                 <el-table-column label="处方名称" prop="prescription_name" min-width="150" show-overflow-tooltip />
-                <el-table-column label="处方类型" width="90">
-                    <template #default="{ row }">
-                        <el-tag :type="row.formula_type === '辅方' ? 'warning' : 'primary'" size="small">
-                            {{ row.formula_type || '主方' }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
                 <el-table-column label="药材数量" width="100">
                     <template #default="{ row }">
                         {{ row.herbs?.length || 0 }}味
@@ -1575,13 +1356,6 @@
                         <span v-else class="text-gray-400">暂无药材</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="是否公开" width="110">
-                    <template #default="{ row }">
-                        <el-tag :type="row.is_public ? 'success' : 'info'" size="small">
-                            {{ row.is_public ? '所有人可见' : '仅自己可见' }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
                 <el-table-column label="创建人" prop="creator_name" width="100" />
                 <el-table-column label="操作" width="100" fixed="right">
                     <template #default="{ row }">
@@ -1670,7 +1444,6 @@ import {
     prescriptionLists,
     prescriptionAdd,
     prescriptionEdit,
-    prescriptionPatchPatient,
     prescriptionDelete,
     prescriptionAudit,
     prescriptionDetail,
@@ -1697,119 +1470,6 @@ import jsPDF from 'jspdf'
 
 const TcmDiagnosisEditView = defineAsyncComponent(() => import('@/views/tcm/diagnosis/edit.vue'))
 
-type FormulaType = '主方' | '辅方'
-type HerbRow = { name: string; dosage: number; formula_type: FormulaType }
-
-type AuxUsageForm = {
-    dosage_amount?: number
-    dosage_bag_count: number
-    need_decoction: boolean
-    bags_per_dose: number
-    times_per_day: number
-    usage_days: number
-}
-
-function defaultAuxUsage(prescriptionType = '浓缩水丸'): AuxUsageForm {
-    if (prescriptionType === '饮片') {
-        return {
-            dosage_amount: 50,
-            dosage_bag_count: 1,
-            need_decoction: false,
-            bags_per_dose: 1,
-            times_per_day: 3,
-            usage_days: 7
-        }
-    }
-    if (prescriptionType === '浓缩水丸') {
-        return {
-            dosage_amount: 5,
-            dosage_bag_count: 1,
-            need_decoction: false,
-            bags_per_dose: 1,
-            times_per_day: 3,
-            usage_days: 7
-        }
-    }
-    return {
-        dosage_amount: 1,
-        dosage_bag_count: 1,
-        need_decoction: false,
-        bags_per_dose: 1,
-        times_per_day: 3,
-        usage_days: 7
-    }
-}
-
-function normalizeAuxUsageForm(raw: unknown, prescriptionType: string): AuxUsageForm {
-    const base = defaultAuxUsage(prescriptionType)
-    if (!raw || typeof raw !== 'object') return { ...base }
-    const o = raw as Record<string, unknown>
-    return {
-        dosage_amount:
-            o.dosage_amount !== null && o.dosage_amount !== undefined && o.dosage_amount !== ''
-                ? Number(o.dosage_amount)
-                : base.dosage_amount,
-        dosage_bag_count: o.dosage_bag_count != null ? Number(o.dosage_bag_count) || 1 : base.dosage_bag_count,
-        need_decoction: o.need_decoction === 1 || o.need_decoction === true,
-        bags_per_dose: o.bags_per_dose != null ? Number(o.bags_per_dose) || 1 : base.bags_per_dose,
-        times_per_day: o.times_per_day != null ? Number(o.times_per_day) || 3 : base.times_per_day,
-        usage_days: o.usage_days != null ? Number(o.usage_days) || 7 : base.usage_days
-    }
-}
-
-function buildUsageSegmentText(
-    usage: {
-        prescription_type?: string
-        dosage_amount?: number | null
-        dosage_unit?: string
-        dosage_bag_count?: number
-        times_per_day?: number
-        usage_way?: string
-        usage_time?: string
-    },
-    fallbackWay?: string,
-    fallbackTime?: string
-): string {
-    const pt = usage.prescription_type || '浓缩水丸'
-    const times = Number(usage.times_per_day) > 0 ? Number(usage.times_per_day) : 3
-    const amount = usage.dosage_amount != null ? Number(usage.dosage_amount) : 10
-    const unit = usage.dosage_unit || (pt === '饮片' ? 'ml' : 'g')
-    const usageWay = usage.usage_way || fallbackWay || '温水送服'
-    const usageTime = usage.usage_time || fallbackTime || ''
-    const seg: string[] = []
-    seg.push(`每天${times}次`)
-    if (pt === '浓缩水丸') {
-        const bags = Number(usage.dosage_bag_count) > 0 ? Number(usage.dosage_bag_count) : 1
-        seg.push(`一次${bags}袋`)
-        seg.push(`每袋${amount}${unit}`)
-    } else {
-        seg.push(`一次${amount}${unit}`)
-    }
-    seg.push(usageWay)
-    if (usageTime) seg.push(usageTime)
-    return seg.join(', ')
-}
-
-function normalizeFormulaType(v: unknown): FormulaType {
-    return v === '辅方' ? '辅方' : '主方'
-}
-
-function normalizeHerbRow(raw: any): HerbRow {
-    return {
-        name: String(raw?.name ?? '').trim(),
-        dosage: Number(raw?.dosage) || 0,
-        formula_type: normalizeFormulaType(raw?.formula_type)
-    }
-}
-
-function normalizeSlipHerbs(raw: unknown): HerbRow[] {
-    if (!raw) return []
-    if (Array.isArray(raw)) {
-        return raw.map((x: any) => normalizeHerbRow(x))
-    }
-    return []
-}
-
 /** 与 server/config/project.php prescription_audit_roles 保持一致 */
 const PRESCRIPTION_AUDIT_ROLE_IDS = [0, 3]
 
@@ -1871,66 +1531,6 @@ const auditTargetId = ref(0)
 const auditRemark = ref('')
 const auditLoading = ref(false)
 
-/** 修正处方笺显示用姓名 / 手机号 */
-const patchPatientVisible = ref(false)
-const patchPatientSubmitLoading = ref(false)
-const patchPatientFormRef = ref<FormInstance>()
-const patchPatientForm = reactive({
-    id: 0,
-    patient_name: '',
-    gender: 1 as 0 | 1,
-    phone: ''
-})
-const patchPatientRules: FormRules = {
-    patient_name: [{ required: true, message: '请输入患者姓名', trigger: 'blur' }],
-    gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
-    phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }]
-}
-
-function openPatchPatientDialog(row: Record<string, unknown>) {
-    patchPatientForm.id = Number(row.id) || 0
-    patchPatientForm.patient_name = String(row.patient_name ?? '').trim()
-    const g = Number(row.gender)
-    patchPatientForm.gender = g === 0 || g === 1 ? (g as 0 | 1) : 1
-    patchPatientForm.phone = String(row.phone ?? '').trim()
-    patchPatientVisible.value = true
-}
-
-function resetPatchPatientForm() {
-    patchPatientForm.id = 0
-    patchPatientForm.patient_name = ''
-    patchPatientForm.gender = 1
-    patchPatientForm.phone = ''
-    patchPatientFormRef.value?.clearValidate()
-}
-
-async function submitPatchPatient() {
-    const form = patchPatientFormRef.value
-    if (!form) return
-    try {
-        await form.validate()
-    } catch {
-        return
-    }
-    patchPatientSubmitLoading.value = true
-    try {
-        await prescriptionPatchPatient({
-            id: patchPatientForm.id,
-            patient_name: patchPatientForm.patient_name.trim(),
-            phone: patchPatientForm.phone.trim(),
-            gender: patchPatientForm.gender
-        })
-        feedback.msgSuccess('已保存')
-        patchPatientVisible.value = false
-        getLists()
-    } catch (e: unknown) {
-        const msg = e && typeof e === 'object' && 'msg' in e ? String((e as { msg?: string }).msg) : ''
-        feedback.msgError(msg || '保存失败')
-    } finally {
-        patchPatientSubmitLoading.value = false
-    }
-}
-
 /** 从消费者处方创建订单 */
 const createOrderVisible = ref(false)
 /** 创建订单分步向导：0 患者与收货 / 1 服务与支付单 / 2 金额与确认 */
@@ -2211,13 +1811,7 @@ const createOrderHerbSummary = computed(() => {
     const row = createOrderPrescription.value
     const herbs = normalizeSlipHerbs(row?.herbs)
     if (!herbs.length) return '暂无药材明细'
-    const main = herbs.filter((h) => normalizeFormulaType(h.formula_type) === '主方')
+    const s = herbs.map((h) => `${h.name} ${h.dosage}g`).join('、')
-    const aux = herbs.filter((h) => normalizeFormulaType(h.formula_type) === '辅方')
-    const fmt = (list: HerbRow[]) => list.map((h) => `${h.name} ${h.dosage}g`).join('、')
-    const parts: string[] = []
-    if (main.length) parts.push(`主方：${fmt(main)}`)
-    if (aux.length) parts.push(`辅方：${fmt(aux)}`)
-    const s = parts.join('；')
     return s.length > 120 ? `${s.slice(0, 120)}…` : s
 })
 
@@ -2457,27 +2051,9 @@ const editReviveHint = computed(() => {
 
 const slipHerbsList = computed(() => {
     const h = slipView.value?.herbs
-    return Array.isArray(h) ? (h as HerbRow[]) : []
+    return Array.isArray(h) ? h : []
 })
 
-const slipMainHerbs = computed(() =>
-    slipHerbsList.value.filter((h) => normalizeFormulaType(h.formula_type) === '主方')
-)
-const slipAuxHerbs = computed(() =>
-    slipHerbsList.value.filter((h) => normalizeFormulaType(h.formula_type) === '辅方')
-)
-
-const mainHerbRows = computed(() =>
-    editForm.herbs
-        .map((herb, index) => ({ herb, index }))
-        .filter(({ herb }) => normalizeFormulaType(herb.formula_type) === '主方')
-)
-const auxHerbRows = computed(() =>
-    editForm.herbs
-        .map((herb, index) => ({ herb, index }))
-        .filter(({ herb }) => normalizeFormulaType(herb.formula_type) === '辅方')
-)
-
 const slipDietaryText = computed(() => {
     const d = slipView.value?.dietary_taboo
     if (Array.isArray(d)) return d.filter(Boolean).join('、')
@@ -2563,26 +2139,23 @@ const rxUsageText = computed(() => {
     const v = slipView.value as any
     if (!v) return '—'
     if (v.usage_text) return v.usage_text
-    return buildUsageSegmentText(v)
+    const times = Number(v.times_per_day) > 0 ? Number(v.times_per_day) : 3
-})
+    const amount = v.dosage_amount != null ? Number(v.dosage_amount) : 10
-
+    const unit = v.dosage_unit || 'g'
-const rxAuxUsageText = computed(() => {
+    const usageWay = v.usage_way || '温水送服'
-    const v = slipView.value as any
+    const usageTime = v.usage_time || ''
-    if (!v || !slipAuxHerbs.value.length) return ''
+    const seg: string[] = []
-    const aux = normalizeAuxUsageForm(v.aux_usage, v.prescription_type || '浓缩水丸')
+    seg.push(`每天${times}次`)
-    return buildUsageSegmentText(
+    if ((v.prescription_type || '浓缩水丸') === '浓缩水丸') {
-        {
+        const bags = Number(v.dosage_bag_count) > 0 ? Number(v.dosage_bag_count) : 1
-            prescription_type: v.prescription_type,
+        seg.push(`一次${bags}袋`)
-            dosage_amount: aux.dosage_amount,
+        seg.push(`每袋${amount}${unit}`)
-            dosage_unit: v.dosage_unit,
+    } else {
-            dosage_bag_count: aux.dosage_bag_count,
+        seg.push(`一次${amount}${unit}`)
-            times_per_day: aux.times_per_day,
+    }
-            usage_way: v.usage_way,
+    seg.push(usageWay)
-            usage_time: v.usage_time
+    if (usageTime) seg.push(usageTime)
-        },
+    return seg.join(', ')
-        v.usage_way,
-        v.usage_time
-    )
 })
 
 const rxAdviceText = computed(() => {
@@ -2777,7 +2350,7 @@ const editForm = reactive({
     pulse: '',
     pulse_condition: '',
     clinical_diagnosis: '',
-    herbs: [] as HerbRow[],
+    herbs: [] as Array<{ name: string; dosage: number }>,
     dose_count: 7,
     dose_unit: '剂',
     usage_days: 7,
@@ -2803,8 +2376,7 @@ const editForm = reactive({
     /** 列表带入：业务订单「处方审核」驳回（消费者处方本身可能仍为已通过） */
     business_prescription_audit_rejected: 0,
     business_prescription_audit_remark: '',
-    times_per_day: 2,
+    times_per_day: 2
-    aux_usage: defaultAuxUsage('浓缩水丸')
 })
 
 /** 编辑页：关联业务订单上的服用天数、医助备注（与处方提示一致） */
@@ -2895,7 +2467,6 @@ watch(() => editForm.prescription_type, (newType) => {
         editForm.need_decoction = false
         editForm.bags_per_dose = 1
     }
-    Object.assign(editForm.aux_usage, defaultAuxUsage(newType))
 })
 
 // 表单验证规则
@@ -3124,15 +2695,15 @@ function slipAgeText(age: unknown) {
     return `${age}岁`
 }
 
-function herbValidationLabel(globalIndex: number): string {
+function normalizeSlipHerbs(raw: unknown): Array<{ name: string; dosage: number }> {
-    const herb = editForm.herbs[globalIndex]
+    if (!raw) return []
-    if (!herb) return `第${globalIndex + 1}味`
+    if (Array.isArray(raw)) {
-    const ft = normalizeFormulaType(herb.formula_type)
+        return raw.map((x: any) => ({
-    let n = 0
+            name: String(x?.name ?? '').trim(),
-    for (let i = 0; i <= globalIndex; i++) {
+            dosage: Number(x?.dosage) || 0
-        if (normalizeFormulaType(editForm.herbs[i]?.formula_type) === ft) n++
+        }))
     }
-    return `${ft}第${n}味`
+    return []
 }
 
 function listRxOrderWarnings(row: any): string[] {
@@ -3355,8 +2926,6 @@ const showLibraryDialog = ref(false)
 const libraryLoading = ref(false)
 const libraryList = ref<any[]>([])
 const librarySearchName = ref('')
-const librarySearchFormulaType = ref('')
-const libraryImportMode = ref<'replace' | 'append'>('replace')
 const libraryPage = ref(1)
 const libraryPageSize = ref(15)
 const libraryTotal = ref(0)
@@ -3401,8 +2970,8 @@ const loadLibraryList = async () => {
             page_no: libraryPage.value,
             page_size: libraryPageSize.value,
             prescription_name: librarySearchName.value,
-            formula_type: librarySearchFormulaType.value,
+            is_public: '',
-            prescribing_creator_id: doctorId
+            creator_id: doctorId
         })
         libraryList.value = res?.lists || []
         libraryTotal.value = res?.count || 0
@@ -3437,33 +3006,18 @@ const handleImportLibrary = (row: any) => {
         feedback.msgWarning('该处方没有药材信息')
         return
     }
-    const formulaType = normalizeFormulaType(row.formula_type)
+    const imported = JSON.parse(JSON.stringify(row.herbs)) as Array<{ name: string; dosage: number }>
-    const imported = (JSON.parse(JSON.stringify(row.herbs)) as any[]).map((h) => ({
+    editForm.herbs = imported
-        ...normalizeHerbRow(h),
-        formula_type: formulaType
-    }))
-    if (libraryImportMode.value === 'replace') {
-        const kept = editForm.herbs.filter((h) => normalizeFormulaType(h.formula_type) !== formulaType)
-        editForm.herbs = [...kept, ...imported]
-    } else {
-        editForm.herbs.push(...imported)
-    }
-    const modeHint = libraryImportMode.value === 'append' ? '（已追加）' : ''
     if (findDuplicateHerbNamesLocal().length) {
-        feedback.msgWarning(
+        feedback.msgWarning('导入的处方中存在重复药名，请合并剂量或删除多余行')
-            `已导入处方「${row.prescription_name}」${modeHint}，共${imported.length}味药材。存在重复药名，请合并剂量或删除多余行`
-        )
-    } else {
-        feedback.msgSuccess(`已导入处方「${row.prescription_name}」${modeHint}，共${imported.length}味药材`)
     }
+    feedback.msgSuccess(`已导入处方「${row.prescription_name}」，共${imported.length}味药材`)
     showLibraryDialog.value = false
 }
 
 watch(showLibraryDialog, (open) => {
     if (open) {
         librarySearchName.value = ''
-        librarySearchFormulaType.value = ''
-        libraryImportMode.value = 'replace'
         libraryPage.value = 1
         loadLibraryList()
     }
@@ -3595,7 +3149,7 @@ async function handlePasteRecipeImport() {
     }
     pasteRecipeImportLoading.value = true
     try {
-        const resolved: HerbRow[] = []
+        const resolved: Array<{ name: string; dosage: number }> = []
         const skippedNames: string[] = []
         for (const row of parsed) {
             const name = await resolvePasteHerbNameFromLibrary(row.name)
@@ -3603,7 +3157,7 @@ async function handlePasteRecipeImport() {
                 skippedNames.push(row.name.trim())
                 continue
             }
-            resolved.push({ name, dosage: row.dosage, formula_type: '主方' })
+            resolved.push({ name, dosage: row.dosage })
         }
         const skippedUnique = [...new Set(skippedNames.filter(Boolean))]
         if (resolved.length === 0) {
@@ -3615,8 +3169,7 @@ async function handlePasteRecipeImport() {
             return
         }
         if (pasteRecipeImportMode.value === 'replace') {
-            const auxKept = editForm.herbs.filter((h) => normalizeFormulaType(h.formula_type) === '辅方')
+            editForm.herbs = resolved
-            editForm.herbs = [...auxKept, ...resolved]
         } else {
             editForm.herbs.push(...resolved)
         }
@@ -3641,12 +3194,11 @@ async function handlePasteRecipeImport() {
     }
 }
 
-// 添加药材（主方 / 辅方）
+// 添加药材
-const addHerb = (formulaType: FormulaType = '主方') => {
+const addHerb = () => {
     editForm.herbs.push({
         name: '',
-        dosage: 0,
+        dosage: 0
-        formula_type: formulaType
     })
 }
 
@@ -3696,8 +3248,6 @@ const resetForm = () => {
     editForm.is_system_auto = 0
     editForm.business_prescription_audit_rejected = 0
     editForm.business_prescription_audit_remark = ''
-    editForm.times_per_day = 2
-    Object.assign(editForm.aux_usage, defaultAuxUsage('浓缩水丸'))
     clearRxLinkedOrderHint()
 }
 
@@ -3796,7 +3346,7 @@ const handleEdit = async (row: any) => {
     editForm.pulse = src.pulse || ''
     editForm.pulse_condition = src.pulse_condition || ''
     editForm.clinical_diagnosis = src.clinical_diagnosis || ''
-    editForm.herbs = src.herbs ? (src.herbs as any[]).map((h) => normalizeHerbRow(h)) : []
+    editForm.herbs = src.herbs ? JSON.parse(JSON.stringify(src.herbs)) : []
     editForm.dose_count = src.dose_count ?? 7
     editForm.dose_unit = src.dose_unit || '剂'
     editForm.usage_days = src.usage_days ?? 7
@@ -3821,10 +3371,6 @@ const handleEdit = async (row: any) => {
     editForm.is_system_auto = Number(src.is_system_auto) === 1 ? 1 : 0
     editForm.business_prescription_audit_rejected = Number(src.business_prescription_audit_rejected) === 1 ? 1 : 0
     editForm.business_prescription_audit_remark = String(src.business_prescription_audit_remark || '')
-    Object.assign(
-        editForm.aux_usage,
-        normalizeAuxUsageForm(src.aux_usage, editForm.prescription_type)
-    )
     
     // 数据加载完成，重新启用watch
     // 使用 setTimeout 确保所有数据都已经渲染完成
@@ -3859,13 +3405,12 @@ const handleSubmit = async () => {
     
     for (let i = 0; i < editForm.herbs.length; i++) {
         const herb = editForm.herbs[i]
-        const label = herbValidationLabel(i)
         if (!herb.name || !herb.name.trim()) {
-            feedback.msgError(`${label}药材名称不能为空`)
+            feedback.msgError(`第${i + 1}味药材名称不能为空`)
             return
         }
         if (!herb.dosage || herb.dosage <= 0) {
-            feedback.msgError(`${label}药材剂量必须大于0`)
+            feedback.msgError(`第${i + 1}味药材剂量必须大于0`)
             return
         }
     }
@@ -4289,38 +3834,6 @@ onMounted(async () => {
     box-sizing: border-box;
 }
 
-.rx-herb-section-label {
-    grid-column: 1 / -1;
-    font-size: 12px;
-    font-weight: 600;
-    color: #409eff;
-    line-height: 1.4;
-}
-
-.rx-herb-section-label--aux {
-    color: #e6a23c;
-    margin-top: 4px;
-}
-
-.herb-formula-block__head {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 8px;
-}
-
-.usage-formula-title {
-    font-size: 13px;
-    font-weight: 600;
-    margin: 8px 0 4px;
-    color: #409eff;
-}
-
-.usage-formula-title--aux {
-    color: #e6a23c;
-    margin-top: 12px;
-}
-
 .rx-herb-cell {
     display: grid;
     grid-template-columns: 1fr 64px;

admin/src/views/consumer/prescription/list.vue

@@ -11,13 +11,6 @@
                         @keyup.enter="resetPage"
                     />
                 </el-form-item>
-                <el-form-item class="w-[200px]" label="处方类型">
-                    <el-select v-model="formData.formula_type" placeholder="全部" clearable>
-                        <el-option label="全部" :value="''" />
-                        <el-option label="主方" value="主方" />
-                        <el-option label="辅方" value="辅方" />
-                    </el-select>
-                </el-form-item>
                 <el-form-item class="w-[200px]" label="是否公开">
                     <el-select v-model="formData.is_public" placeholder="全部" clearable>
                         <el-option label="全部" :value="''" />
@@ -44,13 +37,6 @@
                 <el-table :data="pager.lists" size="large">
                     <el-table-column label="ID" prop="id" min-width="60" />
                     <el-table-column label="处方名称" prop="prescription_name" min-width="200" show-overflow-tooltip />
-                    <el-table-column label="处方类型" min-width="100">
-                        <template #default="{ row }">
-                            <el-tag :type="row.formula_type === '辅方' ? 'warning' : 'primary'" size="small">
-                                {{ row.formula_type || '主方' }}
-                            </el-tag>
-                        </template>
-                    </el-table-column>
                     <el-table-column label="药材数量" min-width="100">
                         <template #default="{ row }">
                             {{ row.herbs?.length || 0 }}味
@@ -128,13 +114,6 @@
                         show-word-limit
                     />
                 </el-form-item>
-
-                <el-form-item label="处方类型" prop="formula_type">
-                    <el-radio-group v-model="editForm.formula_type">
-                        <el-radio value="主方">主方</el-radio>
-                        <el-radio value="辅方">辅方</el-radio>
-                    </el-radio-group>
-                </el-form-item>
                 
                 <el-form-item label="药材配方" prop="herbs" required>
                     <div class="w-full">
@@ -221,7 +200,6 @@ import MedicineNameSelect from '@/components/medicine-name-select/index.vue'
 // 表单数据
 const formData = reactive({
     prescription_name: '',
-    formula_type: '',
     is_public: ''
 })
 
@@ -234,7 +212,6 @@ const formRef = ref<FormInstance>()
 const editForm = reactive({
     id: 0,
     prescription_name: '',
-    formula_type: '主方',
     herbs: [] as Array<{ name: string; dosage: number }>,
     is_public: 0
 })
@@ -290,7 +267,6 @@ const removeHerb = (index: number) => {
 const resetForm = () => {
     editForm.id = 0
     editForm.prescription_name = ''
-    editForm.formula_type = '主方'
     editForm.herbs = []
     editForm.is_public = 0
 }
@@ -307,7 +283,6 @@ const handleView = (row: any) => {
     editMode.value = 'view'
     editForm.id = row.id
     editForm.prescription_name = row.prescription_name || ''
-    editForm.formula_type = row.formula_type || '主方'
     editForm.herbs = row.herbs ? JSON.parse(JSON.stringify(row.herbs)) : []
     editForm.is_public = row.is_public ?? 0
     showEdit.value = true
@@ -318,7 +293,6 @@ const handleEdit = (row: any) => {
     editMode.value = 'edit'
     editForm.id = row.id
     editForm.prescription_name = row.prescription_name || ''
-    editForm.formula_type = row.formula_type || '主方'
     editForm.herbs = row.herbs ? JSON.parse(JSON.stringify(row.herbs)) : []
     editForm.is_public = row.is_public ?? 0
     showEdit.value = true

admin/src/views/consumer/prescription/order_list.vue

@@ -252,7 +252,7 @@
                         v-model="queryParams.assistant_id"
                         clearable
                         filterable
-                        placeholder="订单创建人"
+                        placeholder="诊单医助"
                         class="!w-full"
                     >
                         <el-option
@@ -277,7 +277,7 @@
                         :fetch-fun="prescriptionOrderExport"
                         :params="prescriptionOrderExportParams"
                         :page-size="pager.size"
-                        export-hint="导出范围与上方筛选一致（履约状态、创建时间及其他条件均会生效）。含「自媒体渠道（挂号渠道来源）」：优先取该单关联处方登记的挂号；无则诊单下同患者挂号取 id 最大的一条（与前台挂号选择的记录一致）；业绩侧栏带渠道筛选导出时与同页列表高亮挂号同源。"
+                        export-hint="导出范围与上方筛选一致（履约状态、创建时间及其他条件均会生效）。含「自媒体渠道（挂号渠道来源）」：按诊单关联患者取最近一条挂号的渠道字典与细分。"
                     />
                 </el-form-item>
             </el-form>
@@ -562,28 +562,6 @@
                             round
                             class="ml-2"
                         >甘草 {{ detailData.gancao_reciperl_order_no }}</el-tag>
-                        <div v-if="detailData" class="flex items-center gap-2 ml-4 shrink-0">
-                            <span class="text-sm text-gray-500">发货类型</span>
-                            <el-radio-group
-                                v-perms="['tcm.prescriptionOrder/setShipMode']"
-                                :model-value="normalizeShipMode(detailData.ship_mode)"
-                                size="small"
-                                :disabled="shipModeSaving || !canEditShipMode(detailData)"
-                                @change="onDetailShipModeChange"
-                            >
-                                <el-radio-button label="gancao">甘草药房</el-radio-button>
-                                <el-radio-button
-                                    label="direct"
-                                    :disabled="isShipModeLockedToGancao(detailData)"
-                                >洛阳药房</el-radio-button>
-                            </el-radio-group>
-                            <el-tag
-                                v-if="!hasSetShipModePerm"
-                                :type="normalizeShipMode(detailData.ship_mode) === 'direct' ? 'warning' : 'success'"
-                                effect="plain"
-                                round
-                            >{{ shipModeLabel(detailData.ship_mode) }}</el-tag>
-                        </div>
                     </div>
                     <div v-if="detailData" class="flex items-center gap-2 mr-6">
                         <el-button
@@ -1236,7 +1214,6 @@
                     <template #header>
                         <div class="flex items-center gap-2 flex-wrap">
                             <span class="font-medium text-[15px]">物流轨迹</span>
-                            <span class="text-xs text-gray-400 font-mono">{{ detailData.tracking_number }}</span>
                             <el-tag
                                 v-if="detailLogisticsUrgent.show"
                                 type="danger"
@@ -1948,12 +1925,10 @@
             />
             <el-form v-loading="shipSaving" label-width="90px" class="pr-2" @submit.prevent="submitShip">
                 <el-form-item label="发货方式">
-                    <el-tag
+                    <el-radio-group v-model="shipForm.ship_mode">
-                        :type="normalizeShipMode(shipForm.ship_mode) === 'direct' ? 'warning' : 'success'"
+                        <el-radio label="gancao">甘草药方发</el-radio>
-                        effect="plain"
+                        <el-radio label="direct">药房直发</el-radio>
-                        size="default"
+                    </el-radio-group>
-                    >{{ shipDialogModeDisplay }}</el-tag>
-                    <span class="text-xs text-gray-400 ml-2">请在订单详情顶部「发货类型」中设置，此处不可修改</span>
                 </el-form-item>
                 <el-form-item label="承运商">
                     <el-select v-model="shipForm.express_company" class="w-full">
@@ -2053,7 +2028,7 @@
             @closed="addPayOrderFormRef?.clearValidate()"
         >
             <el-alert
-                :title="addPayOrderAlertTitle"
+                title="可以手动创建新支付单，或关联已存在但未绑定的支付单。"
                 type="info"
                 :closable="false"
                 show-icon
@@ -2071,7 +2046,6 @@
                     <el-radio-group v-model="addPayOrderForm.add_mode">
                         <el-radio value="create">手动创建</el-radio>
                         <el-radio value="link">关联已有</el-radio>
-                        <el-radio value="completion_only">直接完单申请</el-radio>
                     </el-radio-group>
                 </el-form-item>
 
@@ -2092,11 +2066,11 @@
                     <el-form-item label="支付金额" prop="pay_amount">
                         <el-input-number
                             v-model="addPayOrderForm.pay_amount"
-                            :min="0"
+                            :min="0.01"
                             :step="0.01"
                             :precision="2"
                             class="w-full"
-                            placeholder="请输入支付金额（元，可为 0）"
+                            placeholder="请输入支付金额（元）"
                         />
                     </el-form-item>
                     <el-form-item label="备注" prop="pay_remark">
@@ -2111,20 +2085,6 @@
                     </el-form-item>
                 </template>
 
-                <!-- 直接完单申请（不创建/关联支付单） -->
-                <template v-else-if="addPayOrderForm.add_mode === 'completion_only'">
-                    <el-alert
-                        type="warning"
-                        :closable="false"
-                        show-icon
-                        class="!mb-0"
-                    >
-                        <template #title>
-                            不新增或关联支付单，仅向审核人员提交「完成订单」申请；提交后支付审核将变为待审核，审核通过后将自动结案。
-                        </template>
-                    </el-alert>
-                </template>
-
                 <!-- 关联已有模式 -->
                 <template v-else>
                     <el-form-item label="选择支付单" prop="link_pay_order_id">
@@ -2155,8 +2115,8 @@
                     </el-form-item>
                 </template>
 
-                <!-- 完单申请选项（创建/关联时可选） -->
+                <!-- 完单申请选项 -->
-                <el-form-item v-if="addPayOrderForm.add_mode !== 'completion_only'" label="完单申请">
+                <el-form-item label="完单申请">
                     <el-radio-group v-model="addPayOrderForm.completion_request">
                         <el-radio :value="0">不申请</el-radio>
                         <el-radio :value="1">申请完成订单</el-radio>
@@ -2168,13 +2128,7 @@
             </el-form>
             <template #footer>
                 <el-button @click="addPayOrderVisible = false">取消</el-button>
-                <el-button
+                <el-button type="primary" :loading="addPayOrderSaving" @click="submitAddPayOrder">确认新增</el-button>
-                    type="primary"
-                    :loading="addPayOrderSaving"
-                    @click="submitAddPayOrder"
-                >
-                    {{ addPayOrderForm.add_mode === 'completion_only' ? '提交申请' : '确认新增' }}
-                </el-button>
             </template>
         </el-dialog>
 
@@ -2376,49 +2330,23 @@
                             </div>
                         </div>
                         <div class="rx-herbs">
-                            <template v-if="prescriptionTabType === 'internal'">
+                            <div v-for="(h, i) in slipHerbsList" :key="i" class="rx-herb-cell">
-                                <template v-if="slipMainHerbs.length">
+                                <span class="rx-herb-name" v-if="prescriptionTabType === 'internal'">{{ h.name }} ({{ h.dosage }}克)</span>
-                                    <div class="rx-herb-section-label">主方</div>
+                                <span class="rx-herb-name" v-else>{{ h.name }}</span>
-                                    <div
+                                <span class="rx-herb-total" v-if="prescriptionTabType === 'internal'">{{ rxHerbTotal(h.dosage) }}克</span>
-                                        v-for="(h, i) in slipMainHerbs"
+                                <span class="rx-herb-total" v-else>{{ h.dosage }}克</span>
-                                        :key="'main-' + i"
+                            </div>
-                                        class="rx-herb-cell"
-                                    >
-                                        <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
-                                        <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
-                                    </div>
-                                </template>
-                                <template v-if="slipAuxHerbs.length">
-                                    <div class="rx-herb-section-label rx-herb-section-label--aux">辅方</div>
-                                    <div
-                                        v-for="(h, i) in slipAuxHerbs"
-                                        :key="'aux-' + i"
-                                        class="rx-herb-cell"
-                                    >
-                                        <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
-                                        <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
-                                    </div>
-                                </template>
-                            </template>
-                            <template v-else>
-                                <div v-for="(h, i) in slipHerbsList" :key="i" class="rx-herb-cell">
-                                    <span class="rx-herb-name">{{ h.name }}</span>
-                                    <span class="rx-herb-total">{{ h.dosage }}克</span>
-                                </div>
-                            </template>
                         </div>
                     </div>
 
                     <div class="rx-text">
-                        <p v-if="prescriptionTabType === 'internal'">主方服法：{{ rxUsageText }}</p>
+                        <p>服法：{{ rxUsageText }}</p>
-                        <p v-else>服法：{{ rxUsageText }}</p>
-                        <p v-if="prescriptionTabType === 'internal' && rxAuxUsageText">辅方服法：{{ rxAuxUsageText }}</p>
                         <p v-if="rxAdviceText">医嘱：{{ rxAdviceText }}</p>
                         <p v-if="rxRemarkText">备注：{{ rxRemarkText }}</p>
                         <p v-if="rxPharmacyRemarkText" class="rx-text-warn">
                             药房备注：{{ rxPharmacyRemarkText }}
                         </p>
-                        <p v-if="rxOutPelletText && prescriptionViewData?.prescription_type !== '饮片'" class="rx-text-warn">
+                        <p v-if="rxOutPelletText" class="rx-text-warn">
                             出丸：{{ rxOutPelletText }}
                         </p>
                     </div>
@@ -2643,9 +2571,7 @@ import {
     prescriptionOrderShip,
     prescriptionOrderLogs,
     prescriptionOrderUpdateAmount,
-    prescriptionOrderSetShipMode,
     prescriptionOrderAddPayOrder,
-    prescriptionOrderRequestCompletion,
     prescriptionOrderComplete,
     prescriptionOrderRevokeRxAudit,
     prescriptionOrderRevokePayAudit,
@@ -2709,8 +2635,6 @@ const prescriptionOrderDetailButtonText = computed(() =>
 
 /** 与 server/config/project.php prescription_order_finance_roles 保持一致 */
 const FINANCE_ROLE_IDS = [0, 3, 6]
-/** 与 server/config/project.php order_edit_all_roles 一致：可绕过「双审通过后创建人禁编」 */
-const ORDER_EDIT_ALL_ROLE_IDS = [0, 3]
 
 /** 判断当前用户是否有查看财务字段（内部成本）的权限 */
 const canViewFinanceFields = () => {
@@ -2916,9 +2840,9 @@ const queryParams = reactive({
     express_company: '' as '' | 'sf' | 'jd',
     /** 开方医生（后台：关联处方 creator_id） */
     doctor_id: '' as number | '',
-    /** 订单创建人（后台：业务订单 creator_id） */
+    /** 诊单医助（后台：关联诊单 assistant_id） */
     assistant_id: '' as number | '',
-    /** 创建人所属部门（后台：assistant_dept_id，la_admin_dept） */
+    /** 诊单医助所属部门（后台：assistant_dept_id，la_admin_dept） */
     assistant_dept_id: '' as number | '',
     fulfillment_status: '' as number | '',
     prescription_audit_status: '' as number | '',
@@ -3365,32 +3289,8 @@ function formatTime(v: unknown) {
     return String(v)
 }
 
-function canBypassCreatorDualAuditEditLock(): boolean {
-    const u = userStore.userInfo
-    if (!u) return false
-    if (Number(u.root) === 1) return true
-    const ids = Array.isArray(u.role_ids) ? u.role_ids.map((n: unknown) => Number(n)) : []
-    return ids.some((id) => ORDER_EDIT_ALL_ROLE_IDS.includes(id))
-}
-
-function isCurrentUserOrderCreator(row: { creator_id?: number }) {
-    const uid = Number(userStore.userInfo?.id)
-    return uid > 0 && Number(row.creator_id) === uid
-}
-
-/** 处方审核 + 支付单审核均已通过 */
-function isDualAuditPassed(row: {
-    prescription_audit_status?: number
-    payment_slip_audit_status?: number
-}) {
-    return Number(row.prescription_audit_status) === 1 && Number(row.payment_slip_audit_status) === 1
-}
-
 function canEditRow(row: {
-    creator_id?: number
     fulfillment_status?: number
-    prescription_audit_status?: number
-    payment_slip_audit_status?: number
     gancao_reciperl_order_no?: string | null
     gancao_submit_time?: number | null
 }) {
@@ -3398,15 +3298,6 @@ function canEditRow(row: {
     // 已完成(3)、已取消(4) 不可编辑
     if (fs === 3 || fs === 4) return false
 
-    // 双审均已通过：仅订单创建人不可再编辑（超管/全量编辑角色仍可改）
-    if (
-        isCurrentUserOrderCreator(row) &&
-        isDualAuditPassed(row) &&
-        !canBypassCreatorDualAuditEditLock()
-    ) {
-        return false
-    }
-
     const gcNo = String(row.gancao_reciperl_order_no || '').trim()
     const gcTime = Number(row.gancao_submit_time || 0)
     const gcLocked = gcNo !== '' || gcTime > 0
@@ -3473,70 +3364,6 @@ function canShipRow(row: { fulfillment_status?: number }) {
     return Number(row.fulfillment_status) === 2
 }
 
-type ShipMode = 'gancao' | 'direct'
-
-const hasSetShipModePerm = computed(() => {
-    const p = userStore.perms || []
-    return p.includes('*') || p.includes('tcm.prescriptionOrder/setShipMode')
-})
-
-function normalizeShipMode(v: unknown): ShipMode {
-    return String(v || '').toLowerCase() === 'direct' ? 'direct' : 'gancao'
-}
-
-function shipModeLabel(v: unknown): string {
-    return normalizeShipMode(v) === 'direct' ? '洛阳药房' : '甘草药房'
-}
-
-function isShipModeLockedToGancao(row: { gancao_reciperl_order_no?: string | null }) {
-    return String(row.gancao_reciperl_order_no || '').trim() !== ''
-}
-
-function canEditShipMode(row: { fulfillment_status?: number }) {
-    const fs = Number(row.fulfillment_status)
-    return fs !== 3 && fs !== 4
-}
-
-const shipModeSaving = ref(false)
-
-function isSamePrescriptionOrderId(a: unknown, b: unknown) {
-    const na = Number(a)
-    const nb = Number(b)
-    return na > 0 && na === nb
-}
-
-const shipDialogModeDisplay = computed(() => {
-    return normalizeShipMode(shipForm.ship_mode) === 'direct' ? '洛阳药房直发' : '甘草药房直发'
-})
-
-async function onDetailShipModeChange(mode: string | number | boolean | undefined) {
-    const row = detailData.value
-    if (!row?.id) return
-    const next = normalizeShipMode(mode)
-    const prev = normalizeShipMode(row.ship_mode)
-    if (next === prev) return
-    if (!canEditShipMode(row)) {
-        feedback.msgWarning('当前订单状态不可修改发货类型')
-        return
-    }
-    shipModeSaving.value = true
-    try {
-        await prescriptionOrderSetShipMode({ id: row.id, ship_mode: next })
-        if (detailData.value) detailData.value.ship_mode = next
-        if (shipVisible.value && isSamePrescriptionOrderId(shipRowId.value, row.id)) {
-            shipForm.ship_mode = next
-        }
-        await refreshCurrentPrescriptionOrderDetail()
-        feedback.msgSuccess('发货类型已保存')
-        getLists()
-        void fetchLogs(row.id)
-    } catch {
-        /* 拦截器已提示 */
-    } finally {
-        shipModeSaving.value = false
-    }
-}
-
 function canAddPayOrderRow(row: { fulfillment_status?: number }) {
     // 已发货(5) / 已签收(6) 状态可补齐支付单
     const fs = Number(row.fulfillment_status)
@@ -3839,40 +3666,6 @@ const logisticsTraceLoading = ref(false)
 const logisticsTracePayload = ref<Record<string, any> | null>(null)
 /** 顺丰/快递100：与运单一致的收件手机后四位（可覆盖订单收货手机） */
 const logisticsTracePhoneTail = ref('')
-/** 物流轨迹请求序号：同手机多运单或快速切换订单时，丢弃过期的异步响应 */
-let logisticsTraceRequestSeq = 0
-
-type LogisticsTraceRequestContext = {
-    requestSeq: number
-    orderId: number
-    trackingNumber: string
-}
-
-function bumpLogisticsTraceRequestToken() {
-    logisticsTraceRequestSeq += 1
-    logisticsTracePayload.value = null
-}
-
-function isCurrentLogisticsTraceContext(ctx: LogisticsTraceRequestContext): boolean {
-    if (ctx.requestSeq !== logisticsTraceRequestSeq) return false
-    if (Number(detailData.value?.id) !== ctx.orderId) return false
-    return String(detailData.value?.tracking_number || '').trim() === ctx.trackingNumber
-}
-
-function parseLogisticsTracePayload(
-    res: unknown,
-    expectedTrackingNumber: string,
-    expectedOrderId: number
-): Record<string, any> | null {
-    const raw = (res as { data?: unknown })?.data ?? res
-    if (!raw || typeof raw !== 'object') return null
-    const payload = raw as Record<string, any>
-    const respNum = String(payload.tracking_number || '').trim()
-    if (respNum && respNum !== expectedTrackingNumber) return null
-    const respOrderId = Number(payload.order_id)
-    if (respOrderId > 0 && respOrderId !== expectedOrderId) return null
-    return payload
-}
 
 const detailLogs = ref<any[]>([])
 const updateAmountVisible = ref(false)
@@ -3929,8 +3722,6 @@ function logActionText(act: string) {
         ship: '确认发货',
         withdraw: '撤销',
         link_pay_order: '关联支付单',
-        completion_request: '完单申请',
-        auto_complete: '自动完成',
         revoke_rx_audit: '撤回处方审核',
         revoke_pay_audit: '撤回支付审核',
         gancao_submit: '甘草下单',
@@ -4038,33 +3829,24 @@ function expressCompanyLabel(v: unknown) {
 }
 
 async function fetchLogisticsTrace() {
-    const orderId = Number(detailData.value?.id)
+    const id = Number(detailData.value?.id)
-    const trackingNumber = String(detailData.value?.tracking_number || '').trim()
+    if (!id) return
-    if (!orderId || !trackingNumber) return
-
-    const requestSeq = ++logisticsTraceRequestSeq
-    const ctx: LogisticsTraceRequestContext = { requestSeq, orderId, trackingNumber }
-
     logisticsTraceLoading.value = true
     try {
         const digits = String(logisticsTracePhoneTail.value || '').replace(/\D/g, '')
         const params: { id: number; express_company?: string; phone_tail?: string } = {
-            id: orderId,
+            id,
             express_company: detailLogisticsExpress.value
         }
         if (digits.length >= 4) {
             params.phone_tail = digits
         }
         const res: any = await prescriptionOrderLogisticsTrace(params)
-        if (!isCurrentLogisticsTraceContext(ctx)) return
+        logisticsTracePayload.value = (res?.data ?? res) as Record<string, any>
-        logisticsTracePayload.value = parseLogisticsTracePayload(res, trackingNumber, orderId)
     } catch {
-        if (!isCurrentLogisticsTraceContext(ctx)) return
         logisticsTracePayload.value = null
     } finally {
-        if (isCurrentLogisticsTraceContext(ctx)) {
+        logisticsTraceLoading.value = false
-            logisticsTraceLoading.value = false
-        }
     }
 }
 
@@ -4190,7 +3972,7 @@ async function openDetail(id: number) {
     // 修复 Bug：显式彻底清空缓存，防止前一次弹窗的数据残留
     detailData.value = null
     detailUnlinkedPayOrders.value = []
-    bumpLogisticsTraceRequestToken()
+    logisticsTracePayload.value = null
     detailLogisticsExpress.value = 'auto'
     logisticsTracePhoneTail.value = ''
     detailLogs.value = []
@@ -4442,25 +4224,7 @@ async function goEditOrderNextStep() {
     }
 }
 
-async function openEdit(row: {
+async function openEdit(row: { id: number }) {
-    id: number
-    creator_id?: number
-    prescription_audit_status?: number
-    payment_slip_audit_status?: number
-    fulfillment_status?: number
-    gancao_reciperl_order_no?: string | null
-    gancao_submit_time?: number | null
-}) {
-    if (!canEditRow(row)) {
-        if (
-            isCurrentUserOrderCreator(row) &&
-            isDualAuditPassed(row) &&
-            !canBypassCreatorDualAuditEditLock()
-        ) {
-            feedback.msgWarning('处方与支付单均已审核通过，创建人不可再编辑')
-        }
-        return
-    }
     editOrderStep.value = 0
     editOrderPrescription.value = null
     editVisible.value = true
@@ -4981,31 +4745,14 @@ const shipForm = reactive({
     tracking_number: ''
 })
 
-function resolveShipModeForRow(row: { id: number; ship_mode?: unknown }) {
-    if (isSamePrescriptionOrderId(detailData.value?.id, row.id)) {
-        return normalizeShipMode(detailData.value!.ship_mode)
-    }
-    return normalizeShipMode(row.ship_mode)
-}
-
 function openShip(row: { id: number; express_company?: unknown; tracking_number?: unknown; ship_mode?: unknown }) {
-    shipRowId.value = Number(row.id)
+    shipRowId.value = row.id
-    shipForm.ship_mode = resolveShipModeForRow(row)
+    shipForm.ship_mode = String(row.ship_mode || 'gancao') || 'gancao'
     shipForm.express_company = String(row.express_company || 'auto') || 'auto'
     shipForm.tracking_number = String(row.tracking_number || '')
     shipVisible.value = true
 }
 
-watch(
-    () => detailData.value?.ship_mode,
-    (v) => {
-        if (!shipVisible.value || !shipRowId.value || !isSamePrescriptionOrderId(detailData.value?.id, shipRowId.value)) {
-            return
-        }
-        shipForm.ship_mode = normalizeShipMode(v)
-    }
-)
-
 async function submitShip() {
     if (!shipForm.tracking_number.trim()) {
         feedback.msgError('请先填写快递单号再确认发货')
@@ -5015,7 +4762,7 @@ async function submitShip() {
     try {
         await prescriptionOrderShip({
             id: shipRowId.value,
-            ship_mode: normalizeShipMode(shipForm.ship_mode),
+            ship_mode: shipForm.ship_mode === 'direct' ? 'direct' : 'gancao',
             express_company: shipForm.express_company || 'auto',
             tracking_number: shipForm.tracking_number.trim()
         })
@@ -5051,47 +4798,35 @@ const completeOrderDialogVisible = ref(false)
 const completeOrderId = ref(0)
 const completeFulfillmentStatus = ref<number>(3)
 const completeOrderSubmitting = ref(false)
-let completeOrderLogisticsRequestSeq = 0
 
 function onCompleteOrderDialogClosed() {
     completeOrderId.value = 0
-    completeOrderLogisticsRequestSeq += 1
     completeOrderLogisticsPayload.value = null
     completeOrderLogisticsLoading.value = false
 }
 
 async function fetchCompleteOrderLogisticsForDialog(row: {
     id: number
-    tracking_number?: unknown
     express_company?: unknown
     recipient_phone?: unknown
 }) {
-    const orderId = Number(row.id)
-    const trackingNumber = String(row.tracking_number || '').trim()
-    if (!orderId || !trackingNumber) return
-
-    const requestSeq = ++completeOrderLogisticsRequestSeq
     completeOrderLogisticsLoading.value = true
     completeOrderLogisticsPayload.value = null
     try {
         const digits = String(row.recipient_phone || '').replace(/\D/g, '')
         const params: { id: number; express_company?: string; phone_tail?: string } = {
-            id: orderId,
+            id: row.id,
             express_company: String(row.express_company || 'auto') || 'auto'
         }
         if (digits.length >= 4) {
             params.phone_tail = digits
         }
         const res: any = await prescriptionOrderLogisticsTrace(params)
-        if (requestSeq !== completeOrderLogisticsRequestSeq || completeOrderId.value !== orderId) return
+        completeOrderLogisticsPayload.value = (res?.data ?? res) as Record<string, any>
-        completeOrderLogisticsPayload.value = parseLogisticsTracePayload(res, trackingNumber, orderId)
     } catch {
-        if (requestSeq !== completeOrderLogisticsRequestSeq || completeOrderId.value !== orderId) return
         completeOrderLogisticsPayload.value = null
     } finally {
-        if (requestSeq === completeOrderLogisticsRequestSeq && completeOrderId.value === orderId) {
+        completeOrderLogisticsLoading.value = false
-            completeOrderLogisticsLoading.value = false
-        }
     }
 }
 
@@ -5125,15 +4860,8 @@ const addPayOrderRowId = ref(0)
 const addPayOrderFormRef = ref<FormInstance>()
 const addPayOrderAvailableLoading = ref(false)
 const addPayOrderAvailableList = ref<any[]>([])
-const addPayOrderAlertTitle = computed(() => {
-    if (addPayOrderForm.add_mode === 'completion_only') {
-        return '不创建或关联支付单，仅提交完单申请，由审核人员在支付审核时处理。'
-    }
-    return '可以手动创建新支付单，或关联已存在但未绑定的支付单。'
-})
-
 const addPayOrderForm = reactive({
-    add_mode: 'create' as 'create' | 'link' | 'completion_only',
+    add_mode: 'create' as 'create' | 'link',
     order_type: 3,
     pay_amount: undefined as number | undefined,
     pay_remark: '',
@@ -5141,47 +4869,38 @@ const addPayOrderForm = reactive({
     completion_request: 0
 })
 
-const addPayOrderRules = computed<FormRules>(() => {
+const addPayOrderRules: FormRules = {
-    const rules: FormRules = {
+    add_mode: [{ required: true, message: '请选择添加方式', trigger: 'change' }],
-        add_mode: [{ required: true, message: '请选择添加方式', trigger: 'change' }]
+    order_type: [{ required: true, message: '请选择费用类别', trigger: 'change' }],
-    }
+    pay_amount: [
-    if (addPayOrderForm.add_mode === 'create') {
+        { required: true, message: '请输入支付金额', trigger: 'blur' },
-        rules.order_type = [{ required: true, message: '请选择费用类别', trigger: 'change' }]
+        {
-        rules.pay_amount = [
+            validator: (_rule, v, cb) => {
-            {
+                const n = Number(v)
-                validator: (_rule, v, cb) => {
+                if (!Number.isFinite(n) || n <= 0) {
-                    if (v === undefined || v === null || v === '') {
+                    cb(new Error('金额须大于 0'))
-                        cb(new Error('请输入支付金额'))
+                } else {
-                        return
+                    cb()
-                    }
+                }
-                    const n = Number(v)
+            },
-                    if (!Number.isFinite(n) || n < 0) {
+            trigger: 'blur'
-                        cb(new Error('金额不能小于 0'))
+        }
-                    } else {
+    ],
-                        cb()
+    link_pay_order_ids: [
-                    }
+        { 
-                },
+            required: true, 
-                trigger: 'blur'
+            message: '请至少选择一个支付单', 
-            }
+            trigger: 'change',
-        ]
+            validator: (_rule, v, cb) => {
-    } else if (addPayOrderForm.add_mode === 'link') {
+                if (!Array.isArray(v) || v.length === 0) {
-        rules.link_pay_order_ids = [
+                    cb(new Error('请至少选择一个支付单'))
-            {
+                } else {
-                required: true,
+                    cb()
-                message: '请至少选择一个支付单',
-                trigger: 'change',
-                validator: (_rule, v, cb) => {
-                    if (!Array.isArray(v) || v.length === 0) {
-                        cb(new Error('请至少选择一个支付单'))
-                    } else {
-                        cb()
-                    }
                 }
             }
-        ]
+        }
-    }
+    ]
-    return rules
+}
-})
 
 async function loadAddPayOrderAvailable(diagnosisId: number, currentLinkedIds: number[] = []) {
     if (!diagnosisId) {
@@ -5229,10 +4948,7 @@ async function submitAddPayOrder() {
     await addPayOrderFormRef.value.validate()
     addPayOrderSaving.value = true
     try {
-        if (addPayOrderForm.add_mode === 'completion_only') {
+        if (addPayOrderForm.add_mode === 'create') {
-            await prescriptionOrderRequestCompletion({ id: addPayOrderRowId.value })
-            feedback.msgSuccess('完单申请已提交，请等待支付审核')
-        } else if (addPayOrderForm.add_mode === 'create') {
             // 手动创建新支付单
             await prescriptionOrderAddPayOrder({
                 id: addPayOrderRowId.value,
@@ -5354,116 +5070,12 @@ const prescriptionTabType = ref('internal')
 const prescriptionSlipPrintRef = ref<HTMLElement | null>(null)
 const prescriptionSlipExporting = ref(false)
 
-type SlipFormulaType = '主方' | '辅方'
-
-type SlipAuxUsageForm = {
-    dosage_amount?: number
-    dosage_bag_count: number
-    need_decoction: boolean
-    bags_per_dose: number
-    times_per_day: number
-    usage_days: number
-}
-
-function normalizeSlipFormulaType(v: unknown): SlipFormulaType {
-    return v === '辅方' ? '辅方' : '主方'
-}
-
-function defaultSlipAuxUsage(prescriptionType = '浓缩水丸'): SlipAuxUsageForm {
-    if (prescriptionType === '饮片') {
-        return {
-            dosage_amount: 50,
-            dosage_bag_count: 1,
-            need_decoction: false,
-            bags_per_dose: 1,
-            times_per_day: 3,
-            usage_days: 7
-        }
-    }
-    if (prescriptionType === '浓缩水丸') {
-        return {
-            dosage_amount: 5,
-            dosage_bag_count: 1,
-            need_decoction: false,
-            bags_per_dose: 1,
-            times_per_day: 3,
-            usage_days: 7
-        }
-    }
-    return {
-        dosage_amount: 1,
-        dosage_bag_count: 1,
-        need_decoction: false,
-        bags_per_dose: 1,
-        times_per_day: 3,
-        usage_days: 7
-    }
-}
-
-function normalizeSlipAuxUsageForm(raw: unknown, prescriptionType: string): SlipAuxUsageForm {
-    const base = defaultSlipAuxUsage(prescriptionType)
-    if (!raw || typeof raw !== 'object') return { ...base }
-    const o = raw as Record<string, unknown>
-    return {
-        dosage_amount:
-            o.dosage_amount !== null && o.dosage_amount !== undefined && o.dosage_amount !== ''
-                ? Number(o.dosage_amount)
-                : base.dosage_amount,
-        dosage_bag_count: o.dosage_bag_count != null ? Number(o.dosage_bag_count) || 1 : base.dosage_bag_count,
-        need_decoction: o.need_decoction === 1 || o.need_decoction === true,
-        bags_per_dose: o.bags_per_dose != null ? Number(o.bags_per_dose) || 1 : base.bags_per_dose,
-        times_per_day: o.times_per_day != null ? Number(o.times_per_day) || 3 : base.times_per_day,
-        usage_days: o.usage_days != null ? Number(o.usage_days) || 7 : base.usage_days
-    }
-}
-
-function buildSlipUsageSegmentText(
-    usage: {
-        prescription_type?: string
-        dosage_amount?: number | null
-        dosage_unit?: string
-        dosage_bag_count?: number
-        times_per_day?: number
-        usage_way?: string
-        usage_time?: string
-    },
-    fallbackWay?: string,
-    fallbackTime?: string
-): string {
-    const pt = usage.prescription_type || '浓缩水丸'
-    const times = Number(usage.times_per_day) > 0 ? Number(usage.times_per_day) : 3
-    const amount = usage.dosage_amount != null ? Number(usage.dosage_amount) : 10
-    const unit = usage.dosage_unit || (pt === '饮片' ? 'ml' : 'g')
-    const usageWay = usage.usage_way || fallbackWay || '温水送服'
-    const usageTime = usage.usage_time || fallbackTime || ''
-    const seg: string[] = []
-    seg.push(`每天${times}次`)
-    if (pt === '浓缩水丸') {
-        const bags = Number(usage.dosage_bag_count) > 0 ? Number(usage.dosage_bag_count) : 1
-        seg.push(`一次${bags}袋`)
-        seg.push(`每袋${amount}${unit}`)
-    } else {
-        seg.push(`一次${amount}${unit}`)
-    }
-    seg.push(usageWay)
-    if (usageTime) seg.push(usageTime)
-    return seg.join(', ')
-}
-
 // 处方单辅助函数
 const slipHerbsList = computed(() => {
     const h = prescriptionViewData.value?.herbs
     return Array.isArray(h) ? h : []
 })
 
-const slipMainHerbs = computed(() =>
-    slipHerbsList.value.filter((h: any) => normalizeSlipFormulaType(h?.formula_type) === '主方')
-)
-
-const slipAuxHerbs = computed(() =>
-    slipHerbsList.value.filter((h: any) => normalizeSlipFormulaType(h?.formula_type) === '辅方')
-)
-
 const slipDietaryText = computed(() => {
     const d = prescriptionViewData.value?.dietary_taboo
     if (Array.isArray(d)) return d.filter(Boolean).join('、')
@@ -5581,8 +5193,6 @@ const rxTypeText = computed(() => {
     const v = prescriptionViewData.value as any
     if (!v) return '—'
     const t = v.prescription_type || '浓缩水丸'
-    /** 饮片不匹配「丸|散|膏|片」，避免误显示「浓缩丸-饮片」；类型字段直接展示饮片 */
-    if (t === '饮片') return '饮片'
     return /丸|散|膏|片/.test(t) ? `浓缩丸-${t}` : t
 })
 
@@ -5590,26 +5200,23 @@ const rxUsageText = computed(() => {
     const v = prescriptionViewData.value as any
     if (!v) return '—'
     if (v.usage_text) return v.usage_text
-    return buildSlipUsageSegmentText(v)
+    const times = Number(v.times_per_day) > 0 ? Number(v.times_per_day) : 3
-})
+    const amount = v.dosage_amount != null ? Number(v.dosage_amount) : 10
-
+    const unit = v.dosage_unit || 'g'
-const rxAuxUsageText = computed(() => {
+    const usageWay = v.usage_way || '温水送服'
-    const v = prescriptionViewData.value as any
+    const usageTime = v.usage_time || ''
-    if (!v || !slipAuxHerbs.value.length) return ''
+    const seg: string[] = []
-    const aux = normalizeSlipAuxUsageForm(v.aux_usage, v.prescription_type || '浓缩水丸')
+    seg.push(`每天${times}次`)
-    return buildSlipUsageSegmentText(
+    if ((v.prescription_type || '浓缩水丸') === '浓缩水丸') {
-        {
+        const bags = Number(v.dosage_bag_count) > 0 ? Number(v.dosage_bag_count) : 1
-            prescription_type: v.prescription_type,
+        seg.push(`一次${bags}袋`)
-            dosage_amount: aux.dosage_amount,
+        seg.push(`每袋${amount}${unit}`)
-            dosage_unit: v.dosage_unit,
+    } else {
-            dosage_bag_count: aux.dosage_bag_count,
+        seg.push(`一次${amount}${unit}`)
-            times_per_day: aux.times_per_day,
+    }
-            usage_way: v.usage_way,
+    seg.push(usageWay)
-            usage_time: v.usage_time
+    if (usageTime) seg.push(usageTime)
-        },
+    return seg.join(', ')
-        v.usage_way,
-        v.usage_time
-    )
 })
 
 /** 出丸：优先用 slipPillGrams（每袋用量×袋数×每天次数×服用天数），否则按药材总量×剂数 */
@@ -6412,19 +6019,6 @@ async function downloadPrescriptionSlipPdf() {
     box-sizing: border-box;
 }
 
-.rx-herb-section-label {
-    grid-column: 1 / -1;
-    font-size: 12px;
-    font-weight: 600;
-    color: #409eff;
-    line-height: 1.4;
-}
-
-.rx-herb-section-label--aux {
-    color: #e6a23c;
-    margin-top: 4px;
-}
-
 .rx-herb-cell {
     display: grid;
     grid-template-columns: 1fr 64px;

admin/src/views/consumer/prescription/order_list_h5.vue

@@ -3047,48 +3047,14 @@ function formatTime(v: unknown) {
     return String(v)
 }
 
-/** 与 server/config/project.php order_edit_all_roles 一致 */
-const ORDER_EDIT_ALL_ROLE_IDS = [0, 3]
-
-function canBypassCreatorDualAuditEditLock(): boolean {
-    const u = userStore.userInfo
-    if (!u) return false
-    if (Number(u.root) === 1) return true
-    const ids = Array.isArray(u.role_ids) ? u.role_ids.map((n: unknown) => Number(n)) : []
-    return ids.some((id) => ORDER_EDIT_ALL_ROLE_IDS.includes(id))
-}
-
-function isCurrentUserOrderCreator(row: { creator_id?: number }) {
-    const uid = Number(userStore.userInfo?.id)
-    return uid > 0 && Number(row.creator_id) === uid
-}
-
-function isDualAuditPassed(row: {
-    prescription_audit_status?: number
-    payment_slip_audit_status?: number
-}) {
-    return Number(row.prescription_audit_status) === 1 && Number(row.payment_slip_audit_status) === 1
-}
-
 function canEditRow(row: {
-    creator_id?: number
     fulfillment_status?: number
-    prescription_audit_status?: number
-    payment_slip_audit_status?: number
     gancao_reciperl_order_no?: string | null
     gancao_submit_time?: number | null
 }) {
     const fs = Number(row.fulfillment_status)
     if (fs === 3 || fs === 4) return false
 
-    if (
-        isCurrentUserOrderCreator(row) &&
-        isDualAuditPassed(row) &&
-        !canBypassCreatorDualAuditEditLock()
-    ) {
-        return false
-    }
-
     const gcNo = String(row.gancao_reciperl_order_no || '').trim()
     const gcTime = Number(row.gancao_submit_time || 0)
     const gcLocked = gcNo !== '' || gcTime > 0
@@ -3440,40 +3406,6 @@ const logisticsTraceLoading = ref(false)
 const logisticsTracePayload = ref<Record<string, any> | null>(null)
 /** 顺丰/快递100：与运单一致的收件手机后四位（可覆盖订单收货手机） */
 const logisticsTracePhoneTail = ref('')
-/** 物流轨迹请求序号：同手机多运单或快速切换订单时，丢弃过期的异步响应 */
-let logisticsTraceRequestSeq = 0
-
-type LogisticsTraceRequestContext = {
-    requestSeq: number
-    orderId: number
-    trackingNumber: string
-}
-
-function bumpLogisticsTraceRequestToken() {
-    logisticsTraceRequestSeq += 1
-    logisticsTracePayload.value = null
-}
-
-function isCurrentLogisticsTraceContext(ctx: LogisticsTraceRequestContext): boolean {
-    if (ctx.requestSeq !== logisticsTraceRequestSeq) return false
-    if (Number(detailData.value?.id) !== ctx.orderId) return false
-    return String(detailData.value?.tracking_number || '').trim() === ctx.trackingNumber
-}
-
-function parseLogisticsTracePayload(
-    res: unknown,
-    expectedTrackingNumber: string,
-    expectedOrderId: number
-): Record<string, any> | null {
-    const raw = (res as { data?: unknown })?.data ?? res
-    if (!raw || typeof raw !== 'object') return null
-    const payload = raw as Record<string, any>
-    const respNum = String(payload.tracking_number || '').trim()
-    if (respNum && respNum !== expectedTrackingNumber) return null
-    const respOrderId = Number(payload.order_id)
-    if (respOrderId > 0 && respOrderId !== expectedOrderId) return null
-    return payload
-}
 
 const detailLogs = ref<any[]>([])
 const updateAmountVisible = ref(false)
@@ -3568,33 +3500,24 @@ function expressCompanyLabel(v: unknown) {
 }
 
 async function fetchLogisticsTrace() {
-    const orderId = Number(detailData.value?.id)
+    const id = Number(detailData.value?.id)
-    const trackingNumber = String(detailData.value?.tracking_number || '').trim()
+    if (!id) return
-    if (!orderId || !trackingNumber) return
-
-    const requestSeq = ++logisticsTraceRequestSeq
-    const ctx: LogisticsTraceRequestContext = { requestSeq, orderId, trackingNumber }
-
     logisticsTraceLoading.value = true
     try {
         const digits = String(logisticsTracePhoneTail.value || '').replace(/\D/g, '')
         const params: { id: number; express_company?: string; phone_tail?: string } = {
-            id: orderId,
+            id,
             express_company: detailLogisticsExpress.value
         }
         if (digits.length >= 4) {
             params.phone_tail = digits
         }
         const res: any = await prescriptionOrderLogisticsTrace(params)
-        if (!isCurrentLogisticsTraceContext(ctx)) return
+        logisticsTracePayload.value = (res?.data ?? res) as Record<string, any>
-        logisticsTracePayload.value = parseLogisticsTracePayload(res, trackingNumber, orderId)
     } catch {
-        if (!isCurrentLogisticsTraceContext(ctx)) return
         logisticsTracePayload.value = null
     } finally {
-        if (isCurrentLogisticsTraceContext(ctx)) {
+        logisticsTraceLoading.value = false
-            logisticsTraceLoading.value = false
-        }
     }
 }
 
@@ -3720,7 +3643,7 @@ async function openDetail(id: number) {
     // 修复 Bug：显式彻底清空缓存，防止前一次弹窗的数据残留
     detailData.value = null
     detailUnlinkedPayOrders.value = []
-    bumpLogisticsTraceRequestToken()
+    logisticsTracePayload.value = null
     detailLogisticsExpress.value = 'auto'
     logisticsTracePhoneTail.value = ''
     detailLogs.value = []
@@ -3736,7 +3659,7 @@ async function openDetail(id: number) {
             const dig = String(d.recipient_phone || '').replace(/\D/g, '')
             logisticsTracePhoneTail.value = dig.length >= 4 ? dig : ''
             if (String(d.tracking_number || '').trim()) {
-                void fetchLogisticsTrace()
+                fetchLogisticsTrace()
             }
             fetchLogs(id)
             
@@ -3966,25 +3889,7 @@ async function goEditOrderNextStep() {
     }
 }
 
-async function openEdit(row: {
+async function openEdit(row: { id: number }) {
-    id: number
-    creator_id?: number
-    prescription_audit_status?: number
-    payment_slip_audit_status?: number
-    fulfillment_status?: number
-    gancao_reciperl_order_no?: string | null
-    gancao_submit_time?: number | null
-}) {
-    if (!canEditRow(row)) {
-        if (
-            isCurrentUserOrderCreator(row) &&
-            isDualAuditPassed(row) &&
-            !canBypassCreatorDualAuditEditLock()
-        ) {
-            feedback.msgWarning('处方与支付单均已审核通过，创建人不可再编辑')
-        }
-        return
-    }
     editOrderStep.value = 0
     editOrderPrescription.value = null
     editVisible.value = true

admin/src/views/finance/account_cost/edit.vue

@@ -22,25 +22,16 @@
                     <el-select
                         v-model="formData.media_channel_code"
                         placeholder="请选择自媒体渠道"
-                        class="account-cost-channel-select w-full"
+                        class="w-full"
                         filterable
+                        :disabled="mode === 'edit'"
                     >
-                        <el-option-group
+                        <el-option
-                            v-for="g in mediaChannelGroups"
+                            v-for="item in mediaChannelOptions"
-                            :key="g.group_name"
+                            :key="item.code"
-                            :label="g.group_name"
+                            :label="item.name"
-                        >
+                            :value="item.code"
-                            <el-option
+                        />
-                                v-for="ch in g.channels"
-                                :key="ch.channel_code"
-                                :label="ch.channel_name"
-                                :value="ch.channel_code"
-                            >
-                                <div class="channel-opt-row">
-                                    <span class="opt-name">{{ ch.channel_name }}</span>
-                                </div>
-                            </el-option>
-                        </el-option-group>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="部门" prop="dept_id">
@@ -87,9 +78,9 @@ import type { FormInstance } from 'element-plus'
 import { accountCostAdd, accountCostDetail, accountCostEdit } from '@/api/finance'
 import Popup from '@/components/popup/index.vue'
 
-interface MediaChannelGroup {
+interface MediaChannelOption {
-    group_name: string
+    code: string
-    channels: { channel_code: string; channel_name: string }[]
+    name: string
 }
 
 interface DeptOption {
@@ -99,7 +90,7 @@ interface DeptOption {
 }
 
 const props = defineProps<{
-    mediaChannelGroups: MediaChannelGroup[]
+    mediaChannelOptions: MediaChannelOption[]
     deptOptions: DeptOption[]
     defaultMediaChannelCode: string
 }>()
@@ -206,21 +197,3 @@ defineExpose({
     getDetail,
 })
 </script>
-
-<style scoped lang="scss">
-.account-cost-channel-select {
-    :deep(.channel-opt-row) {
-        display: flex;
-        align-items: center;
-        width: 100%;
-        min-width: 0;
-        padding-right: 4px;
-    }
-    :deep(.opt-name) {
-        flex: 1;
-        min-width: 0;
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-}
-</style>

admin/src/views/finance/account_cost/index.vue

@@ -27,25 +27,14 @@
                         placeholder="筛选全部渠道"
                         clearable
                         filterable
-                        class="account-cost-channel-select w-[220px]"
+                        class="w-[220px]"
                     >
-                        <el-option label="全部" value="" />
+                        <el-option
-                        <el-option-group
+                            v-for="item in mediaChannelOptions"
-                            v-for="g in mediaChannelGroups"
+                            :key="item.code"
-                            :key="g.group_name"
+                            :label="item.name"
-                            :label="g.group_name"
+                            :value="item.code"
-                        >
+                        />
-                            <el-option
-                                v-for="ch in g.channels"
-                                :key="ch.channel_code"
-                                :label="ch.channel_name"
-                                :value="ch.channel_code"
-                            >
-                                <div class="channel-opt-row">
-                                    <span class="opt-name">{{ ch.channel_name }}</span>
-                                </div>
-                            </el-option>
-                        </el-option-group>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="部门">
@@ -89,15 +78,7 @@
 
             <el-table class="mt-4" size="large" v-loading="pager.loading" :data="pager.lists">
                 <el-table-column label="日期" prop="cost_date" min-width="120" />
-                <el-table-column label="自媒体渠道" min-width="160">
+                <el-table-column label="自媒体渠道" prop="media_channel_name" min-width="120" />
-                    <template #default="{ row }">
-                        <span v-if="getChannelGroupLabel(row.media_channel_code)">
-                            <el-tag size="small" class="mr-1">{{ getChannelGroupLabel(row.media_channel_code) }}</el-tag>
-                            {{ row.media_channel_name }}
-                        </span>
-                        <span v-else>{{ row.media_channel_name }}</span>
-                    </template>
-                </el-table-column>
                 <el-table-column label="部门" prop="dept_name" min-width="140" />
                 <el-table-column label="账户消耗" min-width="120">
                     <template #default="{ row }">¥{{ row.amount }}</template>
@@ -136,7 +117,7 @@
         <edit-popup
             v-if="showEdit"
             ref="editRef"
-            :media-channel-groups="mediaChannelGroups"
+            :media-channel-options="mediaChannelOptions"
             :dept-options="deptOptions"
             :default-media-channel-code="defaultMediaChannelCode"
             @success="getLists"
@@ -152,11 +133,6 @@ import feedback from '@/utils/feedback'
 
 import EditPopup from './edit.vue'
 
-interface MediaChannelGroup {
-    group_name: string
-    channels: { channel_code: string; channel_name: string }[]
-}
-
 interface MediaChannelOption {
     code: string
     name: string
@@ -184,7 +160,7 @@ const { pager, getLists, resetPage } = usePaging({
     params: queryParams,
 })
 
-const mediaChannelOptionsFlat = computed<MediaChannelOption[]>(() => {
+const mediaChannelOptions = computed<MediaChannelOption[]>(() => {
     const options = pager.extend.media_channel_options
     if (!Array.isArray(options)) return []
 
@@ -194,26 +170,6 @@ const mediaChannelOptionsFlat = computed<MediaChannelOption[]>(() => {
     }))
 })
 
-const mediaChannelGroups = computed<MediaChannelGroup[]>(() => {
-    const groups = pager.extend.media_channel_groups
-    if (Array.isArray(groups) && groups.length > 0) {
-        return groups as MediaChannelGroup[]
-    }
-    const flat = mediaChannelOptionsFlat.value
-    if (!flat.length) {
-        return []
-    }
-    return [
-        {
-            group_name: '渠道',
-            channels: flat.map(item => ({
-                channel_code: item.code,
-                channel_name: item.name,
-            })),
-        },
-    ]
-})
-
 const deptOptions = computed<DeptOption[]>(() => {
     const options = pager.extend.dept_options
     return Array.isArray(options) ? options : []
@@ -221,17 +177,6 @@ const deptOptions = computed<DeptOption[]>(() => {
 
 const defaultMediaChannelCode = computed(() => String(pager.extend.default_media_channel_code || ''))
 
-const getChannelGroupLabel = (channelCode: string): string => {
-    if (!channelCode) return ''
-    for (const group of mediaChannelGroups.value) {
-        const channel = group.channels.find(ch => ch.channel_code === channelCode)
-        if (channel) {
-            return group.group_name
-        }
-    }
-    return ''
-}
-
 const treeProps = {
     value: 'id',
     label: 'name',
@@ -268,21 +213,3 @@ const handleReset = () => {
 
 getLists()
 </script>
-
-<style scoped lang="scss">
-.account-cost-channel-select {
-    :deep(.channel-opt-row) {
-        display: flex;
-        align-items: center;
-        width: 100%;
-        min-width: 0;
-        padding-right: 4px;
-    }
-    :deep(.opt-name) {
-        flex: 1;
-        min-width: 0;
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-}
-</style>

admin/src/views/stats/assistant-performance/index.vue

@@ -1,273 +0,0 @@
-<template>
-    <div class="assistant-performance-page">
-        <el-card class="!border-none" shadow="never">
-            <el-form :inline="true" class="stats-filter-form">
-                <el-form-item label="时间范围">
-                    <el-radio-group v-model="queryParams.time_type" @change="handleTimeTypeChange">
-                        <el-radio-button label="today">今天</el-radio-button>
-                        <el-radio-button label="yesterday">昨天</el-radio-button>
-                        <el-radio-button label="week">最近7天</el-radio-button>
-                        <el-radio-button label="month">最近30天</el-radio-button>
-                        <el-radio-button label="custom">自定义</el-radio-button>
-                    </el-radio-group>
-                </el-form-item>
-
-                <el-form-item v-if="queryParams.time_type === 'custom'">
-                    <el-date-picker
-                        v-model="dateRange"
-                        type="daterange"
-                        value-format="YYYY-MM-DD"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        style="width: 260px"
-                        @change="handleCustomDateChange"
-                    />
-                </el-form-item>
-
-                <el-form-item>
-                    <el-button type="primary" :loading="loading" @click="fetchData">查询</el-button>
-                    <el-button @click="handleReset">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-
-        <div class="stats-kpi-grid">
-            <div v-for="card in summaryCards" :key="card.key" class="stats-kpi-card" :class="card.cardClass">
-                <div class="stats-kpi-label">{{ card.label }}</div>
-                <div class="stats-kpi-value" :class="{ 'is-money': card.type === 'money' }">
-                    {{ formatValue(card.key, card.type) }}
-                </div>
-            </div>
-        </div>
-
-        <el-card class="!border-none mt-4" shadow="never">
-            <template #header>
-                <div class="card-header">
-                    <span class="card-title">业绩趋势</span>
-                    <span class="card-hint">{{ dateRangeText }} · 履约完成业绩</span>
-                </div>
-            </template>
-            <v-charts
-                v-if="chartHasData"
-                class="stats-chart"
-                :option="chartOption"
-                autoresize
-            />
-            <el-empty v-else description="暂无数据" />
-        </el-card>
-    </div>
-</template>
-
-<script setup lang="ts" name="assistantPerformancePage">
-import { computed, onMounted, reactive, ref } from 'vue'
-import { ElMessage } from 'element-plus'
-import vCharts from 'vue-echarts'
-import { assistantPerformanceOverview } from '@/api/stats'
-
-const loading = ref(false)
-const dateRange = ref<string[]>([])
-const queryParams = reactive({
-    time_type: 'month',
-    start_date: '',
-    end_date: ''
-})
-
-const overview = reactive<Record<string, any>>({
-    date_range: [],
-    summary: {
-        total_amount: 0,
-        total_count: 0
-    },
-    chart: {
-        dates: [],
-        amounts: [],
-        counts: []
-    }
-})
-
-const summaryCards = [
-    { key: 'total_amount', label: '业绩', type: 'money', cardClass: '' },
-    { key: 'total_count', label: '有效订单数', type: 'count', cardClass: '' }
-]
-
-const dateRangeText = computed(() => {
-    if (!overview.date_range?.length) return '未选择'
-    return `${overview.date_range[0]} 至 ${overview.date_range[1]}`
-})
-
-const chartHasData = computed(() => {
-    return overview.chart.dates.length > 0 && overview.chart.amounts.some((v: number) => v > 0)
-})
-
-const chartOption = computed(() => ({
-    tooltip: {
-        trigger: 'axis',
-        formatter: (params: any) => {
-            const p = params[0]
-            return `${p.axisValue}<br/>${p.marker}${p.seriesName}: ¥${Number(p.value).toFixed(2)}`
-        }
-    },
-    grid: { left: 60, right: 24, top: 36, bottom: 36 },
-    xAxis: {
-        type: 'category',
-        data: overview.chart.dates,
-        axisLabel: {
-            interval: overview.chart.dates.length > 15 ? 'auto' : 0,
-            rotate: overview.chart.dates.length > 10 ? 30 : 0
-        }
-    },
-    yAxis: {
-        type: 'value',
-        name: '金额（元）',
-        axisLabel: {
-            formatter: (val: number) => val >= 10000 ? (val / 10000).toFixed(1) + '万' : String(val)
-        }
-    },
-    series: [
-        {
-            name: '业绩',
-            type: 'line',
-            smooth: true,
-            showSymbol: true,
-            symbolSize: 6,
-            lineStyle: { width: 3, color: '#4a78ff' },
-            itemStyle: { color: '#4a78ff' },
-            areaStyle: {
-                color: {
-                    type: 'linear',
-                    x: 0, y: 0, x2: 0, y2: 1,
-                    colorStops: [
-                        { offset: 0, color: 'rgba(74, 120, 255, 0.25)' },
-                        { offset: 1, color: 'rgba(74, 120, 255, 0.02)' }
-                    ]
-                }
-            },
-            data: overview.chart.amounts
-        }
-    ]
-}))
-
-const formatValue = (key: string, type: string) => {
-    const value = overview.summary?.[key] ?? 0
-    if (type === 'money') return `¥${Number(value).toFixed(2)}`
-    return String(value)
-}
-
-const fetchData = async () => {
-    loading.value = true
-    try {
-        const params: Record<string, any> = { time_type: queryParams.time_type }
-        if (queryParams.time_type === 'custom') {
-            params.start_date = dateRange.value[0] || ''
-            params.end_date = dateRange.value[1] || ''
-        }
-        const res = await assistantPerformanceOverview(params)
-        Object.assign(overview, res || {})
-    } catch (error: any) {
-        console.error('获取业绩数据失败:', error)
-        ElMessage.error(error?.msg || '获取业绩数据失败')
-    } finally {
-        loading.value = false
-    }
-}
-
-const handleTimeTypeChange = () => {
-    if (queryParams.time_type !== 'custom') {
-        dateRange.value = []
-        fetchData()
-    }
-}
-
-const handleCustomDateChange = () => {
-    if (dateRange.value?.length === 2) {
-        fetchData()
-    }
-}
-
-const handleReset = () => {
-    queryParams.time_type = 'month'
-    dateRange.value = []
-    fetchData()
-}
-
-onMounted(() => {
-    fetchData()
-})
-</script>
-
-<style scoped lang="scss">
-.assistant-performance-page {
-    padding: 20px;
-}
-
-.stats-filter-form {
-    :deep(.el-form-item) {
-        margin-bottom: 0;
-    }
-}
-
-.stats-kpi-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
-    gap: 16px;
-    margin-top: 16px;
-}
-
-.stats-kpi-card {
-    background: linear-gradient(145deg, #ffffff, #f5f8ff);
-    border: 1px solid #ebf1ff;
-    border-radius: 14px;
-    padding: 20px;
-    box-shadow: 0 10px 24px rgba(74, 120, 255, 0.08);
-}
-
-.stats-kpi-card.is-cancelled {
-    background: linear-gradient(145deg, #ffffff, #fff5f5);
-    border-color: #ffe0e0;
-    box-shadow: 0 10px 24px rgba(239, 68, 68, 0.06);
-}
-
-.stats-kpi-label {
-    color: #6b7280;
-    font-size: 13px;
-}
-
-.stats-kpi-value {
-    margin-top: 12px;
-    font-size: 28px;
-    line-height: 1.1;
-    font-weight: 700;
-    color: #1f2937;
-}
-
-.stats-kpi-value.is-money {
-    font-size: 24px;
-}
-
-.stats-kpi-card.is-cancelled .stats-kpi-value {
-    color: #ef4444;
-}
-
-.card-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: 12px;
-}
-
-.card-title {
-    font-size: 15px;
-    font-weight: 600;
-    color: #1f2937;
-}
-
-.card-hint {
-    color: #909399;
-    font-size: 12px;
-}
-
-.stats-chart {
-    height: 360px;
-}
-</style>

admin/src/views/tcm/diagnosis/components/PatientOrderList.vue

@@ -131,7 +131,7 @@
                                 <el-descriptions-item label="医师">{{ detailPrescription.doctor_name || '—' }}</el-descriptions-item>
                                 <el-descriptions-item label="类型">{{ detailPrescription.prescription_type || '—' }}</el-descriptions-item>
                                 <el-descriptions-item label="临床诊断" :span="2">{{ detailPrescription.clinical_diagnosis || '—' }}</el-descriptions-item>
-                                <el-descriptions-item label="剂数 / 用法" :span="2" v-if="showPrescriptionAuditFilter">
+                                <el-descriptions-item label="剂数 / 用法" :span="2">
                                     {{ detailData.dose_count ?? detailPrescription.dose_count ?? '—' }} {{ detailData.dose_unit || '剂' }} ·
                                     {{ detailPrescription.usage_instruction || detailPrescription.usage_method || '—' }}
                                 </el-descriptions-item>
@@ -274,7 +274,6 @@
                         <el-descriptions-item label="用药疗程">{{ detailData.medication_days ? detailData.medication_days + ' 天' : '—' }}</el-descriptions-item>
                         <el-descriptions-item label="上次医护">{{ detailData.prev_staff || '—' }}</el-descriptions-item>
                         <el-descriptions-item label="服务渠道">{{ detailData.service_channel || '—' }}</el-descriptions-item>
-                        <el-descriptions-item label="服务套餐">{{ formatServicePackage(detailData.service_package) }}</el-descriptions-item>
                         <el-descriptions-item label="费用类别">{{ feeTypeText(detailData.fee_type) }}</el-descriptions-item>
                         <el-descriptions-item label="快递单号">{{ detailData.tracking_number || '—' }}</el-descriptions-item>
                         <el-descriptions-item label="快递公司">{{ expressCompanyLabel(detailData.express_company) }}</el-descriptions-item>
@@ -333,7 +332,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, watch, ref, onMounted } from 'vue'
+import { computed, watch, ref } from 'vue'
 import { usePaging } from '@/hooks/usePaging'
 import {
     prescriptionOrderLists,
@@ -342,7 +341,6 @@ import {
     prescriptionOrderLogisticsTrace,
     prescriptionOrderPaidPayOrders
 } from '@/api/tcm'
-import { getDictData } from '@/api/app'
 import { hasPermission } from '@/utils/perm'
 import feedback from '@/utils/feedback'
 import useUserStore from '@/stores/modules/user'
@@ -379,22 +377,6 @@ const buildParams = () => {
     queryParams.scene = 'diagnosis_edit'
 }
 
-/** 诊间医助角色（与 DiagnosisLists 等一致） */
-const TCM_ASSISTANT_ROLE_ID = 2
-/** 与 server/config/project.php prescription_audit_roles 默认一致，可处方审核的角色 */
-const PRESCRIPTION_AUDIT_ROLE_IDS = [0, 3, 6]
-
-/**
- * 是否展示「处方审核」相关字段
- */
-const showPrescriptionAuditFilter = computed(() => {
-    const u = userStore.userInfo
-    if (!u || Number(u.root) === 1) return true
-    const ids = Array.isArray(u.role_ids) ? u.role_ids.map((n: unknown) => Number(n)) : []
-    if (!ids.includes(TCM_ASSISTANT_ROLE_ID)) return true
-    return ids.some((id) => PRESCRIPTION_AUDIT_ROLE_IDS.includes(id))
-})
-
 // ─── 详情抽屉 ───
 const detailVisible = ref(false)
 const detailLoading = ref(false)
@@ -581,39 +563,6 @@ function feeTypeText(t: number | undefined) {
     return m[Number(t)] ?? '—'
 }
 
-// 服务套餐字典选项（与 order_list.vue 数据源一致：dict 类型 server_order）
-const servicePackageOptions = ref<Array<{ name: string; value: string }>>([])
-
-async function loadServicePackageOptions() {
-    try {
-        const data: any = await getDictData({ type: 'server_order' })
-        const list = (data?.server_order || []) as Array<{ name: string; value: string; status?: number }>
-        servicePackageOptions.value = list.filter((item) => item.status !== 0)
-    } catch {
-        servicePackageOptions.value = []
-    }
-}
-
-function formatServicePackage(value: unknown): string {
-    if (value === null || value === undefined || value === '') return '—'
-    let packages: string[] = []
-    if (Array.isArray(value)) {
-        packages = value.map((v) => String(v)).filter((v) => v !== '')
-    } else if (typeof value === 'string') {
-        packages = value.split(',').map((v) => v.trim()).filter((v) => v !== '')
-    }
-    if (packages.length === 0) return '—'
-    const names = packages.map((val) => {
-        const opt = servicePackageOptions.value.find((o) => o.value === val)
-        return opt ? opt.name : val
-    })
-    return names.join('、')
-}
-
-onMounted(() => {
-    loadServicePackageOptions()
-})
-
 function expressCompanyLabel(v: unknown) {
     const s = String(v || '').toLowerCase()
     if (s === 'sf') return '顺丰速运'

admin/src/views/tcm/diagnosis/index.vue

@@ -257,7 +257,7 @@
                     <template #default="{ row }">
                         <el-tooltip
                             v-if="row.last_blood_record_at"
-                            :content="`最近一次健康打卡：${row.last_blood_record_at}`"
+                            :content="`最近一次血糖打卡：${row.last_blood_record_at}`"
                             placement="top"
                         >
                             <span class="unserved-days" :class="unservedDaysClass(row.unserved_days)">

admin/src/views/tcm/diagnosis/readonly.vue

@@ -17,14 +17,14 @@
                 </span>
                 <el-tooltip
                     v-if="lastBloodAt"
-                    :content="`最近一次健康打卡：${lastBloodAt}`"
+                    :content="`最近一次血糖打卡：${lastBloodAt}`"
                     placement="bottom"
                 >
                     <span :class="['unserved-badge', unservedDaysClass(unservedDays)]">
                         未服务 {{ unservedDays ?? '—' }} 天
                     </span>
                 </el-tooltip>
-                <span v-else class="unserved-badge unserved-muted">从未打卡</span>
+                <span v-else class="unserved-badge unserved-muted">从未打卡血糖</span>
             </div>
         </div>
 

server/app/adminapi/controller/stats/AssistantPerformanceController.php

@@ -1,21 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace app\adminapi\controller\stats;
-
-use app\adminapi\controller\BaseAdminController;
-use app\adminapi\logic\stats\AssistantPerformanceLogic;
-
-/**
- * 医助个人业绩
- *
- * - GET stats.assistantPerformance/overview  个人业绩概览
- */
-class AssistantPerformanceController extends BaseAdminController
-{
-    public function overview()
-    {
-        $params = $this->request->get();
-        return $this->data(AssistantPerformanceLogic::overview($params, $this->adminId, $this->adminInfo));
-    }
-}

server/app/adminapi/controller/tcm/PrescriptionController.php

@@ -48,27 +48,6 @@ class PrescriptionController extends BaseAdminController
         return $this->success('编辑成功');
     }
 
-    /**
-     * @notes 修正处方患者姓名手机性别
-     */
-    public function patchPatient()
-    {
-        $params = (new PrescriptionValidate())->post()->goCheck('patchPatient');
-        $ok = PrescriptionLogic::patchPatientContact(
-            (int) $params['id'],
-            (string) $params['patient_name'],
-            (string) $params['phone'],
-            (int) $params['gender'],
-            (int) $this->adminId,
-            $this->adminInfo
-        );
-        if (!$ok) {
-            return $this->fail(PrescriptionLogic::getError());
-        }
-
-        return $this->success('已更新');
-    }
-
     /**
      * @notes 删除处方
      */

server/app/adminapi/controller/tcm/PrescriptionOrderController.php

@@ -124,25 +124,6 @@ class PrescriptionOrderController extends BaseAdminController
         return $this->success('修改成功');
     }
 
-    /**
-     * 设置发货类型（甘草 / 洛阳）
-     */
-    public function setShipMode()
-    {
-        $params = (new PrescriptionOrderValidate())->post()->goCheck('setShipMode');
-        $result = PrescriptionOrderLogic::setShipMode(
-            (int) $params['id'],
-            (string) ($params['ship_mode'] ?? 'gancao'),
-            $this->adminId,
-            $this->adminInfo
-        );
-        if ($result === false) {
-            return $this->fail(PrescriptionOrderLogic::getError());
-        }
-
-        return $this->success('已保存', $result);
-    }
-
     /**
      * 修改关联处方的患者姓名与手机号（订单详情场景）
      */
@@ -312,20 +293,6 @@ class PrescriptionOrderController extends BaseAdminController
         return $this->success('关联支付单成功', $result);
     }
 
-    /**
-     * 已发货/已签收：仅提交完单申请（不新增/关联支付单），并重置支付审核为待审核
-     */
-    public function requestCompletion()
-    {
-        $params = (new PrescriptionOrderValidate())->post()->goCheck('requestCompletion');
-        $result = PrescriptionOrderLogic::requestCompletion($params, $this->adminId, $this->adminInfo);
-        if ($result === false) {
-            return $this->fail(PrescriptionOrderLogic::getError());
-        }
-
-        return $this->success('完单申请已提交', $result);
-    }
-
     /**
      * 将「已发货」且支付审核已通过的订单标记为「已完成」
      */

server/app/adminapi/http/middleware/AuthMiddleware.php

@@ -132,42 +132,9 @@ class AuthMiddleware
             return true;
         }
 
-        // 处方库列表：消费者开方页/处方库页导入共用，复用开方或处方库菜单权限
-        if ($accessUri === 'tcm.prescriptionlibrary/lists'
-            && $this->matchPrescriptionLibraryListsPermission($adminUris)) {
-            return true;
-        }
-
         return false;
     }
 
-    /**
-     * 处方库 lists：与开方、处方库维护菜单权限互通（避免开方页「从处方库导入」403）
-     */
-    private function matchPrescriptionLibraryListsPermission(array $adminUris): bool
-    {
-        $aliases = [
-            'tcm.prescriptionlibrary/lists',
-            'tcm.prescription/lists',
-            'tcm.prescription/add',
-            'tcm.prescription/edit',
-            'tcm.prescription/detail',
-            'cf.prescription/lists',
-            'cf.prescription/add',
-            'cf.prescription/edit',
-            'cf.prescription/read',
-            'cf.prescription/del',
-            'cf.prescription/audit',
-            'wcf.prescription/lists',
-            'wcf.prescription/read',
-            'wcf.prescription/add',
-            'wcf.prescription/edit',
-            'wcf.prescription/delete',
-        ];
-
-        return count(array_intersect($aliases, $adminUris)) > 0;
-    }
-
     /**
      * 面诊进度专用：auth.admin/lists、doctor.appointment/lists + progress_board=1，不校验菜单权限
      */