h5增加取消预约，报告状态显示 合格

Laravel/app/Http/Controllers/API/mH5/OrganizationController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\API\mH5;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use App\Services\mH5\OrganizationService;
+use Illuminate\Support\Facades\DB;
 
 class OrganizationController extends Controller
 {
@@ -47,5 +48,22 @@ class OrganizationController extends Controller
         }
 
     }
+    //取消预约
+    public function CancelYuYue(Request $request)
+    {
+        $openid = $request->get('userid');//中间件产生的参数
+      //  dd($openid);
+        $group = $request->get('role');//中间件产生的参数
+        $id=request('id');
+        $info=DB::table('appointment_record')->where(['id'=>$id,'openid'=>$openid])->update([
+            'is_del'=>1
+        ]);
+        if($info){
+            return \Yz::Return(true,'取消成功',[]);
+        }else{
+            return \Yz::echoError1("取消失败");
+        }
+
+    }
 
 }

Laravel/app/Http/Controllers/API/mH5/PersonController.php

@@ -196,7 +196,7 @@ class PersonController extends Controller
 
         if(isset($sfz)){
             $info=DB::table('appointment_record as a')
-                ->select('a.name','a.id_card_num','a.date','a.time','a.type','a.doc_type_name','a.created_at','b.org_name')
+                ->select('a.id','a.name','a.id_card_num','a.date','a.time','a.type','a.doc_type_name','a.created_at','b.org_name')
                 ->join('medical_institution as b','a.org_code','=','b.sn')
                 ->where(['a.id_card_num'=>$sfz,'a.is_del'=>0])->whereNull('a.source')
                 ->whereBetween('a.created_at',[$firstDay,$lastDay])->orderBy('a.id','desc')->first();

Laravel/routes/api.php

@@ -76,6 +76,7 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1/mH5'],function ()
     Route::post('GetOrgEnableList','App\Http\Controllers\API\mH5\OrganizationController@GetEnableList');  //获取可用体检机构
     Route::post('GetEnableCalendar','App\Http\Controllers\API\mH5\OrganizationController@GetEnableCalendar');  //获取可用体检机构日历
     Route::post('StartYuYue','App\Http\Controllers\API\mH5\OrganizationController@StartYuYue');  //开始预约
+    Route::post('CancelYuYue','App\Http\Controllers\API\mH5\OrganizationController@CancelYuYue');  //取消预约
     Route::post('UpFile','App\Http\Controllers\API\UpLoadController@UpFile');  //上传文件
     Route::post('UpFileBase64','App\Http\Controllers\API\UpLoadController@UpFileBase64');//上传文件base64
     Route::post('GetPersonReportDetail','App\Http\Controllers\API\mH5\PersonController@GetPersonReportDetail');//获取用户pdf

mH5/src/api/api.js

@@ -74,4 +74,8 @@ export const H5GetAppointmentRecord =   (data) =>  {
 //判断是否过65
 export const isAgeOver65 =   (data) =>  {
     	return 	axios({url:import.meta.env.VITE_APP_API+'v1/mH5/isAgeOver65',data:data})
+}
+//判断是否过65
+export const CancelYuYue =   (data) =>  {
+    	return 	axios({url:import.meta.env.VITE_APP_API+'v1/mH5/CancelYuYue',data:data})
 }

mH5/src/main.js

@@ -7,7 +7,7 @@ import App from './App.vue'
 import router from './router'
 import { Button,Toast,Loading,Field,RadioGroup,Radio,Icon,Col, 
     Row,Step, Steps,Empty,Calendar,Cell, CellGroup,Picker,Popup,
-    Overlay,Uploader ,Image as VanImage  } from 'vant';
+    Overlay,Uploader ,Image as VanImage,Dialog   } from 'vant';
 import LoadingD from '@/components/Loading.vue'
 
 import 'vant/lib/index.css';
@@ -38,5 +38,6 @@ app.use(Popup);
 app.use(Overlay);
 app.use(Uploader);
 app.use(VanImage);
+app.use(Dialog);
 
 app.mount('#app')

mH5/src/views/MyAppointment.vue

@@ -24,12 +24,12 @@
 				</tr>
 				<tr>
 					<td>预约时间</td>
-					<td>{{Info.date.substr(0,10)}} {{Info.time}}</td>
+					<td>{{Info.date.substr(0,10)}} {{Info.time}} <van-button style="margin-left: 10px;" round type="default" icon="todo-list-o" @click="CancelYuYueFunc(Info.id)">取消预约</van-button></td>
 				</tr>
 				<tr>
 					<td>记录时间</td>
 					<td>{{Info.created_at}}</td>
-				</tr>
+				</tr> 
 			</table>
 			 
 			<van-empty v-else description="暂无记录" />
@@ -49,10 +49,10 @@
 		useRouter
 	} from "vue-router"
 	import {
-		H5GetAppointmentRecord
+		H5GetAppointmentRecord,CancelYuYue
 	} from "@/api/api.js";
 	import {
-		showToast
+		showToast,showConfirmDialog 
 	} from 'vant';
 	const route = useRoute()
 	const router = useRouter();
@@ -67,6 +67,23 @@
 			
 		})
 	}
+	const CancelYuYueFunc=(id)=>{
+		showConfirmDialog({
+		  title: '提示',
+		  message: '确认取消吗？'
+		}).then(() => {
+		  CancelYuYue({id:id}).then(res => {
+		  	if(res.status){
+				showToast('取消成功');
+		  	   GetInfo()
+		  	}
+		  	
+		  })
+		}).catch(() => {
+		  
+		});
+		
+	}
 	onMounted(()=>{
 		GetInfo()
 	})

mH5/src/views/ShowReport.vue

@@ -38,7 +38,7 @@
 					<van-col v-else span="4"><van-icon name="warning" color="#de554d" size="20px" /></van-col>
 					<van-col span="16">{{ item.item_name }}</van-col>
 					<van-col v-if="item.flag == '' || item.flag == null" span="4"><span
-							style="color: #ccc;">无</span></van-col>
+							style="color: #ccc;">合格</span></van-col>
 					<van-col v-else span="4">{{item.item_result}}</van-col>
 				</van-row>