diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanTypeController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanTypeController.php index e579e28..aa58bba 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanTypeController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanTypeController.php @@ -19,8 +19,9 @@ class PlanTypeController extends Controller 'checkup_type_id' => isset($Info['checkup_type_id']) ? json_encode($Info['checkup_type_id']) : null, 'amount_limit1' => isset($Info['amount_limit1']) ? $Info['amount_limit1'] : 0, 'amount_limit2' => isset($Info['amount_limit2']) ? $Info['amount_limit2'] : 0, + 'status'=>isset($Info['status']) ? $Info['status'] : 0, ]; - $requiredFields = ['name'=>'姓名','is_vip'=>'vip类型','use_type'=>'个检/团检类型','checkup_type_id'=>'体检类型']; + $requiredFields = ['name'=>'姓名','is_vip'=>'vip类型','use_type'=>'个检/团检类型','checkup_type_id'=>'体检类型','status'=>'状态']; // 判断是否为空 foreach ($requiredFields as $key=> $field) { if (!isset($params[$key]) || $params[$key] === null) { @@ -33,7 +34,7 @@ class PlanTypeController extends Controller $do=$table->insert($params); } if($Info['id']>0){ - $do=$table->update($params); + $do=$table->where(['id'=>$Info['id']])->update($params); } if($do){ return \Yz::Return(true,'操作成功',[]); @@ -48,8 +49,54 @@ class PlanTypeController extends Controller $pageSize =request('pageSize'); $searchInfo=request('searchInfo'); $list=DB::table('plan_type')->where(['is_del'=>0]); + if(isset($searchInfo['name'])){ + $list = $list->where('name', 'like','%'.$searchInfo['name'].'%'); + } + if(isset($searchInfo['status'])){ + $list = $list->where('status',$searchInfo['status']); + } $count=$list->count(); + if(isset($page) and isset($pageSize)){ + $list=$list->orderBy('id', 'desc')->limit($pageSize)->skip(($page - 1) * $pageSize)->take($pageSize); + } $list=$list ->get(); + //匹配检查类型 + $check=DB::table('checkup_type')->where(['is_del'=>0])->get(); + + foreach ($list as $key => $l){ + $checkup_type_id=json_decode($l->checkup_type_id,true); + $CheckTypeName=[]; + foreach($check as $k2=>$l2){ + if(in_array($l2->id,$checkup_type_id)){ + $CheckTypeName[]=$l2->name; + } + } + $l->check_type_name=$CheckTypeName; + } return \Yz::Return(true,'查询完成',['list'=>$list,'count'=>$count]); } + + public function GetDetail() + { + $id =request('id'); + $info=DB::table('plan_type')->where(['id'=>$id,'is_del'=>0])->first(); + if(!!$info){ + $info->checkup_type_id=json_decode($info->checkup_type_id,true); + return \Yz::Return(true,'查询完成',$info); + }else{ + return \Yz::echoError1('查询失败'); + } + } + public function Del() + { + $id =request('id'); + $d=DB::table('plan_type')->where(['id'=>$id])->update([ + 'is_del'=>1 + ]); + if($d){ + return \Yz::Return(true,'操作完成',[]); + }else{ + return \Yz::echoError1('操作失败'); + } + } } diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index 98c4320..c27c404 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -52,7 +52,10 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1'],function () { Route::post('admin/CalendarChangeInfo','App\Http\Controllers\API\Admin\YeWu\healthCalendarController@ChangeInfo'); //admin后台更新日历 Route::post('admin/PlanTypeGetList','App\Http\Controllers\API\Admin\YeWu\PlanTypeController@GetList');//号源类型列表 Route::post('admin/PlanTypeSave','App\Http\Controllers\API\Admin\YeWu\PlanTypeController@Save');//号源类型保存 + Route::post('admin/PlanTypeGetDetail','App\Http\Controllers\API\Admin\YeWu\PlanTypeController@GetDetail');//号源类型详情 + Route::post('admin/PlanTypeDel','App\Http\Controllers\API\Admin\YeWu\PlanTypeController@Del');//号源类型详情 Route::post('admin/CheckUpTypeGetEnableList','App\Http\Controllers\API\Admin\YeWu\CheckUpTypeController@GetEnableList');//可用体检类型列表 + Route::post('admin/PlanModelTimeList','App\Http\Controllers\API\Admin\YeWu\PlanModelController@timeList');//可用体检类型列表 }); diff --git a/admin/src/api/api.js b/admin/src/api/api.js index a9643ed..a2e8dea 100644 --- a/admin/src/api/api.js +++ b/admin/src/api/api.js @@ -123,4 +123,16 @@ export const CheckUpTypeGetEnableList = (data={}) => { //号源类型保存 export const PlanTypeSave = (data={}) => { return axios({url:import.meta.env.VITE_APP_API+'v1/admin/PlanTypeSave',data:data}) +} +//号源类型详情 +export const PlanTypeGetDetail = (data={}) => { + return axios({url:import.meta.env.VITE_APP_API+'v1/admin/PlanTypeGetDetail',data:data}) +} +//号源类型详情 +export const PlanTypeDel = (data={}) => { + return axios({url:import.meta.env.VITE_APP_API+'v1/admin/PlanTypeDel',data:data}) +} +//号源模板获取时间段列表 +export const PlanModelTimeList = (data={}) => { + return axios({url:import.meta.env.VITE_APP_API+'v1/admin/PlanModelTimeList',data:data}) } \ No newline at end of file diff --git a/admin/src/router/index.js b/admin/src/router/index.js index fcb2cf1..cd03813 100644 --- a/admin/src/router/index.js +++ b/admin/src/router/index.js @@ -113,6 +113,13 @@ const router = createRouter({ meta: { title: '号源类型' } + },{ + path: '/planMngr/planmodel', + name: 'PlanMngrPlanModel', + component: () => import('../views/PlanMngr/PlanModel.vue'), + meta: { + title: '号源模板' + } }] }, diff --git a/admin/src/views/PlanMngr/PlanType.vue b/admin/src/views/PlanMngr/PlanType.vue index 49283c5..af8e790 100644 --- a/admin/src/views/PlanMngr/PlanType.vue +++ b/admin/src/views/PlanMngr/PlanType.vue @@ -11,20 +11,50 @@ - + - - + + + + + + + + + + + + + - + + + @@ -33,48 +63,48 @@ :page-sizes="[15, 50, 100, 200]" layout="total,sizes, prev, pager, next" :total="total" @size-change="PageSizeChange" @current-change="PageCurrentChange" /> - -
+ +
- 是 - 否 + 是 + 否 - - - - + + + + - - - - + + + + - - - {{item.name}} - - + + + {{item.name}} + + - - - - - - + + + + + + { loading.value = true CheckUpTypeGetEnableList().then(res => { loading.value = false if (res.status) { - CheckUpTypeEnableList.value=res.data.list + CheckUpTypeEnableList.value = res.data.list } else { ElMessage.error(res.msg) } @@ -152,9 +186,9 @@ let Info = ref({}); let dialogVisible = ref(false); const Add = () => { - Info.value={} - Info.value.id=0 - Info.value.status=1 + Info.value = {} + Info.value.id = 0 + Info.value.status = 1 dialogVisible.value = true GetCheckUpTypeEnableList_Func() } @@ -165,14 +199,44 @@ }).then(res => { loading.value = false if (res.status) { - + dialogVisible.value = false + GetList() + } else { + ElMessage.error(res.msg) + } + }) + } + const Edit=(row)=>{ + dialogVisible.value = true + Info.value = {} + GetDetailFunc(row.id) + } + //获取详情 + const GetDetailFunc=(id)=>{ + loading.value = true + PlanTypeGetDetail({ + id: id + }).then(res => { + loading.value = false + if (res.status) { + Info.value=res.data } else { ElMessage.error(res.msg) } }) } - const UseTypeChange=()=>{ - + const Del=(id)=>{ + loading.value = true + PlanTypeDel({ + id: id + }).then(res => { + loading.value = false + if (res.status) { + GetList() + } else { + ElMessage.error(res.msg) + } + }) } onMounted(() => { GetList()