diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php index 6039446..926ee7e 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php @@ -153,6 +153,7 @@ class ComboController extends Controller $page = request('page'); $pageSize = request('pageSize'); $searchInfo = request('searchInfo'); + $type=request('type'); $list = DB::table('combos') ->select('combos.*', 'hospitals.name as hospital_name', 'combo_type.name as combo_type_name', 'combo_crowd.name as combo_crowd_name') ->leftJoin('hospitals', 'hospitals.id', '=', 'combos.hospital_id') @@ -164,9 +165,15 @@ class ComboController extends Controller } $list=$list->where(['combos.status'=>1]); $count = $list->count(); - $list = $list->orderBy('combos.order','asc') - ->skip(($page - 1) * $pageSize) // 跳过前9999条记录 - ->take($pageSize)->get(); + + if(isset($type) and $type=='all'){ + $list = $list->orderBy('combos.order','asc')->get(); + }else{ + $list = $list->orderBy('combos.order','asc') + ->skip(($page - 1) * $pageSize) // 跳过前9999条记录 + ->take($pageSize)->get(); + } + return \Yz::Return(true, "查询完成", ['list' => $list, 'count' => $count]); } @@ -212,4 +219,20 @@ class ComboController extends Controller return \Yz::echoError1("没有数据更新"); } } + //保存排序 + public function SaveOrder(){ + $order_list = request('order_list'); + $count=0; + foreach ($order_list as $order) { + $u=DB::table('combos')->where(['id' => $order['id']])->update(['order' => $order['order']]); + if ($u) { + $count++; + } + } + if ($count) { + return \Yz::Return(true, "更新完成", []); + } else { + return \Yz::echoError1("没有数据更新"); + } + } } diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index c32ec5b..908f75b 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -99,6 +99,7 @@ Route::group(['middleware' => ['checktoken', 'log'], 'prefix' => 'v1'], function Route::post('admin/ComboGetDetail', 'App\Http\Controllers\API\Admin\YeWu\ComboController@GetDetail');//获取套餐详情 Route::post('admin/ComboGetAllList', 'App\Http\Controllers\API\Admin\YeWu\ComboController@GetAllList');//获取全部套餐 Route::post('admin/ComboSave', 'App\Http\Controllers\API\Admin\YeWu\ComboController@Save');//获取全部套餐 + Route::post('admin/ComboSaveOrder', 'App\Http\Controllers\API\Admin\YeWu\ComboController@SaveOrder');//保存排序 Route::post('admin/HospitalSave', 'App\Http\Controllers\API\Admin\YeWu\HospitalController@Save'); Route::post('admin/HospitalGetList', 'App\Http\Controllers\API\Admin\YeWu\HospitalController@GetList'); diff --git a/admin/src/api/api.js b/admin/src/api/api.js index 7bf5e0d..7dad294 100644 --- a/admin/src/api/api.js +++ b/admin/src/api/api.js @@ -433,4 +433,8 @@ export const FenzhenInfoExport = (data = {}) => { //导出问卷 export const QuestionExport = (data = {}) => { return axios({ url: import.meta.env.VITE_APP_API + `v1/admin/QuestionExport`, data: data }) +} +//套餐保存排序 +export const ComboSaveOrder = (data = {}) => { + return axios({ url: import.meta.env.VITE_APP_API + `v1/admin/ComboSaveOrder`, 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 10a1803..6d1521f 100644 --- a/admin/src/views/ComboMngr/Combo.vue +++ b/admin/src/views/ComboMngr/Combo.vue @@ -2,12 +2,21 @@
- - - - - 搜索 - +
+
+ + + + + 搜索 + +
+
+ 开启排序 + 保存排序 +
+
+ @@ -22,7 +31,18 @@ 女 - + + + @@ -32,7 +52,7 @@ -
+
@@ -133,10 +153,12 @@ ComboSave, ComboTypeGetList, ComboCrowdGetList, - CheckUpTypeGetEnableList + CheckUpTypeGetEnableList, + ComboSaveOrder } from '@/api/api.js' import { - Edit + Edit,Top, + Bottom } from '@element-plus/icons-vue' let loading = ref(false) let tableData = ref([]) @@ -165,12 +187,17 @@ } let searchInfo = ref({}); let Info = ref({}); - const GetList = () => { + let Is_PaiXv=ref(false); + const GetList = (type='') => { + if(type=='all'){ + Is_PaiXv.value=true; + } loading.value = true ComboGetList({ page: currentPage.value, pageSize: pageSize.value, - searchInfo: searchInfo.value + searchInfo: searchInfo.value, + type:type }).then(res => { loading.value = false if (res.status) { @@ -305,6 +332,39 @@ } }) } + const OptionUp=(index)=>{ + let temp = tableData.value[index-1]; + tableData.value[index-1]=tableData.value[index] + tableData.value[index]=temp + } + const OptionDown=(index)=>{ + let temp = tableData.value[index+1]; + tableData.value[index+1]=tableData.value[index] + tableData.value[index]=temp + } + //保存排序 + const SaveOrder=()=>{ + let ldate=[]; + tableData.value.forEach((v,i)=>{ + ldate.push({id:v.id,order:i}) + }) + loading.value = true + ComboSaveOrder({ + order_list:ldate + }).then(res => { + loading.value = false + if (res.status) { + Is_PaiXv.value=false; + ElMessage({ + type: 'success', + message: '排序完成', + }) + GetList() + } else { + ElMessage.error(res.msg) + } + }) + } onMounted(() => { GetList() GetCheckUpTypeEnableList_Func() diff --git a/bot/bot/bot_wxSend.php b/bot/bot/bot_wxSend.php index 13bdf87..52a7042 100644 --- a/bot/bot/bot_wxSend.php +++ b/bot/bot/bot_wxSend.php @@ -24,9 +24,9 @@ function WxSendFunc() and status = ? and appointment_number is not null and wx_day1_sendmsg_time is not null - and wx_day1_sendmsg_time <= ? + and wx_day1_sendmsg_time <= ? and wx_day1_sendmsg_time > ? order by wx_day1_sendmsg_time asc", [ - 2, date('Y-m-d H:i:s') + 2, date('Y-m-d H:i:s'),date('Y-m-d')." 00:00:01" ]); if (!!$pay_check) { Db2::u($db, 'orders', [