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

预约连接判断调整。

Browse Source
main
鹿和sa0ChunLuyu 2 weeks ago
parent dd2305fe1c
commit 28d683c22d
5 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php
Unescape Escape View File

@ -131,7 +131,7 @@ public function getMainDetail_duoren()
} }
if(!!$ii){ if(!!$ii){
if(empty($ii->device_id)){ if(empty($ii->device_id)){
$msg="检查项目未关联服务组"; $msg="检查项目未关联排班";
} }
$qudaos = explode(',', $ii->reservation_method); $qudaos = explode(',', $ii->reservation_method);

2
Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
Unescape Escape View File

@ -64,7 +64,7 @@ public function getMainDetail()
} }
if(count($ii)>0 ){ if(count($ii)>0 ){
if(empty($ii[0]->device_id)){ if(empty($ii[0]->device_id)){
$msg="检查项目未关联服务组"; $msg="检查项目未关联排班";
} }
$qudaos = explode(',', $ii[0]->reservation_method); $qudaos = explode(',', $ii[0]->reservation_method);

5
YiJi-admin/.env.production
Unescape Escape View File

@ -5,6 +5,5 @@ VITE_APP_FILE = 'http://192.168.80.76/'
VITE_APP_API_66666666 = 'http://192.168.1.42:8844/api/' VITE_APP_API_66666666 = 'http://192.168.1.42:8844/api/'
VITE_APP_FILE_66666666 = 'http://192.168.1.42:8844/' VITE_APP_FILE_66666666 = 'http://192.168.1.42:8844/'
VITE_APP_API_aa = 'https://yj.dev.cjy.net.cn/api/'
VITE_APP_API_aa = 'https://qhdzyyyiji.cjy.net.cn/api/' VITE_APP_FILE_aa = 'https://yj.dev.cjy.net.cn/'
VITE_APP_FILE_aa = 'https://qhdzyyyiji.cjy.net.cn/'

2
YiJi-admin/src/components/Yewu/YuYue202506.vue
Unescape Escape View File

@ -44,7 +44,7 @@
<span v-if="scope.row.his_is_emergency==0">否</span> <span v-if="scope.row.his_is_emergency==0">否</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="department_resources.department_resources_name" label="预约资源" width="120" /> <el-table-column prop="department_resources.department_resources_name" label="排班" width="120" />
<el-table-column prop="reservation_date" label="预约日期" width="120" /> <el-table-column prop="reservation_date" label="预约日期" width="120" />
<el-table-column prop="check_begin_time" label="预约时间" width="120"> <el-table-column prop="check_begin_time" label="预约时间" width="120">
<template #default="scope"> <template #default="scope">

20
YiJi-admin/src/views/YeWu/MainList.vue
Unescape Escape View File

@ -41,13 +41,6 @@
:label="item.department_resources_name" :value="item.id" /> :label="item.department_resources_name" :value="item.id" />
</el-select> </el-select>
</el-form-item > </el-form-item >
<el-form-item v-if="loginUserinfo && loginUserinfo.group!=2">
<el-select :filterable="true" clearable v-model="searchInfo.services_group" placeholder="服务组"
style="margin-left: 8px;width: 150px;">
<el-option v-for="(item,index) in EnableDeviceList" :key="index" :label="item.device_name"
:value="item.id" />
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
@ -118,16 +111,7 @@
v-if="scope.row.period_begin_time && scope.row.period_end_time ">{{scope.row.period_begin_time.substring(0, 5)}}~{{scope.row.period_end_time.substring(0, 5)}}</span> v-if="scope.row.period_begin_time && scope.row.period_end_time ">{{scope.row.period_begin_time.substring(0, 5)}}~{{scope.row.period_end_time.substring(0, 5)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="department_resources_name" label="预约资源" width="120" /> <el-table-column prop="department_resources_name" label="排班" width="120" />
<el-table-column prop="devices" label="服务组">
<template #default="scope">
<div style="white-space: nowrap;">
<span v-for="(item,index) in scope.row.devices" :key="index">
{{ item.device_name+ ' ' }}
</span>
</div>
</template>
</el-table-column>
<el-table-column prop="reservation_department" label="申请科室" width="120" /> <el-table-column prop="reservation_department" label="申请科室" width="120" />
<el-table-column prop="" label="医嘱时间" width="160"> <el-table-column prop="" label="医嘱时间" width="160">
<template #default="scope"> <template #default="scope">
@ -191,7 +175,7 @@
可一起预约项目 可一起预约项目
</div> </div>
<div style="width: 50%; padding: 8px;text-align: center;"> <div style="width: 50%; padding: 8px;text-align: center;">
关联的服务组 关联的排班
</div> </div>
</div> </div>
<div v-for="(group,index) in ItemGroup" :key="index" class="dialogitem" @click="ClickGroup(group)"> <div v-for="(group,index) in ItemGroup" :key="index" class="dialogitem" @click="ClickGroup(group)">

Write Preview
Loading…
Cancel
Save