diff --git a/Laravel/app/Http/Controllers/API/WeiHu/TiJianListController.php b/Laravel/app/Http/Controllers/API/WeiHu/TiJianListController.php index 7f36e5a..16adf82 100644 --- a/Laravel/app/Http/Controllers/API/WeiHu/TiJianListController.php +++ b/Laravel/app/Http/Controllers/API/WeiHu/TiJianListController.php @@ -7,20 +7,26 @@ use Illuminate\Support\Facades\DB; class TiJianListController { - public function GetList(Request $request){ + public function GetList(Request $request) + { $group = $request->get('role');//中间件产生的参数 - if($group !==1){ + if ($group != 1) { return \Yz::echoError1('权限不足'); } - $info =request('info'); - $sfz_encode=''; + $info = request('info'); + $sfz_encode = ''; // 如果输入长度 >=15，认为是身份证号，进行HSM加密 if (!empty($info) && strlen($info) >= 15) { - $HSM_sfz = \App\Lib\HSM::HsmEncrypt($info); - if ($HSM_sfz['status'] !== true) { - return \Yz::echoError1('调用HSM加密失败'); + if (env('APP_ENV') !== 'bendi') { + $HSM_sfz = \App\Lib\HSM::HsmEncrypt($info); + if ($HSM_sfz['status'] !== true) { + return \Yz::echoError1('调用HSM加密失败'); + } + $sfz_encode = $HSM_sfz['data']; + } else { + $sfz_encode = $info; } - $sfz_encode = $HSM_sfz['data']; + } // 构造搜索条件闭包，避免 where/orWhere 逻辑混乱 @@ -39,15 +45,25 @@ class TiJianListController ->where($searchCondition) ->where('is_del', 0) ->orderBy('id', 'desc') - ->get(); + ->get() + ->map(function ($value) { + return (array)$value; + })->toArray(); + + foreach ($yuyue_list as $k => $v) { - $sfz =\App\Lib\HSM::HsmDecrypt($v->id_card_num); - if($sfz['status']!=true){ - return \Yz::echoError1('调用HSM解密失败'); + $yuyue_list[$k]['leixing']='预约'; + if (env('APP_ENV') !== 'bendi') { + $sfz = \App\Lib\HSM::HsmDecrypt($v['id_card_num']); + if ($sfz['status'] != true) { + return \Yz::echoError1('调用HSM解密失败'); + } + $v['id_card_num'] = $sfz['data']; } - $v->id_card_num=$sfz['data']; } + + // 体检记录查询 $tijian_list = DB::table('examination_records as a') ->leftJoin('medical_institution as b', 'a.institution_id', '=', 'b.id') @@ -55,38 +71,51 @@ class TiJianListController ->where($searchCondition) ->where('a.is_del', 0) // 注意表别名 a ->orderBy('a.id', 'desc') - ->get(); - foreach ($yuyue_list as $k => $v) { - $sfz =\App\Lib\HSM::HsmDecrypt($v->id_card_num); - if($sfz['status']!=true){ - return \Yz::echoError1('调用HSM解密失败'); + ->get() + ->map(function ($value) { + return (array)$value; + })->toArray(); + + foreach ($tijian_list as $k => $v) { + $tijian_list[$k]['leixing']='体检'; + if (env('APP_ENV') !== 'bendi') { + $sfz = \App\Lib\HSM::HsmDecrypt($v['id_card_num']); + if ($sfz['status'] != true) { + return \Yz::echoError1('调用HSM解密失败'); + } + $v['id_card_num'] = $sfz['data']; } - $v->id_card_num=$sfz['data']; } - return \Yz::Return(true,'查询完成',[ - 'yuyue_list'=>$yuyue_list, - 'tijian_list'=>$tijian_list, + + $all_list = []; + $all_list = array_merge($yuyue_list, $tijian_list); + + return \Yz::Return(true, '查询完成', [ + 'all_list' => $all_list, + ]); } - public function Del(Request $request){ + + public function Del(Request $request) + { $group = $request->get('role');//中间件产生的参数 $userid = $request->get('userid');//中间件产生的参数 - if($group !==1){ + if ($group != 1) { return \Yz::echoError1('权限不足'); } - $id =request('id'); - $type =request('type'); + $id = request('id'); + $leixing = request('leixing'); $tablename = 'appointment_record'; - if($type==1){ + if ($leixing == '预约') { $tablename = 'appointment_record'; } - if($type==2){ + if ($leixing == '体检') { $tablename = 'examination_records'; } - $update = DB::table($tablename)->where('id', $id)->update(['is_del'=>1]); - if($update){ - return \Yz::Return(true,'标记删除完成',['id'=>$id,'tablename'=>$tablename,'userid'=>$userid]); - }else{ + $update = DB::table($tablename)->where('id', $id)->update(['is_del' => 1]); + if ($update) { + return \Yz::Return(true, '标记删除完成', ['id' => $id, 'tablename' => $tablename, 'userid' => $userid]); + } else { return \Yz::echoError1('操作失败'); } diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index 19e73fa..5c1be89 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -131,6 +131,6 @@ Route::post('UkeyLogin','App\Http\Controllers\API\UkeyController@UkeyLogin')->mi // Route::group(['middleware'=>['checktoken','log'],'prefix'=>'WeiHu'],function () { //维护 - Route::post('TiJianGetList','App\Http\Controllers\API\mH5\TiJianListController@GetList'); //手机H5端用户注册 - Route::post('TiJianDel','App\Http\Controllers\API\mH5\TiJianListController@Del'); //手机H5端用户注册 + Route::post('TiJianGetList','App\Http\Controllers\API\WeiHu\TiJianListController@GetList'); //手机H5端用户注册 + Route::post('TiJianDel','App\Http\Controllers\API\WeiHu\TiJianListController@Del'); //手机H5端用户注册 }); diff --git a/weihu/api/index.js b/weihu/api/index.js index 4fc910d..481fe88 100644 --- a/weihu/api/index.js +++ b/weihu/api/index.js @@ -16,6 +16,15 @@ import { export const Login = (data) => { return sendRequest({url: BaseUrl+"admin/login",method: 'POST',data:data}); } + export const TiJianGetList = (data) => { + return sendRequest({url: BaseUrl+"WeiHu/TiJianGetList",method: 'POST',data:data}); + } + export const TiJianDel = (data) => { + return sendRequest({url: BaseUrl+"WeiHu/TiJianDel",method: 'POST',data:data}); + } + + + //添加会员 export const PersonSave = (data) => { return sendRequest({url: BaseUrl+"v1/H5/PersonSave",method: 'POST',data:data}); diff --git a/weihu/pages.json b/weihu/pages.json index f21a2d8..47add32 100644 --- a/weihu/pages.json +++ b/weihu/pages.json @@ -79,6 +79,13 @@ "navigationBarTitleText" : "", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/user/SearchInput/SearchInput", + "style" : + { + "navigationBarTitleText" : "" + } } ], diff --git a/weihu/pages/login.vue b/weihu/pages/login.vue index bfbceb6..4d127d6 100644 --- a/weihu/pages/login.vue +++ b/weihu/pages/login.vue @@ -63,10 +63,10 @@ localStorage.setItem("password",password.value) localStorage.setItem("mianmi_date",day7()) } - sessionStorage.setItem("access_token", res.token) - sessionStorage.setItem("refresh_token", res.refresh_token) - uni.switchTab({ - url: '/pages/index/index' + sessionStorage.setItem("access_token", res.data.token) + sessionStorage.setItem("refresh_token", res.data.refresh_token) + uni.navigateTo({ + url: '/pages/user/SearchInput/SearchInput' }) } diff --git a/weihu/pages/user/SearchInput/SearchInput.vue b/weihu/pages/user/SearchInput/SearchInput.vue new file mode 100644 index 0000000..17e3164 --- /dev/null +++ b/weihu/pages/user/SearchInput/SearchInput.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/weihu/pages/user/list.vue b/weihu/pages/user/list.vue index 36aec41..989c1df 100644 --- a/weihu/pages/user/list.vue +++ b/weihu/pages/user/list.vue @@ -9,26 +9,22 @@ - + {{ i.name }} - {{ i.sex === 1 ? "男" : "女" }}性 + {{i.leixing}} {{ i.id_number }} - 本人 + {{i.leixing}} - - - 编辑 - - + 删除 @@ -42,11 +38,9 @@ - 请先添加体检人 - - - 添加体检人 + 无数据 + @@ -55,7 +49,7 @@ ref } from "vue" import { - PersonGetList,PersonDel + TiJianGetList,TiJianDel } from "@/api" import { onLoad, @@ -64,13 +58,16 @@ let search = ref(''); let List = ref([]); const GetList = () => { - PersonGetList({ - search: search.value + List.value=[] + TiJianGetList({ + info: search.value }).then(res => { + if (res.status) { - List.value = res.data.list + + List.value=res.data.all_list } - + console.log(List.value) }) } const goto = (id) => { @@ -96,14 +93,15 @@ url:'/pages/user/person_edit?personid=' + id }) } - const delClickFunc=(id)=>{ + const delClickFunc=(id,leixing)=>{ uni.showModal({ title: '提示', content: '确定删除吗？', success: function (res) { if (res.confirm) { - PersonDel({ - id: id + TiJianDel({ + id: id, + leixing:leixing }).then(res => { if (res.status) { GetList() @@ -122,7 +120,14 @@ }) } onShow(() => { - GetList() + + }) + onLoad((e)=>{ + if(e.info.length>0){ + search.value=e.info + GetList() + } + })