Merge branch 'master' of http://git.jieweizhineng.com/adslunk/office_automation

webmain/flow/page/view_meeting_0.html

@@ -70,7 +70,7 @@
     <tr class="autoyijianview">
         <td height="34" width="10%" align="right" class="ys1">^stay_day^</td>
         <td width="10%" class="ys2">{stay_day}</td>
-        <td width="5%" class="ys2">人</td>
+        <td width="5%" class="ys2">天</td>
         <td height="34" width="10%" align="right" class="ys1">^stay_man^</td>
         <td width="10%" class="ys2">{stay_man}</td>
         <td width="5%" class="ys2">人</td>

webmain/model/flow/meetingModel.php

@@ -95,7 +95,9 @@ class flow_meetingClassModel extends flowModel
         // 将id转换为文字
         $rs['meet_state'] = $this->getstatezt($zt);
         if (!empty($room_id)) $rs['room_id'] = $this->meeting_room[$room_id]['room_name']."({$this->meeting_room[$room_id]['desc']})"; // 会议室Id替换会议室名
-        $rs['state_info'] = $this->getApproval($rs['nowcheckname'] ?? '');
+
+
+        $rs['state_info'] = $this->getApproval($rs['nowcheckname'] ?? ''); // 当前审核人
         $meet_dev = ["不需要", "远程视频会议", "电子大屏"];
         $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 ? '是' : '否'; // 是否固定会议
@@ -104,6 +106,11 @@ class flow_meetingClassModel extends flowModel
     }
 
 
+    //提交时调用
+    protected function flowsubmit($na, $sm){
+        $this->meetingAuditSms($this->id);
+    }
+
 
     // $ors当前单据操作信息，$crs提交过来的信息
     public function flowoptmenu($ors, $crs)
@@ -219,6 +226,7 @@ class flow_meetingClassModel extends flowModel
 
     // 审核样式
     public function getApproval($names) {
+
         if (empty($names)) {
             $html = '<font style="background-color:#00c959; padding: 2px 8px; border-radius: 4px; color: #fff">已审核</font>';
             return $html;
@@ -357,8 +365,8 @@ class flow_meetingClassModel extends flowModel
                         $smsInfo['phoneNum'][] = $mobile;
                         $smsInfo['para'][] = [
                             "usernam" =>  $meetUName,
-                            "meetingname" => $meetTime,
-                            "begindate" => $meetName
+                            "meetingname" => $meetName,
+                            "begindate" => $meetTime
                         ];
                     }
                 }