diff --git a/admin/src/views/consumer/prescription/index.vue b/admin/src/views/consumer/prescription/index.vue index 5c1cdaec..182d7fb4 100644 --- a/admin/src/views/consumer/prescription/index.vue +++ b/admin/src/views/consumer/prescription/index.vue @@ -799,50 +799,50 @@ - -
-
-
- - - -
-
-
关联处方
-
- ID {{ createOrderPrescription.id }} - · {{ createOrderPrescription.sn }} - · {{ createOrderPrescription.patient_name || '—' }} -
-
- {{ createOrderHerbSummary }} +
+ +
+
+ 关联处方 +
+ #{{ createOrderPrescription.id }} + {{ createOrderPrescription.sn }} + {{ createOrderPrescription.patient_name || '—' }}
+ +
{{ createOrderHerbSummary }}
+
-
- - -
-
- - - - 患者与收货 -
-
- + + + + + + +

{{ createOrderStepLead }}

+ + +
+ - + - + @@ -880,7 +880,7 @@ v-model="createOrderForm.region" :options="regionOptions" :props="{ value: 'name', label: 'name', children: 'children', emitPath: true, checkStrictly: false }" - placeholder="请选择省/市/区" + placeholder="省 / 市 / 区" clearable filterable class="w-full" @@ -893,45 +893,39 @@ -
- -
-
- - - - 服务信息 -
-
- - - +
+ + + - - - + + +
+ + +
- + @@ -943,121 +937,98 @@ - - - -
-
-
- - - - - -
-
- - - - 关联收款 -
-
- - - -
-
- {{ o.order_no }} - ¥{{ o.amount }} -
-
- {{ formatPoCategory(o.order_type) }} - {{ String(o.create_time || '').substring(0, 16) }} -
-
-
-
-
- 主管或本诊单医助可见该诊单全部支付单(待支付/已支付),否则仅本人创建的收款单。已被其他有效业务订单占用的支付单不会出现在此列表。 -
-
-
- -
-
- - - - 金额信息 -
-
- -
-
-
-
定金门槛
-
- ¥{{ formatPoDepositMoney(createOrderDepositMin) }} -
-
- {{ createOrderDepositMin > 0 ? '订单和支付单总金额须 ≥ 此值' : '未设置' }} -
-
-
-
已选收款单
-
- ¥{{ formatPoDepositMoney(createOrderLinkedPaidTotal) }} -
-
- {{ createOrderLinkedPaidTotal >= createOrderDepositMin ? '✓ 已达标' : '✗ 未达标' }} -
-
+
+ +
+
+ 定金门槛 + ¥{{ formatPoDepositMoney(createOrderDepositMin) }} + {{ createOrderDepositMin > 0 ? '须 ≥ 此值' : '未设置' }} +
+
+
+ 已选收款 + ¥{{ formatPoDepositMoney(createOrderLinkedPaidTotal) }} + + {{ createOrderLinkedPaidTotal >= createOrderDepositMin ? '已达标' : '未达标' }} +
- + @@ -1072,14 +1043,15 @@ - + @@ -1091,47 +1063,54 @@ :step="0.01" :precision="2" class="w-full" - placeholder="仅财务角色可见" + controls-position="right" + placeholder="财务可见" + /> + + + + + -
-
- - -
-
- - - - 备注说明 -
-
- - - -
+
@@ -400,7 +402,7 @@ 开方人:{{ detailData.doctor_name }}
- + /> --> @@ -752,99 +754,145 @@
- + -
+
+
+
+ 关联处方 +
+ #{{ editOrderPrescription.id }} + {{ editOrderPrescription.sn }} + {{ editOrderPrescription.patient_name || '—' }} +
+
+ +
{{ editOrderHerbSummary }}
+
+
+ + + + + + + +

{{ editOrderStepLead }}

+ - -
-
- - - - - 收货信息 -
- +
+ - + - + + + + + + + + + + + - - - - - - - -
- -
-
- - - - 处方信息 -
- - - +
+ + +
+ 处方 + + 详细 + + + 测试价格 + + ID: {{ editForm.prescription_id || '—' }} +
+
+ + - - -
- + +
+ - +
- + - + - - - -
- -
-
- - - - 服务信息 -
- + - + - + + +
+ + + + + + + +
+
+
+ + + + +
+
+ {{ o.order_no }} + ¥{{ o.amount }} +
+
+ {{ formatPoCategory(o.order_type) }} + {{ String(o.create_time || '').substring(0, 16) }} +
+
+
+
+
+ + 主管/本诊单医助可见全部支付单;否则仅本人收款单。已被占用的支付单不列出。 + + 详情 + +
+
+
- -
-
- - - - 物流信息 -
- -
- - - - - - - -
-
- - - - - 测试价格 - - - 测试当前配置的甘草预下单价格(不会真实提交订单) - - -
- - -
-
- - - - 费用信息 -
- - - - - - - - - - - - - - - - -
-
- {{ o.order_no }} - ¥{{ o.amount }} -
-
- {{ formatPoCategory(o.order_type) }} - {{ String(o.create_time || '').substring(0, 16) }} -
-
-
-
-
- 已选收款合计:¥{{ formatMoney(editLinkedPaidTotal) }} -
-
- - - -
- 须 ≥ 定金门槛 ¥{{ formatMoney(editDepositMin) }} -
-
- - +
- - - - - - +
+ 定金门槛 + ¥{{ formatMoney(editDepositMin) }} + {{ editDepositMin > 0 ? '须 ≥ 此值' : '未设置' }} +
+
+
+ 已选收款 + ¥{{ formatMoney(editLinkedPaidTotal) }} + + {{ editLinkedPaidTotal >= editDepositMin ? '已达标' : '未达标' }} + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ @@ -1530,7 +1620,7 @@ - + @@ -99,7 +99,7 @@ - +
diff --git a/server/server.zip b/server/server.zip index 13128c45..eeacc973 100644 Binary files a/server/server.zip and b/server/server.zip differ