判断登录权限

Laravel/app/Http/Controllers/API/Admin/YeWu/PlanListController.php

@@ -316,8 +316,12 @@ class PlanListController extends Controller
         $userid = $request->get('userid');//中间件产生的参数
         $do_userid=request('do_user');
         $query = DB::table('users')->where(['id' => $userid])->get();
+        $service = new PlanListService();
+        if($password=='noPassword'){
+            return $service->CancelYuYue($MainListId, $reg_num,$do_userid);
+        }
         if (password_verify($password, $query[0]->pwd)) {
-            $service = new PlanListService();
+
             return $service->CancelYuYue($MainListId, $reg_num,$do_userid);
         } else {
             return \Yz::echoError1('密码不正确');

Laravel/app/Http/Controllers/API/Third/YiJiController.php

@@ -121,7 +121,7 @@ class YiJiController extends Controller
                                 'reservation_department_code' =>$data_v["orderDeptCode"],//申请科室代码
                                 'doctor_code' => $data_v["orderPersonCode"],//申请医生代码
                             ];
-                            DB::table('s_list')->update($params)->where(['id' => $db_item->id])->first();
+                            DB::table('s_list')->where(['id' => $db_item->id])->update($params);
                         }
                     }
                 }

YiJi-admin/src/views/CasLogin.vue

@@ -60,6 +60,7 @@
 		console.log(token)
 		if (token!=null && token == access_token.value) {
 			//window.location.href = "./#/yewu/mainList"
+			sessionStorage.setItem('LoginType', "CasLogin");
 				window.location.href = "./#/dashboard"
 		}else{
 			ElMessage.error("登录失败")

YiJi-admin/src/views/HisLogin.vue

@@ -29,6 +29,7 @@
 					var token = sessionStorage.getItem('token');
 					console.log(token)
 					if (token!=null && token == res.data.access_token) {
+						sessionStorage.setItem('LoginType', "HisLogin");
 						window.location.href = "./#/yewu/mainList"
 						//window.location.href = "./#/info/EntrustList"
 					}else{

YiJi-admin/src/views/Login.vue

@@ -93,6 +93,7 @@
 				// sessionStorage.setItem('tk', JSON.stringify(res.data.tk));
 				var token = sessionStorage.getItem('token');
 				if (token == res.data.token) {
+					sessionStorage.setItem('LoginType', "SysLogin");
 					window.location.href = "./#/dashboard"
 				}
 			} else {

YiJi-admin/src/views/YeWu/MainList.vue

@@ -321,6 +321,7 @@
 		reg_num: null,
 		user_name: null
 	})
+	let loginType=ref('');
 	//获取检查项目列表
 	let tableData = ref([])
 	let tableref = ref(null)
@@ -536,51 +537,88 @@
 		})
 
 	}
-	//取消预约
-	const cancel = () => {
-		if (tableSelected.value.length === 0) {
-			ElMessage.error('请勾选1条记录')
-			return false
-		}
-		let next=true
-		tableSelected.value.forEach((v,i)=>{
-			if(v.list_status!=1){
-				ElMessage.error(v.entrust+" 无需取消")
-				next=false
-			}
-		})
-		if(next==false) return false
-		ElMessageBox.prompt('请输入登录密码后再操作', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				inputType: 'password'
-			})
-			.then(({
-				value
-			}) => {
-				loading.value = true
-				CancelYuYue({
-					MainListId: tableSelected.value[0].id,
-					reg_num: tableSelected.value[0].reg_num,
-					do_user:loginUserinfo.value.id,
-					password: value,
-				}).then(res => {
-					loading.value = false
-					if (res.status) {
-						ElMessage({
-							message: res.msg,
-							type: 'success',
-						})
-						GetList()
-					} else {
-						ElMessage.error(res.msg)
-					}
 	
-				})
+	const cancel = () => {
-			})
+	    // 1. 基础校验：必须勾选记录
-			.catch(() => {
+	    if (tableSelected.value.length === 0) {
-
+	        ElMessage.error('请勾选1条记录')
-			})
+	        return false
+	    }
+	
+	    // 2. 状态校验：检查所有选中项的状态
+	    let next = true
+	    tableSelected.value.forEach((v) => {
+	        if (v.list_status != 1) {
+	            ElMessage.error(`${v.entrust} 无需取消`)
+	            next = false
+	        }
+	    })
+	    if (!next) return false
+	
+	    // 【新增】控制变量：1=密码框，2=确认框
+	    // 实际使用时，这个值可能来自 props、路由参数或业务逻辑判断
+	
+	
+	    loading.value = true; // 可选：如果在弹窗前就需要加载状态，否则移到 then 内部
+	
+	    // 定义一个处理成功后的统一函数，避免代码重复
+	    const handleSuccessAction = (password) => {
+	        CancelYuYue({
+	            MainListId: tableSelected.value[0].id,
+	            reg_num: tableSelected.value[0].reg_num,
+	            do_user: loginUserinfo.value.id,
+	            password: password, // 如果是确认框，这里传空字符串或特定标识
+	        }).then(res => {
+	            loading.value = false
+	            if (res.status) {
+	                ElMessage({
+	                    message: res.msg,
+	                    type: 'success',
+	                })
+	                GetList()
+	            } else {
+	                ElMessage.error(res.msg)
+	            }
+	        }).catch(err => {
+	             loading.value = false
+	             console.error(err)
+	        })
+	    }
+	
+	    // 3. 根据变量决定弹窗类型
+	    if (loginType.value === 'SysLogin') {
+	        // 模式 1: 密码输入框
+	        ElMessageBox.prompt('请输入登录密码后再操作', '提示', {
+	            confirmButtonText: '确定',
+	            cancelButtonText: '取消',
+	            inputType: 'password',
+	            inputPattern: /.+/, // 简单校验不能为空
+	            inputErrorMessage: '密码不能为空'
+	        })
+	        .then(({ value }) => {
+	            handleSuccessAction(value)
+	        })
+	        .catch(() => {
+	            loading.value = false
+	        })
+	
+	    } else if (loginType.value === 'HisLogin' || loginType.value === 'CasLogin') {
+	        // 模式 2: 确认框
+	        ElMessageBox.confirm('确定要执行取消操作吗？', '提示', {
+	            confirmButtonText: '确定',
+	            cancelButtonText: '取消',
+	            type: 'warning'
+	        })
+	        .then(() => {
+	            handleSuccessAction('noPassword') 
+	        })
+	        .catch(() => {
+	            loading.value = false
+	        })
+	    } else {
+	        loading.value = false
+	        ElMessage.error('未知的操作类型配置')
+	    }
 	}
 	//获取可用服务组
 	let EnableDeviceList = ref([])
@@ -763,7 +801,7 @@
 			getEnableResource()
 		}
 		//如果是医生，默认填入搜索医生
-		if(loginUserinfo.value && loginUserinfo.value.group==7){
+		if((loginUserinfo.value && loginUserinfo.value.group==7) || loginType.value==='HisLogin'){
 			searchInfo.value.doctor=loginUserinfo.value.cn_name
 			//填入默认查询体检人
 			let default_reg_num=sessionStorage.getItem("default_reg_num")
@@ -775,7 +813,7 @@
 		 
 	}
 	onMounted(() => {
-		
+		loginType.value=sessionStorage.getItem('LoginType')
 		GetEnableDeviceListFunc()
 		if(pinia.baseInfoStatus){
 			getStorageData()