详情美化，提交bug信息修改

webmain/model/flow/flow.php

@@ -688,32 +688,77 @@ class flowModel extends Model
 			if($lx==1){
 				$contvimr	= '';
 				if($this->isflow>0 && $this->urs){
-					$contvimr.='<div class="r-border-b">
-					<div class="blank5"></div>
-					<table><tr>
-						<td width="50" align="left"><img style="height:40px;width:40px;border-radius:50%" src="'.$this->urs['face'].'"></td>
-						<td><div>'.$this->urs['name'].'<font color="#888888">('.$this->urs['ranking'].')</font></div><div style="padding-top:5px">'.$this->urs['deptallname'].'</div></td>
-					</tr></table>
-					<div style="margin:5px 0px" class="blank10"></div>
-					</div>';
+
+//					$contvimr.='<div class="r-border-b">
+//					<div class="blank5"></div>
+//					<table><tr>
+//						<td width="50" align="left"><img style="height:40px;width:40px;border-radius:50%" src="'.$this->urs['face'].'"></td>
+//						<td><div>'.$this->urs['name'].'<font color="#888888">('.$this->urs['ranking'].')</font></div><div style="padding-top:5px">'.$this->urs['deptallname'].'</div></td>
+//					</tr></table>
+//					<div style="margin:5px 0px" class="blank10"></div>
+//					</div>';
+
+                    // 顶部头像、申请信息
+                    $contvimr .='<div class="" style="background-color: #fff; border-radius: 30px; padding: 10px;">
+                    <div style="display: flex; align-items: center;">
+                        <div style="width: 50px; height: 50px; border-radius: 50%; overflow: hidden;">
+                            <img style="height:40px;width:40px;border-radius:50%;background-color:#fff;padding:5px;" src="'.$this->urs['face'].'">
+                        </div>
+                        <div style="margin-left: 10px;">
+                            <div>'.$this->urs['name'].'<font color="#888888">('.$this->urs['ranking'].')</font></div>
+                            <div style="padding-top:5px">'.$this->urs['deptallname'].'</div>
+                        </div>
+                    </div></div>
+                    <div style="margin:5px 0px" class="blank10"></div>
+                    ';
 					unset($fields['base_name']);
 					unset($fields['base_deptname']);
 				}
-				$contvimr 	.= '<div><table width="100%"  id="mobile_info_table">';
-				foreach($fields as $f=>$n){
-					$vs = arrvalue($data, $f);
-					if(!isempt($vs)){
-						//子表
-						if(substr($f,0,7)=='subdata'){
-							$contvimr .= '<tr><td colspan="3"><div style="padding:5px" align="left"><div><b>'.$n.'</b></div>'.$vs.'</div></td></tr>';
 
-						}else{
-							$contvimr .= '<tr><td nowrap><div align="right" style="color:#888888;padding:3px 0px">'.str_replace(' ','<br>',$n).'</div></td><td style="color:#888888">：</td><td width="95%"><div style="padding:3px" align="left">'.$vs.'</div></td></tr>';
+//				$contvimr 	.= '<div><table width="100%"  id="mobile_info_table">';
+//				foreach($fields as $f=>$n){
+//					$vs = arrvalue($data, $f);
+//					if(!isempt($vs)){
+//						//子表
+//						if(substr($f,0,7)=='subdata'){
+//							$contvimr .= '<tr><td colspan="3"><div style="padding:5px" align="left"><div><b>'.$n.'</b></div>'.$vs.'</div></td></tr>';
+//
+//						}else{
+//							$contvimr .= '<tr><td nowrap><div align="right" style="color:#888888;padding:3px 0px">'.str_replace(' ','<br>',$n).'</div></td><td style="color:#888888">：</td><td width="95%"><div style="padding:3px" align="left">'.$vs.'</div></td></tr>';
+//
+//						}
+//					}
+//				}
+//				$contvimr  .= '</table></div>';
 
-						}
-					}
-				}
-				$contvimr  .= '</table></div>';
+                $contvimr 	.= '<div style=""><div id="mobile_info_table" style="width: 100%;">';
+                $contvimr 	.= '<div style="">';
+                $i=0;
+//                $bkcl = ["#fff", "#f7fff4"];
+                $bkcl = ["#fff", "#fff"];
+                foreach($fields as $f=>$n){
+                    $vs = arrvalue($data, $f);
+                    if(!isempt($vs)){
+                        //子表
+                        if(substr($f,0,7)=='subdata'){
+                            $contvimr .= '<div style="padding:5px"><div><b>'.$n.'</b></div>'.$vs.'</div>';
+//                        } else if(substr($f,0,4)=='base'){
+
+                        } else {
+                            $contvimr .='
+                                <div style="margin-bottom: 10px; padding: 10px; background-color:'.$bkcl[$i++ % 2].'">
+                                    <div style="font-weight: bold; color: #333; margin-bottom: 5px;">'.str_replace(' ','<br>',$n).'</div>
+                                    <div style="color: #666; ">'.$vs.'</div>
+                                </div>';
+
+
+//                            $contvimr .= '<div style="color:#888888;padding:3px 0px">'.str_replace(' ','<br>',$n).'：</div>';
+//                            $contvimr .= '<div style="padding:3px" align="left">'.$vs.'</div>';
+
+                        }
+                    }
+                }
+                $contvimr  .= '</div></div></div>';
 			}
 			if(isempt($contview))$contview = $contvimr;
 			$contview	 = str_replace('$contview$',$contvimr, $contview);

