From e14c2706e8b8103a3903f1826af2a0ede49a089d Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Mon, 14 Oct 2024 17:48:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=83=A8=E9=97=A8=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=AE=8C=E5=96=84=20=E5=AE=89=E5=85=A8=E6=8E=92?=
 =?UTF-8?q?=E6=9F=A5=E6=B5=81=E7=A8=8B=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/learun-app/organize-tree.vue   |  6 ++---
 .../SafetyCheck/list.vue                      | 27 ++++++++++++++-----
 .../SafetyCheck/single.vue                    |  4 +--
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue
index 7de48c55c..5728c5211 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue	
@@ -96,7 +96,7 @@ export default {
 	  }
       // 如果自己是根节点，则创建时直接加载子节点
       if (this.open) {
-        await this.loadChildren()
+        await this.loadChildren(false)
       }
     },
 
@@ -129,7 +129,7 @@ export default {
 	},
 
     // 加载子节点
-    async loadChildren() {
+    async loadChildren(userLoad=true) {
       this.isLoading = true
 
       let children = []
@@ -162,7 +162,7 @@ export default {
       }
 
       // 加载子职员
-      if (this.level === 'user') {
+      if (this.level === 'user'&&userLoad) {
         children = children.concat(
           Object.entries(this.GET_GLOBAL('user'))
             .filter(
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SafetyCheck/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SafetyCheck/list.vue
index 00882bef6..02c18d5f2 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SafetyCheck/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SafetyCheck/list.vue	
@@ -145,10 +145,14 @@
 			<view v-if="ready" class="padding">
 				<l-customlist-sidepage-datefilter v-model="dateRange" @change="searchChange" title="按申请时间查询: "
 					ref="datefilter" class="margin-bottom" />
+				<l-organize-picker @input="queryData.Name=$event" :value="queryData.Name" type="user" title="姓名"
+					@change="searchChange" />
+				<l-organize-picker @input="queryData.Department=$event" :value="queryData.Department"
+					type="department" title="处室部门" @change="searchChange"/>
 				<!-- 重置查询条件按钮 -->
-				<!-- <view class="padding-tb">
+				<view class="padding-tb">
 					<l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button>
-				</view> -->
+				</view>
 			</view>
 		</scroll-view>
 
@@ -198,7 +202,7 @@
 					},
 					CheckTime: {
 						type: 'datetime',
-						dateformat:'0',
+						dateformat: '0',
 					},
 					Question: {
 						type: 'text'
@@ -235,7 +239,9 @@
 				// 查询条件 
 				searchData: {},
 				defaultQueryData: {},
-				queryData: {},
+				queryData: {
+					Name: ''
+				},
 				// 时间查询参数
 				dateRange: null,
 
@@ -315,7 +321,7 @@
 							rows: 10,
 							page: this.page,
 							sord: 'ASC',
-							sidx:"CheckTime desc",
+							sidx: "CheckTime desc",
 						},
 						queryJson: JSON.stringify(this.searchData)
 					},
@@ -458,7 +464,16 @@
 					default:
 						return value === null || value === undefined ? '' : value
 				}
-			}
+			},
+			// 获取表单值
+			getValue(path) {
+				return get(this.current, path)
+			},
+
+			// 设置表单值 
+			setValue(path, val) {
+				set(this.current, path, val)
+			},
 
 		}
 	}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SafetyCheck/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SafetyCheck/single.vue
index d302d617d..1b06e77f9 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SafetyCheck/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SafetyCheck/single.vue	
@@ -2,9 +2,9 @@
 	<view class="page">
 		<view v-if="ready">
 			<l-organize-picker @input="setValue('SafetyCheck.Name', $event)" :value="getValue('SafetyCheck.Name')"
-				:readonly="!edit" type="user" title="姓名" required readonly />
+				type="user" title="姓名" required readonly/>
 			<l-organize-picker @input="setValue('SafetyCheck.Department', $event)"
-				:value="getValue('SafetyCheck.Department')" type="department" :readonly="!edit" title="处室部门" required
+				:value="getValue('SafetyCheck.Department')" type="department" title="处室部门" required
 				readonly />
 			<l-input @input="setValue('SafetyCheck.Area', $event)" :value="getValue('SafetyCheck.Area')"
 				:disabled="!edit" title="责任区域" required />