本地修改

.gitignore

@@ -1,4 +1,4 @@
-/config/config.php
+/config/*
 /webmain/webmainConfig.php
 ./idea
 ./idea/*

include/chajian/checkChajian.php

@@ -87,6 +87,14 @@ class checkChajian extends Chajian{
 	}
 	
 	/**
+	*	是否为日期时间
+	*/
+	public function isdatetime($str)
+	{
+		return preg_match("/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/", $str);
+	}
+	
+	/**
 	*	是否为月份
 	*/
 	public function ismonth($str)

include/chajian/downChajian.php

@@ -19,6 +19,7 @@ class downChajian extends Chajian{
 	*/
 	public function getallfilename($ext)
 	{
+		if(!is_dir(UPDIR))mkdir(UPDIR);
 		$mkdir 	= ''.UPDIR.'/'.date('Y-m').'';
 		if(!is_dir($mkdir))mkdir($mkdir);
 		$allfilename			= ''.$mkdir.'/'.date('d_His').''.rand(10,99).'.'.$ext.'';

include/chajian/inputChajian.php

@@ -20,7 +20,7 @@ class inputChajian extends Chajian
 	public function initUser($uid)
 	{
 		$this->adminid 	= $uid;
-		$this->urs  	= m('admin')->getone($uid, '`name`,`deptname`');
+		$this->urs  	= m('admin')->getone($uid, '`name`,`num`,`deptname`');
 		$this->adminname= $this->urs['name'];
 	}
 	
@@ -195,7 +195,7 @@ class inputChajian extends Chajian
 			));
 		}
 		if($type=='selectdatafalse' || $type=='selectdatatrue'){
-			$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="width:95%" 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>';
@@ -203,7 +203,7 @@ class inputChajian extends Chajian
 		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="width:95%" 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>';
@@ -225,8 +225,17 @@ class inputChajian extends Chajian
 		if($type=='uploadfile'){
 			$str = '<input name="'.$fname.'" value="'.$val.'" type="hidden">';
 			$str.= '<div style="display:inline-block" id="fileview_'.$fname.'"><div onclick="c.uploadfilei(\''.$fname.'\')" style="display:;border:dashed 1px #cccccc" id="'.$fname.'_divadd" class="upload_items"><img class="imgs" src="images/jia.png"></div></div>';
-			$str.= '<div style="display:none" tsye="file" tnam="'.$fname.'" tdata="'.$data.'" id="filed_'.$fname.'"><input type="file" style="width:120px" id="filed_'.$fname.'_inp"></div>';
-		}
+			$str.= '<div style="display:none" tsye="file" tnam="'.$fname.'" tdata="'.$data.'" id="filed_'.$fname.'"><input type="file" style="width:120px" id="filed_'.$fname.'_inp" multiple></div>';
+		}
+        if($type=='userlocation'){
+            $res = $this->getUserLocation();
+            $str = '<input name="'.$fname.'" value="'.$res['province'].$res['city'].$res['street'].$res['streetNum'].$res['poiName'].'" type="hidden">';
+            $str .= '<div style="height:174px;width:100%;background:url(/images/dingwei.png) center no-repeat;background-size: 100% 100%;">';
+            $str .= '<div style="width:100%;height:30px;"></div><div style="min-height:40px;width:66%;background:#fff;border:2px solid #00a0e8;margin:0 auto;border-radius:6px;padding:10px 10px;">';
+            $str .= '<div style="font-size:16px;color:#838383;width:100%;height:16px;line-height:16px;">当前位置：</div>';
+            $str .= '<div style="font-size:18px;color:#000;width:100%;line-height:22px;margin-top:8px;">'.$res['province'].$res['city'].$res['street'].$res['streetNum'].$res['poiName'].'</div>';
+            $str .= '</div></div>';
+        }
 		if($type=='auto'){
 			$datanum = $data;
 			if(!isempt($datanum)){
@@ -243,7 +252,7 @@ class inputChajian extends Chajian
 				if($iszhang){
 					$str = '<tr class="lumtr"><td colspan="2"><div style="padding-left:10px;padding-top:10px">'.$fnams.'</div>'.$str.'</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="lulim" nowrap><div class="form_title">'.str_replace(' ','<br>', $fnams).'</div><div class="form_content">'.$str.'</div></td><td></td></tr>';
 				}
 			}
 		}
@@ -274,7 +283,7 @@ 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 	= '<table width="99%" cellpadding="0" border="0"><tr><td width="100%"><input class="inputs" style="width:95%" '.$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   .= '<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;
@@ -420,4 +429,11 @@ class inputChajian extends Chajian
 		}
 		return $rows;
 	}
+
+	//查询定位信息
+    public function getUserLocation()
+    {
+        $query = m('user_location')->getone("`staff_num`='" . $this->urs['num'] . "'", '*', '`id` desc');
+        return $query;
+    }
 }                                              

include/class/mysql.php

@@ -44,6 +44,9 @@ abstract class mysql{
 		'betweeni' => "BETWEEN ?0 AND ?1",	'notbetweeni' => "NOT BETWEEN ?0 AND ?1"
 	);
 	
