浏览代码

会议操作菜单调整

q 1 年之前
父节点
当前提交
4e0e593be7
共有 3 个文件被更改,包括 30 次插入8 次删除
  1. 2 5
      webmain/login/tpl_login.html
  2. 20 3
      webmain/model/flow/meetingModel.php
  3. 8 0
      webmain/model/meetingModel.php

+ 2 - 5
webmain/login/tpl_login.html

@@ -47,7 +47,8 @@
 
 				<div class="blank10"></div>
 				<div align="left" style="color:white">
-					 <div class="checkbox"><label><input type="checkbox" <?php if($da['ca_rempass']=='1')echo 'checked';?> name="rempass">记住密码</label><?php if($da['loginyzm']>0){?>&nbsp; <a href="javascript:;" class="white" onclick="changlogin()">使用验证码登录</a><?php }?>&nbsp; <a onclick="erwmlogin()" href="javascript:;"><img src="images/ewml.png" title="二维码登录" align="absmiddle"></a>
+					 <div class="checkbox"><label><input type="checkbox" <?php if($da['ca_rempass']=='1')echo 'checked';?> name="rempass">记住密码</label><?php if($da['loginyzm']>0){?>&nbsp; <a href="javascript:;" class="white" onclick="changlogin()">使用验证码登录</a><?php }?>&nbsp;
+<!--						 <a onclick="erwmlogin()" href="javascript:;"><img src="images/ewml.png" title="二维码登录" align="absmiddle"></a>-->
 					 <?php 
 					 if($da['platsign'])echo '&nbsp; <a onclick="reimplatlogin(this)" href="javascript:;">快捷登录</a>';
 					 ?>
@@ -87,10 +88,6 @@
 
 
 	<div class="blank20"></div>
-	<div align="center" style="height:30px;line-height:30px;color:#f1f1f1">
-		Copyright &copy;<?=date('Y')?> <?=$da['title']?>v<?=VERSION?> &nbsp; - &nbsp; 
-		版权所有:<a href="<?=URLY?>" style="color:#f1f1f1" target="_blank">信呼开发团队</a>
-	</div>
 	<script type="text/javascript" src="mode/plugin/jquery-rockmodels.js"></script>
 </div>
 </body>

+ 20 - 3
webmain/model/flow/meetingModel.php

@@ -64,10 +64,14 @@ class flow_meetingClassModel extends flowModel
                 $nzt = 0;
             } else {
                 $nzt = 1;
+                $topic = m('meeting_topics')->getone("mid={$this->id}",'id, topic_state', 'sort');
+                if (isset($topic['id']) && $topic['topic_state']<2) {
+                    m('meeting')->firstMeetingTopicStart($this->id);
+                }
             }
         }
 
-        if ($stime <= $time && $nzt != 2){
+        if ($stime <= $time && $nzt != 2) {
             $nzt = 1;
         }
 
@@ -86,7 +90,12 @@ class flow_meetingClassModel extends flowModel
 
     public function getstatezt($zt)
     {
-        return '<font color="'.$this->hyarrb[$zt].'">'.$this->hyarra[$zt].'</font>';
+        if (isset($this->hyarrb[$zt])) {
+            $html = '<font color="'.$this->hyarrb[$zt].'">'.$this->hyarra[$zt].'</font>';
+            return $html;
+        } else {
+            return null;
+        }
     }
 
     // $ors当前单据操作信息,$crs提交过来的信息
@@ -133,6 +142,13 @@ class flow_meetingClassModel extends flowModel
                 ];
             }
             m('meeting')->update($data, "id={$this->id}");
+
+            $topic = m('meeting_topics')->getone("mid={$this->id}", "id", 'sort desc');
+            if (isset($topic['id'])) {
+                m('meeting_topics')->update(['topic_state'=>'2'], 'id='.$topic['id']);
+            }
+        } else if ($ors['num'] == 'enableMeeting') {
+
         }
     }
 
@@ -146,7 +162,7 @@ class flow_meetingClassModel extends flowModel
     public function flowcheckfinsh($sm) {
 
         // 会议议题状态全部设置为1
-        m('meeting_topic')->update(['topic_state'=>'1'], 'mid='.$this->id);
+//        m('meeting_topics')->update(['topic_state'=>'1'], 'mid='.$this->id);
 
     }
 
@@ -162,4 +178,5 @@ class flow_meetingClassModel extends flowModel
 
 
 
+
 }

+ 8 - 0
webmain/model/meetingModel.php

@@ -26,4 +26,12 @@ class meetingClassModel extends Model
         }
         return $msg;
     }
+
+    public function firstMeetingTopicStart($meeting_id) {
+
+        $topic = m('meeting_topics')->getone("mid={$meeting_id}", "id", 'sort');
+        if (isset($topic['id'])) {
+            m('meeting_topics')->update(['topic_state'=>'2'], 'id='.$topic['id']);
+        }
+    }
 }