From 3e42aae522a5b31ba2fd0d4e3a07855ae852336d Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Tue, 2 Apr 2024 21:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E8=B4=A6=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/pages/order/order.vue              | 53 ++++++++++++++++++++
 app/Http/Controllers/UserOrderController.php |  8 ++-
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/admin/src/pages/order/order.vue b/admin/src/pages/order/order.vue
index 7043bcb..cb9edd3 100644
--- a/admin/src/pages/order/order.vue
+++ b/admin/src/pages/order/order.vue
@@ -330,6 +330,59 @@ const user_order_columns = [{
     ]))
     return children
   }
+},{
+  title: '结算信息',
+  key: 'receivers',
+  render(row) {
+	  let s_info=JSON.parse(row.receivers)
+	  if(s_info)
+	  console.log(s_info)
+    let children = [
+      h('div', null, [
+        h('b', '订单总金额: '),
+        h('span', row.price),
+      ]),
+      h('div', null, [
+        h('b', '各方应收: '),
+        //h('span', !!row.appointment_number ? row.appointment_number : '-'),
+		h('div',  !!s_info ? s_info.map((item) => {
+		  return item.account + ' ￥'+(item.amount/100)
+		}).join('\r\n') : ''),
+      ]),
+      h('div', null, [
+        h('b', '结算状态: '),
+        h(
+          NTag,
+          {
+            size: 'small',
+            type: row.sharing_status ===1 ? 'success' : 'error'
+          },
+          {
+            default: () => {
+              return row.sharing_status === 1 ? '已结算' : '未结算'
+            }
+          }
+        ),
+      ]),
+    ]
+    if (row.check_status === 2) {
+      children.push(h('div', null, [
+        h('b', '到检时间: '),
+        h('span', row.check_time),
+      ]))
+    }
+    if (!!row.exam_number) {
+      children.push(h('div', null, [
+        h('b', '体检编号: '),
+        h('span', row.exam_number),
+      ]))
+    }
+    children.push(h('div', null, [
+      h('b', '介绍人: '),
+      h('span', row.referral ? row.referral : '-'),
+    ]))
+    return children
+  }
 }]
 
 const pagePush = () => {
diff --git a/app/Http/Controllers/UserOrderController.php b/app/Http/Controllers/UserOrderController.php
index 131b348..fb5eb87 100644
--- a/app/Http/Controllers/UserOrderController.php
+++ b/app/Http/Controllers/UserOrderController.php
@@ -761,8 +761,12 @@ class UserOrderController extends Controller
     $time = $request->post('time');
     $search = $request->post('search');
     $status = $request->post('status');
-    $list = UserOrder::select('*')
-      ->where('hospital', $hospital);
+//    $list = UserOrder::select('*')
+//      ->where('hospital', $hospital);
+    $list = UserOrder::select('user_orders.*', 'profitsharing_logs.receivers','profitsharing_logs.status as sharing_status')
+      ->where('user_orders.hospital', $hospital)
+      ->leftjoin('profitsharing_logs', 'user_orders.id', '=', 'profitsharing_logs.order');
+
     if ($status == 2) {
       $list = $list->where('status', 2)->where('refund_time', null);
     } elseif ($status == 7) {