From 537751d71c73ae32a59f09fa3597d4e92f33486d Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Tue, 20 Aug 2024 22:48:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=85=B3=E8=81=94=E5=A5=97?=
 =?UTF-8?q?=E9=A4=90=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../API/Admin/YeWu/ComboController.php        |   8 +-
 .../API/Admin/YeWu/ComboTypeController.php    |  16 +++
 Laravel/routes/api.php                        | 113 +++++++++---------
 admin/src/api/api.js                          |   4 +
 admin/src/views/ComboMngr/Combo.vue           |  23 +++-
 5 files changed, 104 insertions(+), 60 deletions(-)
 create mode 100644 Laravel/app/Http/Controllers/API/Admin/YeWu/ComboTypeController.php

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php
index 6fa3308..0aebee6 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php
@@ -106,8 +106,9 @@ class ComboController extends Controller
         $pageSize = request('pageSize');
         $searchInfo = request('searchInfo');
         $list=DB::table('combos')
-            ->select('combos.*','hospitals.name as hospital_name')
-            ->leftJoin('hospitals','hospitals.id','=','combos.hospital_id');
+            ->select('combos.*','hospitals.name as hospital_name','combo_type.name as combo_type_name')
+            ->leftJoin('hospitals','hospitals.id','=','combos.hospital_id')
+        ->leftJoin('combo_type','combos.type_id','=','combo_type.id');
         if(isset($searchInfo['name'])){
 
             $list = $list->where('combos.name', 'like', '%' . $searchInfo['name'] . '%');
@@ -135,7 +136,8 @@ class ComboController extends Controller
     {
         $Info = request('Info');
         $u=DB::table('combos')->where(['id'=>$Info['id']])->update([
-            'tags'=>json_encode($Info['tags'],JSON_UNESCAPED_UNICODE),
+            'type_id'=>$Info['type_id'],
+            'tags'=>isset($Info['tags'])?json_encode($Info['tags'],JSON_UNESCAPED_UNICODE):[],
             'cover'=>$Info['cover'],
             'intro'=>$Info['intro'],
             'sub_intro'=>$Info['sub_intro'],
diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboTypeController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboTypeController.php
new file mode 100644
index 0000000..2c38983
--- /dev/null
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboTypeController.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Controllers\API\Admin\YeWu;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class ComboTypeController extends Controller
+{
+    public function GetList()
+    {
+      $list=DB::table('combo_type')->get();
+      return \Yz::Return(true,'查询成功',['list'=>$list]);
+    }
+}
diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php
index 2b08934..58bf2b8 100644
--- a/Laravel/routes/api.php
+++ b/Laravel/routes/api.php
@@ -15,73 +15,74 @@ use Illuminate\Support\Facades\Route;
 */
 
 Route::middleware('auth:sanctum')->get('/user', function (Request $request) {
-    return $request->user();
+  return $request->user();
 });
 
 
-Route::post('admin/login','App\Http\Controllers\API\Admin\LoginController@Login')->middleware('log');   //登录
-Route::post('/tokenRefresh','App\Http\Controllers\API\TokenController@TokenRefresh')->middleware('log');  //刷新token
+Route::post('admin/login', 'App\Http\Controllers\API\Admin\LoginController@Login')->middleware('log');   //登录
+Route::post('/tokenRefresh', 'App\Http\Controllers\API\TokenController@TokenRefresh')->middleware('log');  //刷新token
 
-Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1'],function () {  //路由分组
-    Route::post('admin/getBaseMenuList','App\Http\Controllers\API\Admin\BaseInfoController@GetBaseMenuList');   //登录后获取admin后台用户对应菜单列表
-    Route::post('admin/GetBaseUserInfo','App\Http\Controllers\API\Admin\BaseInfoController@GetBaseUserInfo');   //获取admin用户基本信息
-    Route::post('admin/getMenuList','App\Http\Controllers\API\Admin\MenuController@GetList');  //admin后台所有菜单管理
-    Route::post('admin/GetFatherMenuList','App\Http\Controllers\API\Admin\MenuController@GetFatherMenuList');  //admin后台获取一级菜单
-    Route::post('admin/AddMenu','App\Http\Controllers\API\Admin\MenuController@AddMenu');  //admin后台添加菜单
-    Route::post('admin/EditMenu','App\Http\Controllers\API\Admin\MenuController@EditMenu');  //admin后台修改菜单
-    Route::post('admin/getUserList','App\Http\Controllers\API\Admin\UserController@GetInfoList');  //admin后台获取用户列表
-    Route::post('admin/GetSystemUserDetail','App\Http\Controllers\API\Admin\UserController@GetDetail');  //admin后台获取用户详情
-    Route::post('admin/adminChangePwd','App\Http\Controllers\API\Admin\UserController@ChangePwd');  //admin后台修改密码
-    Route::post('admin/SaveSystemUserInfo','App\Http\Controllers\API\Admin\UserController@Save');  //admin后台保存用户信息
-    Route::post('admin/getGroupList','App\Http\Controllers\API\Admin\GroupController@GetList');  //admin后台组列表
-    Route::post('admin/GroupChangeMenu','App\Http\Controllers\API\Admin\GroupController@ChangeMenu');  //admin后台组列表
-    Route::post('admin/GetGroupMenuList','App\Http\Controllers\API\Admin\GroupController@GetGroupMenuList');  //管理员查询分组使用的菜单
-    Route::post('admin/SaveGroup','App\Http\Controllers\API\Admin\GroupController@Save');  //admin后台组列表
-    Route::post('admin/CheckMenuAuth','App\Http\Controllers\API\Admin\BaseInfoController@CheckMenuAuth');  //admin后台检查用户菜单权限
-    Route::post('UpFile','App\Http\Controllers\API\UpLoadController@UpFile');  //上传文件
-    Route::post('admin/ChangInfo','App\Http\Controllers\API\Admin\UserController@ChangInfo');  //修改自身用户信息
-    Route::post('admin/GetConfigInfo','App\Http\Controllers\API\Admin\ConfigController@GetConfigInfo');  //获取配置信息
-    Route::post('admin/SaveConfigInfo','App\Http\Controllers\API\Admin\ConfigController@SaveConfig');  //保存配置信息
-    Route::post('admin/SystemLogGetList','App\Http\Controllers\API\LogController@GetList');//admin后台获取日志列表
-    Route::post('admin/GetLogTableName','App\Http\Controllers\API\LogController@GetLogTableName');//admin后台获取日志表名
-    //--------------以上为系统基本接口
-    Route::post('admin/GetHealthOrganizationEnableList','App\Http\Controllers\API\Admin\YeWu\HealthOrganizationController@GetEnableList');  //admin后台获取可用体检机构列表
-    Route::post('admin/CreateCalendar','App\Http\Controllers\API\Admin\YeWu\healthCalendarController@CreateCalendar');  //admin后台创建日历
-    Route::post('admin/CalendarGetList','App\Http\Controllers\API\Admin\YeWu\healthCalendarController@getList');  //admin后台获取日历列表
-    Route::post('admin/CalendarListDel','App\Http\Controllers\API\Admin\YeWu\healthCalendarController@Del');  //admin后台删除日历
-    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');//获取时间点列表
-    Route::post('admin/PlanModelSave','App\Http\Controllers\API\Admin\YeWu\PlanModelController@Save');//保存号源模板
-    Route::post('admin/PlanModelGetList','App\Http\Controllers\API\Admin\YeWu\PlanModelController@GetList');//号源模板列表
-    Route::post('admin/PlanModelGetDetail','App\Http\Controllers\API\Admin\YeWu\PlanModelController@GetDetail');//号源模板详情
-    Route::post('admin/PlanModelDel','App\Http\Controllers\API\Admin\YeWu\PlanModelController@Del');//号源模板删除
-    Route::post('admin/CreatePlan','App\Http\Controllers\API\Admin\YeWu\PlanController@CreatePlan');//生成号源
-    Route::post('admin/PlanGetList','App\Http\Controllers\API\Admin\YeWu\PlanController@GetList');//号源列表
-    Route::post('admin/PlanGetDetail','App\Http\Controllers\API\Admin\YeWu\PlanController@GetDetail');//号源详情
-    Route::post('admin/PlanSave','App\Http\Controllers\API\Admin\YeWu\PlanController@Save');//保存号源详情
+Route::group(['middleware' => ['checktoken', 'log'], 'prefix' => 'v1'], function () {  //路由分组
+  Route::post('admin/getBaseMenuList', 'App\Http\Controllers\API\Admin\BaseInfoController@GetBaseMenuList');   //登录后获取admin后台用户对应菜单列表
+  Route::post('admin/GetBaseUserInfo', 'App\Http\Controllers\API\Admin\BaseInfoController@GetBaseUserInfo');   //获取admin用户基本信息
+  Route::post('admin/getMenuList', 'App\Http\Controllers\API\Admin\MenuController@GetList');  //admin后台所有菜单管理
+  Route::post('admin/GetFatherMenuList', 'App\Http\Controllers\API\Admin\MenuController@GetFatherMenuList');  //admin后台获取一级菜单
+  Route::post('admin/AddMenu', 'App\Http\Controllers\API\Admin\MenuController@AddMenu');  //admin后台添加菜单
+  Route::post('admin/EditMenu', 'App\Http\Controllers\API\Admin\MenuController@EditMenu');  //admin后台修改菜单
+  Route::post('admin/getUserList', 'App\Http\Controllers\API\Admin\UserController@GetInfoList');  //admin后台获取用户列表
+  Route::post('admin/GetSystemUserDetail', 'App\Http\Controllers\API\Admin\UserController@GetDetail');  //admin后台获取用户详情
+  Route::post('admin/adminChangePwd', 'App\Http\Controllers\API\Admin\UserController@ChangePwd');  //admin后台修改密码
+  Route::post('admin/SaveSystemUserInfo', 'App\Http\Controllers\API\Admin\UserController@Save');  //admin后台保存用户信息
+  Route::post('admin/getGroupList', 'App\Http\Controllers\API\Admin\GroupController@GetList');  //admin后台组列表
+  Route::post('admin/GroupChangeMenu', 'App\Http\Controllers\API\Admin\GroupController@ChangeMenu');  //admin后台组列表
+  Route::post('admin/GetGroupMenuList', 'App\Http\Controllers\API\Admin\GroupController@GetGroupMenuList');  //管理员查询分组使用的菜单
+  Route::post('admin/SaveGroup', 'App\Http\Controllers\API\Admin\GroupController@Save');  //admin后台组列表
+  Route::post('admin/CheckMenuAuth', 'App\Http\Controllers\API\Admin\BaseInfoController@CheckMenuAuth');  //admin后台检查用户菜单权限
+  Route::post('UpFile', 'App\Http\Controllers\API\UpLoadController@UpFile');  //上传文件
+  Route::post('admin/ChangInfo', 'App\Http\Controllers\API\Admin\UserController@ChangInfo');  //修改自身用户信息
+  Route::post('admin/GetConfigInfo', 'App\Http\Controllers\API\Admin\ConfigController@GetConfigInfo');  //获取配置信息
+  Route::post('admin/SaveConfigInfo', 'App\Http\Controllers\API\Admin\ConfigController@SaveConfig');  //保存配置信息
+  Route::post('admin/SystemLogGetList', 'App\Http\Controllers\API\LogController@GetList');//admin后台获取日志列表
+  Route::post('admin/GetLogTableName', 'App\Http\Controllers\API\LogController@GetLogTableName');//admin后台获取日志表名
+  //--------------以上为系统基本接口
+  Route::post('admin/GetHealthOrganizationEnableList', 'App\Http\Controllers\API\Admin\YeWu\HealthOrganizationController@GetEnableList');  //admin后台获取可用体检机构列表
+  Route::post('admin/CreateCalendar', 'App\Http\Controllers\API\Admin\YeWu\healthCalendarController@CreateCalendar');  //admin后台创建日历
+  Route::post('admin/CalendarGetList', 'App\Http\Controllers\API\Admin\YeWu\healthCalendarController@getList');  //admin后台获取日历列表
+  Route::post('admin/CalendarListDel', 'App\Http\Controllers\API\Admin\YeWu\healthCalendarController@Del');  //admin后台删除日历
+  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');//获取时间点列表
+  Route::post('admin/PlanModelSave', 'App\Http\Controllers\API\Admin\YeWu\PlanModelController@Save');//保存号源模板
+  Route::post('admin/PlanModelGetList', 'App\Http\Controllers\API\Admin\YeWu\PlanModelController@GetList');//号源模板列表
+  Route::post('admin/PlanModelGetDetail', 'App\Http\Controllers\API\Admin\YeWu\PlanModelController@GetDetail');//号源模板详情
+  Route::post('admin/PlanModelDel', 'App\Http\Controllers\API\Admin\YeWu\PlanModelController@Del');//号源模板删除
+  Route::post('admin/CreatePlan', 'App\Http\Controllers\API\Admin\YeWu\PlanController@CreatePlan');//生成号源
+  Route::post('admin/PlanGetList', 'App\Http\Controllers\API\Admin\YeWu\PlanController@GetList');//号源列表
+  Route::post('admin/PlanGetDetail', 'App\Http\Controllers\API\Admin\YeWu\PlanController@GetDetail');//号源详情
+  Route::post('admin/PlanSave', 'App\Http\Controllers\API\Admin\YeWu\PlanController@Save');//保存号源详情
 
-  Route::post('admin/ComboGetList','App\Http\Controllers\API\Admin\YeWu\ComboController@GetList');//获取套餐列表
-  Route::post('admin/ComboGetDetail','App\Http\Controllers\API\Admin\YeWu\ComboController@GetDetail');//获取套餐详情
-  Route::post('admin/ComboSave','App\Http\Controllers\API\Admin\YeWu\ComboController@Save');//获取套餐详情保存
+  Route::post('admin/ComboGetList', 'App\Http\Controllers\API\Admin\YeWu\ComboController@GetList');//获取套餐列表
+  Route::post('admin/ComboGetDetail', 'App\Http\Controllers\API\Admin\YeWu\ComboController@GetDetail');//获取套餐详情
+  Route::post('admin/ComboSave', 'App\Http\Controllers\API\Admin\YeWu\ComboController@Save');//获取套餐详情保存
 
-  Route::post('admin/HospitalSave','App\Http\Controllers\API\Admin\YeWu\HospitalController@Save');
-  Route::post('admin/HospitalGetList','App\Http\Controllers\API\Admin\YeWu\HospitalController@GetList');
-  Route::post('admin/GetBaseInfoDetail','App\Http\Controllers\API\Admin\YeWu\HospitalController@GetBaseInfoDetail');
-  Route::post('admin/SaveCacheInfo','App\Http\Controllers\API\Admin\YeWu\HospitalController@SaveCacheInfo');
+  Route::post('admin/HospitalSave', 'App\Http\Controllers\API\Admin\YeWu\HospitalController@Save');
+  Route::post('admin/HospitalGetList', 'App\Http\Controllers\API\Admin\YeWu\HospitalController@GetList');
+  Route::post('admin/GetBaseInfoDetail', 'App\Http\Controllers\API\Admin\YeWu\HospitalController@GetBaseInfoDetail');
+  Route::post('admin/SaveCacheInfo', 'App\Http\Controllers\API\Admin\YeWu\HospitalController@SaveCacheInfo');
+  Route::post('admin/ComboTypeGetList', 'App\Http\Controllers\API\Admin\YeWu\ComboTypeController@GetList');//套餐类型列表
 
 });
 
-Route::post('admin/UpdateCombo','App\Http\Controllers\API\Admin\YeWu\ComboController@UpdateCombo')->middleware('log');
+Route::post('admin/UpdateCombo', 'App\Http\Controllers\API\Admin\YeWu\ComboController@UpdateCombo')->middleware('log');
 
 
-Route::group(['middleware'=>['log'],'prefix'=>'v1'],function () {  //路由分组
-  Route::post('PayCheck','App\Http\Controllers\API\Admin\YeWu\PayController@PayCheck');//支付查询
-  Route::post('MakePay','App\Http\Controllers\API\Admin\YeWu\PayController@MakePay');//支付
+Route::group(['middleware' => ['log'], 'prefix' => 'v1'], function () {  //路由分组
+  Route::post('PayCheck', 'App\Http\Controllers\API\Admin\YeWu\PayController@PayCheck');//支付查询
+  Route::post('MakePay', 'App\Http\Controllers\API\Admin\YeWu\PayController@MakePay');//支付
 });
 
 
diff --git a/admin/src/api/api.js b/admin/src/api/api.js
index 44edc11..be001c8 100644
--- a/admin/src/api/api.js
+++ b/admin/src/api/api.js
@@ -199,4 +199,8 @@ export const UpdateCombo =   (data={}) =>  {
 //更新缓存
 export const SaveCacheInfo =   (data={}) =>  {
 	return 	axios({url:import.meta.env.VITE_APP_API+'v1/admin/SaveCacheInfo',data:data})
+}
+//获取套餐类型
+export const ComboTypeGetList =   (data={}) =>  {
+	return 	axios({url:import.meta.env.VITE_APP_API+'v1/admin/ComboTypeGetList',data:data})
 }
\ No newline at end of file
diff --git a/admin/src/views/ComboMngr/Combo.vue b/admin/src/views/ComboMngr/Combo.vue
index eff0717..f8abff9 100644
--- a/admin/src/views/ComboMngr/Combo.vue
+++ b/admin/src/views/ComboMngr/Combo.vue
@@ -12,6 +12,7 @@
 			<el-table :data="tableData" style="width: 100%;" row-key="id" v-loading="loading">
 				<el-table-column prop="hospital_name" label="医院" />
 				<el-table-column prop="name" label="套餐名称" />
+				<el-table-column prop="combo_type_name" label="套餐类型" />
 				<el-table-column prop="price" label="价格" />
 				<el-table-column prop="sex" label="性别">
 					<template #default="scope">
@@ -47,6 +48,12 @@
 							</el-icon>
 						</el-upload>
 					</el-form-item>
+					<el-form-item label="套餐类型">
+						 <el-select :filterable="true" clearable v-model="Info.type_id" placeholder="选择套餐类型"
+						 	 >
+						 	<el-option v-for="(item,index) in ComboTypeList" :key="index" :label="item.name" :value="item.id" />
+						 </el-select>
+					</el-form-item>
 					<el-form-item label="标签">
 						<el-input v-model="Info.tags" type="textarea" />
 					</el-form-item>
@@ -97,7 +104,7 @@
 		UpFileUrl,
 		ComboGetList,
 		ComboGetDetail,
-		ComboSave
+		ComboSave,ComboTypeGetList
 	} from '@/api/api.js'
 	import {
 		Edit
@@ -166,6 +173,7 @@
 	const EditFunc = (row) => {
 		dialogVisible.value = true
 		loading.value = true
+		GetComboType()
 		ComboGetDetail({
 			id: row.id
 		}).then(res => {
@@ -224,6 +232,19 @@
 	const handleCreated = (editor) => {
 		editorRef.value = editor // 记录 editor 实例，重要！
 	}
+	//获取全部套餐类型
+	let ComboTypeList=ref([]);
+	const GetComboType = () => {
+		loading.value = true
+		ComboTypeGetList({}).then(res => {
+			loading.value = false
+			if (res.status) {
+			 ComboTypeList.value=res.data.list
+			} else {
+				ElMessage.error(res.msg)
+			}
+		})
+	}
 	onMounted(() => {
 		GetList()
 	})