操作日志增加机构筛选，去掉取消总检日志；

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();
 

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 = app()->make(\App\Services\DeleteLogService::class);
-        $deleteLogService->logDeletion(
+//        $deleteLogService->logDeletion(
-            'examination_records',
+//            'examination_records',
-            $info->id,
+//            $info->id,
-            $info->name,
+//            $info->name,
-            $info->id_card_num,
+//            $info->id_card_num,
-            null,
+//            null,
-            $doctor_name,
+//            $doctor_name,
-            '接口删除-取消总检',
+//            '接口删除-取消总检',
-            $org_id->org_name ?? '',
+//            $org_id->org_name ?? '',
-            $info->type ?? '',
+//            $info->type ?? '',
-            ''
+//            ''
-        );
+//        );
 
         $del=DB::table('examination_records')->where(['id'=>$info->id])->update(['is_del'=>1]);
         if($del){

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_API = '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_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_API_6666666666 = 'http://172.31.68.39:33583/common/la/public/api/'
-VITE_APP_FILE = 'http://172.31.68.39:33583/common/la/public'
+VITE_APP_FILE_6666666666 = 'http://172.31.68.39:33583/common/la/public'

el-admin/src/views/Report/DeleteOperationLog.vue

@@ -27,6 +27,11 @@
 					<el-date-picker v-model="searchInfo.dateRange" value-format="YYYY-MM-DD" type="daterange"
 						range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
 				</el-form-item>
+				<el-form-item v-if="org_list.length > 0">
+					<el-select filterable clearable v-model="searchInfo.org_id" placeholder="请选择体检机构">
+						<el-option v-for="(item, index) in org_list" :key="index" :label="item.org_name" :value="item.id" />
+					</el-select>
+				</el-form-item>
 				<el-form-item>
 					<el-button type="primary" @click="Search">搜索</el-button>
 					<el-button type="success" @click="ExportExcel" :loading="exportLoading">导出Excel</el-button>
@@ -60,7 +65,7 @@
 <script setup>
 	import { ref, onMounted } from 'vue'
 	import { ElMessage } from 'element-plus'
-	import { DeleteOperationLogGetList, DeleteOperationLogExport } from '@/api/api.js'
+	import { DeleteOperationLogGetList, DeleteOperationLogExport, GetHealthOrganizationEnableList } from '@/api/api.js'
 	import * as XLSX from 'xlsx'
 
 	let typeMap = { '1': '健康证体检', '2': '老年人体检' }
@@ -79,7 +84,22 @@
 		table_name: '',
 		type: '',
 		dateRange: [],
+		org_id: null,
+	})
+
+	let org_list = ref([])
+	const getHealthOrganizationEnableList = () => {
+		GetHealthOrganizationEnableList().then(res => {
+			if (res.status) {
+				org_list.value = res.data
+				if (res.data.length == 1) {
+					searchInfo.value.org_id = res.data[0].id
+				}
+			} else {
+				ElMessage.error(res.msg)
+			}
 		})
+	}
 
 	const PageSizeChange = (e) => {
 		pageSize.value = e
@@ -139,6 +159,7 @@
 		})
 	}
 	onMounted(() => {
+		getHealthOrganizationEnableList()
 		GetList()
 	})
 </script>