From 63220de99455955d7d079818139ee488cf37cc19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=A9=E4=BB=9488?= <>
Date: Sun, 7 Jun 2026 11:37:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E7=BB=B4=E6=8A=A4=E6=9C=AC?=
 =?UTF-8?q?=E7=A7=91=E5=AE=A4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../API/Admin/YeWu/DepartmentController.php   |  6 ++-
 .../Services/Admin/YeWu/DepartmentService.php | 33 ++++++++++++++--
 .../src/views/YeWu/DepartmentConfig.vue       | 38 +++++++++++++------
 3 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/DepartmentController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/DepartmentController.php
index 1cdd907..9685378 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/DepartmentController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/DepartmentController.php
@@ -9,14 +9,16 @@
 class DepartmentController extends Controller
 {
     //获取科室列表
-    public function GetList()
+    public function GetList(Request $request)
     {
         $page =request('page');
         $pageSize =request('pageSize');
         $searchInfo =request('searchInfo');
+        $userid = $request->get('userid');
+        $group = $request->get('role');
 
         $service = new DepartmentService();
-        return $service->GetList($searchInfo,$page,$pageSize);
+        return $service->GetList($searchInfo,$page,$pageSize,$userid,$group);
     }
     //获取启用的科室列表
     public function GetEnableList(Request $request)
diff --git a/Laravel/app/Services/Admin/YeWu/DepartmentService.php b/Laravel/app/Services/Admin/YeWu/DepartmentService.php
index 5aacda5..1610abb 100644
--- a/Laravel/app/Services/Admin/YeWu/DepartmentService.php
+++ b/Laravel/app/Services/Admin/YeWu/DepartmentService.php
@@ -5,9 +5,25 @@
 
 class DepartmentService
 {
-  public function GetList($searchInfo,$page,$pageSize)
+  public function GetList($searchInfo,$page,$pageSize,$userid=null,$group=null)
   {
       $list=DB::table('s_department')->where('is_del',0);
+
+      if(!in_array($group,[1,5]) && $userid){
+          $userInfo = DB::table('users')->where(['id'=>$userid])->first();
+          if($userInfo){
+              $deptIds = [];
+              if(!empty($userInfo->department_ids)){
+                  $deptIds = explode(",", $userInfo->department_ids);
+              } elseif($userInfo->department_id){
+                  $deptIds = [$userInfo->department_id];
+              }
+              if(count($deptIds) > 0){
+                  $list = $list->whereIn('id', $deptIds);
+              }
+          }
+      }
+
       if(isset($searchInfo['status'])){
           $list=  $list->where('department_status',$searchInfo['status']);
 
@@ -29,9 +45,18 @@ public function GetEnableList($arr,$is_all=false)
   {
       $list=DB::table('s_department');
       if(!in_array($arr['group'],[1,5])  and $is_all===false){
-          $userInfo = DB::table('users')->where(['id'=>$arr['userid']])->get();
-          $department_id=$userInfo[0]->department_id;
-          $list= $list->where(['id'=>$department_id]);
+          $userInfo = DB::table('users')->where(['id'=>$arr['userid']])->first();
+          if($userInfo){
+              $deptIds = [];
+              if(!empty($userInfo->department_ids)){
+                  $deptIds = explode(",", $userInfo->department_ids);
+              } elseif($userInfo->department_id){
+                  $deptIds = [$userInfo->department_id];
+              }
+              if(count($deptIds) > 0){
+                  $list = $list->whereIn('id', $deptIds);
+              }
+          }
       }
       $list= $list->where(['is_del'=>0,'department_status'=>1])->get();
       return \Yz::Return(true, '查询成功', ['list'=>$list]);
diff --git a/YiJi-admin/src/views/YeWu/DepartmentConfig.vue b/YiJi-admin/src/views/YeWu/DepartmentConfig.vue
index 30caf5a..c3b3f91 100644
--- a/YiJi-admin/src/views/YeWu/DepartmentConfig.vue
+++ b/YiJi-admin/src/views/YeWu/DepartmentConfig.vue
@@ -9,11 +9,11 @@
 						<el-option label="禁用" :value="0" />
 					</el-select>
 				</el-form-item>
-				<el-form-item>
+				<el-form-item v-if="isAdmin">
 					<el-input v-model="searchInfo.name" placeholder="请输入科室名称" style="margin-left: 10px;" />
 				</el-form-item>
 				<el-button @click="GetList()" style="margin-left: 10px;">查询</el-button>
-				<el-button type="primary" @click="add()" style="margin-left: 10px;">添加科室</el-button>
+				<el-button v-if="isAdmin" type="primary" @click="add()" style="margin-left: 10px;">添加科室</el-button>
 			</el-row>
 		</div>
 		<el-table :data="tableData" style="width: 100%;" row-key="id" :row-style="{'height':'60px'}"
@@ -27,7 +27,7 @@
 					<el-tag v-if="scope.row.department_status==1" class="ml-2" type="success">正常</el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column prop="status" label="科室账号" width="120">
+			<el-table-column prop="status" label="科室账号" width="120" v-if="isAdmin">
 				<template #default="scope">
 					<div style="text-align: center;" >
 						<el-button v-if="scope.row.department_status==1"  @click="addUser(scope.row)" size="small">添加账号</el-button>
@@ -41,7 +41,7 @@
 					</div>
 				</template>
 			</el-table-column>
-			<el-table-column label="科室资源">
+			<el-table-column label="科室资源" v-if="isAdmin">
 				<template #default="scope">
 					<div class="zi_button" @click="goto1(scope.row.id)">科室资源 (共 <span
 							style="color: #dd377f;">{{scope.row.resource_count}}</span> 个)</div>
@@ -52,7 +52,7 @@
 			<el-table-column prop="" label="操作" width="180">
 				<template #default="scope">
 					<el-button type="primary" @click="Edit(scope.row)" size="small">修改</el-button>
-					<el-button type="danger" @click="Del(scope.row)" size="small">删除</el-button>
+					<el-button v-if="isAdmin" type="danger" @click="Del(scope.row)" size="small">删除</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -62,14 +62,18 @@
 				@size-change="PageSizeChange" @current-change="PageCurrentChange" />
 		</div>
 		<el-dialog v-model="dialogVisible" title="科室信息" width="30%">
-			<el-form :model="departmentInfo" label-width="100px" v-loading="loading" style="padding-right: 40px;">
+			<el-form :model="departmentInfo" label-width="130px" v-loading="loading" style="padding-right: 40px;">
 				<el-form-item label="科室名称:">
-					<el-input v-model="departmentInfo.department_name" />
+					<el-input v-model="departmentInfo.department_name" :disabled="!isAdmin" />
 				</el-form-item>
 				<el-form-item label="科室编号:">
-					<el-input v-model="departmentInfo.department_number" />
+					<el-input v-model="departmentInfo.department_number" :disabled="!isAdmin" />
+				</el-form-item>
+				<el-form-item label="自动生成天数:">
+					<el-input-number v-model="departmentInfo.auto_gen_days" :min="1" :max="90" />
+					<span style="color: #aaa; margin-left: 10px; font-size: 12px;">*定时任务自动生成N天后的号源</span>
 				</el-form-item>
-				<el-form-item label="科室状态:">
+				<el-form-item label="科室状态:" v-if="isAdmin">
 					<el-switch v-model="departmentInfo.department_status" active-text="正常" inactive-text="关闭"
 						:active-value="1" :inactive-value="0" />
 				</el-form-item>
@@ -126,6 +130,13 @@
 	} from '@/api/api.js'
 	import { ElMessage, ElMessageBox } from 'element-plus'
 	import DepartmentResourcesSave from '@/components/Yewu/DepartmentResourcesSave.vue'
+	let loginUserinfo = ref(null)
+	if (sessionStorage.getItem("LoginUserInfo")) {
+		loginUserinfo.value = JSON.parse(sessionStorage.getItem("LoginUserInfo"))
+	}
+	const isAdmin = computed(() => {
+		return loginUserinfo.value && (loginUserinfo.value.group == 1 || loginUserinfo.value.group == 5)
+	})
 	 const groupList_new = computed(() => {
 	      return groupList.value.filter(item => (item.id !== 1 && item.id !== 5));
 	    });
@@ -169,7 +180,8 @@
 		id: null,
 		department_name: '',
 		department_number: '',
-		department_status: null
+		department_status: null,
+		auto_gen_days: 15
 	})
 	const Edit = (row) => {
 		dialogVisible.value = true
@@ -177,7 +189,8 @@
 			id: row.id,
 			department_name: row.department_name,
 			department_number: row.department_number,
-			department_status: row.department_status
+			department_status: row.department_status,
+			auto_gen_days: row.auto_gen_days || 15
 		}
 	}
 	const Save = () => {
@@ -201,7 +214,8 @@
 			id: null,
 			department_name: '',
 			department_number: '',
-			department_status: 1
+			department_status: 1,
+			auto_gen_days: 15
 		}
 	}
 	//添加账号