From c3f6f62cd644dc07512015c214e6c841e143070d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= <y1530857136@163.com>
Date: Fri, 23 Sep 2022 12:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=BA=E5=91=98=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E7=BB=84=E4=BB=B6=20=E5=AE=9E=E7=8E=B0=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=9A=84=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/learun-app/organize-picker.vue             | 2 +-
 Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js    | 4 ++--
 .../pages/PersonnelManagement/MeetingManagement/list.vue  | 4 ++--
 .../PersonnelManagement/MeetingManagement/single.vue      | 5 ++---
 .../pages/common/select-organize-multiple.vue             | 8 ++++----
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue
index 586450ed4..8c7f9fa70 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue	
@@ -67,7 +67,7 @@ export default {
 	  
 	  let values = this.value.split(",")
 	  if(values.length>1){
-		  const orgItems = values.map(t=>list[t].name).toString()
+		  const orgItems = values.map(t=>list[t]?list[t].name:'').toString()
 		  return orgItems
 	  }
 	  
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
index f3f6ba6fe..600ac69e3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
@@ -21,9 +21,9 @@ export default {
   //   "http://192.168.2.98:8088/"
   // ],
   "apiHost": [
-    "http://cyzjzx.gnway.cc:30626/"//测试地址
+    // "http://cyzjzx.gnway.cc:30626/"//测试地址
 	// "http://cyzjzx.gnway.cc:29615/"//正式地址
-	 // "http://192.168.10.31:8088/"
+	 "http://192.168.10.58:8012/"
   ],
   "webHost":"http://cyzjzx.gnway.cc:29618/",//测试地址
   //"webHost":"http://wxd3f.cyzjzx.com/",//正式地址
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue
index fcf2f7932..b012a98b5 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue	
@@ -106,13 +106,13 @@
           title="会议地点"
           placeholder="按会议地点查询"
         />
-        <l-organize-picker
+        <!-- <l-organize-picker
           v-model="queryData.CreateUser"
           @change="searchChange"
           type="user"
           title="申请人"
           placeholder="按申请人查询"
-        />
+        /> -->
 
         <!-- 重置查询条件按钮 -->
         <view class="padding-tb">
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue
index 67336586b..1b6bfc745 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue	
@@ -51,7 +51,7 @@
 	    :readonly="!edit"
 	    type="user"
 	    title="参会人员"
-	  	multiple
+	  	:multiple="true"
 	  />
       <l-organize-picker
         @input="setValue('MeetingManagement.RecordPerson', $event)"
@@ -188,11 +188,10 @@ export default {
     async fetchForm() {
       if (this.mode === 'create') {
         this.origin = await this.getDefaultForm()
-		console.log(this.origin)
       } else {
         const result = await this.HTTP_GET('learun/adms/PersonnelManagement/MeetingManagement/form', this.id)
         this.origin = await this.formatFormData(result)
-		console.log(this.origin)
+		console.log(this.origin,this.origin.prototype)
       }
       this.current = this.COPY(this.origin)
     },
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue
index c97355c75..2ecdfc75d 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue	
@@ -7,7 +7,7 @@
 		<!-- </view> -->
 		<view>
 			<view class="pearson">
-				已选择人员：{{names||'暂无'}}
+				已选择：{{names||'暂无'}}
 			</view>
 			<view style="display: flex;justify-content: center;">
 				<view class="cu-btn sm line-red" @tap="itemClear" style="font-size: 16px;margin: 4px;">
@@ -64,8 +64,8 @@ export default {
 		  let arr = this.ids.split(",")
 		  let items = []
 		  for (let s of arr) {
-			  if(this.GET_GLOBAL("user")[s]){
-				  items.push({...this.GET_GLOBAL("user")[s],id:s})
+			  if(this.GET_GLOBAL(type)[s]){
+				  items.push({...this.GET_GLOBAL(type)[s],id:s})
 			  }
 		  }
 		  this.items = items
@@ -82,7 +82,7 @@ export default {
       this.type = type || 'user'
 
       const selectType = { user: '职员', department: '部门', company: '公司' }[type]
-      this.SET_TITLE(`请选择一个${selectType}`)
+      this.SET_TITLE(`请选择${selectType}`)
     },
 	
 	findItem(arr,item){