会议申请样式，手机端bug修改

include/chajian/inputChajian.php

@@ -142,11 +142,11 @@ class inputChajian extends Chajian
 		}
 		if($type=='rockcombo' || $type=='select' || $type=='checkboxall' || $type=='radio'){
 			$attr.=' onchange="c.inputblur(this, '.$iszb.')"';
-			$str ='<select style="width:99%;'.$style.'" '.$attr.' name="'.$fname.'" class="inputs">';
+			$str ='<select style=" ;'.$style.'" '.$attr.' name="'.$fname.'" class="inputs">';
 			$str.='<option value="">-请选择-</option>';
 			$str1= '';
 			$str2= '';
-			
+
 			$datanum 	= $data;
 			$fopt		= $this->getdatastore($type, $objs, $datanum, $fid);
 			$optgroup	= '';
@@ -164,7 +164,7 @@ class inputChajian extends Chajian
 					$optgroup = $rs['optgroup'];
 				}
 				$str.='<option'.$ocn.' value="'.$_val.'" '.$sel.'>'.$rs['name'].'</option>';
-				
+
 				$str1.='<label><input name="'.$fname.'[]" value="'.$_val.'" type="checkbox">'.$rs['name'].'</label>&nbsp;&nbsp;';
 				$str2.='<label><input'.$ocn.' name="'.$fname.'" '.$sel2.' value="'.$_val.'" type="radio">'.$rs['name'].'</label>&nbsp;&nbsp;';
 			}
@@ -173,9 +173,9 @@ class inputChajian extends Chajian
 			if($type=='checkboxall')$str = $str1;
 			if($type=='radio')$str = $str2;
 		}
