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="按会议地点查询" /> - + /> --> 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" /> --> - 已选择人员:{{names||'暂无'}} + 已选择:{{names||'暂无'}} @@ -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){