From a12a7bb2ec2309037291831140cc2a6a9ef2d559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=A9=E4=BB=9488?= <> Date: Thu, 9 Apr 2026 14:18:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/Admin/YeWu/WorkMainController.php | 6 +- YiJi-admin/src/components/Yewu/YuYue.vue | 7 +- .../src/views/YeWu/MainList_ZhuYuan.vue | 35 +++- opencode.json | 189 +++++++++--------- opencode.json11111111 | 175 ++++++++++++++++ 5 files changed, 307 insertions(+), 105 deletions(-) create mode 100644 opencode.json11111111 diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php index 4991acd..06cdccd 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php @@ -116,8 +116,10 @@ class WorkMainController extends Controller $userid = $request->get('userid');//中间件产生的参数 $userInfo = DB::table('users')->where(['id' => $userid])->get(); $department_id = $userInfo[0]->department_id; - $department = DB::table('s_department')->where(['id' => $department_id,'is_del'=>0])->first(); - // if(!$department) return \Yz::echoError1('科室信息不存在'); +$department = DB::table('s_department')->where(['id' => $department_id,'is_del'=>0])->first(); + if(!$department){ + return \Yz::Return(true,'用户所属科室信息不存在',['list'=>[],'count'=>0]); + } $list=DB::table('s_list') ->leftJoin('s_period','s_list.reservation_time','=','s_period.id') diff --git a/YiJi-admin/src/components/Yewu/YuYue.vue b/YiJi-admin/src/components/Yewu/YuYue.vue index e2dd88c..38c7c3d 100644 --- a/YiJi-admin/src/components/Yewu/YuYue.vue +++ b/YiJi-admin/src/components/Yewu/YuYue.vue @@ -269,6 +269,10 @@ }, ServiceDate:{ type:String + }, + do_user:{ + type:[String,Number], + default:null } }) let loading = ref(false) @@ -562,7 +566,8 @@ mainlistid: startYuYueInfo.value.mainListids, planid: startYuYueInfo.value.planInfo.id, appointment_type: props.YuYueInfo.appointment_type, - dotype: type + dotype: type, + do_user: props.do_user }).then(res => { loading.value = false if (res.status) { diff --git a/YiJi-admin/src/views/YeWu/MainList_ZhuYuan.vue b/YiJi-admin/src/views/YeWu/MainList_ZhuYuan.vue index 763510b..45ecff1 100644 --- a/YiJi-admin/src/views/YeWu/MainList_ZhuYuan.vue +++ b/YiJi-admin/src/views/YeWu/MainList_ZhuYuan.vue @@ -1,7 +1,7 @@