-		
+
 		if($type=='datetime'||$type=='date'||$type=='time'||$type=='month'){
-			$str = '<input onclick="js.datechange(this,\''.$type.'\')" value="'.$val.'" '.$attr.''.$onblue.''.$styles.' class="inputs" inputtype="'.$type.'" readonly name="'.$fname.'">';
+			$str = '<input onclick="js.datechange(this,\''.$type.'\')" value="'.$val.'" '.$attr.''.$onblue.''.$styles.' class="inputs datesss" inputtype="'.$type.'" readonly name="'.$fname.'">';
 		}
 		//数字类型
 		if($type=='number'){
@@ -203,18 +203,29 @@ class inputChajian extends Chajian
 		}
 		if($type=='selectdatafalse' || $type=='selectdatatrue'){
             if ($ism) {
-                $str 	= '<input '.$attr.''.$onblue.''.$styles.' class="inputs" style="width:99%" value="'.$val.'" readonly type="text" name="'.$fname.'" onclick="c.selectdata(\''.$data.'\','.substr($type,10).',\''.$fname.'\',\''.$fieldname.'\','.$iszb.')">';
+//                $str 	= '<input '.$attr.''.$onblue.''.$styles.' class="inputs" style=" " value="'.$val.'" readonly type="text" name="'.$fname.'" onclick="c.selectdata(\''.$data.'\','.substr($type,10).',\''.$fname.'\',\''.$fieldname.'\','.$iszb.')">';
+
+                $str = '<div style=" display: flex;">';
+//                $str .= '<div style="flex: 1;">';
+                $str .= '<input ' . $attr . $onblue . $styles . ' class="inputs" style="width: 100%; flex: 1" value="' . $val . '" readonly type="text" name="' . $fname . '">';
+                if ($isbt == '0') $str .= '<button onclick="c.selectdataclear(\'' . $fname . '\', \'' . $data . '\', ' . $iszb . ')" class="webbtn" type="button">x</button>';
+                $str .= '<button type="button" onclick="c.selectdata(\'' . $data . '\', ' . substr($type, 10) . ', \'' . $fname . '\', \'' . $fieldname . '\', ' . $iszb . ')" class="webbtn">选</button>';
+                $str .= '</div>';
+//                $str .= '<div style="white-space: nowrap;">';
+//                $str .= '</div>';
+//                $str .= '</div>';
             } else {
-                $str 	= '<table width="98%" cellpadding="0" border="0"><tr><td width="100%"><input '.$attr.''.$onblue.''.$styles.' class="inputs" style="width:99%" value="'.$val.'" readonly type="text" name="'.$fname.'"></td>';
+                $str 	= '<table width="98%" cellpadding="0" border="0"><tr><td width="100%"><input '.$attr.''.$onblue.''.$styles.' class="inputs" style=" " value="'.$val.'" readonly type="text" name="'.$fname.'"></td>';
                 $str   .= '<td nowrap>';
                 if($isbt=='0')$str   .= '<button onclick="c.selectdataclear(\''.$fname.'\',\''.$data.'\','.$iszb.')" class="webbtn" type="button">x</button>';
                 $str   .= '<button type="button" onclick="c.selectdata(\''.$data.'\','.substr($type,10).',\''.$fname.'\',\''.$fieldname.'\','.$iszb.')" class="webbtn">选</button></td></tr></table>';
             }
-		}
+
+        }
 		if($type=='ditumap'){
 			$zbnae	= $data;
 			if($iszb>0)$zbnae = ''.($iszb-1).''.$leox.'';
-			$str 	= '<table width="99%" cellpadding="0" border="0"><tr><td width="100%"><input '.$attr.''.$onblue.''.$styles.''.$lenstr.' class="inputs" style="width:99%" value="'.$val.'" type="text" name="'.$fname.'"></td>';
+			$str 	= '<table width="99%" cellpadding="0" border="0"><tr><td width="100%"><input '.$attr.''.$onblue.''.$styles.''.$lenstr.' class="inputs" style=" " value="'.$val.'" type="text" name="'.$fname.'"></td>';
 			$str   .= '<td nowrap>';
 			if($isbt=='0')$str   .= '<button onclick="c.selectmapclear(\''.$fname.'\',\''.$zbnae.'\','.$iszb.')" class="webbtn" type="button">x</button>';
 			$str   .= '<button type="button" onclick="c.selectmap(\''.$fname.'\',\''.$zbnae.'\',\''.$fieldname.'\','.$iszb.')" class="webbtn">选</button></td></tr></table>';
@@ -260,23 +271,35 @@ class inputChajian extends Chajian
 			$str = '<'.$lx.' id="div_'.$fname.'" class="divinput">'.$str.'</'.$lx.'>';
 			if($ism==1 && $iszb==0){
 				if($iszhang){
-//					$str = '<tr class="lumtr"><td colspan="2"><div style="padding-left:10px;padding-top:10px">'.$fnams.'</div>'.$str.'</td></tr>';
+//					$str = '<tr class="lumtr">';
+//                    $str .= '<td colspan="2">';
+//                    $str .= '<div style="padding-left:10px;padding-top:10px">'.$fnams.'</div>';
+//                    $str .= '</td></tr>';
+
                     $str = '<tr class="lumtr">
+                              <td>
                                 <div class="lurim_c">'.str_replace(' ','<br>', $fnams).'</div>
                                 <div class="divinput_c">'.$str.'</div>
+                              </td>
                             </tr>';
 				}else{
-//					$str = '<tr class="lumtr"><td class="lurim" nowrap>'.str_replace(' ','<br>', $fnams).'</td><td width="90%">'.$str.'</td></tr>';
+//					$str = '<tr class="lumtr">
+//                              <td class="lurim" nowrap>'.str_replace(' ','<br>', $fnams).'</td>
+//                              <td width="90%">'.$str.'</td>
+//                            </tr>';
+
                     $str = '<tr class="lumtr">
+                              <td>
                                 <div class="lurim_c">'.str_replace(' ','<br>', $fnams).'</div>
                                 <div class="divinput_c">'.$str.'</div>
+                              </td>
                             </tr>';
 				}
 			}
 		}
 		return $str;
 	}
-	
+
 	/**
 	*	输出选择人员html
 	*/
@@ -301,8 +324,8 @@ class inputChajian extends Chajian
 		$_vals0	= $valea[0];
 		$_vals1	= arrvalue($valea,1, $oarr['valueid']);
 
