1

2026-06-11 14:26:41 +08:00
parent 08249451a7
commit e5959fd89a
7 changed files with 121 additions and 46 deletions
@@ -1522,13 +1522,14 @@
                <el-form-item label="添加方式" prop="add_mode">
                    <el-radio-group v-model="addPayOrderForm.add_mode">
                        <el-radio value="create">付呗</el-radio>
+                        <el-radio value="create_express">快递代收</el-radio>
                        <el-radio value="link">关联已有</el-radio>
                        <el-radio value="completion_only">直接完单申请</el-radio>
                    </el-radio-group>
                </el-form-item>

-                <!-- 付呗（手动创建支付单） -->
-                <template v-if="addPayOrderForm.add_mode === 'create'">
+                <!-- 付呗 / 快递代收（手动创建支付单） -->
+                <template v-if="addPayOrderForm.add_mode === 'create' || addPayOrderForm.add_mode === 'create_express'">
                    <el-form-item label="费用类别" prop="order_type">
                        <el-select v-model="addPayOrderForm.order_type" class="w-full">
                            <el-option label="挂号费" :value="1" />
@@ -4274,11 +4275,14 @@ const addPayOrderAlertTitle = computed(() => {
    if (addPayOrderForm.add_mode === 'completion_only') {
        return '不创建或关联支付单，仅提交完单申请，由审核人员在支付审核时处理。'
    }
+    if (addPayOrderForm.add_mode === 'create_express') {
+        return '通过快递代收创建新支付单（流转同付呗），或关联已存在但未绑定的支付单。'
+    }
    return '可以通过付呗创建新支付单，或关联已存在但未绑定的支付单。'
 })

 const addPayOrderForm = reactive({
-    add_mode: 'create' as 'create' | 'link' | 'completion_only',
+    add_mode: 'create' as 'create' | 'create_express' | 'link' | 'completion_only',
    order_type: 3,
    pay_amount: undefined as number | undefined,
    pay_remark: '',
@@ -4290,7 +4294,7 @@ const addPayOrderRules = computed<FormRules>(() => {
    const rules: FormRules = {
        add_mode: [{ required: true, message: '请选择添加方式', trigger: 'change' }]
    }
-    if (addPayOrderForm.add_mode === 'create') {
+    if (addPayOrderForm.add_mode === 'create' || addPayOrderForm.add_mode === 'create_express') {
        rules.order_type = [{ required: true, message: '请选择费用类别', trigger: 'change' }]
        rules.pay_amount = [
            {
@@ -4377,14 +4381,19 @@ async function submitAddPayOrder() {
        if (addPayOrderForm.add_mode === 'completion_only') {
            await prescriptionOrderRequestCompletion({ id: addPayOrderRowId.value })
            feedback.msgSuccess('完单申请已提交，请等待支付审核')
-        } else if (addPayOrderForm.add_mode === 'create') {
-            // 手动创建新支付单
+        } else if (
+            addPayOrderForm.add_mode === 'create' ||
+            addPayOrderForm.add_mode === 'create_express'
+        ) {
+            // 手动创建新支付单（付呗 / 快递代收）
            await prescriptionOrderAddPayOrder({
                id: addPayOrderRowId.value,
                order_type: addPayOrderForm.order_type,
                pay_amount: addPayOrderForm.pay_amount!,
                pay_remark: addPayOrderForm.pay_remark || '',
-                completion_request: addPayOrderForm.completion_request
+                completion_request: addPayOrderForm.completion_request,
+                pay_create_type:
+                    addPayOrderForm.add_mode === 'create_express' ? 'express_cod' : 'fubei'
            })
            feedback.msgSuccess('支付单已新增，请等待审核')
        } else {
@@ -1998,13 +1998,14 @@
                <el-form-item label="添加方式" prop="add_mode">
                    <el-radio-group v-model="addPayOrderForm.add_mode">
                        <el-radio value="create">付呗</el-radio>
+                        <el-radio value="create_express">快递代收</el-radio>
                        <el-radio value="link">关联已有</el-radio>
                        <el-radio value="completion_only">直接完单申请</el-radio>
                    </el-radio-group>
                </el-form-item>

-                <!-- 付呗（手动创建支付单） -->
-                <template v-if="addPayOrderForm.add_mode === 'create'">
+                <!-- 付呗 / 快递代收（手动创建支付单） -->
+                <template v-if="addPayOrderForm.add_mode === 'create' || addPayOrderForm.add_mode === 'create_express'">
                    <el-form-item label="费用类别" prop="order_type">
                        <el-select v-model="addPayOrderForm.order_type" class="w-full">
                            <el-option label="挂号费" :value="1" />
@@ -4955,10 +4956,13 @@ const addPayOrderAlertTitle = computed(() => {
    if (addPayOrderForm.add_mode === 'completion_only') {
        return '不创建或关联支付单，仅提交完单申请，由审核人员在支付审核时处理。'
    }
+    if (addPayOrderForm.add_mode === 'create_express') {
+        return '通过快递代收创建新支付单（流转同付呗），或关联已存在但未绑定的支付单。'
+    }
    return '可以通过付呗创建新支付单，或关联已存在但未绑定的支付单。'
 })
 const addPayOrderForm = reactive({
-    add_mode: 'create' as 'create' | 'link' | 'completion_only',
+    add_mode: 'create' as 'create' | 'create_express' | 'link' | 'completion_only',
    order_type: 3,
    pay_amount: undefined as number | undefined,
    pay_remark: '',
@@ -4970,7 +4974,7 @@ const addPayOrderRules = computed<FormRules>(() => {
    const rules: FormRules = {
        add_mode: [{ required: true, message: '请选择添加方式', trigger: 'change' }]
    }
-    if (addPayOrderForm.add_mode === 'create') {
+    if (addPayOrderForm.add_mode === 'create' || addPayOrderForm.add_mode === 'create_express') {
        rules.order_type = [{ required: true, message: '请选择费用类别', trigger: 'change' }]
        rules.pay_amount = [
            { required: true, message: '请输入支付金额', trigger: 'blur' },
@@ -5054,14 +5058,19 @@ async function submitAddPayOrder() {
        if (addPayOrderForm.add_mode === 'completion_only') {
            await prescriptionOrderRequestCompletion({ id: addPayOrderRowId.value })
            feedback.msgSuccess('完单申请已提交，请等待支付审核')
-        } else if (addPayOrderForm.add_mode === 'create') {
-            // 手动创建新支付单
+        } else if (
+            addPayOrderForm.add_mode === 'create' ||
+            addPayOrderForm.add_mode === 'create_express'
+        ) {
+            // 手动创建新支付单（付呗 / 快递代收）
            await prescriptionOrderAddPayOrder({
                id: addPayOrderRowId.value,
                order_type: addPayOrderForm.order_type,
                pay_amount: addPayOrderForm.pay_amount!,
                pay_remark: addPayOrderForm.pay_remark || '',
-                completion_request: addPayOrderForm.completion_request
+                completion_request: addPayOrderForm.completion_request,
+                pay_create_type:
+                    addPayOrderForm.add_mode === 'create_express' ? 'express_cod' : 'fubei'
            })
            feedback.msgSuccess('支付单已新增，请等待审核')
        } else {