From ad019afb6e1dcd5a9b4dfbb5c454865149925bc0 Mon Sep 17 00:00:00 2001
From: unknown <caixiangyi@zoneland.net>
Date: Thu, 14 Oct 2021 16:35:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86=E5=8F=82?=
 =?UTF-8?q?=E4=BC=9A=E4=BA=BA=E5=91=98=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E3=80=81=E8=BA=AB=E4=BB=BD=E3=80=81=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E3=80=81=E7=BE=A4=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 o2web/source/x_component_Meeting/Common.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/o2web/source/x_component_Meeting/Common.js b/o2web/source/x_component_Meeting/Common.js
index ed5eb316fb..014083c07e 100644
--- a/o2web/source/x_component_Meeting/Common.js
+++ b/o2web/source/x_component_Meeting/Common.js
@@ -815,7 +815,7 @@ MWF.xApplication.Meeting.MeetingForm = new Class({
                     },
                     invitePersonList: { type: "org", isEdited : this.isNew, orgType: ["identity","person"], count : 0, orgWidgetOptions : {
                         "onLoadedInfor": function(item){
-                            this.loadAcceptAndReject( item );
+                            // this.loadAcceptAndReject( item );
                         }.bind(this)
                     }},
                     inviteMemberList: { type: "org", isEdited : isEditing, orgType: ["identity","person","group","unit"], count : 0, orgWidgetOptions : {
@@ -982,6 +982,14 @@ MWF.xApplication.Meeting.MeetingForm = new Class({
                     "<tr><td></td><td styles='formTableValue'><div item='acceptAction'></div><div item='rejectAction'></div></td></tr>" : ""
             ) +
 
+            "<tr style='display:"+((this.data.acceptPersonList && this.data.acceptPersonList.length)?'':'none')+"'>" +
+            "   <td styles='formTableTitle'>"+this.lp.acceptPerson+":</td>" +
+            "   <td styles='formTableValue'><div item='acceptPersonList'></div></td></tr>"+
+
+            "<tr style='display:"+((this.data.rejectPersonList && this.data.rejectPersonList.length)?'':'none')+"'>" +
+            "   <td styles='formTableTitle'>"+this.lp.rejectPerson+":</td>" +
+            "   <td styles='formTableValue'><div item='rejectPersonList'></div></td></tr>"+
+
             "<tr style='display:"+(this.isShowInviteDelPersonList()?'':'none')+"' class='inviteDelPersonListTr'>" +
             "   <td styles='formTableTitle'>"+this.lp.deleteInvitePerson2+":</td>" +
             "   <td styles='formTableValue'><div item='inviteDelPersonList'></div></td></tr>";
@@ -1682,14 +1690,8 @@ MWF.xApplication.Meeting.MeetingTooltip = new Class({
         }else{
             inviteList = this.data.invitePersonList || [];
         }
-        // inviteList.each(function( person ){
-        //     var O2person = new MWF.widget.O2Person({name : person, displayName:person.split("@")[0]}, area, {"style": "room", "onLoadedInfor": function(item){
-        //             this.loadAcceptAndReject( item );
-        //         }.bind(this) });
-        //     this.O2PersonList.push( O2person );
-        // }.bind(this));
         this.loadOrgWidget(inviteList, area, {"onLoadedInfor": function(item){
-            this.loadAcceptAndReject( item );
+            // this.loadAcceptAndReject( item );
         }.bind(this)})
     },
     loadOrgWidget: function(value, node, opt){
-- 
GitLab