-//		$str 	= '<table width="99%" cellpadding="0" border="0"><tr><td width="100%"><input class="inputs" style="width:99%" '.$oarr['attr'].' placeholder="'.$oarr['placeholder'].'" id="change'.$fname.'" value="'.$_vals0.'" readonly type="text" name="'.$fname.'"><input name="'.$zbnae.'" value="'.$_vals1.'" id="change'.$fname.'_id" type="hidden"></td>';
-        $str 	= '<input class="inputs" style="width:99%" '.$oarr['attr'].' placeholder="'.$oarr['placeholder'].'" id="change'.$fname.'" value="'.$_vals0.'" readonly type="text" name="'.$fname.'" id="btnchange_'.$fname.'" onclick="js.changeuser(\'change'.$fname.'\',\''.$type.'\',\''.$oarr['title'].'\' ,{changerange:\''.$oarr['changerange'].'\'})"><input name="'.$zbnae.'" value="'.$_vals1.'" id="change'.$fname.'_id" type="hidden">';
+//		$str 	= '<table width="99%" cellpadding="0" border="0"><tr><td width="100%"><input class="inputs" style=" " '.$oarr['attr'].' placeholder="'.$oarr['placeholder'].'" id="change'.$fname.'" value="'.$_vals0.'" readonly type="text" name="'.$fname.'"><input name="'.$zbnae.'" value="'.$_vals1.'" id="change'.$fname.'_id" type="hidden"></td>';
+        $str 	= '<input class="inputs" style=" " '.$oarr['attr'].' placeholder="'.$oarr['placeholder'].'" id="change'.$fname.'" value="'.$_vals0.'" readonly type="text" name="'.$fname.'" id="btnchange_'.$fname.'" onclick="js.changeuser(\'change'.$fname.'\',\''.$type.'\',\''.$oarr['title'].'\' ,{changerange:\''.$oarr['changerange'].'\'})"><input name="'.$zbnae.'" value="'.$_vals1.'" id="change'.$fname.'_id" type="hidden">';
 // 		$str   .= '<td nowrap><button onclick="js.changeclear(\'change'.$fname.'\')" class="webbtn" type="button">x</button><button id="btnchange_'.$fname.'" onclick="js.changeuser(\'change'.$fname.'\',\''.$type.'\',\''.$oarr['title'].'\' ,{changerange:\''.$oarr['changerange'].'\'})" type="button" class="webbtn">选</button></td></tr></table>';
 
 		return $str;

web/res/js/jquery-changeuser.js