+	//sql中禁用方法
+	protected $disabledfua = array('dumpfile','outfile','load_file','system_user');
+	
 	public function __construct()
 	{
 		$this->rock			= $GLOBALS['rock'];
@@ -117,6 +120,9 @@ abstract class mysql{
 		if($this->conn == null)exit('数据库的帐号/密码有错误!'.$this->errormsg.'');
 		$sql	= trim($sql);
 		$sql	= str_replace(array('[Q]','[q]','{asqom}'), array($this->perfix, $this->perfix,''), $sql);
+		$sqls 	= strtolower($sql);
+		foreach($this->disabledfua as $fus)if(contain($sqls,$fus))exit('禁止包含'.$fus.'字符串');
+		
 		$this->countsql++;
 		$this->sqlarr[]	= $sql;
 		$this->nowsql	= $sql;

include/class/rockClass.php

@@ -50,7 +50,7 @@ final class rockClass
 	*/
 	public function xssrepstr($str)
 	{
-		$xpd  = explode(',','(,), ,	,<,>,\\,*,/,&,%,$,^,[,],{,},!,@,#,",+,?,;\'');
+		$xpd  = explode(',','(,), ,	,<,>,\\,*,&,%,$,^,[,],{,},!,@,#,",+,?,;\'');
 		$xpd[]= "\n";
 		return str_ireplace($xpd, '', $str);
 	}

mode/plugin/jquery-rockdatepicker-mobile.js

@@ -70,27 +70,42 @@
 			s+='</div>';
 			s+='<div id="pickermobile_div1" style="width:100%;background:white;position:fixed;top:30%;z-index:10;">';
 			s+='<div style="margin:5px;"><table width="100%"><tr>';
-			
+
 			if(this.view != 'time'){
-				s+='	<td style="padding:5px" align="center">';
-				s+='		<div><input type="button" value="＋"  pickermobile="y1" style="'+inst+'"></div>';
-				s+='		<div><select id="pickermobile_input_year" style="width:100%;height:30px">'+this.selectoption(this.min.Y,this.max.Y,this.now.Y)+'</select></div>';
-				s+='		<div><input type="button" value="－"  pickermobile="y2" style="'+inst+'"></div>';
-				s+='	</td>';
-				
-				s+='	<td style="padding:5px" align="center">';
-				s+='		<div><input type="button" value="＋"  pickermobile="m1" style="'+inst+'"></div>';
-				s+='		<div><select id="pickermobile_input_month" style="width:100%;height:30px">'+this.selectoption(1,12,this.now.m)+'</select></div>';
-				s+='		<div><input type="button" value="－"  pickermobile="m2" style="'+inst+'"></div>';
-				s+='	</td>';
-				
-				s+='	<td style="padding:5px" align="center">';
-				s+='		<div><input type="button" value="＋"  pickermobile="d1" style="'+inst+'"></div>';
-				s+='		<div><select id="pickermobile_input_day" style="width:100%;height:30px">'+this.selectoption(1,31,this.now.d)+'</select></div>';
-				s+='		<div><input type="button" value="－"  pickermobile="d2" style="'+inst+'"></div>';
-				s+='	</td>';
-				s+='	<td>日</td>';
+				if (this.view == 'month') {
+					s+='	<td style="padding:5px;width:50%;" align="center">';
+					s+='		<div><input type="button" value="＋"  pickermobile="y1" style="'+inst+'"></div>';
+					s+='		<div><select id="pickermobile_input_year" style="width:100%;height:30px">'+this.selectoption(this.min.Y,this.max.Y,this.now.Y)+'</select></div>';
+					s+='		<div><input type="button" value="－"  pickermobile="y2" style="'+inst+'"></div>';
+					s+='	</td>';
+
+					s+='	<td style="padding:5px;width:50%;" align="center">';
+					s+='		<div><input type="button" value="＋"  pickermobile="m1" style="'+inst+'"></div>';
+					s+='		<div><select id="pickermobile_input_month" style="width:100%;height:30px">'+this.selectoption(1,12,this.now.m)+'</select></div>';
+					s+='		<div><input type="button" value="－"  pickermobile="m2" style="'+inst+'"></div>';
+					s+='	</td>';
+				} else {
+					s+='	<td style="padding:5px" align="center">';
+					s+='		<div><input type="button" value="＋"  pickermobile="y1" style="'+inst+'"></div>';
+					s+='		<div><select id="pickermobile_input_year" style="width:100%;height:30px">'+this.selectoption(this.min.Y,this.max.Y,this.now.Y)+'</select></div>';
+					s+='		<div><input type="button" value="－"  pickermobile="y2" style="'+inst+'"></div>';
+					s+='	</td>';
+
+					s+='	<td style="padding:5px" align="center">';
+					s+='		<div><input type="button" value="＋"  pickermobile="m1" style="'+inst+'"></div>';
+					s+='		<div><select id="pickermobile_input_month" style="width:100%;height:30px">'+this.selectoption(1,12,this.now.m)+'</select></div>';
+					s+='		<div><input type="button" value="－"  pickermobile="m2" style="'+inst+'"></div>';
+					s+='	</td>';
+
+					s+='	<td style="padding:5px" align="center">';
+					s+='		<div><input type="button" value="＋"  pickermobile="d1" style="'+inst+'"></div>';
+					s+='		<div><select id="pickermobile_input_day" style="width:100%;height:30px">'+this.selectoption(1,31,this.now.d)+'</select></div>';
+					s+='		<div><input type="button" value="－"  pickermobile="d2" style="'+inst+'"></div>';
+					s+='	</td>';
+					s+='	<td>日</td>';
+				}
 			}
+
 			if(this.view=='datetime' || this.view=='time'){
 				
 				s+='	<td style="padding:5px" align="center">';

upload/cache/27411e5f0f1d74b4e7f12578a72ca6a8_1640674513

@@ -1 +0,0 @@
-{"key":"xinhu_9fe22955d6fab27b4213adda61f596ce","data":"-2","time":1640674513,"timedt":"2021-12-28 14:55:13","url":"http:\/\/xinhu_test.com\/api.php?m=login&a=getewm&randkey=ewm873382&dfrom=pc"}

webmain/flow/input/inputAction.php

@@ -478,10 +478,10 @@ class inputAction extends Action
 		$oldrs 		= m($moders['table'])->getone($mid);
 		$this->rs 	= $oldrs;
 		$this->gongsiarr = array();
-
-		$fieldarr 	= m('flow_element')->getrows("`mid`='$modeid' and `iszb`=0 $stwhe",'fields,fieldstype,id,name,dev,data,isbt,islu,attr,iszb,issou,gongsi,placeholder,lens','`sort`');
+		
+		$fieldarr 	= m('flow_element')->getrows("`mid`='$modeid' and `iszb`=0 $stwhe",'fields,fieldstype,name,dev,data,isbt,islu,attr,iszb,issou,gongsi,placeholder,lens','`sort`');
 		$fieldarr	= $this->flow->flowfieldarr($fieldarr, $this->ismobile);
-
+		
 		$modelu		= '';
 		$fieldstypearr = array();
 		foreach($fieldarr as $k=>$rs){
@@ -502,7 +502,7 @@ class inputAction extends Action
 			$this->fieldarr[$rs['fields']] = $rs;
 			if($rs['islu']==1)$fieldstypearr[] = $rs['fieldstype'];
 		}
-
+		
 		$this->smartydata['fieldsjson']	= json_encode($fieldarr);
 		$this->moders	= $moders;
 		$zbshu			= 0;
@@ -512,7 +512,6 @@ class inputAction extends Action
 			$zbshu	 = count($tableas);
 		}
 		$path 			= ''.P.'/flow/page/input_'.$num.'.html';
-
 		if(COMPANYNUM){
 			$path1 		= ''.P.'/flow/page/input_'.$num.'_'.COMPANYNUM.'.html';
 			if(file_exists($path1))$path = $path1;
@@ -522,7 +521,6 @@ class inputAction extends Action
 		
 		$isupfile		= 0;
 		$nameaas 		= explode(',', $moders['names']); //子表名
-
 		//PC端
 		if($this->ismobile==0){
 			$content = $pclucont;
@@ -566,7 +564,7 @@ class inputAction extends Action
 			$this->actclss->rs 		= $this->rs;
 			$this->actclss->ismobile= $this->ismobile;
 		}
-
+		
 		//初始表单插件元素
 		$this->fieldarrall	= $this->fieldarr;
 		$this->inputobj	= c('input');
@@ -582,9 +580,8 @@ class inputAction extends Action
 		$this->fieldarrall['base_name'] 	= array('name'=>arrvalue($chufarr,'base_name','申请人'));
 		$this->fieldarrall['base_deptname'] = array('name'=>arrvalue($chufarr,'base_deptname','申请人部门'));
 		$this->fieldarrall['file_content']  = array('name'=>arrvalue($chufarr,'file_content','相关文件'));
-
+		
 		preg_match_all('/\{(.*?)\}/', $content, $list);
-
 		foreach($list[1] as $k=>$nrs){
 			$str		= $this->inputobj->getfieldcont($nrs, $this->actclss);
 			$content	= str_replace('{'.$nrs.'}', $str, $content);
@@ -653,11 +650,14 @@ class inputAction extends Action
 		$this->smartydata['mid']		= $mid;
 		$this->smartydata['isflow']		= $isflow;
 		$this->smartydata['showtype']	= $this->get('showtype');
+		
 		$this->smartydata['zbnamearr']	= $nameaas;
 		$this->smartydata['zbshu']		= $zbshu;//子表数
 		$this->smartydata['isupfile']	= $isupfile;//是否有上传
 		$this->assign('inputobj', c('input'));
 		
+		
+		
 		$this->smartydata['course']		= $course;
 		$inpwhere	= $this->flow->inputwidth;
 		if($inpwhere<200)$inpwhere = $this->option->getval('inputwidth', 750);
@@ -827,19 +827,19 @@ class inputAction extends Action
 		$barr['souarr']		= $this->flow->flowsearchfields();
 		$rows 				= $this->flow->viewjinfields($rows);//禁看字段处理
 		$farrl	= array();
-		foreach($this->flow->fieldsarra as $k2=>$rs2){
-			if($rs2['fieldstype']=='uploadimg')$farrl[$rs2['fields']]=$rs2['fieldstype'];
-		}
-		
+        foreach ($this->flow->fieldsarra as $k2 => $rs2) {
+            $farrl[$rs2['fields']] = $rs2['fieldstype'];
+        }
+
 		if($rows)foreach($rows as $k1=>$rs1){
 			foreach($farrl as $fid=>$flx){
 				if(isset($rs1[$fid])){
 					$val = $rs1[$fid];
-					if($flx=='uploadimg'){
-						$val = $this->rock->gethttppath($val);
-						$rows[$k1][$fid] = $val;
-						//if($this->flow->modeid>92)$val='<img src="'.$val.'" height="60">';
-					}
+					if ($flx == 'uploadimg') {
+                        $rows[$k1][$fid] = $this->rock->gethttppath($val);
+                    }
+					//单独处理列表字段
+                    $rows[$k1][$fid] = $this->handleRows($val, $fid, $flx, $table);
 				}
 			}
 		}
@@ -1134,6 +1134,62 @@ class inputAction extends Action
 		}
 		return 'ok';
 	}
+
+    /**
+     * 作者: qiuzijian
+     * 注释: 单独处理列表字段
+     * @param $val 字段值
+     * @param $fid 字段名
+     * @param $flx 字段类型
+     * @param $table 对应表
+     * @return mixed
+     */
+    public function handleRows($val, $fid, $flx, $table)
+    {
+        $flow_set     = m('flow_set')->getone("`table`='" . $table . "'");
+        $flow_element = m('flow_element')->getone("`mid`=" . $flow_set['id'] . " and `fields`='" . $fid . "'");
+
+        //radio处理数据选项展示
+        if ($flx == 'uploadimg' && in_array($flx, ['radio', 'select']) && strstr($flow_element['data'], '|')) {
+            $data = explode(',', $flow_element['data']);
+            $data_split = [];
+            foreach ($data as $dv) {
+                $data_split[explode('|', $dv)[0]] = explode('|', $dv)[1];
+            }
+            $val = $data_split[$val];
+        }
+
+        //uploadimg处理数据选项展示
+        if ($flx == 'uploadimg' && $fid == 'picture') {
+            $val = '<img src="' . $this->rock->gethttppath($val) . '" height="60">';
+        }
+
+        //拼图模块分类方法getClassifyList处理
+        if ($flow_element['data'] == 'getClassifyList') {
+            $query = m('ptfl')->getone('`id`=' . $val);
+            $val   = $query['title'];
+        }
+
+        //拼图模块分类方法getSpecialList处理
+        if ($flow_element['data'] == 'getSpecialList') {
+            $query = m('ptzt')->getone('`id`=' . $val);
+            $val   = $query['name'];
+        }
+
+        //拼图模块员工编号字段staff_num处理
+        if ($fid == 'staff_num') {
+            $query = m('admin')->getone("`num`='" . $val . "'");
+            $val   = $query['name'];
+        }
+
+        //拼图模块员工编号字段picture_id处理
+        if ($fid == 'picture_id') {
+            $query = m('tpsc')->getone('`id`=' . $val);
+            $val   = '<img src="' . $this->rock->gethttppath($query['picture']) . '" height="60">';
+        }
+
+        return $val;
+    }
 }
 
 class inputClassAction extends inputAction{}

webmain/flow/input/inputjs/input_two.js

@@ -169,6 +169,7 @@ var inputtwo={
 				}
 			},
 			onchange:function(f){
+				console.log(f);
 				var sna= f.sname,tsye=f.snape;
 				if(tsye=='file'){
 					var flx = js.filelxext(f.fileext);

webmain/flow/input/inputjs/mode_csdw.js

@@ -0,0 +1,4 @@
+//流程模块【csdw.测试定位】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}

webmain/flow/input/inputjs/mode_csmk.js

@@ -0,0 +1,4 @@
+//流程模块【csmk.测试模块】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}

webmain/flow/input/inputjs/mode_data_module.js

@@ -0,0 +1,4 @@
+//流程模块【data_module.生产数据模块】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}

webmain/flow/input/inputjs/mode_ele_equipment.js

@@ -0,0 +1,4 @@
+//流程模块【ele_equipment.机电设备管理】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}

webmain/flow/input/inputjs/mode_paiche.js

@@ -0,0 +1,4 @@
+//流程模块【paiche.派车管理】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}

webmain/flow/input/inputjs/mode_ptfl.js

@@ -0,0 +1,4 @@
+//流程模块【ptfl.拼图分类】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}

webmain/flow/input/inputjs/mode_ptzt.js

@@ -0,0 +1,4 @@
+//流程模块【ptzt.拼图专题】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}

webmain/flow/input/inputjs/mode_scsjqx.js

@@ -0,0 +1,4 @@
+//流程模块【scsjqx.生产数据权限】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}

webmain/flow/input/inputjs/mode_tpsc.js

@@ -0,0 +1,4 @@
+//流程模块【tpsc.图片上传】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}

webmain/flow/input/inputjs/mode_wclb.js

@@ -0,0 +1,4 @@
+//流程模块【wclb.拼图完成列表】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}

webmain/flow/input/mode_csdwAction.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*	此文件是流程模块【csdw.测试定位】对应控制器接口文件。
+*/ 
+class mode_csdwClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+}	
+			

webmain/flow/input/mode_csmkAction.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*	此文件是流程模块【csmk.测试模块】对应控制器接口文件。
+*/ 
+class mode_csmkClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+}	
+			

webmain/flow/input/mode_data_moduleAction.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*	此文件是流程模块【data_module.生产数据模块】对应控制器接口文件。
+*/ 
+class mode_data_moduleClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+}	
+			

webmain/flow/input/mode_ele_equipmentAction.php

@@ -0,0 +1,44 @@
+<?php
+/**
+*	此文件是流程模块【ele_equipment.机电设备管理】对应控制器接口文件。
+*/ 
+class mode_ele_equipmentClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+
+    public function abc()
+    {
+        return '<select>
+<option>1</option><option>2</option>
+</select>';
+
+    $arr[] = array("name"=>"第一个下拉框","value"=>"0");
+
+    $arr[] = array("name"=>"第二个下拉框","value"=>"1");
+
+    return $arr;
+
+    }
+}	
+			

webmain/flow/input/mode_paicheAction.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*	此文件是流程模块【paiche.派车管理】对应控制器接口文件。
+*/ 
+class mode_paicheClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+}	
+			

webmain/flow/input/mode_ptflAction.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*	此文件是流程模块【ptfl.拼图分类】对应控制器接口文件。
+*/ 
+class mode_ptflClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+}	
+			

webmain/flow/input/mode_ptztAction.php

@@ -0,0 +1,46 @@
+<?php
+/**
+*	此文件是流程模块【ptzt.拼图专题】对应控制器接口文件。
+*/ 
+class mode_ptztClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+
+	//拼图分类列表
+    public function getClassifyList()
+    {
+        $query = m('ptfl')->getall('`id`>0');
+
+        $arr = [];
+        foreach ($query as $key => $val) {
+            $arr[] = [
+                'name'  => $val['title'],
+                'value' => $val['id']
+            ];
+        }
+
+        return $arr;
+    }
+}	
+			

webmain/flow/input/mode_scsjqxAction.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*	此文件是流程模块【scsjqx.生产数据权限】对应控制器接口文件。
+*/ 
+class mode_scsjqxClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+}	
+			

webmain/flow/input/mode_tpscAction.php

@@ -0,0 +1,46 @@
+<?php
+/**
+*	此文件是流程模块【tpsc.图片上传】对应控制器接口文件。
+*/ 
+class mode_tpscClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+
+    //拼图专题列表
+    public function getSpecialList()
+    {
+        $query = m('ptzt')->getall('`id`>0');
+
+        $arr = [];
+        foreach ($query as $key => $val) {
+            $arr[] = [
+                'name'  => $val['name'],
+                'value' => $val['id']
+            ];
+        }
+
+        return $arr;
+    }
+}	
+			

webmain/flow/input/mode_userAction.php

