From 28d683c22d78492839cbcbc65516522d7e2bbeba Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Tue, 21 Jul 2026 00:46:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=BF=9E=E6=8E=A5=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../API/Admin/YeWu/EntrustController.php      |  2 +-
 .../API/Admin/YeWu/WorkMainController.php     |  2 +-
 YiJi-admin/.env.production                    |  5 ++---
 .../src/components/Yewu/YuYue202506.vue       |  2 +-
 YiJi-admin/src/views/YeWu/MainList.vue        | 20 ++-----------------
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php
index 69fb911..2534886 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php
@@ -131,7 +131,7 @@ public function getMainDetail_duoren()
                 }
                 if(!!$ii){
                     if(empty($ii->device_id)){
-                        $msg="检查项目未关联服务组";
+                        $msg="检查项目未关联排班";
                     }
 
                     $qudaos = explode(',', $ii->reservation_method);
diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
index 5bd36c2..3e14450 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
@@ -64,7 +64,7 @@ public function getMainDetail()
            }
            if(count($ii)>0 ){
                if(empty($ii[0]->device_id)){
-                   $msg="检查项目未关联服务组";
+                   $msg="检查项目未关联排班";
                }
 
                $qudaos = explode(',', $ii[0]->reservation_method);
diff --git a/YiJi-admin/.env.production b/YiJi-admin/.env.production
index 443bab1..cdef114 100644
--- a/YiJi-admin/.env.production
+++ b/YiJi-admin/.env.production
@@ -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_FILE_66666666 = 'http://192.168.1.42:8844/'
 
-
-VITE_APP_API_aa = 'https://qhdzyyyiji.cjy.net.cn/api/'
-VITE_APP_FILE_aa = 'https://qhdzyyyiji.cjy.net.cn/'
\ No newline at end of file
+VITE_APP_API_aa = 'https://yj.dev.cjy.net.cn/api/'
+VITE_APP_FILE_aa = 'https://yj.dev.cjy.net.cn/'
\ No newline at end of file
diff --git a/YiJi-admin/src/components/Yewu/YuYue202506.vue b/YiJi-admin/src/components/Yewu/YuYue202506.vue
index 74f3b19..b417610 100644
--- a/YiJi-admin/src/components/Yewu/YuYue202506.vue
+++ b/YiJi-admin/src/components/Yewu/YuYue202506.vue
@@ -44,7 +44,7 @@
 						<span v-if="scope.row.his_is_emergency==0">否</span>
 					</template>
 				</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="check_begin_time" label="预约时间" width="120">
 					<template #default="scope">
diff --git a/YiJi-admin/src/views/YeWu/MainList.vue b/YiJi-admin/src/views/YeWu/MainList.vue
index 54c028c..5f85978 100644
--- a/YiJi-admin/src/views/YeWu/MainList.vue
+++ b/YiJi-admin/src/views/YeWu/MainList.vue
@@ -41,13 +41,6 @@
 								:label="item.department_resources_name" :value="item.id" />
 						</el-select>
 					</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>
@@ -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>
 				</template>
 			</el-table-column>
-			<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="department_resources_name" label="排班" width="120" />
 			<el-table-column prop="reservation_department" label="申请科室" width="120" />
 			<el-table-column prop="" label="医嘱时间" width="160">
 				<template #default="scope">
@@ -191,7 +175,7 @@
 						可一起预约项目
 					</div>
 					<div style="width: 50%;  padding: 8px;text-align: center;">
-						关联的服务组
+						关联的排班
 					</div>
 				</div>
 				<div v-for="(group,index) in ItemGroup" :key="index" class="dialogitem" @click="ClickGroup(group)">