@@ -309,7 +309,7 @@
 				stotal = parseFloat(a.stotal);
 				for(i=0;i<len;i++){
 					spath = this.userarr[i].deptpath;
-					if(spath.indexOf('['+a.id+']')>=0)nstotal++;
+					if(spath && spath.indexOf('['+a.id+']')>=0)nstotal++;
 				}
 				return nstotal>=stotal;
 			}else{

webmain/css/cssm.css

@@ -7,10 +7,12 @@ html{
 }
 body{--main-color:#1389D3;color:#000000;margin:0px;border:0;font-size:14px; background-color:white}
 .mbody{background-color: #fff;}
+/*.mbody{background-color: #f1f1f1;}*/
 td,button{ font-size:14px}
 a,.cursor{cursor:pointer;}
 p{text-indent:24pt; margin:12px 0px;line-height:25px}
 input,textarea,select,button{resize: none;outline:none;font-size:14px;border:none;}
+/*input,textarea,select,button{resize: none;outline:none;font-size:14px;}*/
 .zhu{ color:#1389D3;color:var(--main-color)}
 .hui{ color:#888888}
 .red{ color:#ff0000}
@@ -46,7 +48,15 @@ a.white:hover{TEXT-DECORATION:underline;color:white;}
 ul,li,a{ list-style-type:none}
 .h1{ font-size:24px;font-weight:bold;}
 .h2{ font-size:20px;font-weight:bold;}
-
+/*.input,.inputs,.textarea{*/
+/*	height:30px;*/
+/*	line-height:25px;*/
+/*	background-color:white;*/
+/*	padding:2px;*/
+/*	width:95%;*/
+/*	border:0.5px #dddddd solid;*/
+/*	border-radius:2px;*/
+/*}*/
 /*margin-left: 5%;*/
 /*    width: 90%;*/
 /*    height: 40px;*/
@@ -56,12 +66,13 @@ ul,li,a{ list-style-type:none}
 /*    margin-top: 8px;*/
 /*    line-height: 40px;*/
 /*    padding-left: 4px;*/
+
 .input,.inputs,.textarea{
 	height: 40px;
 	line-height: 25px;
 	background-color: white;
 	width: 100%;
-
+	border-bottom: 0px!important;
 }
 
 .inputb{height:30px;line-height:20px;background-color:white;padding:2px;border:0.5px #cccccc solid;border-radius:2px}
@@ -69,7 +80,7 @@ ul,li,a{ list-style-type:none}
 
 .title{height:40px;line-height:40px;overflow:hidden;font-size:18px;text-align:left;border-bottom:1px #cccccc solid;color:#55555;font-weight:bold; background-color:var(--main-color)}
 
-/*.inputs[readonly]{ background-color:#f1f1f1;box-shadow:none}*/
+.inputs[readonly]{ background-color:#f1f1f1;box-shadow:none}
 
 .btn{width:100%;height:44px;line-height:44px;opacity:0.8; background-color:#00A1E9;border:none;color:white;font-size:18px; cursor:pointer;margin-top:10px;}
 .btn:active,.btn:hover{opacity:1;color:white;TEXT-DECORATION:none;}
@@ -117,7 +128,7 @@ a.webbtn:link,a.webbtn:visited,.webbtn{color:#ffffff;opacity:1; background-color
 	color: #000;
 	height: 14px;
 	line-height: 14px;
-	margin-top: 24px;
+	margin-top: 20px;
 }
 
 .divinput_c{
@@ -129,5 +140,18 @@ a.webbtn:link,a.webbtn:visited,.webbtn{color:#ffffff;opacity:1; background-color
 	border: 1px solid #DCDCDC;
 	margin-top: 8px;
 	line-height: 40px;
-	padding-left: 4px;
-}
+	overflow: auto;
+	/*padding-left: 4px;*/
+}
+
+.wrapper_select_c {
+	display: flex; /* 使用 flexbox 布局 */
+	align-items: center; /* 垂直居中对齐 */
+}
+
+.wrapper_select_c input {
+	flex: 1; /* 输入框自动填充剩余空间 */
+}
+.wrapper_select_c a {
+	padding: 0px 6px !important;
+}

webmain/flow/input/inputjs/mode_meeting.js

@@ -11,11 +11,10 @@ function initbodys(){
     });
 
     $("#div_room_id").hide();
-
+    $("#div_room_id").parents("tr").eq(0).hide();
 
     c.onselectdata['meeting_room']=function(d) {
         form('room_id').value=d.value;
-        console.log(d.value);
     }
 
 }

webmain/flow/page/input_meeting.html

@@ -33,11 +33,13 @@
     </tbody>
 </table><br/>
 <div><b>会议室安排</b></div>
+
 <table width="100%" border="0" class="ke-zeroborder">
     <tbody>
     <tr class="autoyijianview">
         <td height="34" width="10%" align="right" class="ys1">*^meeting_room^</td>
-        <td class="ys2" colspan="3">{meeting_room}{room_id}</td>
+        <td class="ys2" colspan="3">{meeting_room}</td>
+
     </tr>
     </tbody>
 </table><br/>
@@ -88,3 +90,4 @@
     </tr>
     </tbody>
 </table>
+{room_id}

webmain/flow/page/view_news_0.html

@@ -1 +1,4 @@
-<div style="font-size:24px;padding:20px 0px;" align="center">{title}</div><div style="font-size:12px;color:#888888;">[{typename}] {optdt}，来源：{zuozhe} </div><div><p>{content}</p></div><div>{file_content}</div>
+<div style="font-size:24px;padding:20px 0px;" align="center">{title}</div>
+<div style="font-size:12px;color:#888888;">[{typename}] {optdt}，来源：{zuozhe}</div>
+<div><p>{content}</p></div>
+<div>{file_content}</div>

webmain/flow/page/view_news_1.html

@@ -1 +1,4 @@
-<div style="font-size:24px;padding:20px 0px;" align="center">{title}</div><div style="font-size:12px;color:#888888;">[{typename}] {optdt}，来源：{zuozhe} </div><div><p>{content}</p></div><div>{file_content}</div>
+<div style="font-size:24px;padding:20px 0px;" align="center">{title}</div>
+<div style="font-size:12px;color:#888888;">[{typename}] {optdt}，来源：{zuozhe}</div>
+<div><p>{content}</p></div>
+<div>{file_content}</div>

webmain/main/flow/rock_flow_view.php

@@ -3,7 +3,7 @@
 $(document).ready(function(){
 
 	var modeid = 0;
-	
+
 	var a = $('#view_{rand}').bootstable({
 		tablename:'flow_set',celleditor:true,fanye:true,params:{modeid:0},autoLoad:false,dir:'desc',sort:'id',statuschange:false,
 		url:publicstore('{mode}','{dir}'),storebeforeaction:'viewshowbefore',storeafteraction:'viewshowafter',

webmain/model/flow/repair_faultModel.php

@@ -69,8 +69,9 @@ class flow_repair_faultClassModel extends flowModel
 
     public function getstatezt($zt)
     {
+        $colors = ["#ff8b1a", "#00c959", "#ff4974"];
         if (isset($this->hstate[$zt])) {
-            $html = '<font color="'.$this->hcolor[$zt].'">'.$this->hstate[$zt].'</font>';
+            $html = '<font style="background-color:'.$colors[$zt].'; padding: 2px 8px; border-radius: 4px; color: #fff">'.$this->hstate[$zt].'</font>';
             return $html;
         } else {
             return null;