From deb2b30e87d4d2feb8921e8f179a22f683e58940 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Thu, 2 Nov 2023 19:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BD=93=E6=A3=80=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改管理员删除体检日历
---
 .../Controllers/AppointmentController.php     | 21 ++++++++++++++++---
 北京仁仁体检平台报告对比/api/api.js           |  2 +-
 北京仁仁体检平台报告对比/api/index.js         |  2 +-
 .../pages/main/report/report.vue              |  1 +
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/AppointmentController.php b/app/Http/Controllers/AppointmentController.php
index 3586695..7602464 100644
--- a/app/Http/Controllers/AppointmentController.php
+++ b/app/Http/Controllers/AppointmentController.php
@@ -202,7 +202,12 @@ class AppointmentController extends Controller
     if (count($appointments_to_delete)) {
       return Yo::error_echo(200023);
     }
-    Appointment::whereIn('id', $ids)->where('hospital', Login::$info->hospital)->update(['del' => 1]);
+    if(Login::$info->id==1){
+      Appointment::whereIn('id', $ids)->update(['del' => 1]);
+    }else{
+      Appointment::whereIn('id', $ids)->where('hospital', Login::$info->hospital)->update(['del' => 1]);
+    }
+
     return Yo::delete_echo($ids);
   }
 
@@ -211,7 +216,12 @@ class AppointmentController extends Controller
     Login::admin([], [15, 27]);
     $ids = $request->post('ids');
     $status = $request->post('status');
-    Appointment::whereIn('id', $ids)->where('hospital', Login::$info->hospital)->update(['status' => $status]);
+    if(Login::$info->id==1){
+      Appointment::whereIn('id', $ids)->update(['status' => $status]);
+    }else{
+      Appointment::whereIn('id', $ids)->where('hospital', Login::$info->hospital)->update(['status' => $status]);
+    }
+
     return Yo::update_echo($ids);
   }
 
@@ -220,7 +230,12 @@ class AppointmentController extends Controller
     Login::admin([], [15, 27]);
     $ids = $request->post('ids');
     $count = $request->post('count');
-    Appointment::whereIn('id', $ids)->where('hospital', Login::$info->hospital)->update(['max_count' => $count]);
+    if(Login::$info->id==1){
+      Appointment::whereIn('id', $ids)->update(['max_count' => $count]);
+    }else{
+      Appointment::whereIn('id', $ids)->where('hospital', Login::$info->hospital)->update(['max_count' => $count]);
+    }
+
     return Yo::update_echo($ids);
   }
 
diff --git a/北京仁仁体检平台报告对比/api/api.js b/北京仁仁体检平台报告对比/api/api.js
index 27d27d0..425e5c9 100644
--- a/北京仁仁体检平台报告对比/api/api.js
+++ b/北京仁仁体检平台报告对比/api/api.js
@@ -1,5 +1,5 @@
 let url_ = "https://bjrrtj-api.cjy.net.cn";
-const dev = 0
+const dev = 1
 if (dev === 1) {
 	url_ = "http://localbeijingrenren"
 }
diff --git a/北京仁仁体检平台报告对比/api/index.js b/北京仁仁体检平台报告对比/api/index.js
index 0508343..ef3237d 100644
--- a/北京仁仁体检平台报告对比/api/index.js
+++ b/北京仁仁体检平台报告对比/api/index.js
@@ -2,7 +2,7 @@ import {
 	$post
 } from '@/lu/axios.js'
 let url_ = "https://bjrrtj-api.cjy.net.cn";
-const dev = 0
+const dev = 1
 if (dev === 1) {
 	url_ = "http://localbeijingrenren"
 }
diff --git a/北京仁仁体检平台报告对比/pages/main/report/report.vue b/北京仁仁体检平台报告对比/pages/main/report/report.vue
index e40df36..d02f38e 100644
--- a/北京仁仁体检平台报告对比/pages/main/report/report.vue
+++ b/北京仁仁体检平台报告对比/pages/main/report/report.vue
@@ -49,6 +49,7 @@
 				conclusion: response.data.conclusion,
 				list: response.data.list,
 			}
+			 
 		})
 	}