diff --git a/Laravel.zip b/Laravel.zip new file mode 100644 index 0000000..af020b0 Binary files /dev/null and b/Laravel.zip differ diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php index 1dea04f..c21d786 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\API\Admin\YeWu; use App\Http\Controllers\Controller; use Illuminate\Http\Request; use App\Services\Admin\YeWu\AppointmentService; +use Illuminate\Support\Facades\DB; class AppointmentController extends Controller { //获取预约记录 @@ -17,4 +18,46 @@ class AppointmentController extends Controller $s=app()->make(AppointmentService::class); return $s->GetAppointmentList(['userid'=>$userid,'group'=>$group,'page'=>$page,'pageSize'=>$pageSize,'searchInfo'=>$searchInfo]); } + + //对外插入预约记录 + public function CreateAppointment(){ + date_default_timezone_set('PRC'); + $currentYear = date('Y'); + $firstDay = date('Y-01-01', strtotime($currentYear)); + $lastDay = date('Y-12-31', strtotime($currentYear)); + + $source='接口'; + $info=request('info'); + + $c=DB::table('appointment_record as a') + ->where([['a.id_card_num','=',$info['id_card_num']],['a.fee_type','=',0],['a.created_at','>=',$firstDay],['a.created_at','<=',$lastDay]])->get(); + if(count($c)>0){ + $result['status']=false; + $result['msg']='已体检过'; + $result['info']=$c; + return \Yz::Return(false,'本年度已经体检过',['info'=>$c]); + }else{ + $result['status']=true; + $result['msg']='可以继续,本年度无免费体检记录'; + $result['info']=$c; + } + + + $i=DB::table('appointment_record')->insert([ + 'source'=>$source, + 'type'=>$info['type'], + 'name'=>$info['name'], + 'id_card_num'=>$info['id_card_num'], + 'sex'=>$info['sex'], + 'tel'=>$info['tel'], + 'content'=>json_encode($info['content']), + 'fee_type'=>$info['fee_type'] + ]); + + if($i){ + return \Yz::Return(true,'保存成功',[]); + }else{ + return \Yz::echoError1('保存失败'); + } + } } diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php index 5acd345..3fbbe7b 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php @@ -17,18 +17,22 @@ class HealthCheckupController extends Controller if(!$CheckupInfo) return \Yz::echoError1('检查信息为空'); if(!$CheckupInfo['name']) return \Yz::echoError1('姓名不能为空'); if(!isset($CheckupInfo['id_card_num'])) return \Yz::echoError1('id_card_num不能为空'); - if(!isset($CheckupInfo['type'])) return \Yz::echoError1('type不能为空'); - if(!isset($CheckupInfo['institution_sn'])) return \Yz::echoError1('institution_sn不能为空'); + if(!isset($CheckupInfo['institution_sn'])) return \Yz::echoError1('体检机构编码institution_sn不能为空'); if(!isset($CheckupInfo['tijian_num'])) return \Yz::echoError1('体检号tijian_num不能为空'); if(!isset($CheckupInfo['tijian_time'])) return \Yz::echoError1('体检时间tijian_time不能为空'); - if(!isset($CheckupInfo['fee_type'])) return \Yz::echoError1('收费类型fee_type不能为空'); if(!isset($CheckupInfo['report_content'])) return \Yz::echoError1('报告内容report_content不能为空'); + if(!isset($CheckupInfo['issue_time'])) return \Yz::echoError1('发证时间issue_time不能为空'); + if(!isset($CheckupInfo['expire_time'])) return \Yz::echoError1('证件到期时间expire_time不能为空'); + + if(!isset($CheckupInfo['sex'])) return \Yz::echoError1('性别sex不能为空'); + $s=app()->make(HealthCheckupService::class); return $s->CreateRecord($CheckupInfo); } //查询能否进行免费体检 public function CheckRequirements(){ $id_card_num=request('id_card_num'); + $type=request('type');//体检类型 1,健康证2老年人 $s=app()->make(PersonService::class); return $s->GetPersonRecode(['id_num'=>$id_card_num]); } diff --git a/Laravel/app/Http/Controllers/API/DxAppController.php b/Laravel/app/Http/Controllers/API/DxAppController.php new file mode 100644 index 0000000..19247cc --- /dev/null +++ b/Laravel/app/Http/Controllers/API/DxAppController.php @@ -0,0 +1,37 @@ +$info]); + } + public function UkeyLogin(){ + $cliCert=request('cliCert'); //客户端证书 + $sign=request('sign'); //签名值 + $oridata=request('oridata'); //随机数原文 + $ukey_userid=request('ukey_userid'); //ukey唯一标识 + $check=UKEY::CheckCert($cliCert); + if($check==1){ + $checksign=UKEY::CheckSign($cliCert,$oridata,$sign); + if($checksign){ + $user=DB::table('users')->where(['ukey_sfuid'=>$ukey_userid,'status'=>1])->get(); + if(count($user)>0){ + $result=[]; + $jwt= new JWT(); + $accessTimeout = $jwt -> GetGetSecretTimeOut(); + $refreshTimeout = $jwt -> GetRefreshTokenTimeOut(); + $access_token = $jwt->BuildJWT('yz','access',$user[0]->id,$user[0]->group,$accessTimeout); + $refresh_token = $jwt->BuildJWT('yz','refresh',$user[0]->id,'',$refreshTimeout); + if(!empty($arr['mian7'])){ + $mian7_token = $jwt->BuildJWT('yz','mian7',$user[0]->id,'',$jwt -> GetMian7TokenTimeOut()); + $result['mian7_token']=$mian7_token; + } + DB::table('users')->where(['id'=>$user[0]->id,'status'=>1])->update(['token'=>md5($refresh_token)]); + $result['token']=$access_token; + $result['refresh_token']=$refresh_token; + return \Yz::Return(true,'验证成功',$result); + }else{ + return \Yz::echoError1("未找到关联此Ukey的有效用户"); + } + + }else{ + return \Yz::echoError1("验证客户端随机数签名失败"); + } + }else{ + return \Yz::echoError1("证书验证失败".$check); + } + + } } diff --git a/Laravel/app/Http/Controllers/API/mH5/LoginController.php b/Laravel/app/Http/Controllers/API/mH5/LoginController.php index e20da75..ad75858 100644 --- a/Laravel/app/Http/Controllers/API/mH5/LoginController.php +++ b/Laravel/app/Http/Controllers/API/mH5/LoginController.php @@ -8,6 +8,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Http; use JWT; +use function PHPUnit\Framework\isEmpty; class LoginController extends Controller @@ -62,5 +63,30 @@ class LoginController extends Controller return $result; } + //APP嵌套h5登录，参数APP内用户唯一id + public function Applogin(){ + $openid =request('openid'); + if(isset($openid)){ + $accessTimeout = JWT::GetGetSecretTimeOut(); + $refreshTimeout = JWT::GetRefreshTokenTimeOut(); + $access_token = JWT::BuildJWT('yz','access',$openid,'mH5user',$accessTimeout); + $refresh_token = JWT::BuildJWT('yz','refresh',$openid,'',$refreshTimeout); + $s=app()->make(PersonService::class); + $c= $s->checkRegister(['openid'=>$openid]); + if($c){ //判断是否注册过 + DB::table('persons')->where(['openid'=>$openid,'status'=>1])->update(['token'=>md5($refresh_token)]); + $result['isRegister']=true; + }else{ + $result['isRegister']=false; + } + $result['token']=$access_token; + $result['refresh_token']=$refresh_token; + $result['status']='ok'; + }else{ + $result['msg']='获取openid失败'; + $result['status']='no'; + } + return $result; + } } diff --git a/Laravel/app/Http/Controllers/API/mH5/PersonController.php b/Laravel/app/Http/Controllers/API/mH5/PersonController.php index f755999..c9dd825 100644 --- a/Laravel/app/Http/Controllers/API/mH5/PersonController.php +++ b/Laravel/app/Http/Controllers/API/mH5/PersonController.php @@ -23,8 +23,8 @@ class PersonController extends Controller } //获取用户pdf public function GetPersonReportDetail(){ - $tijian_num =request('tijian_num'); - $info=DB::table('examination_records')->where(['tijian_num'=>$tijian_num])->first(); + $sfz =request('sfz'); + $info=DB::table('examination_records')->where(['id_card_num'=>$sfz]) ->orderBy('id', 'desc')->first(); if($info){ $item=DB::table('report_result_item') ->where(['examination_id'=>$info->id]) diff --git a/Laravel/app/Http/Controllers/TestController.php b/Laravel/app/Http/Controllers/TestController.php new file mode 100644 index 0000000..2894467 --- /dev/null +++ b/Laravel/app/Http/Controllers/TestController.php @@ -0,0 +1,13 @@ +count(); + } +} diff --git a/Laravel/app/Lib/UKEY.php b/Laravel/app/Lib/UKEY.php new file mode 100644 index 0000000..b1170ef --- /dev/null +++ b/Laravel/app/Lib/UKEY.php @@ -0,0 +1,97 @@ +self::$appName, + 'length'=>16 + ]; + $random=''; + $res=self::post(self::$url.'/api/common/genRandom',json_encode($c));//获取随机数 + if($res['status']==0){ + $random=$res['body']['random']; + $info['random']=$random; + $info['signData']=self::signData($random); + $info['serverCert']=self::GetServerCert(); + } + + return $info; + } + //数据签名 + public static function signData($oriData){ + $c=[ + 'appName'=>self::$appName, + 'oriData'=>$oriData + ]; + $sign=''; + $res=self::post(self::$url.'/api/pkcs1/signData',json_encode($c)); + if($res['status']==0){ + $sign=$res['body']['p1Sign']; + } + return $sign; + } + //获取服务器证书 + public static function GetServerCert(){ + $c=[ + 'appName'=>self::$appName, + ]; + $cert=''; + $res=self::post(self::$url.'/api/cert/getServerCertificate',json_encode($c)); + if($res['status']==0){ + $cert=$res['body']['base64Cert']; + } + return $cert; + } + //服务端验证客户端证书有效性,证书有效返回1,证书无效情况下：-1为不是所信任的根，-2为超过 + //有效期，-3为作废证书，-4已加入黑名单，-5证书未生效, 0 未知错误 + public static function CheckCert($cert){ + $c=[ + 'appName'=>self::$appName, + 'cert'=>$cert + ]; + $validRes=''; + $res=self::post(self::$url.'/api/cert/validateCert',json_encode($c)); + if($res['status']==0){ + $validRes=$res['body']['validRes']; + } + return $validRes; + } + //验证数据签名 返回数据签名验证结果,true 验证通过，false 验证失败 + public static function CheckSign($cert,$oriData,$sign){ + $c=[ + 'appName'=>self::$appName, + 'cert'=>$cert, + 'oriData'=>$oriData, + 'sign'=>$sign + ]; + $validRes=false; + $res=self::post(self::$url.'/api/pkcs1/verifySignData',json_encode($c)); + if($res['status']==0){ + $validRes=$res['body']['verifyRes']; + } + return $validRes; + } + + public function post($url, $data_string) + { + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $url); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curl, CURLOPT_POST, true); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); + curl_setopt($curl, CURLOPT_HTTPHEADER, [ + 'Content-Type: application/json; charset=utf-8', + 'Content-Length: ' . strlen($data_string) + ]); + curl_setopt($curl, CURLOPT_POSTFIELDS, $data_string); + $r = curl_exec($curl); + curl_close($curl); + + return json_decode($r,true); + } +} diff --git a/Laravel/app/Lib/Yz.php b/Laravel/app/Lib/Yz.php index 5286392..2bb8947 100644 --- a/Laravel/app/Lib/Yz.php +++ b/Laravel/app/Lib/Yz.php @@ -18,6 +18,7 @@ class Yz{ $result['msg']=$msg; return response()->json($result)->setEncodingOptions(JSON_UNESCAPED_UNICODE); } + public static function Return($status,$msg,$data=[]){ $result=array(); $result['status']=$status; diff --git a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php index f194682..ac280f4 100644 --- a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php +++ b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php @@ -2,6 +2,8 @@ namespace App\Services\Admin\YeWu; use Illuminate\Support\Facades\DB; use App\Services\mH5\PersonService; +use Illuminate\Support\Facades\Storage; +use Illuminate\Support\Str; class HealthCheckupService { @@ -28,7 +30,7 @@ class HealthCheckupService DB::beginTransaction(); // 开始事务 try { // 执行数据库操作 - if($CheckupInfo['type']==1){ + // if($CheckupInfo['type']==1){ //如果体检类型为健康证 更新预约记录表 $u= DB::table('appointment_record') ->where([ @@ -38,46 +40,56 @@ class HealthCheckupService ])->whereBetween('created_at',[$firstDay,$lastDay])->update(['status'=>2]); - } + // } //检查体检流水号是否存在，存在禁止再次插入。 $check_cunzai=DB::table('examination_records')->where('tijian_num',$CheckupInfo['tijian_num'])->get(); if(count($check_cunzai)>0) return \Yz::echoError1('此体检号已经存在，禁止创建'); + $img_url=''; + if(isset($CheckupInfo['head_img'])){ + $date = date("Ymd"); + preg_match('/^(data:\s*image\/(\w+);base64,)/', $CheckupInfo['head_img'], $res); + $file = base64_decode(Str::after($CheckupInfo['head_img'], $res[1])); + $filePath = 'APIUpload/'.$date.'/'.$CheckupInfo['tijian_num'].'.jpg'; + Storage::disk('public')->put($filePath, $file); + $img_url='/storage/'.$filePath; + } + - $u2=DB::table('examination_records')->insert([ + $u2=DB::table('examination_records')->insertGetId([ "name"=>$CheckupInfo['name'], "sex"=>$CheckupInfo['sex'], "tel"=>$CheckupInfo['tel'], + "head_img"=>$img_url, "id_card_num"=>$CheckupInfo['id_card_num'], - "type"=>$CheckupInfo['type'], + "type"=>1, "industry_type"=>$CheckupInfo['industry_type'], "institution_id"=>$org_id[0]->id, "tijian_time"=>$CheckupInfo['tijian_time'], "register_time"=>$CheckupInfo['register_time'],//登记时间 "tijian_num"=>$CheckupInfo['tijian_num'], - "report_content"=>json_encode($CheckupInfo['report_content']), - "fee_type"=>$CheckupInfo['fee_type'] + "report_content"=>isset($CheckupInfo['report_content'])?json_encode($CheckupInfo['report_content'],JSON_UNESCAPED_UNICODE):'', + "result_status"=>$CheckupInfo['result_status'], + "issue_time"=>$CheckupInfo['issue_time'], + "expire_time"=>$CheckupInfo['expire_time'] ]); - if($CheckupInfo['type']==1){ - if($u==1 and $u2==true){ - DB::commit(); // 提交事务 - $status=true; - }else{ - DB::rollBack(); // 回滚事务 - } - }else{ - if($u2){ + if( $u2>0){ + foreach ($CheckupInfo['report_content'] as $item){ + $item['examination_id']=$u2; + $item['tijian_num']=$CheckupInfo['tijian_num']; + DB::table('report_result_item')->insert($item); + } DB::commit(); // 提交事务 $status=true; }else{ - DB::rollBack(); // 回滚事务 + DB::rollBack(); // 回滚事务 } - } + } catch (\Exception $e) { DB::rollBack(); // 回滚事务 @@ -97,7 +109,7 @@ class HealthCheckupService public function SaveFile($arr){ $date = date("Ymd"); - $path = $arr['file']->store('public/'.$date); + $path = $arr['file']->store('public/reportPDF/'.$date); return \Yz::Return(true,'',$path); } //查询个人查询体检记录列表 diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index 8c83fd5..fd01b0d 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -53,7 +53,7 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1'],function () { Route::post('wxGetOpenid','App\Http\Controllers\API\mH5\LoginController@wxGetOpenid')->middleware('log'); //mH5手机用户获取openid - +Route::post('AppLogin','App\Http\Controllers\API\mH5\LoginController@AppLogin')->middleware('log'); //APP嵌套h5登录，参数APP内用户唯一id Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1/mH5'],function () { //手机H5路由分组 Route::post('Register','App\Http\Controllers\API\mH5\PersonController@Register'); //手机H5端用户注册 Route::post('GetPersonRecode','App\Http\Controllers\API\mH5\PersonController@GetPersonRecode'); //查询用户本年度体检记录 @@ -74,10 +74,14 @@ Route::group(['middleware'=>['check.sign','log'],'prefix'=>'v1'],function () { Route::post('UploadFile','App\Http\Controllers\API\Admin\YeWu\HealthCheckupController@UploadFile'); //上传体检报告pdf Route::get('GetPersonCheckUpList','App\Http\Controllers\API\Admin\YeWu\HealthCheckupController@GetPersonCheckUpList');//查询个人查询体检记录列表 Route::get('GetPersonCheckUpDetail','App\Http\Controllers\API\Admin\YeWu\HealthCheckupController@GetPersonCheckUpDetail');//根据体检号查询体检详情 + Route::post('CreateAppointment','App\Http\Controllers\API\Admin\YeWu\AppointmentController@CreateAppointment');//创建预约记录 }); Route::post('test','App\Http\Controllers\API\Admin\LoginController@test'); Route::any('XTSignNotify','App\Http\Controllers\API\XTSignController@Notify'); -Route::post('XTSignCheckNotify','App\Http\Controllers\API\XTSignController@CheckNotify')->middleware('log'); ; +Route::post('XTSignCheckNotify','App\Http\Controllers\API\XTSignController@CheckNotify')->middleware('log'); Route::post('addSignJob','App\Http\Controllers\API\XTSignController@addSignJob')->middleware('log'); ; //添加签名任务展示二维码 +Route::post('AppGetUserInfo','App\Http\Controllers\API\DxAppController@getUserInfo')->middleware('log');//大兴app根据userid查询用户信息 +Route::post('UkeyGetServeInfo','App\Http\Controllers\API\UkeyController@GetServeInfo')->middleware('log');//Ukey登录获取服务器信息 +Route::post('UkeyLogin','App\Http\Controllers\API\UkeyController@UkeyLogin')->middleware('log');//Ukey登录 diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index 057690e..08abe1d 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -25,3 +25,4 @@ Route::get('/wxLogin/{env}', function ($env) { }); //微信登录授权获取openid Route::get('/wxGetCode','App\Http\Controllers\API\mH5\LoginController@wxGetCode' ); +Route::get('/test','App\Http\Controllers\TestController@DBtest' ); diff --git a/el-admin/public/js/xtxsync.js b/el-admin/public/js/xtxsync.js index 73447c6..de4ab8b 100644 --- a/el-admin/public/js/xtxsync.js +++ b/el-admin/public/js/xtxsync.js @@ -879,7 +879,7 @@ function ParseDateString(strDate) { } //Form login -function Login(formName, strCertID, strPin) { +function xtxLogin(formName, strCertID, strPin,strServerCert, strServerRan, strServerSignedData) { var objForm = eval(formName); if (objForm == null) { return false; @@ -980,6 +980,5 @@ function Login(formName, strCertID, strPin) { objForm.UserCert.value = strClientCert; objForm.UserSignedData.value = clientSignData; objForm.LoginToken.value = xtxsync.custom.getToken(); - return true; } diff --git a/el-admin/src/api/api.js b/el-admin/src/api/api.js index 23e9ebf..0d79323 100644 --- a/el-admin/src/api/api.js +++ b/el-admin/src/api/api.js @@ -111,4 +111,13 @@ export const XTSignBindUser = (data={}) => { //admin后台用户绑定ukey export const UkeyBindUser = (data={}) => { return axios({url:import.meta.env.VITE_APP_API+'v1/admin/UkeyBindUser',data:data}) +} + +//Ukey获取服务器参数 +export const UkeyGetServeInfo = (data={}) => { + return axios({url:import.meta.env.VITE_APP_API+'UkeyGetServeInfo',data:data}) +} +//Ukey登陆 +export const UkeyUserInfoLogin = (data={}) => { + return axios({url:import.meta.env.VITE_APP_API+'UkeyLogin',data:data}) } \ No newline at end of file diff --git a/el-admin/src/main.js b/el-admin/src/main.js index c4ee121..e98a880 100644 --- a/el-admin/src/main.js +++ b/el-admin/src/main.js @@ -20,5 +20,4 @@ app.use(ElementPlus, { }) app.use(createPinia()) app.use(router) -app.use(ElementPlus) app.mount('#app') diff --git a/el-admin/src/views/Login.vue b/el-admin/src/views/Login.vue index 8d15d0f..1d009dc 100644 --- a/el-admin/src/views/Login.vue +++ b/el-admin/src/views/Login.vue @@ -14,7 +14,7 @@ inactive-action-icon="Sunny" @change="toggleDark" /> - + 登录您的账户 @@ -38,7 +38,7 @@
- + 请扫描二维码登录 @@ -54,7 +54,7 @@
- + 证书登录 @@ -65,11 +65,14 @@ - - 登录 + 登录 + + + 返回账号密码
@@ -84,7 +87,7 @@ + + \ No newline at end of file diff --git a/mH5/src/views/GetWxCode.vue b/mH5/src/views/GetWxCode.vue index 7525d3d..01d18e5 100644 --- a/mH5/src/views/GetWxCode.vue +++ b/mH5/src/views/GetWxCode.vue @@ -25,7 +25,13 @@ sessionStorage.setItem('token', res.token); sessionStorage.setItem('refreshToken', res.refresh_token); var token = sessionStorage.getItem('token'); + let loginType=sessionStorage.getItem('loginType');//登录状态 空为正常登录 report为查看报告 + console.log(loginType) if (token == res.token){ + if(loginType=='report'){ + router.replace('/ShowReport') + return false + } if(res.isRegister){ //跳转到选择机构 // window.location.href="./#/selectOrganization" diff --git a/mH5/src/views/HealthCertificate.vue b/mH5/src/views/HealthCertificate.vue index 98e2062..927db67 100644 --- a/mH5/src/views/HealthCertificate.vue +++ b/mH5/src/views/HealthCertificate.vue @@ -1,200 +1,227 @@ - \ No newline at end of file diff --git a/mH5/src/views/Login.vue b/mH5/src/views/Login.vue index a643336..9b28258 100644 --- a/mH5/src/views/Login.vue +++ b/mH5/src/views/Login.vue @@ -1,7 +1,7 @@ @@ -14,13 +14,29 @@ useRoute, useRouter } from "vue-router" + const route = useRoute() const login = () => { loading.value=true window.location.replace(import.meta.env.VITE_APP_WXCODE_URL) } let loading=ref(false) - + let buttonText=ref('开始预约') onMounted(() => { + + let tijian_num =route.query.tijian_num + let logintype =route.query.logintype + + sessionStorage.setItem('loginType', logintype); + sessionStorage.setItem('tijian_num', tijian_num); + let sloginType=sessionStorage.getItem('loginType'); + console.log(sloginType) + if(sloginType=='undefined'){ + console.log('denglu') + buttonText.value='开始预约' + }else{ + console.log('report') + buttonText.value='查看报告' + } //router.replace('/selectOrganization') //window.location.href="http://localhostcommon/wxLogin" diff --git a/mH5/src/views/ShowReport.vue b/mH5/src/views/ShowReport.vue index 315ad3c..abee48c 100644 --- a/mH5/src/views/ShowReport.vue +++ b/mH5/src/views/ShowReport.vue @@ -16,7 +16,7 @@ {{reportinfo.id_card_num}} - 查看健康证 + 查看健康证 查看报告
北京市从业人员体检结果
@@ -85,8 +85,9 @@ let list = [ document.title='报告查询' let reportinfo=ref('') const getDetail=()=>{ + let sfz=sessionStorage.getItem('sfz'); loading.value=true - GetPersonReportDetail({tijian_num:'34567'}).then(res => { + GetPersonReportDetail({sfz:sfz}).then(res => { loading.value=false if (res.status) { reportinfo.value=res.data.info @@ -116,6 +117,13 @@ const previewReport=()=>{ } } +const gotoHealthCertificate=()=>{ + if(reportinfo.value.result_status==1){ + router.push('/healthCertificate') + }else{ + showToast('暂无对应此次体检结果的健康证'); + } +} onMounted(()=>{ getDetail() })