会议列表提示信息

webmain/flow/page/view_meeting_key_0.html

@@ -14,7 +14,7 @@
         <td height="34" width="15%" align="right" class="ys1">^compere^</td>
         <td width="35%" class="ys2">{compere}</td>
         <td height="34" align="right" class="ys1">^meeting_room^</td>
-        <td class="ys2">{meeting_room}{room_id}{meet_state}</td>
+        <td class="ys2">{meeting_room}</td>
     </tr>
     <tr>
         <td height="34" align="right" class="ys1">^attendees^</td>

webmain/model/flow/meetingModel.php

@@ -98,6 +98,7 @@ class flow_meetingClassModel extends flowModel
         $rs['state_info'] = $this->getApproval($rs['nowcheckname'] ?? '');
         $meet_dev = ["不需要", "视频会议", "LED屏"];
         $rs['meet_dev'] = $rs['meet_dev'] == 0 ? $meet_dev[$rs['meet_dev']] : "<font color=red>".$meet_dev[$rs['meet_dev']]."</font>";
+        $rs['fixed'] = $rs['fixed'] == 1 ? '是' : '否'; // 是否固定会议
 
         return $rs;
     }

webmain/model/flow/meeting_keyModel.php

@@ -112,18 +112,20 @@ class flow_meeting_keyClassModel extends flowModel
 //        }
         // 有会议开始、结束时间时开启↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑
         $topic = m('meeting_topics')->getone("mid={$this->id}",'id, topic_state, topic_title', 'sort desc');
-        $rs['topic'] = $this->getTopicState($topic['topic_state']);
+//        $rs['topic'] = $this->getTopicState($topic['topic_state']);
 
         if ($zt == 0) {
+            $rs['topic'] = '<font style="color:green;">【会议未开始】</font><br />';
             $topic = m('meeting_topics')->getone("mid={$this->id}",'id, topic_state, topic_title', 'sort asc');
-            $rs['topic'] = $this->getTopicInfoState($topic);
+            $rs['topic'] .= $this->getTopicInfoState($topic);
         } else if ($zt == 1) {
             // 展示近几个议题状态
+            $rs['topic'] = '<font style="color:blue;">【会议进行中】</font><br />';
             $topics = m('meeting_topics')->getall("mid={$this->id}",'id, topic_state, topic_title', 'sort');
             for ($i = 0; $i < count($topics); $i++) {
                 $topic = $topics[$i];
                 if ($topic['topic_state'] == 3) {
-                    $rs['topic'] = $this->getTopicInfoState($topic);
+                    $rs['topic'] .= $this->getTopicInfoState($topic);
                 }
                 if ($topic['topic_state'] == 1) {
                     $rs['topic'] .= $this->getTopicInfoState($topic);
@@ -133,7 +135,7 @@ class flow_meeting_keyClassModel extends flowModel
                 }
             }
         } else if ($zt == 2) {
-//            $rs['topic'] = '<font style="color:#ff4974"; padding: 4px 8px; border-radius: 4px;">已结束</font>';
+            $rs['topic'] = '<font style="color:red;">【会议已结束】</font>';
         }
 
         // 会议状态-将id转换为文字
@@ -145,9 +147,9 @@ class flow_meeting_keyClassModel extends flowModel
 
     //单据判断条件从写$lx类型，$uid用户Id
     protected function flowbillwhere($lx, $uid){
-        return [
-            'order'=>'meet_state, sort'
-        ];
+//        return [
+//            'order'=>'meet_state, sort'
+//        ];
     }
 
     // $ors当前单据操作信息，$crs提交过来的信息
@@ -292,7 +294,7 @@ class flow_meeting_keyClassModel extends flowModel
         $title = ["【等待议题】", "【下一议题】", "【当前议题】", "【上一议题】"];
         $info = str_replace("\n", "", $title[$zt]."：".$topic['topic_title']);
         if (isset(m('meeting')->hyarrb[$zt])) {
-            $html = '<font style="color:'.$colors[$zt].'; padding: 4px 8px; border-radius: 4px;">'.$info.'</font>.<br />';
+            $html = '<font style="color:'.$colors[$zt].';">'.$info.'</font><br />';
             return $html;
         } else {
             return null;