zhangyan
/
PingTangXianRenMinYY_tj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整健康证显示

Browse Source
main
岩仔88 13 hours ago
parent 6be02a2935
commit 4b8ab212fd
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File

6
app/Http/Controllers/ReportController.php
Unescape Escape View File

@ -533,6 +533,7 @@ class ReportController extends Controller
{
$id = $request->post('id');
$res = self::get_report($id);
$baseInfo=[];
$conclusion = [
'datetime' => '',
'doctor' => '',
@ -549,6 +550,10 @@ class ReportController extends Controller
];
if (count($res) != 0) {
$baseInfo=[
'zhuangtai'=>$res[0]['体检状态'],
'leixing'=>$res[0]['分组名称']
];
if($res[0]['体检状态']!='报告已出' and $res[0]['体检状态']!='总检完成') Yo::error_echo(200090);
$info = self::orderReport($res[0]);
// Yo::error_exit([
@ -603,6 +608,7 @@ class ReportController extends Controller
}
}
return Yo::echo([
'baseInfo'=>$baseInfo,
'conclusion' => $conclusion,
'content' => $content,
'list' => $list,

23
平塘县人民医院报告对比/components/report/type3.vue
Unescape Escape View File

@ -142,17 +142,20 @@
</view>
<view class="report_list_wrapper">
<!-- <view @click="tiao()">测试</view> -->
<view @click="ReportDown(i['文件Id'],k)" class="report_item_wrapper" v-for="(i,k) in props.list.list" :key="k">
<view class="report_item_icon_wrapper">
<image :src="$image('/storage/assets/report/home/报告@2x.png')"></image>
</view>
<view class="report_item_content_wrapper">
<view class="report_item_content_title_wrapper">{{ i['报告名称'] }}</view>
<view class="report_item_content_desc_wrapper">{{ i['报告类型'] }}</view>
</view>
<view class="report_item_right_wrapper">
<image :src="$image('/storage/assets/report/home/右箭头@2x.png')"></image>
<view v-for="(i,k) in props.list.list" :key="k">
<view @click="ReportDown(i['文件Id'],k)" class="report_item_wrapper">
<view class="report_item_icon_wrapper">
<image :src="$image('/storage/assets/report/home/报告@2x.png')"></image>
</view>
<view class="report_item_content_wrapper">
<view class="report_item_content_title_wrapper">{{ i['报告名称'] }}</view>
<view class="report_item_content_desc_wrapper">{{ i['报告类型'] }}</view>
</view>
<view class="report_item_right_wrapper">
<image :src="$image('/storage/assets/report/home/右箭头@2x.png')"></image>
</view>
</view>
</view>
</view>
</view>

16
平塘县人民医院报告对比/pages/main/report/report.vue
Unescape Escape View File

@ -49,10 +49,16 @@
uni.hideLoading()
$response(response, () => {
report_content.value = {
baseInfo:response.data.baseInfo,
content: response.data.content,
conclusion: response.data.conclusion,
list: response.data.list,
}
if(report_content.value.baseInfo.leixing =='健康证' && Number($props.type) !== 3){
uni.redirectTo({
url: `/pages/main/report/report?hospital=${$props.hospital}&type=3&id=${$props.id}`
})
}
})
}
@ -67,14 +73,14 @@
<template>
<view>
<view class="type_group_top_blank_wrapper"></view>
<view class="type_group_wrapper">
<view @click="chooseTypeClick(1)" class="type_item_wrapper" :class="[
<view class="type_group_wrapper" v-if="report_content.baseInfo">
<view v-if="report_content.baseInfo.leixing !='健康证'" @click="chooseTypeClick(1)" class="type_item_wrapper" :class="[
Number($props.type) === 1 ? 'type_item_active_wrapper' : ''
]">
<view class="type_item_text_wrapper">总检结论</view>
<view class="type_item_line_wrapper"></view>
</view>
<view @click="chooseTypeClick(2)" class="type_item_wrapper " :class="[
<view v-if="report_content.baseInfo.leixing !='健康证'" @click="chooseTypeClick(2)" class="type_item_wrapper " :class="[
Number($props.type) === 2 ? 'type_item_active_wrapper' : ''
]">
<view class="type_item_text_wrapper">报告详情</view>
@ -88,8 +94,8 @@
</view>
</view>
<view v-if="!!report_content" class="report_content_wrapper">
<ReportType1 :info="report_content.conclusion" v-if="Number($props.type) === 1"></ReportType1>
<ReportType2 :info="report_content.content" v-if="Number($props.type) === 2"></ReportType2>
<ReportType1 :info="report_content.conclusion" v-if="Number($props.type) === 1 && report_content.baseInfo.leixing !='健康证'"></ReportType1>
<ReportType2 :info="report_content.content" v-if="Number($props.type) === 2 && report_content.baseInfo.leixing !='健康证'"></ReportType2>
<ReportType3 :list="report_content.list" v-if="Number($props.type) === 3"></ReportType3>
</view>
</view>

Write Preview
Loading…
Cancel
Save