@@ -33,7 +33,7 @@ class mode_userClassAction extends inputAction{
 		if(!isempt($mobile)){
 			if(!$check->ismobile($mobile))return '手机格式有误';
 		}
-//		if(isempt($mobile) && isempt($email))return '邮箱/手机号不能同时为空';
+		if(isempt($mobile) && isempt($email))return '邮箱/手机号不能同时为空';
 		if(!isempt($weixinid)){
 			if(is_numeric($weixinid))return '微信号不能是数字';
 			if($check->isincn($weixinid))return '微信号不能有中文';
@@ -56,7 +56,7 @@ class mode_userClassAction extends inputAction{
 		$notsave		= '';
 		
 		if($addbo){
-			if(isempt($pass))$pass = '123456';
+			if(isempt($pass))$pass = 'Zhks123456+';
 			$rows['pass'] 	= md5($pass);
 		}else{
 			if(isempt($pass)){

webmain/flow/input/mode_wclbAction.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*	此文件是流程模块【wclb.拼图完成列表】对应控制器接口文件。
+*/ 
+class mode_wclbClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+}	
+			

webmain/flow/input/tpl_input_lu.html

@@ -133,7 +133,7 @@ echo 'body{--main-color:'.$maincolor.';--main-border:rgba('.$maincolors.',0.2)}'
 		<?php
 		if($da['isflow']>0)echo '<label><input onclick="c.changeturn(this)" value="1" checked type="checkbox" id="sysisturn">直接提交</label>&nbsp;';
 		?>
-		<input id="AltS" type="button" style="border-radius:5px" onclick="return c.save()" value="提交" class="webbtn"></span>&nbsp; &nbsp;
+		<input id="AltS" type="button" style="border-radius:5px" onclick="return c.save()" value="提交" class="webbtn"></span>&nbsp; &nbsp; 
 	</div>
 </div>
 <script>

webmain/flow/input/tpl_input_lum.html

@@ -13,7 +13,7 @@
 <script type="text/javascript" src="js/js.js"></script>
 <script type="text/javascript" src="js/base64-min.js"></script>
 <script type="text/javascript" src="mode/plugin/jquery-rockdatepicker.js"></script>
-<script type="text/javascript" src="mode/plugin/jquery-rockdatepicker-mobile.js"></script>
+<script type="text/javascript" src="mode/plugin/jquery-rockdatepicker-mobile.js?v=1"></script>
 <script type="text/javascript" src="web/res/js/jquery-rockupload.js"></script>
 <script type="text/javascript" src="<?=$da['p']?>/flow/input/inputjs/input.js?<?=$da['logintime']?>"></script>
 <script type="text/javascript" src="web/res/js/jquery-changeuser.js"></script>
@@ -66,7 +66,9 @@ echo 'body{--main-color:'.$maincolor.';}';
 ?>
 .datesss{background:url(mode/icons/date.png) no-repeat right;cursor:pointer}
 input,textarea,select,*,td, button{font-size:16px}
-.lurim{text-align:right;padding-left:5px}
+.lurim{text-align:right;padding-left:5px;width:100%;}
+.lulim{text-align:left;padding-left:10px;width:100%;padding-bottom:5px;}
+.lulim:first-child{padding-top:10px;}
 .tablesub td{height:25px;text-align:left;border:0px #888888 solid;}
 .tablesub .inputs{width:100%}
 
@@ -78,8 +80,8 @@ input,textarea,select,*,td, button{font-size:16px}
 .btn:hover{opacity:1;color:#ffffff}
 .lumtr{background-color:white}
 .tablelum{}
-.inputs{border-bottom:0.5px #cccccc solid;border-top:0px;border-left:0px;border-right:0px}
-.inputs:focus{border:none;box-shadow:none;border-bottom:0.5px <?=$maincolor?> solid;}
+/*.inputs{border-bottom:0.5px #cccccc solid;border-top:0px;border-left:0px;border-right:0px}*/
+/*.inputs:focus{border:none;box-shadow:none;border-bottom:0.5px <?=$maincolor?> solid;}*/
 
 .divzb0{display:inline-block;width:100%;margin:5px 0px}
 .divzb1{float:left;width:25%;overflow:auto;text-align:right;line-height:20px;margin-top:8px}
@@ -87,6 +89,68 @@ input,textarea,select,*,td, button{font-size:16px}
 .xuhao{border:none;font-size:12px;text-align:left;color:#888888}
 .xuhao:focus{border:none;}
 .xuantitle{text-align:left;font-size:12px;padding-left:8px;line-height:30px;margin-top:10px;color:#888888;}
+/*页面修改*/
+	.form_title{
+		font-size: 16px;
+		font-weight: bold;
+		color: #000;
+	}
+
+	.form_content{
+		font-size: 15px;
+		color: #3A3A3C;
+		padding-right: 10px;
+	}
+
+	.header{
+		color: #fff;
+		font-weight: bold;
+		font-size: 20px;
+		background-color: #1389D3;
+	}
+
+	.btn{
+		font-size: 18px;
+	}
+
+	.submit_tip{
+		margin-bottom: 10px;
+	}
+
+	.xuantitle{
+		font-size: 14px;
+		line-height: 14px;
+		margin-bottom: 10px;
+	}
+
+	.inputs{
+		border: 1px solid #dcdcdc;
+		border-radius: 5px;
+		height: 30px;
+		width: 100%;
+		font-size: 15px;
+		color: #3A3A3C;
+		padding-left: 8px;
+	}
+
+	.textarea{
+		border: 1px solid #dcdcdc;
+		border-radius: 5px;
+		height: 30px;
+		width: 100%;
+		font-size: 15px;
+		color: #3A3A3C;
+		padding-left: 8px;
+	}
+
+	.divinput{
+		padding: 8px 8px 8px 0px;
+	}
+
+	select[class="inputs"]{
+		height: 36px;
+		padding-left: 6px;
+	}
 </style>
 </head>
 
@@ -106,8 +170,8 @@ if($showheader==1)echo '<div id="header_title" style="padding-top:'.$cenghei.'px
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" class="tablelum">
 		<?php if($da['mid']==0){?>
 		<tr class="lumtr">
-			<td class="lurim" nowrap>填写人</td>
-			<td><div class="divinput"><?=$da['adminname']?></div></td>
+			<td class="lulim" nowrap><div class="form_title">填写人：</div><div class="divinput form_content" style="border:1px solid #dcdcdc;border-radius:5px;margin-top:8px;padding-left:8px;width:92%;"><?=$da['adminname']?></div></td>
+			<td></td>
 		</tr>
 		<?php
 		}
@@ -115,7 +179,7 @@ if($showheader==1)echo '<div id="header_title" style="padding-top:'.$cenghei.'px
 		if($da['isupfile']==1){
 		?>
 		<tr class="lumtr">
-		<td class="lurim" nowrap>相关文件</td>
+		<td class="lulim" nowrap>相关文件</td>
 		<td><div class="divinput">
 			<input name="fileid" id="fileidview-inputEl" type="hidden">
 			<div id="view_fileidview" style="height:auto;min-height:60px" class="inputs"></div>
@@ -148,14 +212,15 @@ if($showheader==1)echo '<div id="header_title" style="padding-top:'.$cenghei.'px
 				$firstrs['isbt'] = 0;
 				$stsp = '<tr><td colspan="2"><div class="xuantitle">选择审批人</div></td></tr>';
 				$stsp.= '<tr class="lumtr">';
-				$stsp.= '<td class="lurim" nowrap>';
+				$stsp.= '<td class="lulim" nowrap><div class="form_title">';
 				if($firstrs['checktype']=='change'){
 					$stsp.='<font color=red>*</font>';
 					$placeholder = '必须指定人员';
 					$firstrs['isbt'] = 1;
 				}
-				$stsp.= ''.$firstrs['name'].':</td>';
-				$stsp.= '<td><div class="divinput"><table width="98%" cellpadding="0" border="0"><tr><td width="100%"><input  class="inputs" style="width:99%" id="sysnextchange" value="'.$firstrs['sysnextopt'].'" placeholder="'.$placeholder.'" readonly type="text" name="sysnextopt"><input name="sysnextoptid" value="'.$firstrs['sysnextoptid'].'" id="sysnextchange_id" type="hidden"><input name="sysnextcustidid" value="'.$firstrs['id'].'" type="hidden"></td>';
+				$stsp.= ''.$firstrs['name'].':</div>';
+				$stsp.= '<div class="divinput form_content"><table width="98%" cellpadding="0" border="0"><tr><td width="100%"><input  class="inputs" style="width:99%" id="sysnextchange" value="'.$firstrs['sysnextopt'].'" placeholder="'.$placeholder.'" readonly type="text" name="sysnextopt"><input name="sysnextoptid" value="'.$firstrs['sysnextoptid'].'" id="sysnextchange_id" type="hidden"><input name="sysnextcustidid" value="'.$firstrs['id'].'" type="hidden"></td>';
+				$stsp.= '<td></td>';
 				$stsp.= '<td nowrap><a href="javascript:;" onclick="js.changeclear(\'sysnextchange\')" class="webbtn">×</a><a href="javascript:;" id="btnchange_recename" onclick="js.changeuser(\'sysnextchange\',\'changeusercheck\',\'\',{changerange:\''.$firstrs['checktypeid'].'\'})" class="webbtn">选择</a></td></tr></table></div></td>';
 				$stsp.= '</tr>';
 				echo $stsp;
@@ -176,7 +241,7 @@ if($showheader==1)echo '<div id="header_title" style="padding-top:'.$cenghei.'px
 				'valueid'	=> $da['chao']['csnameid']
 			));
 			echo '<tr><td colspan="2"><div class="xuantitle">抄送</div></td></tr>';
-			echo '<tr class="lumtr"><td class="lurim" nowrap><font color="red">'.(($iscs==1) ? '':'*').'</font>抄送给</td><td><div class="divinput">'.$csstr.'</div></td></tr>';
+			echo '<tr class="lumtr"><td class="lulim" nowrap><font color="red">'.(($iscs==1) ? '':'*').'</font>抄送给</td><td><div class="divinput">'.$csstr.'</div></td></tr>';
 		}
 		?>
 		</table>
@@ -185,7 +250,7 @@ if($showheader==1)echo '<div id="header_title" style="padding-top:'.$cenghei.'px
 	<div class="padding10">
 		<span id="AltSspan" style="display:none" >
 		<?php
-		if($da['isflow']>0)echo '<label><input onclick="c.changeturn(this)" value="1" checked type="checkbox" id="sysisturn">直接提交</label>&nbsp;';
+		if($da['isflow']>0)echo '<div class="submit_tip"><input onclick="c.changeturn(this)" value="1" checked type="checkbox" id="sysisturn">直接提交</div>';
 		?>
 		<button id="AltS" style="border-radius:5px" type="button" onclick="return c.save()"  class="btn">提交</button></span>
 		<div id="msgview"></div>

webmain/flow/page/input_csdw.html

@@ -0,0 +1 @@
+*定位{dingwei}

webmain/flow/page/input_csmk.html

@@ -0,0 +1 @@
+<table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">*^cszd^</td><td width="35%" class="ys2">{cszd}</td><td height="34" align="right" class="ys1"></td><td class="ys2"></td></tr></tbody></table>

webmain/flow/page/input_data_module.html

@@ -0,0 +1 @@
+<table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">*^module_code^</td><td width="35%" class="ys2">{module_code}</td><td height="34" width="15%" align="right" class="ys1">*^module_name^</td><td width="35%" class="ys2">{module_name}</td></tr></tbody></table>

webmain/flow/page/input_ele_equipment.html

@@ -0,0 +1 @@
+<p>设备名称&nbsp;{name}</p><p>设备型号&nbsp;{type}</p><p>设备状态&nbsp;{status}</p><p>自定义元素&nbsp;{test}</p><p>地图定位&nbsp;{dtdw}</p>

webmain/flow/page/input_scsjqx.html

@@ -0,0 +1 @@
+<table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">*^data_module^</td><td width="35%" class="ys2">{data_module}</td><td height="34" align="right" class="ys1"></td><td class="ys2"></td></tr><tr><td height="34" align="right" class="ys1">*^power_group^</td><td colspan="3" class="ys2">{power_group}</td></tr></tbody></table>

webmain/flow/page/rock_page_data_module.php

@@ -0,0 +1,59 @@
+<?php
+/**
+*	模块：data_module.生产数据模块
+*	说明：自定义区域内可写你想要的代码
+*	来源：流程模块→表单元素管理→[模块.生产数据模块]→生成列表页
+*/
+defined('HOST') or die ('not access');
+?>
+<script>
+$(document).ready(function(){
+	{params}
+	var modenum = 'data_module',modename='生产数据模块',isflow=0,modeid='134',atype = params.atype,pnum=params.pnum,modenames='',listname='ZGF0YV9tb2R1bGU:';
+	if(!atype)atype='';if(!pnum)pnum='';
+	var fieldsarr = [],fieldsselarr= [],chufarr= [];
+	
+	<?php
+	include_once('webmain/flow/page/rock_page.php');
+	?>
+	
+//[自定义区域start]
+
+
+
+//[自定义区域end]
+	c.initpagebefore();
+	js.initbtn(c);
+	var a = $('#view'+modenum+'_{rand}').bootstable(bootparams);
+	c.init();
+	
+});
+</script>
+<!--SCRIPTend-->
+<!--HTMLstart-->
+<div>
+	<table width="100%">
+	<tr>
+		<td style="padding-right:10px;" id="tdleft_{rand}" nowrap><button id="addbtn_{rand}" class="btn btn-primary" click="clickwin,0" disabled type="button"><i class="icon-plus"></i> 新增</button></td>
+		
+		<td><select class="form-control" style="width:110px;border-top-right-radius:0;border-bottom-right-radius:0;padding:0 2px" id="fields_{rand}"></select></td>
+		<td><select class="form-control" style="width:60px;border-radius:0px;border-left:0;padding:0 2px" id="like_{rand}"><option value="0">包含</option><option value="1">等于</option><option value="2">大于等于</option><option value="3">小于等于</option><option value="4">不包含</option></select></td>
+		<td><select class="form-control" style="width:130px;border-radius:0;border-left:0;display:none;padding:0 5px" id="selkey_{rand}"><option value="">-请选择-</option></select><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px" id="keygj_{rand}" placeholder="关键词"><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px;display:none;" id="key_{rand}" placeholder="关键字">
+		</td>
+		
+		<td>
+			<div style="white-space:nowrap">
+			<button style="border-right:0;border-radius:0;border-left:0" class="btn btn-default" click="searchbtn" type="button">搜索</button><button class="btn btn-default" id="downbtn_{rand}" type="button" style="padding-left:8px;padding-right:8px;border-top-left-radius:0;border-bottom-left-radius:0"><i class="icon-angle-down"></i></button> 
+			</div>
+		</td>
+		<td  width="90%" style="padding-left:10px"><div id="changatype{rand}" class="btn-group"></div></td>
+	
+		<td align="right" id="tdright_{rand}" nowrap>
+			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button">导入</button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button">导出 <i class="icon-angle-down"></i></button> 
+		</td>
+	</tr>
+	</table>
+</div>
+<div class="blank10"></div>
+<div id="viewdata_module_{rand}"></div>
+<!--HTMLend-->

webmain/flow/page/rock_page_demo.php

@@ -9,7 +9,7 @@ defined('HOST') or die ('not access');
 <script>
 $(document).ready(function(){
 	{params}
-	var modenum = 'demo',modename='演示测试',isflow=4,modeid='72',atype = params.atype,pnum=params.pnum,modenames='多行子表1,多行子表2',listname='ZGVtbw::';
+	var modenum = 'demo',modename='演示测试',isflow=1,modeid='72',atype = params.atype,pnum=params.pnum,modenames='多行子表1,多行子表2',listname='ZGVtbw::';
 	if(!atype)atype='';if(!pnum)pnum='';
 	var fieldsarr = [],fieldsselarr= [],chufarr= [];
 	

webmain/flow/page/rock_page_ele_equipment.php

@@ -0,0 +1,59 @@
+<?php
+/**
+*	模块：ele_equipment.机电设备管理
+*	说明：自定义区域内可写你想要的代码
+*	来源：流程模块→表单元素管理→[模块.机电设备管理]→生成列表页
+*/
+defined('HOST') or die ('not access');
+?>
+<script>
+$(document).ready(function(){
+	{params}
+	var modenum = 'ele_equipment',modename='机电设备管理',isflow=0,modeid='125',atype = params.atype,pnum=params.pnum,modenames='',listname='ZWxlX2VxdWlwbWVudA::';
+	if(!atype)atype='';if(!pnum)pnum='';
+	var fieldsarr = [],fieldsselarr= [],chufarr= [];
+	
+	<?php
+	include_once('webmain/flow/page/rock_page.php');
+	?>
+	
+//[自定义区域start]
+
+
+
+//[自定义区域end]
+	c.initpagebefore();
+	js.initbtn(c);
+	var a = $('#view'+modenum+'_{rand}').bootstable(bootparams);
+	c.init();
+	
+});
+</script>
+<!--SCRIPTend-->
+<!--HTMLstart-->
+<div>
+	<table width="100%">
+	<tr>
+		<td style="padding-right:10px;" id="tdleft_{rand}" nowrap><button id="addbtn_{rand}" class="btn btn-primary" click="clickwin,0" disabled type="button"><i class="icon-plus"></i> 新增</button></td>
+		
+		<td><select class="form-control" style="width:110px;border-top-right-radius:0;border-bottom-right-radius:0;padding:0 2px" id="fields_{rand}"></select></td>
+		<td><select class="form-control" style="width:60px;border-radius:0px;border-left:0;padding:0 2px" id="like_{rand}"><option value="0">包含</option><option value="1">等于</option><option value="2">大于等于</option><option value="3">小于等于</option><option value="4">不包含</option></select></td>
+		<td><select class="form-control" style="width:130px;border-radius:0;border-left:0;display:none;padding:0 5px" id="selkey_{rand}"><option value="">-请选择-</option></select><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px" id="keygj_{rand}" placeholder="关键词"><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px;display:none;" id="key_{rand}" placeholder="关键字">
+		</td>
+		<td><select class="form-control" style="width:120px;border-left:0;border-radius:0;" id="selstatus_{rand}"><option value="">-全部状态-</option><option style="color:blue" value="0">待处理</option><option style="color:green" value="1">已审核</option><option style="color:red" value="2">不同意</option><option style="color:#888888" value="5">已作废</option></select></td>
+		<td>
+			<div style="white-space:nowrap">
+			<button style="border-right:0;border-radius:0;border-left:0" class="btn btn-default" click="searchbtn" type="button">搜索</button><button class="btn btn-default" id="downbtn_{rand}" type="button" style="padding-left:8px;padding-right:8px;border-top-left-radius:0;border-bottom-left-radius:0"><i class="icon-angle-down"></i></button> 
+			</div>
+		</td>
+		<td  width="90%" style="padding-left:10px"><div id="changatype{rand}" class="btn-group"></div></td>
+	
+		<td align="right" id="tdright_{rand}" nowrap>
+			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button">导入</button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button">导出 <i class="icon-angle-down"></i></button> 
+		</td>
+	</tr>
+	</table>
+</div>
+<div class="blank10"></div>
+<div id="viewele_equipment_{rand}"></div>
+<!--HTMLend-->

webmain/flow/page/rock_page_gong.php

@@ -9,7 +9,7 @@ defined('HOST') or die ('not access');
 <script>
 $(document).ready(function(){
 	{params}
-	var modenum = 'gong',modename='通知公告',isflow=0,modeid='1',atype = params.atype,pnum=params.pnum,modenames='投票选项',listname='aW5mb3I:';
+	var modenum = 'gong',modename='通知公告',isflow=0,modeid='1',atype = params.atype,pnum=params.pnum,modenames='多行子表名称',listname='aW5mb3I:';
 	if(!atype)atype='';if(!pnum)pnum='';
 	var fieldsarr = [],fieldsselarr= [],chufarr= [];
 	

webmain/flow/page/rock_page_paiche.php

@@ -0,0 +1,59 @@
+<?php
+/**
+*	模块：paiche.派车测试2
+*	说明：自定义区域内可写你想要的代码
+*	来源：流程模块→表单元素管理→[模块.派车测试2]→生成列表页
+*/
+defined('HOST') or die ('not access');
+?>
+<script>
+$(document).ready(function(){
+	{params}
+	var modenum = 'paiche',modename='派车测试2',isflow=1,modeid='124',atype = params.atype,pnum=params.pnum,modenames='',listname='cGFpY2hl';
+	if(!atype)atype='';if(!pnum)pnum='';
+	var fieldsarr = [],fieldsselarr= [],chufarr= [];
+	
+	<?php
+	include_once('webmain/flow/page/rock_page.php');
+	?>
+	
+//[自定义区域start]
+
+
+
+//[自定义区域end]
+	c.initpagebefore();
+	js.initbtn(c);
+	var a = $('#view'+modenum+'_{rand}').bootstable(bootparams);
+	c.init();
+	
+});
+</script>
+<!--SCRIPTend-->
+<!--HTMLstart-->
+<div>
+	<table width="100%">
+	<tr>
+		<td style="padding-right:10px;" id="tdleft_{rand}" nowrap><button id="addbtn_{rand}" class="btn btn-primary" click="clickwin,0" disabled type="button"><i class="icon-plus"></i> 新增</button></td>
+		
+		<td><select class="form-control" style="width:110px;border-top-right-radius:0;border-bottom-right-radius:0;padding:0 2px" id="fields_{rand}"></select></td>
+		<td><select class="form-control" style="width:60px;border-radius:0px;border-left:0;padding:0 2px" id="like_{rand}"><option value="0">包含</option><option value="1">等于</option><option value="2">大于等于</option><option value="3">小于等于</option><option value="4">不包含</option></select></td>
+		<td><select class="form-control" style="width:130px;border-radius:0;border-left:0;display:none;padding:0 5px" id="selkey_{rand}"><option value="">-请选择-</option></select><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px" id="keygj_{rand}" placeholder="关键词"><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px;display:none;" id="key_{rand}" placeholder="关键字/申请人/单号">
+		</td>
+		<td><select class="form-control" style="width:120px;border-left:0;border-radius:0;" id="selstatus_{rand}"><option value="">-全部状态-</option><option style="color:blue" value="0">待处理</option><option style="color:green" value="1">已审核</option><option style="color:red" value="2">不同意</option><option style="color:#888888" value="5">已作废</option><option style="color:#17B2B7" value="23">退回</option></select></td>
+		<td>
+			<div style="white-space:nowrap">
+			<button style="border-right:0;border-radius:0;border-left:0" class="btn btn-default" click="searchbtn" type="button">搜索</button><button class="btn btn-default" id="downbtn_{rand}" type="button" style="padding-left:8px;padding-right:8px;border-top-left-radius:0;border-bottom-left-radius:0"><i class="icon-angle-down"></i></button> 
+			</div>
+		</td>
+		<td  width="90%" style="padding-left:10px"><div id="changatype{rand}" class="btn-group"></div></td>
+	
+		<td align="right" id="tdright_{rand}" nowrap>
+			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button">导入</button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button">导出 <i class="icon-angle-down"></i></button> 
+		</td>
+	</tr>
+	</table>
+</div>
+<div class="blank10"></div>
+<div id="viewpaiche_{rand}"></div>
+<!--HTMLend-->

webmain/flow/page/rock_page_ptfl.php

@@ -0,0 +1,59 @@
+<?php
+/**
+*	模块：ptfl.拼图分类
+*	说明：自定义区域内可写你想要的代码
+*	来源：流程模块→表单元素管理→[模块.拼图分类]→生成列表页
+*/
+defined('HOST') or die ('not access');
+?>
+<script>
+$(document).ready(function(){
+	{params}
+	var modenum = 'ptfl',modename='拼图分类',isflow=0,modeid='129',atype = params.atype,pnum=params.pnum,modenames='',listname='cHRmbA::';
+	if(!atype)atype='';if(!pnum)pnum='';
+	var fieldsarr = [],fieldsselarr= [],chufarr= [];
+	
+	<?php
+	include_once('webmain/flow/page/rock_page.php');
+	?>
+	
+//[自定义区域start]
+
+
+
+//[自定义区域end]
+	c.initpagebefore();
+	js.initbtn(c);
+	var a = $('#view'+modenum+'_{rand}').bootstable(bootparams);
+	c.init();
+	
+});
+</script>
+<!--SCRIPTend-->
+<!--HTMLstart-->
+<div>
+	<table width="100%">
+	<tr>
+		<td style="padding-right:10px;" id="tdleft_{rand}" nowrap><button id="addbtn_{rand}" class="btn btn-primary" click="clickwin,0" disabled type="button"><i class="icon-plus"></i> 新增</button></td>
+		
+		<td><select class="form-control" style="width:110px;border-top-right-radius:0;border-bottom-right-radius:0;padding:0 2px" id="fields_{rand}"></select></td>
+		<td><select class="form-control" style="width:60px;border-radius:0px;border-left:0;padding:0 2px" id="like_{rand}"><option value="0">包含</option><option value="1">等于</option><option value="2">大于等于</option><option value="3">小于等于</option><option value="4">不包含</option></select></td>
+		<td><select class="form-control" style="width:130px;border-radius:0;border-left:0;display:none;padding:0 5px" id="selkey_{rand}"><option value="">-请选择-</option></select><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px" id="keygj_{rand}" placeholder="关键词"><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px;display:none;" id="key_{rand}" placeholder="关键字">
+		</td>
+		
+		<td>
+			<div style="white-space:nowrap">
+			<button style="border-right:0;border-radius:0;border-left:0" class="btn btn-default" click="searchbtn" type="button">搜索</button><button class="btn btn-default" id="downbtn_{rand}" type="button" style="padding-left:8px;padding-right:8px;border-top-left-radius:0;border-bottom-left-radius:0"><i class="icon-angle-down"></i></button> 
+			</div>
+		</td>
+		<td  width="90%" style="padding-left:10px"><div id="changatype{rand}" class="btn-group"></div></td>
+	
+		<td align="right" id="tdright_{rand}" nowrap>
+			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button">导入</button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button">导出 <i class="icon-angle-down"></i></button> 
+		</td>
+	</tr>
+	</table>
+</div>
+<div class="blank10"></div>
+<div id="viewptfl_{rand}"></div>
+<!--HTMLend-->

webmain/flow/page/rock_page_ptzt.php

@@ -0,0 +1,59 @@
+<?php
+/**
+*	模块：ptzt.拼图专题
+*	说明：自定义区域内可写你想要的代码
+*	来源：流程模块→表单元素管理→[模块.拼图专题]→生成列表页
+*/
+defined('HOST') or die ('not access');
+?>
+<script>
+$(document).ready(function(){
+	{params}
+	var modenum = 'ptzt',modename='拼图专题',isflow=0,modeid='130',atype = params.atype,pnum=params.pnum,modenames='',listname='cHR6dA::';
+	if(!atype)atype='';if(!pnum)pnum='';
+	var fieldsarr = [],fieldsselarr= [],chufarr= [];
+	
+	<?php
+	include_once('webmain/flow/page/rock_page.php');
+	?>
+	
+//[自定义区域start]
+
+
+
+//[自定义区域end]
+	c.initpagebefore();
+	js.initbtn(c);
+	var a = $('#view'+modenum+'_{rand}').bootstable(bootparams);
+	c.init();
+	
+});
+</script>
+<!--SCRIPTend-->
+<!--HTMLstart-->
+<div>
+	<table width="100%">
+	<tr>
+		<td style="padding-right:10px;" id="tdleft_{rand}" nowrap><button id="addbtn_{rand}" class="btn btn-primary" click="clickwin,0" disabled type="button"><i class="icon-plus"></i> 新增</button></td>
+		
+		<td><select class="form-control" style="width:110px;border-top-right-radius:0;border-bottom-right-radius:0;padding:0 2px" id="fields_{rand}"></select></td>
+		<td><select class="form-control" style="width:60px;border-radius:0px;border-left:0;padding:0 2px" id="like_{rand}"><option value="0">包含</option><option value="1">等于</option><option value="2">大于等于</option><option value="3">小于等于</option><option value="4">不包含</option></select></td>
+		<td><select class="form-control" style="width:130px;border-radius:0;border-left:0;display:none;padding:0 5px" id="selkey_{rand}"><option value="">-请选择-</option></select><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px" id="keygj_{rand}" placeholder="关键词"><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px;display:none;" id="key_{rand}" placeholder="关键字">
+		</td>
+		
+		<td>
+			<div style="white-space:nowrap">
+			<button style="border-right:0;border-radius:0;border-left:0" class="btn btn-default" click="searchbtn" type="button">搜索</button><button class="btn btn-default" id="downbtn_{rand}" type="button" style="padding-left:8px;padding-right:8px;border-top-left-radius:0;border-bottom-left-radius:0"><i class="icon-angle-down"></i></button> 
+			</div>
+		</td>
+		<td  width="90%" style="padding-left:10px"><div id="changatype{rand}" class="btn-group"></div></td>
+	
+		<td align="right" id="tdright_{rand}" nowrap>
+			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button">导入</button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button">导出 <i class="icon-angle-down"></i></button> 
+		</td>
+	</tr>
+	</table>
+</div>
+<div class="blank10"></div>
+<div id="viewptzt_{rand}"></div>
+<!--HTMLend-->

webmain/flow/page/rock_page_scsjqx.php

@@ -0,0 +1,59 @@
+<?php
+/**
+*	模块：scsjqx.生产数据权限
+*	说明：自定义区域内可写你想要的代码
+*	来源：流程模块→表单元素管理→[模块.生产数据权限]→生成列表页
+*/
+defined('HOST') or die ('not access');
+?>
+<script>
+$(document).ready(function(){
+	{params}
+	var modenum = 'scsjqx',modename='生产数据权限',isflow=0,modeid='133',atype = params.atype,pnum=params.pnum,modenames='',listname='c2NzanF4';
+	if(!atype)atype='';if(!pnum)pnum='';
+	var fieldsarr = [],fieldsselarr= [],chufarr= [];
+	
+	<?php
+	include_once('webmain/flow/page/rock_page.php');
+	?>
+	
+//[自定义区域start]
+
+
+
+//[自定义区域end]
+	c.initpagebefore();
+	js.initbtn(c);
+	var a = $('#view'+modenum+'_{rand}').bootstable(bootparams);
+	c.init();
+	
+});
+</script>
+<!--SCRIPTend-->
+<!--HTMLstart-->
+<div>
+	<table width="100%">
+	<tr>
+		<td style="padding-right:10px;" id="tdleft_{rand}" nowrap><button id="addbtn_{rand}" class="btn btn-primary" click="clickwin,0" disabled type="button"><i class="icon-plus"></i> 新增</button></td>
+		
+		<td><select class="form-control" style="width:110px;border-top-right-radius:0;border-bottom-right-radius:0;padding:0 2px" id="fields_{rand}"></select></td>
+		<td><select class="form-control" style="width:60px;border-radius:0px;border-left:0;padding:0 2px" id="like_{rand}"><option value="0">包含</option><option value="1">等于</option><option value="2">大于等于</option><option value="3">小于等于</option><option value="4">不包含</option></select></td>
+		<td><select class="form-control" style="width:130px;border-radius:0;border-left:0;display:none;padding:0 5px" id="selkey_{rand}"><option value="">-请选择-</option></select><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px" id="keygj_{rand}" placeholder="关键词"><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px;display:none;" id="key_{rand}" placeholder="关键字">
+		</td>
+		
+		<td>
+			<div style="white-space:nowrap">
+			<button style="border-right:0;border-radius:0;border-left:0" class="btn btn-default" click="searchbtn" type="button">搜索</button><button class="btn btn-default" id="downbtn_{rand}" type="button" style="padding-left:8px;padding-right:8px;border-top-left-radius:0;border-bottom-left-radius:0"><i class="icon-angle-down"></i></button> 
+			</div>
+		</td>
+		<td  width="90%" style="padding-left:10px"><div id="changatype{rand}" class="btn-group"></div></td>
+	
+		<td align="right" id="tdright_{rand}" nowrap>
+			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button">导入</button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button">导出 <i class="icon-angle-down"></i></button> 
+		</td>
+	</tr>
+	</table>
+</div>
+<div class="blank10"></div>
+<div id="viewscsjqx_{rand}"></div>
+<!--HTMLend-->

webmain/flow/page/rock_page_tpsc.php

@@ -0,0 +1,59 @@
+<?php
+/**
+*	模块：tpsc.图片上传
+*	说明：自定义区域内可写你想要的代码
+*	来源：流程模块→表单元素管理→[模块.图片上传]→生成列表页
+*/
+defined('HOST') or die ('not access');
+?>
+<script>
+$(document).ready(function(){
+	{params}
+	var modenum = 'tpsc',modename='图片上传',isflow=0,modeid='131',atype = params.atype,pnum=params.pnum,modenames='',listname='dHBzYw::';
+	if(!atype)atype='';if(!pnum)pnum='';
+	var fieldsarr = [],fieldsselarr= [],chufarr= [];
+	
+	<?php
+	include_once('webmain/flow/page/rock_page.php');
+	?>
+	
+//[自定义区域start]
+
+
+
+//[自定义区域end]
+	c.initpagebefore();
+	js.initbtn(c);
+	var a = $('#view'+modenum+'_{rand}').bootstable(bootparams);
+	c.init();
+	
+});
+</script>
+<!--SCRIPTend-->
+<!--HTMLstart-->
+<div>
+	<table width="100%">
+	<tr>
+		<td style="padding-right:10px;" id="tdleft_{rand}" nowrap><button id="addbtn_{rand}" class="btn btn-primary" click="clickwin,0" disabled type="button"><i class="icon-plus"></i> 新增</button></td>
+		
+		<td><select class="form-control" style="width:110px;border-top-right-radius:0;border-bottom-right-radius:0;padding:0 2px" id="fields_{rand}"></select></td>
+		<td><select class="form-control" style="width:60px;border-radius:0px;border-left:0;padding:0 2px" id="like_{rand}"><option value="0">包含</option><option value="1">等于</option><option value="2">大于等于</option><option value="3">小于等于</option><option value="4">不包含</option></select></td>
+		<td><select class="form-control" style="width:130px;border-radius:0;border-left:0;display:none;padding:0 5px" id="selkey_{rand}"><option value="">-请选择-</option></select><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px" id="keygj_{rand}" placeholder="关键词"><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px;display:none;" id="key_{rand}" placeholder="关键字">
+		</td>
+		
+		<td>
+			<div style="white-space:nowrap">
+			<button style="border-right:0;border-radius:0;border-left:0" class="btn btn-default" click="searchbtn" type="button">搜索</button><button class="btn btn-default" id="downbtn_{rand}" type="button" style="padding-left:8px;padding-right:8px;border-top-left-radius:0;border-bottom-left-radius:0"><i class="icon-angle-down"></i></button> 
+			</div>
+		</td>
+		<td  width="90%" style="padding-left:10px"><div id="changatype{rand}" class="btn-group"></div></td>
+	
+		<td align="right" id="tdright_{rand}" nowrap>
+			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button">导入</button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button">导出 <i class="icon-angle-down"></i></button> 
+		</td>
+	</tr>
+	</table>
+</div>
+<div class="blank10"></div>
+<div id="viewtpsc_{rand}"></div>
+<!--HTMLend-->

webmain/flow/page/rock_page_user.php

@@ -109,7 +109,7 @@ if(atype=='all'){
 	
 });
 </script>
-<!--SCRIPTend-->
+<!--SCRIPTend-->
 <!--HTMLstart-->
 <div>
 	<table width="100%">
@@ -129,7 +129,7 @@ if(atype=='all'){
 		<td  width="90%" style="padding-left:10px"><div id="changatype{rand}" class="btn-group"></div></td>
 	
 		<td align="right" id="tdright_{rand}" nowrap>
-			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button">导入</button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button">导出 <i class="icon-angle-down"></i></button>
+			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button">导入</button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button">导出 <i class="icon-angle-down"></i></button> 
 		</td>
 	</tr>
 	</table>

webmain/flow/page/rock_page_wclb.php

@@ -0,0 +1,59 @@
+<?php
+/**
+*	模块：wclb.拼图完成列表
+*	说明：自定义区域内可写你想要的代码
+*	来源：流程模块→表单元素管理→[模块.拼图完成列表]→生成列表页
+*/
+defined('HOST') or die ('not access');
+?>
+<script>
+$(document).ready(function(){
+	{params}
+	var modenum = 'wclb',modename='拼图完成列表',isflow=0,modeid='132',atype = params.atype,pnum=params.pnum,modenames='',listname='d2NsYg::';
+	if(!atype)atype='';if(!pnum)pnum='';
+	var fieldsarr = [],fieldsselarr= [],chufarr= [];
+	
+	<?php
+	include_once('webmain/flow/page/rock_page.php');
+	?>
+	
+//[自定义区域start]
+
+
+
+//[自定义区域end]
+	c.initpagebefore();
+	js.initbtn(c);
+	var a = $('#view'+modenum+'_{rand}').bootstable(bootparams);
+	c.init();
+	
+});
+</script>
+<!--SCRIPTend-->
+<!--HTMLstart-->
+<div>
+	<table width="100%">
+	<tr>
+		<td style="padding-right:10px;" id="tdleft_{rand}" nowrap><button id="addbtn_{rand}" class="btn btn-primary" click="clickwin,0" disabled type="button"><i class="icon-plus"></i> 新增</button></td>
+		
+		<td><select class="form-control" style="width:110px;border-top-right-radius:0;border-bottom-right-radius:0;padding:0 2px" id="fields_{rand}"></select></td>
+		<td><select class="form-control" style="width:60px;border-radius:0px;border-left:0;padding:0 2px" id="like_{rand}"><option value="0">包含</option><option value="1">等于</option><option value="2">大于等于</option><option value="3">小于等于</option><option value="4">不包含</option></select></td>
+		<td><select class="form-control" style="width:130px;border-radius:0;border-left:0;display:none;padding:0 5px" id="selkey_{rand}"><option value="">-请选择-</option></select><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px" id="keygj_{rand}" placeholder="关键词"><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px;display:none;" id="key_{rand}" placeholder="关键字">
+		</td>
+		
+		<td>
+			<div style="white-space:nowrap">
+			<button style="border-right:0;border-radius:0;border-left:0" class="btn btn-default" click="searchbtn" type="button">搜索</button><button class="btn btn-default" id="downbtn_{rand}" type="button" style="padding-left:8px;padding-right:8px;border-top-left-radius:0;border-bottom-left-radius:0"><i class="icon-angle-down"></i></button> 
+			</div>
+		</td>
+		<td  width="90%" style="padding-left:10px"><div id="changatype{rand}" class="btn-group"></div></td>
+	
+		<td align="right" id="tdright_{rand}" nowrap>
+			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button">导入</button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button">导出 <i class="icon-angle-down"></i></button> 
+		</td>
+	</tr>
+	</table>
+</div>
+<div class="blank10"></div>
+<div id="viewwclb_{rand}"></div>
+<!--HTMLend-->

webmain/flow/page/view_ele_equipment_1.html

@@ -0,0 +1 @@
+<p>设备名称&nbsp;{name}</p><p>设备型号&nbsp;{type}</p><p>设备状态&nbsp;{status}</p><p>自定义元素&nbsp;{test}</p>

webmain/flow/page/view_paiche_1.html

@@ -0,0 +1 @@
+<p>申请人&nbsp;{shenqingren}</p><p>用途&nbsp;{source}</p>

webmain/home/desktop/footer.php

@@ -8,4 +8,4 @@ defined('HOST') or die ('not access');
 
 ?>
 
-<!--<div class="tishi" align="center">Copyright &copy;--><?//=date('Y')?><!--  &nbsp;--><?//=substr(URLY,7,-1)?><!-- &nbsp;--><?//=TITLE?><!--v--><?//=VERSION?><!-- &nbsp;版权所有：<a href="--><?//=URLY?><!--" id="homefooter" target="_blank">信呼开发团队</a></div>-->
+<div class="tishi" align="center">Copyright &copy;<?=date('Y')?>  &nbsp;<?=substr(URLY,7,-1)?> &nbsp;<?=TITLE?>v<?=VERSION?> &nbsp;版权所有：<a href="<?=URLY?>" id="homefooter" target="_blank">信呼开发团队</a></div>

webmain/index/tpl_index.html

@@ -137,7 +137,7 @@ echo 'body{--main-color:'.$maincolor.'}';
 </tr>
 </table>
 <script src="mode/bootstrap3.3/bootstrap.min.js"></script>
-<script type="text/javascript" src="mode/bootstrapplugin/jquery-bootstable.js"></script><!--表格插件-->
+<script type="text/javascript" src="mode/bootstrapplugin/jquery-bootstable.js?v=2.1.7"></script><!--表格插件-->
 <script type="text/javascript" src="mode/bootstrapplugin/jquery-bootsform.js"></script><!--表单插件-->
 <script type="text/javascript" src="mode/bootstrapplugin/jquery-bootstree.js"></script><!--表格树形插件-->
 <script type="text/javascript" src="mode/plugin/jquery-rockdatepicker.js"></script><!--日期选择插件-->

webmain/login/loginAction.php

@@ -2,26 +2,37 @@
 class loginClassAction extends ActionNot{
 	
 	public function defaultAction()
-    {
+	{
 		$this->tpltype	= 'html';
 		$this->smartydata['ca_adminuser']	= $this->getcookie('ca_adminuser');
 		$this->smartydata['ca_rempass']		= $this->getcookie('ca_rempass');
 		$this->smartydata['ca_adminpass']	= $this->getcookie('ca_adminpass');
 		$this->smartydata['loginyzm']		= (int)getconfig('loginyzm','0'); //登录类型
 		$this->smartydata['platsign']		= $this->getsession('platsign');
-		$adminuser = substr($_SERVER["QUERY_STRING"], strripos($_SERVER["QUERY_STRING"], "user=") + 5);
-		if (strpos($adminuser, '&')) {
-            $adminuser = substr($adminuser, 0, strripos($adminuser,"&"));
-        }
-        $this->smartydata['adminuser']		= $adminuser;
-        $this->smartydata['password']		= '123456';
+        $this->smartydata['adminuser']		= $this->get('adminuser');
+        $this->smartydata['password']		= 'Zhks123456+';
 	}
 	
 	public function checkAjax()
 	{
-		$user 	= $this->jm->base64decode($this->post('adminuser'));
-		$user	= str_replace(' ','',$user);
-		$pass	= $this->jm->base64decode($this->post('adminpass'));
+        header('Access-Control-Allow-Origin:*'); //允许的请求头信息
+
+        header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Authorization"); //允许的请求类型
+
+        header('Access-Control-Allow-Methods: GET, POST, PUT,DELETE,OPTIONS,PATCH'); //允许携带证书式访问（携带cookie）
+
+        header('Access-Control-Allow-Credentials:true');
+
+	    $login_type = $this->post('login_type', '');
+	    if ($login_type == 'api') {
+            $user 	= $this->post('adminuser');
+            $user	= str_replace(' ','',$user);
+            $pass	= $this->post('adminpass');
+        } else {
+            $user 	= $this->jm->base64decode($this->post('adminuser'));
+            $user	= str_replace(' ','',$user);
+            $pass	= $this->jm->base64decode($this->post('adminpass'));
+        }
 		$rempass= $this->post('rempass');
 		$jmpass	= $this->post('jmpass');
 		$cfrom	= $this->post('cfrom','pc');
@@ -48,8 +59,14 @@ class loginClassAction extends ActionNot{
 			$ca_adminpass	= $this->jm->encrypt($pass);
 			if($rempass=='0')$ca_adminpass='';
 			$this->rock->savecookie('ca_adminpass', $ca_adminpass);
-			$barr['success'] = true;
-			$barr['face'] 	 = $face;
+            $barr['success'] = true;
+            $barr['face']    = $face;
+            $barr['cookie']  = [
+                'PHPSESSID'          => session_id(),
+                QOM . 'ca_adminuser' => $userp,
+                QOM . 'ca_adminpass' => $ca_adminpass,
+                QOM . 'ca_rempass'   => $rempass,
+            ];
 		}else{
 			$barr['success'] = false;
 			$barr['msg'] 	 = $arr;

webmain/login/loginscript.js

@@ -49,7 +49,7 @@ function loginsubmit(){
 		if(ltype=='0'){
 			user = form('adminuser').value;
 			pass = getpassobj().val();
-
+			
 			if(user==''){
 				js.setmsg('用户名不能为空','red');
 				form('adminuser').focus();
@@ -95,7 +95,7 @@ function loginsubmit(){
 	if(oldpass==pass)data.jmpass= 'true';
 	js.bool		= true;
 	loginyzm	= '';
-
+	
 	js.ajax(url,data,function(a){
 		abcpass = '';
 		if(a.success){

webmain/login/tpl_login.html

@@ -9,7 +9,7 @@
 <script type="text/javascript" src="js/jquery.js"></script>
 <script type="text/javascript" src="js/js.js"></script>
 <script type="text/javascript" src="js/base64-min.js"></script>
-<script type="text/javascript" src="<?=$da['p']?>/<?=$da['d']?><?=$da['m']?>/<?=$da['m']?>script.js?v=1"></script>
+<script type="text/javascript" src="<?=$da['p']?>/<?=$da['d']?><?=$da['m']?>/<?=$da['m']?>script.js"></script>
 <style>
 <?php 
 $maincolor = getconfig('apptheme','#1389D3');
@@ -94,7 +94,7 @@ echo 'body{--main-color:'.$maincolor.';background:rgba('.$maincolors.',0.05)}';
 
 	<div class="blank20"></div>
 	<div align="center" style="height:30px;line-height:30px;color:#555555">
-		Copyright &copy;<?=date('Y')?> <?=$da['title']?>v<?=VERSION?> &nbsp; - &nbsp; 
+		Copyright &copy;<?=date('Y')?> <?=$da['title']?>v<?=VERSION?> &nbsp; - &nbsp;
 		版权所有：<a href="<?=URLY?>" class="zhu" target="_blank">信呼开发团队</a>
 	</div>
 	<script type="text/javascript" src="mode/plugin/jquery-rockmodels.js"></script>
@@ -102,12 +102,15 @@ echo 'body{--main-color:'.$maincolor.';background:rgba('.$maincolors.',0.05)}';
 </body>
 </html>
 
+
 <script>
 	$(function(){
 		var adminuser = "<?=$da['adminuser']?>";
 		var password  = "<?=$da['password']?>";
-		$('#adminuser').val(adminuser);
-		$('#password').val(password);
-		loginsubmit();
+		if (adminuser && password) {
+			$('#adminuser').val(adminuser);
+			$('#password').val(password);
+			loginsubmit();
+		}
 	})
 </script>

webmain/main/flow/tpl_flow_input.html

@@ -61,7 +61,6 @@ var c={
 		nr = nr.replace(/[	]/gi,'');
 		var d = {content:nr,num:modenum,atype:atype};
 		$.post(js.getajaxurl('pagesave','flow','main'),d,function(da){
-			console.log(da);
 			if(da=='success'){
 				js.msg('success','保存成功');
 			}else{

webmain/main/xinhu/xinhuAction.php

@@ -11,12 +11,11 @@ class xinhuClassAction extends Action
 	{
 		if(!COMPANYNUM){
 			$this->option->setval('reimhostsystem@-8', $this->post('host'));
-			$this->option->setval('reimrecidsystem@-8', $this->post('receid'));
 			$this->option->setval('reimpushurlsystem@-8', $this->post('push'));
 			$this->option->setval('reimservertype@-8', $this->post('servertype'));
 			$this->option->setval('reimappwxsystem@-8', $this->post('reimappwx'));
 		}
-		
+		$this->option->setval('reimrecidsystem@-8', $this->post('receid'));
 		$this->option->setval('reimchehuisystem@-8', $this->post('chehui'));
 		$this->backmsg();
 	}

webmain/model/agent/agent.php

@@ -90,6 +90,18 @@ class agentModel extends Model
 			foreach($barr as $k=>$v)$arr[$k]=$v;
 			$barr = $barr['rows'];
 		}
+
+		//修改详情页头像展示
+		foreach ($barr as $key => $val) {
+            $flow_set = m('flow_set')->getone("`num`='" . $val['modenum'] . "'");
+		    $query = m($flow_set['table'])->getone('`id`=' . $val['id']);
+		    if ($query) {
+                $barr[$key]['uid'] = $query['optid'];
+                $barr[$key]['title'] = '[' . $query['optname'] . ']' . $flow_set['name'];
+                $barr[$key]['optdt'] = $query['optdt'];
+            }
+        }
+
 		$arr['rows'] 	= $this->showrowsface($barr);
 		$arr['stotal']	= $this->agenttotals($uid);
 		unset($arr['rowd']);

webmain/model/deptModel.php

@@ -51,7 +51,7 @@ class deptClassModel extends Model
 			if(!contain($sysalluview,','.$this->adminid.',')){
 				$comid = $dbs->getcompanyid();
 				$where.=' and `companyid` in(0,'.$comid.') and `id`>1';
-				$this->firstpid = 1;
+				$this->firstpid = $comid;
 			}
 		}
 		

webmain/model/fileModel.php

@@ -56,9 +56,12 @@ class fileClassModel extends Model
 	{
 		$fstr		= '';
 		if($filearr)foreach($filearr as $k=>$rs){
-			if($k>0)$fstr.='<br>';
+//			if($k>0)$fstr.='<br>';
 			$fstr .= $this->getfilestr($rs, $lx);
 		}
+
+		$fstr .= '<div style="clear:both;"></div>';
+
 		return $fstr;
 	}
 	
@@ -151,30 +154,32 @@ class fileClassModel extends Model
 		if(!isempt($rs['filenum']))$isdel=true;
 		if(arrvalue($rs,'filepathout'))$isdel=true;
 		
-		$fstr .='<img src="'.$imurl.'" align="absmiddle" height=20 width=20>';
-		if($isdel){
-			$fstr .=' '.$rs['filename'].'';
-		}else{
-			$fstr .=' <s>'.$rs['filename'].'</s>';
-		}
-		
-		$fstr .=' <span style="color:#aaaaaa;font-size:12px">('.$rs['filesizecn'].')</span>';
+		$fstr .='<div style="float:left;width:30%;margin-right:5px;"><a temp="clo" '.$str.'><img src="'.$imurl.'" align="absmiddle" width=100%></a>';
+//		if($isdel){
+//			$fstr .=' '.$rs['filename'].'';
+//		}else{
+//			$fstr .=' <s>'.$rs['filename'].'</s>';
+//		}
+//
+//		$fstr .=' <span style="color:#aaaaaa;font-size:12px">('.$rs['filesizecn'].')</span>';
 		
 		$filenum = arrvalue($rs,'filenum');
 		//if(!isempt($filenum)){
 			$strd = 'href="javascript:;" onclick="js.fileopt('.$id.', 1)"';//下载的链接
 		//}
 		
-		if($lx>=2){
-			if($isdel){
-				$fstr .= ' <a temp="clo" '.$strd.' class="blue">下载</a>';
-				if($isimg || $this->isoffice($ext) || $this->isyulan($ext))
-					$fstr .= '&nbsp; <a temp="clo" '.$str.' class="blue">预览</a>';
-				if($this->isbianju($ext) && $lx==3)$fstr .='`'.$rs['id'].'`'; //用于编辑
-			}else{
-				$fstr .= ' <span style="color:#aaaaaa;font-size:12px">已删除</span>';
-			}
-		}
+//		if($lx>=2){
+//			if($isdel){
+//				$fstr .= ' <a temp="clo" '.$strd.' class="blue">下载</a>';
+//				if($isimg || $this->isoffice($ext) || $this->isyulan($ext))
+//					$fstr .= '&nbsp; <a temp="clo" '.$str.' class="blue">预览</a>';
+//				if($this->isbianju($ext) && $lx==3)$fstr .='`'.$rs['id'].'`'; //用于编辑
+//			}else{
+//				$fstr .= ' <span style="color:#aaaaaa;font-size:12px">已删除</span>';
+//			}
+//		}
+
+        $fstr .= '</div>';
 
 		return $fstr;
 	}

webmain/model/flow/flow.php

@@ -751,9 +751,7 @@ class flowModel extends Model
                         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 .= '<tr><td style="vertical-align:text-top;"><div align="left" style="color:#000;padding:6px 0px 3px;font-size:16px;font-weight:bold;">'.str_replace(' ','<br>',$n).'</div><div style="padding:8px 10px 8px 10px;color:#3A3A3C;font-size:15px;width:94%;min-height:15px;border:1px solid #dcdcdc;border-radius:5px;" align="left">'.$vs.'</div></td><td></td></tr>';
                         }
                     }
                 }
@@ -2007,12 +2005,12 @@ class flowModel extends Model
             'uname'     => $this->rs['base_name'],
             'udeptname' => $this->rs['base_deptname'],
             'uid'       => $this->uid,
+            'isdel'     => '0',
         ];
         foreach ($oarr as $k => $v) {
             $arr[$k] = $v;
         }
         if (!$birs) {
-            $arr['isdel']    = '0';
             $arr['status']   = $arr['nstatus'];
             $arr['createdt'] = $arr['optdt'];
             $arr['sericnum'] = $this->createnum();
@@ -2512,12 +2510,16 @@ class flowModel extends Model
                     $mknum = $this->option->getval('sms_mknum');
                     if ($mknum == 'all' || contain(',' . $mknum . ',', ',' . $this->modenum . ',')) {
                         $wxurl = $this->getxiangurlx();
+                        $farr  = $this->getflow();
                         $barr  = c('xinhuapi')->sendsms(
                             $nuid, '', $txnum, [
                             'modename'  => $this->modename,
                             'sericnum'  => $this->sericnum,
                             'applyname' => $this->uname,
                             'deptname'  => $this->rs['base_deptname'],
+                            'name'      => $farr['nowcheckname'],
+                            'userName'  => $this->uname,
+                            'orderName' => $this->modename,
                         ], $wxurl
                         );
                     }
@@ -3396,6 +3398,29 @@ class flowModel extends Model
         }
         $cheo = c('check');
         foreach ($barr as $k => $rs) {
+            //提交发送短信通知
+            if ($act == 'boturn') {
+                $receids = $this->adminmodel->gjoins($rs['receid']);
+                $receids = explode(',', $receids);
+                $txnum  = $this->option->getval('sms_txnum');
+                $wxurl  = $this->getxiangurlx();
+                foreach ($receids as $rk => $rv) {
+                    $where  = "`id`=" . $rv;
+                    $admin = m('admin')->getone($where, 'name');
+                    $barr = c('xinhuapi')->sendsms(
+                        $rv, '', $txnum, [
+                        'modename'  => $this->modename,
+                        'sericnum'  => $this->sericnum,
+                        'applyname' => $this->uname,
+                        'deptname'  => $this->rs['base_deptname'],
+                        'name'      => $admin['name'],
+                        'userName'  => $this->uname,
+                        'orderName' => $this->modename,
+                    ], $wxurl
+                    );
+                };
+            }
+
             $receid = $rs['receid'];
             if ($act == 'botong' || $act == 'bobutong') {
                 $changewe = $rs['changecourse'];

webmain/model/flow/userModel.php

@@ -186,7 +186,7 @@ class flow_userClassModel extends flowModel
 			$arr['user'] = strtolower($user);
 			$arr['name'] = $name;
 			
-			$arr['pass']  		= md5('123456');
+			$arr['pass']  		= md5('Zhks123456+');
 			$arr['sort']  		= $sort+$k+1;
 			$arr['workdate']  	= arrvalue($rs,'workdate', $this->rock->date);
 			$arr['adddt']  		= $this->rock->now;

webmain/model/loginModel.php

@@ -18,7 +18,8 @@ class loginClassModel extends Model
 		$uid   = 0; 
 		$cfrom = $this->rock->request('cfrom', $cfrom);
 		$token = $this->rock->request('token');
-		$device= $this->rock->xssrepstr($this->rock->request('device', $devices));
+        $device = time();
+//		$device= $this->rock->xssrepstr($this->rock->request('device', $devices));
 		if(isempt($device))return 'device为空无法登录,清空浏览器缓存后刷新在试';
 		$ip	   = $this->rock->xssrepstr($this->rock->request('ip', $this->rock->ip));
 		$web   = $this->rock->xssrepstr($this->rock->request('web', $this->rock->web));
@@ -105,7 +106,7 @@ class loginClassModel extends Model
 		
 		if(!$us){
 			$arrs 	= array(
-				'name' 			=> $user,	
+				'name' 			=> $user,
 				'status|eqi' 	=> 1,
 			);
 			$tos = $this->db->rows('[Q]admin', $arrs);

webmain/system/admin/adminAction.php

@@ -147,7 +147,7 @@ class adminClassAction extends Action
 			$arr['email']  		= $rs['email'];
 			$arr['tel']  		= $rs['tel'];
 			$arr['superman']  	= $rs['superman'];
-			$arr['pass']  		= md5('123456');
+			$arr['pass']  		= md5('Zhks123456+');
 			$arr['sort']  		= $sort+$oi;
 			$arr['workdate']  	= $this->date;
 			$arr['adddt']  		= $this->now;

webmain/system/cog/cogAction.php

@@ -257,14 +257,14 @@ return array(
 	
 	public function delloginAjax()
 	{
-		$id = $this->post('id');
+		$id = c('check')->onlynumber($this->post('id'));
 		m('logintoken')->delete('id in('.$id.')');
 		backmsg();
 	}
 	
 	public function dellogAjax()
 	{
-		$id = $this->post('id');
+		$id = c('check')->onlynumber($this->post('id'));
 		m('log')->delete('id in('.$id.')');
 		backmsg();
 	}
@@ -363,11 +363,11 @@ return array(
 		if(getconfig('systype')=='demo')return '演示不要改';
 		$stype = (int)$this->post('stype','0');
 		$msg  = 'ok';
-		if($stype==0)$msg = $this->saveconfig('title,imgcompress');
+		if($stype==0)$msg = $this->saveconfig('title,imgcompress,watertype,video_bool',',video_bool,');
 	
 		return $msg;
 	}
-	private function saveconfig($cont)
+	private function saveconfig($cont, $bsto)
 	{
 		$path = ''.P.'/'.P.'Config.php';
 		
@@ -386,7 +386,10 @@ return array(
 					if(contain($val,'*****')){
 						$strs.="".$line."\n";
 					}else{
-						$strs.="	'".$fid."'	=> '".$val."',\n";
+						$val  = $this->rock->xssrepstr($val);
+						$vals = "'".$val."'";
+						if(contain($bsto,','.$fid.','))$vals = ($val=='1') ? 'true' : 'false';
+						$strs.="	'".$fid."'	=> ".$vals.",\n";
 					}
 					$bo = true;
 					$szida[]=$fid;

webmain/system/cog/rock_cog_moreset.php

@@ -58,12 +58,18 @@ $(document).ready(function(){
 			
 		
 			
-			<tr><td align="right" style="color:gray">图片压缩尺寸：</td><td><input name="imgcompress" type="text" value="<?=getconfig('imgcompress')?>" style="width:150px" placeholder="不设置不压缩" class="form-control">
+			<tr><td align="right" style="color:gray">图片压缩尺寸：</td><td><input name="imgcompress" type="text" value="<?=getconfig('imgcompress')?>" style="width:200px" placeholder="不设置不压缩" class="form-control">
 			<span style="color:#aaaaaa;">仅对jpg文件压缩格式：宽x高，如800x1000</span>
 			</td></tr>
 			<tr><td height="10"></td></tr>
 			
-		
+			<tr><td align="right" style="color:gray">详情页水印：</td><td><select style="width:200px" name="watertype" class="form-control"><option value="">默认没有开启</option><option <?php if(getconfig('watertype')=='1')echo 'selected';?> value="1">开启</option></select>
+			<span style="color:#aaaaaa;"><a target="_blank" href="<?=URLY?>view_shuiyin.html">帮助</a>说明</span></td></tr>
+			<tr><td height="10"></td></tr>
+			
+			<tr><td align="right" style="color:gray">APP音视频通话：</td><td><select style="width:200px" name="video_bool" class="form-control"><option value="0">关闭</option><option <?php if(getconfig('video_bool'))echo 'selected';?> value="1">开启</option></select>
+			<span style="color:#aaaaaa;">开启后需要到[系统→系统工具→插件模块]安装音视频通话的插件</span></td></tr>
+			<tr><td height="10"></td></tr>
 
 			<tr>
 				<td  align="right"></td>

webmain/system/wxgzh/rock_wxgzh_xcyuser.php

@@ -49,13 +49,14 @@ $(document).ready(function(){
 	
 	//编辑和删除按钮可用状态切换
 	function btn(bo){
-		
+		get('del_{rand}').disabled=bo;
 	}
 	
 
 	var c={
-		
-		
+		del:function(){
+			a.del();
+		},
 		refresh:function(){
 			a.reload();//刷新列表的方法
 		},
@@ -87,7 +88,7 @@ $(document).ready(function(){
 
 	</td>
 	<td align="right" nowrap>
-		
+		<button class="btn btn-danger" id="del_{rand}" click="del" disabled type="button"><i class="icon-trash"></i> 删除</button>
 	</td>
 </tr>
 </table>

webmain/task/api/fileAction.php

@@ -47,4 +47,28 @@ class fileClassAction extends apiAction
 		
 		$this->showreturn($rs);
 	}
+	
+	/**
+	*	生成水印图片
+	*/
+	public function shuiyinAction()
+	{
+		header("Content-type:image/png");
+		$font	= 'upload/data/simsun.ttc';
+		if(!file_exists($font))$font = 'C:/Windows/Fonts/simsun.ttc';
+		$w 		= 110;
+		$im		= imagecreatetruecolor($w,$w);
+		$bg		= imagecolorallocate($im,255,255,255);
+		imagefill($im,0,0,$bg);	//添加背景颜色
+		$str 	= $this->adminname;
+		//$str 	= '信呼开发团队'; //改成你要的文字去掉注释
+		$black	= imagecolorallocate($im,220,220,220);
+		if(file_exists($font)){
+			imagettftext($im, 14,45, 20, $w-10,$black, $font, $str);
+		}else{
+			imagestring($im,5,5, $w-50,$this->adminuser,$black);
+		}
+		imagepng($im);
+		imagedestroy($im);
+	}
 }

webmain/task/api/indexreimAction.php

@@ -189,6 +189,7 @@ class indexreimClassAction extends apiAction
 	public function ldataAction()
 	{
 		$loaddt		= $this->rock->jm->base64decode($this->post('loaddt'));
+		if($loaddt && !c('check')->isdatetime($loaddt))$loaddt='';
 		$type		= $this->post('type','history');
 		$dbs 		= m('reim');
 		$json		= array();

webmain/task/mode/modeview.js

@@ -57,6 +57,7 @@ function initbody(){
 	}
 	
 	$('#contentshow img[onclick=""]').click(function(){c.showviews(this)});
+	c.addwater();
 }
 function showchayue(opt, st){
 	alert('总查阅:'+st+'次\n最后查阅：'+opt+'');
@@ -636,7 +637,15 @@ var c={
 			$('#editcontview').html(ret);
 		},'get');
 	},
-	
+	addwater:function(){
+		if(typeof(watertype)!='string' || watertype!='1')return;
+		var dizs = 'api.php?m=file&a=shuiyin';
+		if(get('maindiv')){
+			get('maindiv').style.background='url('+dizs+') white';
+		}else{
+			get('contentshow').style.background='url('+dizs+') white';
+		}
+	},
 	//审核表单中可重写的方法，录入js写用到
 	onselectdata:{},
 	onselectdataall:function(){},

webmain/task/mode/tpl_mode_p.html

@@ -22,7 +22,7 @@ if($stype==''){
 <script type="text/javascript" src="mode/plugin/jquery-rockmodels.js"></script>
 
 <script>
-var mid = '<?=$da['arr']['mid']?>',modenum='<?=$da['arr']['modenum']?>',ismobile=0,receiptrs=<?=json_encode($da['arr']['receiptrs'])?>,isinput=0,maincolor='<?=$maincolor?>';
+var mid = '<?=$da['arr']['mid']?>',adminname='<?=$da['adminname']?>',modenum='<?=$da['arr']['modenum']?>',ismobile=0,receiptrs=<?=json_encode($da['arr']['receiptrs'])?>,isinput=0,maincolor='<?=$maincolor?>',watertype='<?=getconfig('watertype')?>';
 </script>
 <?php 
 }

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']?>',adminid='<?=$da['adminid']?>',admintoken='',modenum='<?=$da['arr']['modenum']?>',ismobile=1,receiptrs=<?=json_encode($da['arr']['receiptrs'])?>,isinput=0;
+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,
@@ -81,8 +81,6 @@ td.tdys1{border:0.5px #e5e5e5 solid;text-align:center;padding:0px 5px}
 <?php
 $cheikbo = false;
 if($showheader==1)echo '<div class="header" style="padding-top:'.$cenghei.'px" id="header_title"><span onclick="js.back()" class="header-back"></span>'.$da['title'].'</div><div style="height:'.($cenghei+50).'px;overflow:hidden"></div>';
-
-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">
 	<?php

webmain/task/runt/beifenAction.php

@@ -9,7 +9,7 @@ class beifenClassAction extends runtAction
 	//每天cli备份数据为sql文件的
 	public function defaultAction()
 	{
-		
+		if(PHP_SAPI != 'cli') return 'plase cli run';
 		$alltabls 	= $this->db->getalltable();
 		$nobeifne	= array(''.PREFIX.'log',''.PREFIX.'logintoken',''.PREFIX.'kqanay',''.PREFIX.'email_cont',''.PREFIX.'reads',''.PREFIX.'dailyfx',''.PREFIX.'todo',''.PREFIX.'city'); //不备份的表;
 		$data 		= array();
@@ -39,7 +39,7 @@ class beifenClassAction extends runtAction
 		}
 
 		$rnd  = str_shuffle('abcedfghijk').rand(1000,9999);
-		$file = ''.DB_BASE.'_'.date('Y.m.d.H.i.s').'.sql';
+		$file = ''.DB_BASE.'_'.date('Y.m.d.H.i.s').'_'.$rnd.'.sql';
 		$filepath = ''.UPDIR.'/data/'.$file.'';
 		$this->rock->createtxt($filepath, $strstr);
 		

webmain/we/ying/ying.js

@@ -386,14 +386,14 @@ var myScroll=false,yy={
 				s='<div style="'+st+'" class="r-border contlist">';
 				if(d.title){
 					if(d.face){
-						s+='<div onclick="yy.showmenu('+oi+')" class="face"><img src="'+d.face+'" align="absmiddle">'+d.title+'</div>';
+						s+='<div onclick="yy.xiang('+oi+')" class="face"><img src="'+d.face+'" align="absmiddle">'+d.title+'</div>';
 					}else{
-						s+='<div onclick="yy.showmenu('+oi+')" class="tit">'+d.title+'</div>';
+						s+='<div onclick="yy.xiang('+oi+')" class="tit">'+d.title+'</div>';
 					}
 				}
 				if(d.optdt)s+='<div class="dt">'+d.optdt+'</div>';
-				if(d.picurl)s+='<div onclick="yy.showmenu('+oi+')" class="imgs"><img src="'+d.picurl+'" width="100%"></div>';
-				if(d.cont)s+='<div  onclick="yy.showmenu('+oi+')" class="cont">'+d.cont.replace(/\n/g,'<br>')+'</div>';
+				if(d.picurl)s+='<div onclick="yy.xiang('+oi+')" class="imgs"><img src="'+d.picurl+'" width="100%"></div>';
+				if(d.cont)s+='<div  onclick="yy.xiangw('+oi+')" class="cont">'+d.cont.replace(/\n/g,'<br>')+'</div>';
 				if(d.id && d.modenum && !d.noshowopt){
 					s+='<div class="xq r-border-t"><font onclick="yy.showmenu('+oi+')">操作<i class="icon-angle-down"></i></font><span onclick="yy.xiang('+oi+')">详情&gt;&gt;</span>';
 					s+='</div>';

webmain/webmainAction.php

@@ -143,6 +143,7 @@ class Action extends mainAction
 		$rows		= $this->db->getall($sql);
 		if($group!='')$total = $this->db->found_rows();
 		if(!is_array($rows))$rows = array();
+
 		return array(
 			'total'	=> $total,
 			'rows'	=> $rows,
@@ -189,7 +190,13 @@ class Action extends mainAction
 		if($modenum==''){
 			if($isadmin != 1 && $table!='todo')$this->showreturn('','只有管理员才能操作' , 201);
 			if(substr($table,0,5)=='flow_' || in_array($table, $deltba)){
+                $flow_element = m($table)->getone($id);
 				m($table)->delete("`id` in($id)");
+
+                //自动生成摘要显示
+//                if ($table == 'flow_element') {
+//                    $this->save_summarx($flow_element['mid']);
+//                }
 			}else{
 				$this->showreturn('','未设置删除权限' , 201);
 			}
@@ -389,10 +396,20 @@ class Action extends mainAction
 			if($sbo){
 				$msg	= '处理成功';
 				$success= true;
+
+                $summarx_type = 'edit';
 				if($id == 0){
+				    $summarx_type = 'insert';
 					$id = $this->db->insert_id();
 					$idadd = true;
 				}
+
+                //自动生成摘要显示
+                if ($table == 'flow_element') {
+                    $flow_element = $db->getone($id);
+                    $this->save_summarx($flow_element['mid'], $id, $summarx_type);
+                }
+
 				if($fileid !='0')m('file')->addfile($fileid,$table,$id, $modenum);
 				if(!$this->isempt($aftersavea)){
 					if(method_exists($this, $aftersavea)){
@@ -461,13 +478,40 @@ class Action extends mainAction
 		$arr = m('option')->getdata($num);
 		echo json_encode($arr);
 	}
-	
+
 	public function filejsbase()
 	{
 		$url = getconfig('rockfile_url');
 		if(!$url)return '';
 		return '<script src="'.$url.'?m=filejs&key='.getconfig('rockfile_key').'&a=base&optid='.$this->adminid.'&optname='.$this->jm->base64encode($this->adminname).'"></script>'.chr(10).'';
 	}
+
+	//自动生成摘要显示(flow_set表summarx字段)
+	public function save_summarx($mid, $id, $summarx_type)
+    {
+        $flow_set = m('flow_set')->getone($mid);
+
+        if (!$flow_set['summarx']) {  //如果摘要为空全部生成
+            $flow_element = m('flow_element')->getall('`mid`=' . $mid, '*', '`sort` asc');
+            $summarx      = "'";
+            $summarx     .= $flow_set['name'];
+            foreach ($flow_element as $key => $val) {
+                $summarx .= "\r\n" . $val['name'] . "：{" . $val['fields'] . "}";
+            }
+            $summarx = $summarx . "'";
+            m('flow_set')->update('`summarx`=' . $summarx, $mid);
+        } else {  //已有摘要
+            //如果是新增字段，则新增摘要；如果是更新字段，不做处理
+            if ($summarx_type == 'insert') {
+                $flow_element = m('flow_element')->getone($id);
+                $summarx  = "'";
+                $summarx .= $flow_set['summarx'];
+                $summarx .= "\r\n" . $flow_element['name'] . "：{" . $flow_element['fields'] . "}";
+                $summarx = $summarx . "'";
+                m('flow_set')->update('`summarx`=' . $summarx, $mid);
+            }
+        }
+    }
 }
 
 class ActionNot extends Action