From cefbc900165cd5139c1e9ac2a3f7bdd73c3ca87c Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Wed, 5 Aug 2026 20:20:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AE=B5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=89=A5=E7=A6=BB=E3=80=82=E6=B8=A0=E9=81=93=E5=8F=B7=E6=BA=90?= =?UTF-8?q?=E5=8F=AA=E4=BF=9D=E7=95=99=E5=8C=BB=E7=94=9F=E6=B8=A0=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/Admin/YeWu/EntrustController.php | 4 +- .../API/Admin/YeWu/PlanListController.php | 30 +- .../API/Admin/YeWu/PlanModelController.php | 30 +- .../API/Admin/YeWu/SignInController.php | 4 +- .../API/Admin/YeWu/WorkMainController.php | 16 +- .../Controllers/API/H5/EntrustController.php | 6 +- .../Http/Controllers/API/PdfController.php | 12 +- .../API/Third/CSharpController.php | 3 + .../Controllers/API/Third/PacsController.php | 4 +- .../Services/Admin/YeWu/PlanListService.php | 13 +- .../app/Services/Xml/ShenQingDanService.php | 3 + .../src/views/AppointmentMngr/PlanList.vue | 313 ++++++++++---- .../views/AppointmentMngr/PlanListAdmin.vue | 315 ++++++++++---- .../src/views/AppointmentMngr/PlanModel.vue | 387 +++++++++++------- .../views/AppointmentMngr/PlanModelAdmin.vue | 386 ++++++++++------- 15 files changed, 1024 insertions(+), 502 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php index 1919eb2..1daeffe 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php @@ -16,7 +16,7 @@ public function GetList(){ $list=DB::table('s_list') ->leftJoin('s_period','s_list.reservation_time','=','s_period.id') ->leftJoin('s_department_resources','s_list.reservation_sources','=','s_department_resources.id') - ->select('s_list.*','s_period.period_begin_time','s_period.period_end_time','s_department_resources.department_resources_name'); + ->select('s_list.*',DB::raw('COALESCE(s_list.reservation_begin_time, s_period.period_begin_time) as period_begin_time'),DB::raw('COALESCE(s_list.reservation_end_time, s_period.period_end_time) as period_end_time'),'s_department_resources.department_resources_name'); if ($searchInfo['dateRange']!=null and count($searchInfo['dateRange']) == 2) { $list = $list->where(function ($q) use($searchInfo) { $q->whereBetween('s_list.entrust_date', $searchInfo['dateRange']) @@ -85,7 +85,7 @@ public function getMainDetail_duoren() $allInfo=[]; foreach ($entrustInfos as $key => $entrustInfo) { $info = DB::table('s_list as a')->where(['a.reg_num' => $entrustInfo['reg_num'], 'a.episodeid'=>$entrustInfo['episodeid'],'a.is_nullify'=>0]) - ->select('a.*','c.period_begin_time','c.period_end_time') + ->select('a.*',DB::raw('COALESCE(a.reservation_begin_time, c.period_begin_time) as period_begin_time'),DB::raw('COALESCE(a.reservation_end_time, c.period_end_time) as period_end_time')) ->leftJoin('s_period as c','a.reservation_time','=','c.id') ->whereIn('a.entrust_id',$entrustInfo['entrustid']) ->get(); diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanListController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanListController.php index 0380713..520b19e 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanListController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanListController.php @@ -175,6 +175,13 @@ public function ChangeInfo(Request $request) $u1 = DB::table('s_source_roster_detail')->where(['id' => $PlanDetaiInfo['id']])->update([ 'status' => $PlanDetaiInfo['status'] ]); + // 更新截止时间 + $timeUpdated = false; + if (isset($PlanDetaiInfo['end_reservation_time'])) { + $timeUpdated = DB::table('s_source_roster_detail')->where(['id' => $PlanDetaiInfo['id']])->update([ + 'end_reservation_time' => $PlanDetaiInfo['end_reservation_time'] + ]) > 0; + } $i = 0; foreach ($PlanDetaiInfo['coutsInfo'] as $key => $value) { $u2 = DB::table('s_source_roster_detail_count')->where(['id' => $value['id']])->update([ @@ -183,7 +190,7 @@ public function ChangeInfo(Request $request) ]); if ($u2) $i++; } - if ($u1 or $i > 0) { + if ($u1 or $i > 0 or $timeUpdated) { return \Yz::Return(true, '保存成功', []); } else { return \Yz::echoError1('没有数据更新'); @@ -881,6 +888,13 @@ public function ChangeInfoAdmin(Request $request) $u1 = DB::table('s_source_roster_detail')->where(['id' => $PlanDetaiInfo['id']])->update([ 'status' => $PlanDetaiInfo['status'] ]); + // 更新截止时间 + $timeUpdated = false; + if (isset($PlanDetaiInfo['end_reservation_time'])) { + $timeUpdated = DB::table('s_source_roster_detail')->where(['id' => $PlanDetaiInfo['id']])->update([ + 'end_reservation_time' => $PlanDetaiInfo['end_reservation_time'] + ]) > 0; + } $i = 0; foreach ($PlanDetaiInfo['coutsInfo'] as $key => $value) { $u2 = DB::table('s_source_roster_detail_count')->where(['id' => $value['id']])->update([ @@ -889,7 +903,7 @@ public function ChangeInfoAdmin(Request $request) ]); if ($u2) $i++; } - if ($u1 or $i > 0) { + if ($u1 or $i > 0 or $timeUpdated) { return \Yz::Return(true, '保存成功', []); } else { return \Yz::echoError1('没有数据更新'); @@ -1179,6 +1193,7 @@ public function BatchChangeCount(Request $request) $ids = request('ids'); $max_total = request('max_total'); $coutsInfo = request('coutsInfo'); + $end_reservation_time = request('end_reservation_time'); if (empty($ids) || empty($coutsInfo)) { return \Yz::echoError1('参数错误'); } @@ -1197,7 +1212,16 @@ public function BatchChangeCount(Request $request) WHERE roster_detail_id IN ({$idsStr}) AND appointment_type_id IN ({$atypeIdsStr})"; $u2 = DB::update($sql); - if ($u2 > 0) { + $timeUpdated = false; + // 更新截止时间（同一时间段时传入） + if ($end_reservation_time !== null) { + $timeUpdated = DB::table('s_source_roster_detail') + ->whereIn('id', $ids) + ->where('department_id', $department_id) + ->where('is_del', 0) + ->update(['end_reservation_time' => $end_reservation_time]) > 0; + } + if ($u2 > 0 || $timeUpdated) { return \Yz::Return(true, '批量修改成功', []); } else { return \Yz::echoError1('批量修改失败'); diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanModelController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanModelController.php index 4f60894..246c3d9 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanModelController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanModelController.php @@ -558,7 +558,7 @@ public function BatchEnable(Request $request) } } - //批量修改计划模板（渠道数量+病人类型） + //批量修改计划模板（渠道数量+病人类型+可选时间字段） public function BatchChange(Request $request) { $userid = $request->get('userid'); @@ -566,6 +566,9 @@ public function BatchChange(Request $request) $max_total = request('max_total'); $coutsInfo = request('coutsInfo'); $patientType = request('patientType'); + $begin_time = request('begin_time'); + $end_time = request('end_time'); + $end_reservation_time = request('end_reservation_time'); if (empty($ids) || !is_array($ids)) { return \Yz::echoError1('请选择要修改的记录'); @@ -585,11 +588,19 @@ public function BatchChange(Request $request) $patient_type_str = !empty($patientType) ? implode(',', $patientType) : ''; foreach ($ids as $id) { + $rosterData = []; // 更新病人类型 if ($patient_type_str !== '') { + $rosterData['patient_type'] = $patient_type_str; + } + // 更新时间字段（同一时间段时传入） + if ($begin_time !== null) $rosterData['begin_time'] = $begin_time; + if ($end_time !== null) $rosterData['end_time'] = $end_time; + if ($end_reservation_time !== null) $rosterData['end_reservation_time'] = $end_reservation_time; + if (!empty($rosterData)) { DB::table('s_source_roster') ->where(['id' => $id, 'department_id' => $department_id, 'is_del' => 0]) - ->update(['patient_type' => $patient_type_str]); + ->update($rosterData); } // 更新渠道数量 @@ -912,7 +923,7 @@ public function BatchEnableAdmin(Request $request) } } - //管理员批量修改计划模板（渠道数量+病人类型） + //管理员批量修改计划模板（渠道数量+病人类型+可选时间字段） public function BatchChangeAdmin(Request $request) { $department_id = request('department_id'); @@ -923,6 +934,9 @@ public function BatchChangeAdmin(Request $request) $max_total = request('max_total'); $coutsInfo = request('coutsInfo'); $patientType = request('patientType'); + $begin_time = request('begin_time'); + $end_time = request('end_time'); + $end_reservation_time = request('end_reservation_time'); if (empty($ids) || !is_array($ids)) { return \Yz::echoError1('请选择要修改的记录'); @@ -936,11 +950,19 @@ public function BatchChangeAdmin(Request $request) $patient_type_str = !empty($patientType) ? implode(',', $patientType) : ''; foreach ($ids as $id) { + $rosterData = []; // 更新病人类型 if ($patient_type_str !== '') { + $rosterData['patient_type'] = $patient_type_str; + } + // 更新时间字段（同一时间段时传入） + if ($begin_time !== null) $rosterData['begin_time'] = $begin_time; + if ($end_time !== null) $rosterData['end_time'] = $end_time; + if ($end_reservation_time !== null) $rosterData['end_reservation_time'] = $end_reservation_time; + if (!empty($rosterData)) { DB::table('s_source_roster') ->where(['id' => $id, 'department_id' => $department_id, 'is_del' => 0]) - ->update(['patient_type' => $patient_type_str]); + ->update($rosterData); } // 更新渠道数量 diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/SignInController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/SignInController.php index 6a80361..fbd39b8 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/SignInController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/SignInController.php @@ -16,7 +16,7 @@ public function SignIn(Request $request) $MainListIds = request('MainListIds'); if(empty($MainListIds)) return \Yz::echoError1('id参数不能为空'); $mainInfos=DB::table('s_list as a') - ->select('a.*','b.period_begin_time','b.period_end_time') + ->select('a.*',DB::raw('COALESCE(a.reservation_begin_time, b.period_begin_time) as period_begin_time'),DB::raw('COALESCE(a.reservation_end_time, b.period_end_time) as period_end_time')) ->leftJoin('s_period as b','a.reservation_time','=','b.id') ->whereIn('a.id',$MainListIds)->where(['a.is_del'=>0])->get(); //遍历判断所有要预约的医嘱是否符合条件 @@ -145,7 +145,7 @@ public function CancelSign(Request $request) $MainListIds = request('MainListIds'); if(empty($MainListIds)) return \Yz::echoError1('id参数不能为空'); $mainInfos=DB::table('s_list as a') - ->select('a.*','b.period_begin_time','b.period_end_time') + ->select('a.*',DB::raw('COALESCE(a.reservation_begin_time, b.period_begin_time) as period_begin_time'),DB::raw('COALESCE(a.reservation_end_time, b.period_end_time) as period_end_time')) ->leftJoin('s_period as b','a.reservation_time','=','b.id') ->whereIn('a.id',$MainListIds)->where(['a.is_del'=>0])->get(); //遍历判断所有要预约的医嘱是否符合条件 diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php index 7c6c9f6..7c21933 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php @@ -28,7 +28,7 @@ public function getMainDetail() $arrayEntrustids = explode(",", $entrustids); $info = DB::table('s_list as a')->where(['a.reg_num' => $regnum, 'a.episodeid'=>$episodeid,'a.is_nullify'=>0]) - ->select('a.*','c.period_begin_time','c.period_end_time') + ->select('a.*',DB::raw('COALESCE(a.reservation_begin_time, c.period_begin_time) as period_begin_time'),DB::raw('COALESCE(a.reservation_end_time, c.period_end_time) as period_end_time')) ->leftJoin('s_period as c','a.reservation_time','=','c.id') ->whereIn('a.entrust_id',$arrayEntrustids) ->get(); @@ -224,7 +224,7 @@ public function GetList(Request $request) $list=DB::table('s_list') ->leftJoin('s_period','s_list.reservation_time','=','s_period.id') ->leftJoin('s_department_resources','s_list.reservation_sources','=','s_department_resources.id') - ->select('s_list.*','s_period.period_begin_time','s_period.period_end_time','s_department_resources.department_resources_name') + ->select('s_list.*',DB::raw('COALESCE(s_list.reservation_begin_time, s_period.period_begin_time) as period_begin_time'),DB::raw('COALESCE(s_list.reservation_end_time, s_period.period_end_time) as period_end_time'),'s_department_resources.department_resources_name') ->where(['s_list.is_del'=>0]); if($userInfo[0]->group==2){ // $list=$list->whereIn('warddesc', explode(",", $userInfo[0]->ward)); @@ -360,7 +360,7 @@ public function GetListByDept(Request $request) $list = DB::table('s_list') ->leftJoin('s_period', 's_list.reservation_time', '=', 's_period.id') ->leftJoin('s_department_resources', 's_list.reservation_sources', '=', 's_department_resources.id') - ->select('s_list.*', 's_period.period_begin_time', 's_period.period_end_time', 's_department_resources.department_resources_name') + ->select('s_list.*', DB::raw('COALESCE(s_list.reservation_begin_time, s_period.period_begin_time) as period_begin_time'), DB::raw('COALESCE(s_list.reservation_end_time, s_period.period_end_time) as period_end_time'), 's_department_resources.department_resources_name') ->where(['s_list.is_del' => 0, 's_list.is_nullify' => 0]); // 选中具体科室时，按科室编号过滤 @@ -534,7 +534,7 @@ public function CheckIsDaiJian() $planTime=[$plan->date.' '.$plan->begin_time,$plan->date.' '.$plan->end_time]; $query=DB::table('s_list')->where(['reg_num'=>$reg_num,'list_status'=>1,'is_nullify'=>0]) - ->select('s_list.*','s_period.period_begin_time','s_period.period_end_time','s_department_resources.department_resources_name') + ->select('s_list.*',DB::raw('COALESCE(s_list.reservation_begin_time, s_period.period_begin_time) as period_begin_time'),DB::raw('COALESCE(s_list.reservation_end_time, s_period.period_end_time) as period_end_time'),'s_department_resources.department_resources_name') ->leftJoin('s_period','s_list.reservation_time','=','s_period.id') ->leftJoin('s_department_resources','s_list.reservation_sources','=','s_department_resources.id') ->get(); @@ -572,6 +572,9 @@ public function NoPayCancel() $u_data = [ 'list_status' => 0, 'reservation_date' => null, + 'reservation_begin_time' => null, + 'reservation_end_time' => null, + 'reservation_deadline_time' => null, 'reservation_time' => null, 'reservation_sources' => null, 'services_group' => null, @@ -631,6 +634,9 @@ public function NoPayCancel() $u_data = [ 'list_status' => 0, 'reservation_date' => null, + 'reservation_begin_time' => null, + 'reservation_end_time' => null, + 'reservation_deadline_time' => null, 'reservation_time' => null, 'reservation_sources' => null, 'services_group' => null, @@ -684,7 +690,7 @@ public function GetPersonYuYueList() $list=DB::table('s_list') ->leftJoin('s_period','s_list.reservation_time','=','s_period.id') ->leftJoin('s_department_resources','s_list.reservation_sources','=','s_department_resources.id') - ->select('s_list.*','s_period.period_begin_time','s_period.period_end_time','s_department_resources.department_resources_name') + ->select('s_list.*',DB::raw('COALESCE(s_list.reservation_begin_time, s_period.period_begin_time) as period_begin_time'),DB::raw('COALESCE(s_list.reservation_end_time, s_period.period_end_time) as period_end_time'),'s_department_resources.department_resources_name') ->where(['s_list.is_del'=>0,'s_list.is_nullify'=>0]) ->where('s_list.reg_num', $reg_num) ->whereIn('list_status',[1,2,3]); diff --git a/Laravel/app/Http/Controllers/API/H5/EntrustController.php b/Laravel/app/Http/Controllers/API/H5/EntrustController.php index da56e65..06f2f3e 100644 --- a/Laravel/app/Http/Controllers/API/H5/EntrustController.php +++ b/Laravel/app/Http/Controllers/API/H5/EntrustController.php @@ -18,8 +18,8 @@ public function GetList(Request $request) ->leftJoin('s_department_resources', 's_list.reservation_sources', '=', 's_department_resources.id') ->select( 's_list.*', - 's_period.period_begin_time', - 's_period.period_end_time', + DB::raw('COALESCE(s_list.reservation_begin_time, s_period.period_begin_time) as period_begin_time'), + DB::raw('COALESCE(s_list.reservation_end_time, s_period.period_end_time) as period_end_time'), 's_department_resources.department_resources_name' ) ->where(['s_list.is_del' => 0, 's_list.is_nullify' => 0]) @@ -45,7 +45,7 @@ public function GetDetail(Request $request) $id = request('id'); $userid = $request->get('userid');//中间件产生的参数 $info = DB::table('s_list as a')->where(['a.id'=>$id,'a.reg_num' => $userid]) - ->select('a.*','c.period_begin_time','c.period_end_time') + ->select('a.*',DB::raw('COALESCE(a.reservation_begin_time, c.period_begin_time) as period_begin_time'),DB::raw('COALESCE(a.reservation_end_time, c.period_end_time) as period_end_time')) ->leftJoin('s_period as c','a.reservation_time','=','c.id') ->first(); if($info){ diff --git a/Laravel/app/Http/Controllers/API/PdfController.php b/Laravel/app/Http/Controllers/API/PdfController.php index b64b0af..8604781 100644 --- a/Laravel/app/Http/Controllers/API/PdfController.php +++ b/Laravel/app/Http/Controllers/API/PdfController.php @@ -118,8 +118,8 @@ public function GetCheckPdf() $list = DB::table('s_list as a') ->select( 'a.*', - 'c.period_begin_time', - 'c.period_end_time', + DB::raw('COALESCE(a.reservation_begin_time, c.period_begin_time) as period_begin_time'), + DB::raw('COALESCE(a.reservation_end_time, c.period_end_time) as period_end_time'), 'b.department_resources_name', 'b.department_resources_addr' ) @@ -431,7 +431,7 @@ public function CreateJianChaShenQingDanPdf() $successCount=0; foreach ($OrderNoList as $orderNo) { $entrustInfo=DB::table('s_list as a')->where(['a.entrust_id'=>$orderNo,'a.list_status'=>1,'a.is_nullify'=>0]) - ->select('a.*','c.period_begin_time','c.period_end_time') + ->select('a.*',DB::raw('COALESCE(a.reservation_begin_time, c.period_begin_time) as period_begin_time'),DB::raw('COALESCE(a.reservation_end_time, c.period_end_time) as period_end_time')) ->leftJoin('s_period as c','a.reservation_time','=','c.id') ->first(); if(!$entrustInfo) continue; @@ -499,8 +499,8 @@ public function GenerateGroupedCheckPdf() $list = DB::table('s_list as a') ->select( 'a.*', - 'c.period_begin_time', - 'c.period_end_time', + DB::raw('COALESCE(a.reservation_begin_time, c.period_begin_time) as period_begin_time'), + DB::raw('COALESCE(a.reservation_end_time, c.period_end_time) as period_end_time'), 'b.department_resources_name', 'b.department_resources_addr' ) @@ -745,7 +745,7 @@ public function PrintMainList() $list = DB::table('s_list') ->leftJoin('s_period','s_list.reservation_time','=','s_period.id') ->leftJoin('s_department_resources','s_list.reservation_sources','=','s_department_resources.id') - ->select('s_list.*','s_period.period_begin_time','s_period.period_end_time','s_department_resources.department_resources_name','s_department_resources.department_resources_addr') + ->select('s_list.*',DB::raw('COALESCE(s_list.reservation_begin_time, s_period.period_begin_time) as period_begin_time'),DB::raw('COALESCE(s_list.reservation_end_time, s_period.period_end_time) as period_end_time'),'s_department_resources.department_resources_name','s_department_resources.department_resources_addr') ->where(['s_list.is_del'=>0,'s_list.is_nullify'=>0]); if($userInfo->group==2){ diff --git a/Laravel/app/Http/Controllers/API/Third/CSharpController.php b/Laravel/app/Http/Controllers/API/Third/CSharpController.php index 41b319a..4e5afcc 100644 --- a/Laravel/app/Http/Controllers/API/Third/CSharpController.php +++ b/Laravel/app/Http/Controllers/API/Third/CSharpController.php @@ -343,6 +343,9 @@ public function CancelApply ($orderNo) $clearData = [ 'list_status' => 0, 'reservation_date' => null, + 'reservation_begin_time' => null, + 'reservation_end_time' => null, + 'reservation_deadline_time' => null, 'reservation_time' => null, 'reservation_sources' => null, 'services_group' => null, diff --git a/Laravel/app/Http/Controllers/API/Third/PacsController.php b/Laravel/app/Http/Controllers/API/Third/PacsController.php index 2cb58a9..30307f1 100644 --- a/Laravel/app/Http/Controllers/API/Third/PacsController.php +++ b/Laravel/app/Http/Controllers/API/Third/PacsController.php @@ -51,8 +51,8 @@ public function GetEntrustInfo(){ "episodeid", "RISRAcceptDeptCode", "reservation_date", - 's_period.period_begin_time as reservation_time', - 's_period.period_end_time as reservation_end_time', + DB::raw('COALESCE(s_list.reservation_begin_time, s_period.period_begin_time) as reservation_time'), + DB::raw('COALESCE(s_list.reservation_end_time, s_period.period_end_time) as reservation_end_time'), "canel_time as cancel_time", "warddesc", "wardcode", diff --git a/Laravel/app/Services/Admin/YeWu/PlanListService.php b/Laravel/app/Services/Admin/YeWu/PlanListService.php index 7b6ba27..d2b6fa0 100644 --- a/Laravel/app/Services/Admin/YeWu/PlanListService.php +++ b/Laravel/app/Services/Admin/YeWu/PlanListService.php @@ -1113,7 +1113,7 @@ public function YuYue($planid, $appointment_type, $mainlistids, $do_type,$is_eme //遍历多个s_list表id,前端多选，一次预约多个检查项目 foreach ($mainlistids as $key_m => $mainlistid) { $mainInfo = DB::table('s_list as a') - ->select('a.*', 'b.period_begin_time', 'b.period_end_time') + ->select('a.*', DB::raw('COALESCE(a.reservation_begin_time, b.period_begin_time) as period_begin_time'), DB::raw('COALESCE(a.reservation_end_time, b.period_end_time) as period_end_time')) ->leftJoin('s_period as b', 'a.reservation_time', '=', 'b.id') ->where(['a.id' => $mainlistid])->first(); $oldMainInfos[] = $mainInfo; @@ -1760,6 +1760,9 @@ public function YuYue($planid, $appointment_type, $mainlistids, $do_type,$is_eme $u_data = [ 'list_status' => 1, 'reservation_date' => $planInfo->date, + 'reservation_begin_time' => $planInfo->begin_time, + 'reservation_end_time' => $planInfo->end_time, + 'reservation_deadline_time' => $planInfo->end_reservation_time, 'reservation_time' => $planInfo->period_id, 'reservation_sources' => $planInfo->resources_id, 'services_group' => $planInfo->device_id, @@ -1959,6 +1962,9 @@ public function CancelYuYue($MainListId, $reg_num,$do_user=null) $u_data = [ 'list_status' => 0, 'reservation_date' => null, + 'reservation_begin_time' => null, + 'reservation_end_time' => null, + 'reservation_deadline_time' => null, 'reservation_time' => null, 'reservation_sources' => null, 'services_group' => null, @@ -2031,6 +2037,9 @@ public function BatchCancelYuYue($ids, $reg_num, $do_user = null) $u_data = [ 'list_status' => 0, 'reservation_date' => null, + 'reservation_begin_time' => null, + 'reservation_end_time' => null, + 'reservation_deadline_time' => null, 'reservation_time' => null, 'reservation_sources' => null, 'services_group' => null, @@ -2744,7 +2753,7 @@ public function SendMsg($infos,$dotype=1) $s=new SendMessgeService(); foreach ($infos as $key => $info) { $mainInfo = DB::table('s_list as a') - ->select('a.*', 'b.period_begin_time', 'b.period_end_time') + ->select('a.*', DB::raw('COALESCE(a.reservation_begin_time, b.period_begin_time) as period_begin_time'), DB::raw('COALESCE(a.reservation_end_time, b.period_end_time) as period_end_time')) ->leftJoin('s_period as b', 'a.reservation_time', '=', 'b.id') ->where(['a.id' => $info->id])->first(); $s->sendMessage($info->user_phone,'测试短信,项目:'.$mainInfo->entrust.',时间：'.$mainInfo->reservation_date.' '.substr($mainInfo->period_begin_time,0,5).'-'.substr($mainInfo->period_end_time,0,5)); diff --git a/Laravel/app/Services/Xml/ShenQingDanService.php b/Laravel/app/Services/Xml/ShenQingDanService.php index 1495f4a..2eaebef 100644 --- a/Laravel/app/Services/Xml/ShenQingDanService.php +++ b/Laravel/app/Services/Xml/ShenQingDanService.php @@ -150,6 +150,9 @@ public function UpdateStatus($result, $jsonData) $clearData = [ 'list_status' => 0, 'reservation_date' => null, + 'reservation_begin_time' => null, + 'reservation_end_time' => null, + 'reservation_deadline_time' => null, 'reservation_time' => null, 'reservation_sources' => null, 'services_group' => null, diff --git a/YiJi-admin/src/views/AppointmentMngr/PlanList.vue b/YiJi-admin/src/views/AppointmentMngr/PlanList.vue index dd70e14..1733508 100644 --- a/YiJi-admin/src/views/AppointmentMngr/PlanList.vue +++ b/YiJi-admin/src/views/AppointmentMngr/PlanList.vue @@ -73,7 +73,7 @@ - {{item.substring(5,10)}} {{getWeekday(item)}} + {{item.substring(5,10)}} {{getWeekday(item)}}