diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/DeleteOperationLogController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/DeleteOperationLogController.php index 59b6801..6ead528 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/DeleteOperationLogController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/DeleteOperationLogController.php @@ -37,6 +37,12 @@ public function GetList(Request $request) if (!empty($searchInfo['dateRange'])) { $query->whereBetween('created_at', [$searchInfo['dateRange'][0] . ' 00:00:00', $searchInfo['dateRange'][1] . ' 23:59:59']); } + if (!empty($searchInfo['org_id'])) { + $org = DB::table('medical_institution')->where('id', $searchInfo['org_id'])->first(); + if ($org) { + $query->where('current_org_name', $org->org_name); + } + } $count = $query->count(); $list = $query->orderBy('id', 'desc') @@ -83,6 +89,12 @@ public function ExportList(Request $request) if (!empty($searchInfo['dateRange'])) { $query->whereBetween('created_at', [$searchInfo['dateRange'][0] . ' 00:00:00', $searchInfo['dateRange'][1] . ' 23:59:59']); } + if (!empty($searchInfo['org_id'])) { + $org = DB::table('medical_institution')->where('id', $searchInfo['org_id'])->first(); + if ($org) { + $query->where('current_org_name', $org->org_name); + } + } $list = $query->orderBy('id', 'desc')->get(); diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php index 377a38f..46eef6b 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php @@ -248,19 +248,19 @@ public function DelCheckUpInfo() if(!$info) return \Yz::echoError1('未找到对应记录'); //记录删除日志 - $deleteLogService = app()->make(\App\Services\DeleteLogService::class); - $deleteLogService->logDeletion( - 'examination_records', - $info->id, - $info->name, - $info->id_card_num, - null, - $doctor_name, - '接口删除-取消总检', - $org_id->org_name ?? '', - $info->type ?? '', - '' - ); +// $deleteLogService = app()->make(\App\Services\DeleteLogService::class); +// $deleteLogService->logDeletion( +// 'examination_records', +// $info->id, +// $info->name, +// $info->id_card_num, +// null, +// $doctor_name, +// '接口删除-取消总检', +// $org_id->org_name ?? '', +// $info->type ?? '', +// '' +// ); $del=DB::table('examination_records')->where(['id'=>$info->id])->update(['is_del'=>1]); if($del){ diff --git a/el-admin/.env.production b/el-admin/.env.production index 9f2e0e5..4e552bd 100644 --- a/el-admin/.env.production +++ b/el-admin/.env.production @@ -1,6 +1,6 @@ ENV = 'production' -VITE_APP_API_6666666666 = 'http://192.168.50.123:33583/common/la/public/api/' -VITE_APP_FILE_6666666666 = 'http://192.168.50.123:33583/common/la/public' +VITE_APP_API = 'http://192.168.50.123:33583/common/la/public/api/' +VITE_APP_FILE = 'http://192.168.50.123:33583/common/la/public' -VITE_APP_API = 'http://172.31.68.39:33583/common/la/public/api/' -VITE_APP_FILE = 'http://172.31.68.39:33583/common/la/public' \ No newline at end of file +VITE_APP_API_6666666666 = 'http://172.31.68.39:33583/common/la/public/api/' +VITE_APP_FILE_6666666666 = 'http://172.31.68.39:33583/common/la/public' \ No newline at end of file diff --git a/el-admin/src/views/Report/DeleteOperationLog.vue b/el-admin/src/views/Report/DeleteOperationLog.vue index 20abde7..4b3fc92 100644 --- a/el-admin/src/views/Report/DeleteOperationLog.vue +++ b/el-admin/src/views/Report/DeleteOperationLog.vue @@ -27,6 +27,11 @@ + + + + + 搜索 导出Excel @@ -60,7 +65,7 @@