webmain/model/flow/meetingModel.php

@@ -192,7 +192,9 @@ class flow_meetingClassModel extends flowModel
         $meeting = m("meeting")->getone("id={$this->id}");
         if (empty($meeting)) return;
         m("log")->addlog("会议室审批", "发送短信给".$meeting['attendees']."部门负责人");
-
+        $users = [];
+        $depts = [];
+        $mobile = [];
         foreach (explode(',', $meeting['attendees_id']) as $val) {
             if (substr($val, 0,1) == 'u') {
                 $users[] = substr($val, 1);
@@ -200,11 +202,12 @@ class flow_meetingClassModel extends flowModel
                 $depts[] = substr($val, 1);
             }
         }
-        $users = m("admin")->getall("id in (".implode(',', $users).")");
+        if (count($users) > 0) {
+            $users = m("admin")->getall("id in (".implode(',', $users).")");
 
-        $mobile = [];
-        foreach ($users as $val) {
-            $mobile[] = $val['mobile'];
+            foreach ($users as $val) {
+                $mobile[] = $val['mobile'];
+            }
         }
 
         if (!empty($depts)) {
@@ -223,10 +226,11 @@ class flow_meetingClassModel extends flowModel
         }
         $infoText = "短信包括：".implode('、', $mobile);
         if (!empty($depts_e)) {
-            $infoText .= ",其中".implode('、', $mobile)."未设负责人，无法通知";
+            $infoText .= ",其中".implode('、', $depts_e)."未设负责人，无法通知";
         }
         m("log")->addlog("会议室审批", $infoText);
 
+
     }
 
 

webmain/task/mode/tpl_mode_x.html

@@ -19,7 +19,7 @@ if($jswxsdk=='1')echo '<script type="text/javascript" src="js/jswxsdk.js"></scri
 <script type="text/javascript" src="web/res/js/jquery-imgview.js"></script>
 <script type="text/javascript" src="mode/plugin/jquery-rockmodels.js"></script>
 <script>
-var mid = '<?=$da['arr']['mid']?>',adminname='<?=$da['adminname']?>',adminid='<?=$da['adminid']?>',admintoken='',modenum='<?=$da['arr']['modenum']?>',ismobile=1,receiptrs=<?=json_encode($da['arr']['receiptrs'])?>,isinput=0,watertype='<?=getconfig('watertype')?>';
+var mid = '<?=$da["arr"]["mid"]?>',adminname='<?=$da["adminname"]?>',adminid='<?=$da["adminid"]?>',admintoken='',modenum='<?=$da["arr"]["modenum"]?>',ismobile=1,receiptrs=<?=json_encode($da["arr"]["receiptrs"])?>,isinput=0,watertype='<?=getconfig("watertype")?>';
 js.changeuser=function(na,lx,tit, cans){
 	var can = {
 		'changetype':lx,
@@ -68,7 +68,7 @@ td.tdys1{border:0.5px #e5e5e5 solid;text-align:center;padding:0px 5px}
 .divinput{padding:0px}
 .datesss{background:url(mode/icons/date.png) no-repeat right;cursor:pointer;}
 
-.statustext{position: absolute;right:5px;top:5px;width:60px;height:60px;overflow:hidden; border:2px red solid;border-radius:50%;font-size:16px;text-align:center;line-height:60px;color:red;transform:rotate(-45deg);-o-transform:rotate(-45deg);-webkit-transform:rotate(-45deg);-ms-transform:rotate(-45deg);}
+.statustext{position: absolute;right:10px;top:15px;width:55px;height:55px;overflow:hidden; border:2px red solid;border-radius:50%;font-size:16px;text-align:center;line-height:55px;color:red;transform:rotate(-45deg);-o-transform:rotate(-45deg);-webkit-transform:rotate(-45deg);-ms-transform:rotate(-45deg);}
 
 .btn-danger{background-color:#d9534f;}
 #contentshow img{max-width:100%}
@@ -84,7 +84,9 @@ if($showheader==1)echo '<div class="header" style="padding-top:'.$cenghei.'px" i
 
 if($da['arr']['isdefaultview']==1)echo '<div onclick="c.changeshow(0)" class="r-subtitle">&nbsp;&nbsp;'.$da['arr']['modename'].'</div>';
 ?>
-<div id="contentshow" class="padding10<?php if($da['arr']['isdefaultview']==1) echo ' r-border-t';?>" style="position:relative; background:white">
+<!--<div id="contentshow" class="padding10<?php if($da['arr']['isdefaultview']==1) echo ' r-border-t';?>" style="position:relative; background:white">-->
+<div id="contentshow" class="padding10<?php if($da['arr']['isdefaultview']==1) echo ' r-border-t';?>" style="position:relative; background:#f1f1f1">
+
 	<?php
 	if($da['arr']['isflow']>0){
 		echo '<div class="statustext" style="color:'.$da['arr']['statuscolor'].';border-color:'.$da['arr']['statuscolor'].'">'.$da['arr']['statustext'].'</div>';