预检弹窗开关

push^2
鹿和sa0ChunLuyu 18 hours ago
parent 3f70535099
commit 20830dea09

@ -3060,6 +3060,10 @@ public function PreCheckYuYue($groups, $appointment_type, $do_type, $is_emergenc
date_default_timezone_set('PRC'); date_default_timezone_set('PRC');
$nowdatetime = date("Y-m-d H:i:s"); $nowdatetime = date("Y-m-d H:i:s");
// 读取执行科室提示配置
$deptCheckConfig = DB::table('configs')->where('label', '执行科室提示')->first();
$deptCheckEnabled = $deptCheckConfig ? $deptCheckConfig->value : '0';
$allList = []; $allList = [];
$hasMismatch = false; $hasMismatch = false;
$hasFail = false; $hasFail = false;
@ -3296,6 +3300,7 @@ public function PreCheckYuYue($groups, $appointment_type, $do_type, $is_emergenc
} }
return \Yz::Return(true, '检查完成', [ return \Yz::Return(true, '检查完成', [
'dept_check_enabled' => $deptCheckEnabled,
'has_mismatch' => $hasMismatch, 'has_mismatch' => $hasMismatch,
'has_fail' => $hasFail, 'has_fail' => $hasFail,
'list' => $allList, 'list' => $allList,

@ -244,12 +244,7 @@
<div v-if="scope.row.check_status === 'fail'" style="color: #f56c6c; font-size: 12px; margin-top: 2px;">{{ scope.row.check_msg }}</div> <div v-if="scope.row.check_status === 'fail'" style="color: #f56c6c; font-size: 12px; margin-top: 2px;">{{ scope.row.check_msg }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="校验结果" width="80">
<template #default="scope">
<el-tag v-if="scope.row.check_status === 'pass'" type="success"></el-tag>
<el-tag v-else type="danger">失败</el-tag>
</template>
</el-table-column>
</el-table> </el-table>
<template #footer> <template #footer>
<el-button v-if="!preCheckHasFail" @click="preCheckDialogVisible = false"></el-button> <el-button v-if="!preCheckHasFail" @click="preCheckDialogVisible = false"></el-button>
@ -1537,11 +1532,50 @@ let TanChuangMsgDialogVisible=ref(false)
return return
} }
//
if (res.data.dept_check_enabled !== '1') {
//
const msg = type === 2 ? '确定改约至此时间吗?' : '确定预约此时间吗?'
ElMessageBox.confirm(msg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
startYuYue(type)
}).catch(() => {})
return
}
//
if (res.data.has_fail) {
// dialog
preCheckList.value = res.data.list || [] preCheckList.value = res.data.list || []
preCheckHasMismatch.value = res.data.has_mismatch || false preCheckHasMismatch.value = res.data.has_mismatch || false
preCheckHasFail.value = res.data.has_fail || false preCheckHasFail.value = true
preCheckDotype.value = type
preCheckDialogVisible.value = true
return
}
if (res.data.has_mismatch) {
// dialog
preCheckList.value = res.data.list || []
preCheckHasMismatch.value = true
preCheckHasFail.value = false
preCheckDotype.value = type preCheckDotype.value = type
preCheckDialogVisible.value = true preCheckDialogVisible.value = true
return
}
//
const msg = type === 2 ? '确定改约至此时间吗?' : '确定预约此时间吗?'
ElMessageBox.confirm(msg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
startYuYue(type)
}).catch(() => {})
} }
const startYuYue = async (type) => { const startYuYue = async (type) => {
planLoading.value = true planLoading.value = true

Loading…
Cancel
Save