发布v2.6.3版本

2024-05-04 17:53:06 +08:00
parent b0d1a233bd
commit 3048af398c
26 changed files with 176 additions and 56 deletions
--- a/README.md
+++ b/README.md
@@ -5,12 +5,12 @@
 公司团队：信呼开发团队  
 官网网站：http://www.rockoa.com/  
 源码仅供学习二次开发使用，禁止二次发布，禁止用于商业用途出售等(违者必究)  
-版权：Copyright @2016-2023 信呼开发团队  
-版本整理时间：2023-12-22 23:59:59  
-版本号：V2.6.2   
+版权：Copyright @2016-2024 信呼开发团队  
+版本整理时间：2024-05-05 23:59:59  
+版本号：V2.6.3  


-### V2.6.2更新说明
+### V2.6.3更新说明
 1、完善系统安全性。  
 2、更多升级日志详见：http://www.rockoa.com/view_core.html  

--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
-//版本2.6.2，2023-12-22
-return '2.6.2';
+//版本2.6.3，2024年
+return '2.6.3';
--- a/include/chajian/checkChajian.php
+++ b/include/chajian/checkChajian.php
@@ -119,4 +119,18 @@ class checkChajian extends Chajian{
 		$qian	= array(" ","　","\t","\n","\r");
 		return str_replace($qian, '', $str); 
 	}
+	
+	public function removeEmojiChar($str)
+	{
+		$mbLen  = mb_strlen($str);
+		$strArr = array();
+		for ($i = 0; $i < $mbLen; $i++) {
+			$mbSubstr = mb_substr($str, $i, 1, 'utf-8');
+			if (strlen($mbSubstr) >= 4) {
+				continue;
+			}
+			$strArr[] = $mbSubstr;
+		}
+		return implode('', $strArr);
+	}
 }
--- a/js/jswx.js
+++ b/js/jswx.js
@@ -338,7 +338,7 @@ function touchclass(cans){
 	this.ismobile=function(){
 		var llq = navigator.userAgent;
 		llq 	= llq.toLowerCase();
-		var sarr= ['micromessenger','android','mobile','iphone'],bo=false,i;
+		var sarr= ['android','mobile','iphone'],bo=false,i;
 		for(i=0;i<sarr.length;i++){
 			if(llq.indexOf(sarr[i])>-1){
 				bo=true;
--- a/js/reim_xina.js
+++ b/js/reim_xina.js
@@ -1106,7 +1106,11 @@ var reim={
 		var lx=d.lx;
 		if(lx=='sx'){
 			js.loading('刷新中...');
-			location.reload();
+			if(nwjsgui){
+				nwjs.reload();
+			}else{
+				location.reload();
+			}
 		}
 		if(lx=='exit'){
 			this.exitlogin();
@@ -1237,8 +1241,12 @@ var reim={

 		if(nwjsgui){
 			var ips = nwjs.getipmac();
+			var d = nw.process.versions;
+			var json = nw.App.manifest;
+			s+='<div style="padding:10px 0px;border-top:1px #eeeeee solid">开机启动：<button type="button" class="cursor" onclick="reim.kaijistart(0)">启动</button>&nbsp;<button type="button" class="cursor" onclick="reim.kaijistart(1)">删除</button>&nbsp;<button type="button" class="cursor" onclick="reim.kaijistart(2)">快捷方式</button></div>';
 			s+='<div style="padding:10px 0px;border-top:1px #eeeeee solid">我局域网IP：'+ips.ip+'</div>';
 			s+='<div style="padding:10px 0px;border-top:1px #eeeeee solid">我的MAC地址：'+ips.mac+'</div>';
+			s+='<div style="padding:10px 0px;border-top:1px #eeeeee solid">此客户端版本：V'+json.version+'，内核nwjs-'+d.nw+'</div>';
 		}
 		
 		s+='	<div style="padding:10px 0px;border-top:1px #eeeeee solid">网络IP：'+this.myip+'</div>';
@@ -1247,6 +1255,12 @@ var reim={
 		this.addtabs(num,s);
 		get('changesoundid').value=notifyobj.sound;
 	},
+	kaijistart:function(lx){
+		var dz = '加入开机启动.vbs';
+		if(lx==1)dz = '删除开机启动.vbs';
+		if(lx==2)dz = '创建桌面快捷方式.vbs';
+		nwjs.openfile(dz);
+	},
 	//内部服务处理
 	serverdata:function(a){
 		var lx = a.atype;
--- a/mode/bootstrapplugin/jquery-bootstable.js
+++ b/mode/bootstrapplugin/jquery-bootstable.js
@@ -882,10 +882,17 @@
 		
 		this._caozuochengs=function(a,oj){
 			a.renderer=function(v,d,oi){
-				var s='<a oi="'+oi+'" oj="'+oj+'" style="TEXT-DECORATION:none" temp="caozuomenu_'+rand+'">操作<i class="icon-angle-down"></i></a>';
+				var s='<a oi="'+oi+'" oj="'+oj+'" style="TEXT-DECORATION:none" temp="caozuomenu_'+rand+'">';
+				if(this.opttype){
+					s+=this.opttype;
+				}else{
+					s+='操作<i class="icon-angle-down"></i>';
+				}
+				s+='</a>';
 				if(!d.id)s='&nbsp;';
 				return s;
 			};
+			a.renderattr=function(){return 'nowrap'}
 			a.notexcel=true;
 			return a;
 		};
--- a/web/res/js/nwjs.js
+++ b/web/res/js/nwjs.js
@@ -94,6 +94,10 @@ var nwjs={
 		if(!this.execcmd)this.execcmd= require('child_process').exec;
 		this.execcmd(cmd);
 	},
+	openfile:function(path){
+		var ss = this.getpath()+'/'+path;
+		this.runcmd(ss);
+	},
 	openurl:function(url){
 		this.runcmd(''+this.getpath()+'/images/start.bat '+url+'');
 	},
@@ -118,6 +122,9 @@ var nwjs={
 		if(!bo)this.jumptime=setTimeout('nwjs.jumpicon('+oi+')',500);
 		if(bo)this.changeicon(this.wdshu);
 	},
+	reload:function(){
+		this.win.reloadIgnoringCache();
+	},
 	jumpclear:function(){
 		this.jumpicon(0,true);
 	},
--- a/webmain/flow/input/inputjs/input.js
+++ b/webmain/flow/input/inputjs/input.js
@@ -221,8 +221,8 @@ var c={
 		}
 		
 		if(sdtname && edename && d.startdt && d.enddt){
-			if(d.startdt>=d.enddt){
-				this.showtx(''+sdtname+'必须大于'+edename+'', 'enddt');
+			if(d.startdt>d.enddt){
+				this.showtx(''+edename+'必须大于等于'+sdtname+'', 'enddt');
 				return false;
 			}
 		}
--- a/webmain/flow/page/input_assetm.html
+++ b/webmain/flow/page/input_assetm.html
@@ -1 +1 @@
-<table width="100%" class="ke-zeroborder" bordercolor="#000000" border="0"><tbody><tr><td height="34" align="right" class="ys1">编号</td><td class="ys2">{num}</td><td align="right" class="ys1" rowspan="3">封面图片</td><td class="ys2" rowspan="3">{fengmian}<br /></td></tr><tr><td height="34" align="right" class="ys1">*资产分类</td><td class="ys2">{typeid}</td></tr><tr><td height="34" align="right" class="ys1">*名称</td><td class="ys2">{title}</td></tr><tr><td height="34" align="right" class="ys1">所在位置</td><td class="ys2">{address}</td><td align="right" class="ys1">品牌</td><td class="ys2">{brand}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">规格型号</td><td width="35%" class="ys2">{model}</td><td width="15%" align="right" class="ys1">使用者</td><td width="35%" class="ys2">{usename}</td></tr><tr><td height="34" align="right" class="ys1">*资产来源</td><td class="ys2">{laiyuan}</td><td align="right" class="ys1">*状态</td><td class="ys2">{state}</td></tr><tr><td height="34" align="right" class="ys1">购进日期</td><td class="ys2">{buydt}</td><td align="right" class="ys1">价格</td><td class="ys2">{price}</td></tr><tr><td height="34" align="right" class="ys1">说明</td><td class="ys2" colspan="3">{explain}</td></tr><tr><td height="34" align="right" class="ys1">相关文件</td><td class="ys2" colspan="3">{file_content}</td></tr></tbody></table>
+<table width="100%" class="ke-zeroborder" bordercolor="#000000" border="0"><tbody><tr><td height="34" align="right" class="ys1">编号</td><td class="ys2">{num}</td><td align="right" class="ys1" rowspan="3">封面图片</td><td class="ys2" rowspan="3">{fengmian}<br /></td></tr><tr><td height="34" align="right" class="ys1">*资产分类</td><td class="ys2">{typeid}</td></tr><tr><td height="34" align="right" class="ys1">*名称</td><td class="ys2">{title}</td></tr><tr><td height="34" align="right" class="ys1">所在位置</td><td class="ys2">{address}</td><td align="right" class="ys1">品牌</td><td class="ys2">{brand}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">规格型号</td><td width="35%" class="ys2">{model}</td><td width="15%" align="right" class="ys1">使用者</td><td width="35%" class="ys2">{usename}</td></tr><tr><td height="34" align="right" class="ys1">*资产来源</td><td class="ys2">{laiyuan}</td><td align="right" class="ys1">*状态</td><td class="ys2">{state}</td></tr><tr><td height="34" align="right" class="ys1">购进日期</td><td class="ys2">{buydt}</td><td align="right" class="ys1">价格</td><td class="ys2">{price}</td></tr><tr><td height="34" align="right" class="ys1">^zjshu^</td><td class="ys2">{zjshu}</td><td align="right" class="ys1">^zjstart^</td><td class="ys2">{zjstart}</td></tr><tr><td height="34" align="right" class="ys1">^zjcz^</td><td class="ys2">{zjcz}</td><td align="right" class="ys1"></td><td class="ys2"></td></tr><tr><td height="34" align="right" class="ys1">说明</td><td class="ys2" colspan="3">{explain}</td></tr><tr><td height="34" align="right" class="ys1">相关文件</td><td class="ys2" colspan="3">{file_content}</td></tr></tbody></table>
--- a/webmain/flow/page/input_flowset.html
+++ b/webmain/flow/page/input_flowset.html
@@ -1 +1 @@
-<br /><div><b>基本信息</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">*^type^</td><td width="35%" class="ys2">{type}</td><td height="34" width="15%" align="right" class="ys1">*^name^</td><td width="35%" class="ys2">{name}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">*^num^</td><td width="35%" class="ys2">{num}</td><td height="34" width="15%" align="right" class="ys1">*^table^</td><td width="35%" class="ys2">{table}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^where^</td><td width="35%" class="ys2">{where}</td><td height="34" width="15%" align="right" class="ys1">^tables^</td><td width="35%" class="ys2">{tables}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^sort^</td><td width="35%" class="ys2">{sort}</td><td height="34" width="15%" align="right" class="ys1">^names^</td><td width="35%" class="ys2">{names}</td></tr><tr><td height="34" align="right" class="ys1">*^recename^</td><td colspan="3" class="ys2">{recename}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^status^</td><td width="35%" class="ys2">{status}</td><td height="34" align="right" class="ys1"></td><td class="ys2"></td></tr></tbody></table><br /><div><b>流程</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">*^isflow^</td><td width="35%" class="ys2">{isflow}</td><td height="34" width="15%" align="right" class="ys1">^sericnum^</td><td width="35%" class="ys2">{sericnum}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">*^isflowlx^</td><td width="35%" class="ys2">{isflowlx}</td><td height="34" width="15%" align="right" class="ys1">^isys^</td><td width="35%" class="ys2">{isys}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^isbxs^</td><td width="35%" class="ys2">{isbxs}</td><td height="34" width="15%" align="right" class="ys1">*^iscs^</td><td width="35%" class="ys2">{iscs}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^zfeitime^</td><td width="35%" class="ys2">{zfeitime}</td><td height="34" align="right" class="ys1"></td><td class="ys2"></td></tr></tbody></table><br /><div><b>摘要设置</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" align="right" class="ys1">^summary^</td><td colspan="3" class="ys2">{summary}</td></tr><tr><td height="34" align="right" class="ys1">^summarx^</td><td colspan="3" class="ys2">{summarx}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^sortdir^</td><td width="35%" class="ys2">{sortdir}</td><td height="34" align="right" class="ys1"></td><td class="ys2"></td></tr></tbody></table><br /><div><b>提醒设置</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">^pctx^</td><td width="35%" class="ys2">{pctx}</td><td height="34" width="15%" align="right" class="ys1">^emtx^</td><td width="35%" class="ys2">{emtx}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^mctx^</td><td width="35%" class="ys2">{mctx}</td><td height="34" width="15%" align="right" class="ys1">^wxtx^</td><td width="35%" class="ys2">{wxtx}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^ddtx^</td><td width="35%" class="ys2">{ddtx}</td><td height="34" width="15%" align="right" class="ys1">^istxset^</td><td width="35%" class="ys2">{istxset}</td></tr></tbody></table><br /><div><b>详情显示</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">^isgbjl^</td><td width="35%" class="ys2">{isgbjl}</td><td height="34" width="15%" align="right" class="ys1">^isgbcy^</td><td width="35%" class="ys2">{isgbcy}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^ispl^</td><td width="35%" class="ys2">{ispl}</td><td height="34" align="right" class="ys1"></td><td class="ys2"></td></tr></tbody></table><br /><div><b>其他</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">^islu^</td><td width="35%" class="ys2">{islu}</td><td height="34" width="15%" align="right" class="ys1">^isup^</td><td width="35%" class="ys2">{isup}</td></tr><tr><td height="34" align="right" class="ys1">^statusstr^</td><td colspan="3" class="ys2">{statusstr}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^ishz^</td><td width="35%" class="ys2">{ishz}</td><td height="34" width="15%" align="right" class="ys1">^lbztxs^</td><td width="35%" class="ys2">{lbztxs}</td></tr></tbody></table>
+<br /><div><b>基本信息</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">*^type^</td><td width="35%" class="ys2">{type}</td><td height="34" width="15%" align="right" class="ys1">*^name^</td><td width="35%" class="ys2">{name}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">*^num^</td><td width="35%" class="ys2">{num}</td><td height="34" width="15%" align="right" class="ys1">*^table^</td><td width="35%" class="ys2">{table}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^where^</td><td width="35%" class="ys2">{where}</td><td height="34" width="15%" align="right" class="ys1">^tables^</td><td width="35%" class="ys2">{tables}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^sort^</td><td width="35%" class="ys2">{sort}</td><td height="34" width="15%" align="right" class="ys1">^names^</td><td width="35%" class="ys2">{names}</td></tr><tr><td height="34" align="right" class="ys1">*^recename^</td><td colspan="3" class="ys2">{recename}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^status^</td><td width="35%" class="ys2">{status}</td><td height="34" align="right" class="ys1">^isscl^</td><td class="ys2">{isscl}</td></tr></tbody></table><br /><div><b>流程</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">*^isflow^</td><td width="35%" class="ys2">{isflow}</td><td height="34" width="15%" align="right" class="ys1">^sericnum^</td><td width="35%" class="ys2">{sericnum}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">*^isflowlx^</td><td width="35%" class="ys2">{isflowlx}</td><td height="34" width="15%" align="right" class="ys1">^isys^</td><td width="35%" class="ys2">{isys}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^isbxs^</td><td width="35%" class="ys2">{isbxs}</td><td height="34" width="15%" align="right" class="ys1">*^iscs^</td><td width="35%" class="ys2">{iscs}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^zfeitime^</td><td width="35%" class="ys2">{zfeitime}</td><td height="34" align="right" class="ys1"></td><td class="ys2"></td></tr></tbody></table><br /><div><b>摘要设置</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" align="right" class="ys1">^summary^</td><td colspan="3" class="ys2">{summary}</td></tr><tr><td height="34" align="right" class="ys1">^summarx^</td><td colspan="3" class="ys2">{summarx}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^sortdir^</td><td width="35%" class="ys2">{sortdir}</td><td height="34" align="right" class="ys1"></td><td class="ys2"></td></tr></tbody></table><br /><div><b>提醒设置</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">^pctx^</td><td width="35%" class="ys2">{pctx}</td><td height="34" width="15%" align="right" class="ys1">^emtx^</td><td width="35%" class="ys2">{emtx}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^mctx^</td><td width="35%" class="ys2">{mctx}</td><td height="34" width="15%" align="right" class="ys1">^wxtx^</td><td width="35%" class="ys2">{wxtx}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^ddtx^</td><td width="35%" class="ys2">{ddtx}</td><td height="34" width="15%" align="right" class="ys1">^istxset^</td><td width="35%" class="ys2">{istxset}</td></tr></tbody></table><br /><div><b>详情显示</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">^isgbjl^</td><td width="35%" class="ys2">{isgbjl}</td><td height="34" width="15%" align="right" class="ys1">^isgbcy^</td><td width="35%" class="ys2">{isgbcy}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^ispl^</td><td width="35%" class="ys2">{ispl}</td><td height="34" align="right" class="ys1"></td><td class="ys2"></td></tr></tbody></table><br /><div><b>其他</b></div><table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">^islu^</td><td width="35%" class="ys2">{islu}</td><td height="34" width="15%" align="right" class="ys1">^isup^</td><td width="35%" class="ys2">{isup}</td></tr><tr><td height="34" align="right" class="ys1">^statusstr^</td><td colspan="3" class="ys2">{statusstr}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^ishz^</td><td width="35%" class="ys2">{ishz}</td><td height="34" width="15%" align="right" class="ys1">^lbztxs^</td><td width="35%" class="ys2">{lbztxs}</td></tr></tbody></table>
--- a/webmain/flow/page/rock_page.php
+++ b/webmain/flow/page/rock_page.php
@@ -1,6 +1,7 @@
 //<script>	
 	var c = {
 		optalign:'',
+		opttype:'',
 		reload:function(){
 			a.reload();
 		},
@@ -136,7 +137,8 @@
 			if(d.modeid)modeid = d.modeid;
 			if(modeid>101 && d.loadci==1 && (!d.atypearr || d.atypearr.length==0))js.confirm('<?=lang('notcolumns','base')?>',function(){window.open('<?=URLY?>view_columns.html')});
 			if(!d.atypearr)return;
-			get('addbtn_{rand}').disabled=(d.isadd!=true);
+			var addobj = get('addbtn_{rand}');
+			addobj.disabled=(d.isadd!=true);
 			get('daobtn_{rand}').disabled=(d.isdaochu!=true);
 			if(d.isdaochu)$('#daobtn_{rand}').show();
 			if(d.isdaoru)$('#daoruspan_{rand}').show();
@@ -147,6 +149,13 @@
 			$('#changatype{rand}').html(str);
 			$('#changatype{rand}_'+atype+'').addClass('active');
 			js.initbtn(c);
+			if(d.isadd){
+				addobj.title = '<?=lang('右键可新窗口打开新增')?>';
+				$(addobj).on('contextmenu', function(e) {
+					e.preventDefault();
+					js.open('?a=lu&m=input&d=flow&num='+modenum+'&callback=opegs{rand}',950,500);
+				});
+			}
 		},
 		setdownsodata:function(darr){
 			var ddata = [{name:'<?=lang('高级搜索')?>',lx:0}],dsd,i;
@@ -226,7 +235,7 @@
 			}
 			if(isflow>0)d.push({text:'<?=lang('流程')?><?=lang('状态')?>',dataIndex:'statustext'});
 			if(nstr=='' || nstr.indexOf(',caozuo,')>=0){
-				d1 = {text:'',dataIndex:'caozuo',callback:'opegs{rand}'};
+				d1 = {text:'',opttype:this.opttype,dataIndex:'caozuo',callback:'opegs{rand}'};
 				(this.optalign=='left')?d.unshift(d1):d.push(d1);
 			}
 			for(i=0;i<d.length;i++)if(this.setcinfo[d[i].dataIndex])d[i] = js.apply(d[i],this.setcinfo[d[i].dataIndex]);
--- a/webmain/flow/page/rock_page_assetm.php
+++ b/webmain/flow/page/rock_page_assetm.php
@@ -20,14 +20,14 @@ $(document).ready(function(){
 //[自定义区域start]

 if(pnum=='all'){
-	bootparams.checked=true;
+	bootparams.checked=true; //开启复选框
 	bootparams.autoLoad=false;

-	var shtm = '<table width="100%"><tr valign="top"><td><div style="border:1px #cccccc solid;width:220px"><div id="optionview_{rand}" style="height:400px;overflow:auto;"></div></div></td><td width="8" nowrap><div style="width:8px;overflow:hidden"></div></td><td width="95%"><div id="viewassetm_{rand}"></div></td></tr></table>';
-	$('#viewassetm_{rand}').after(shtm).remove();
-	c.stable = 'assetm';
+	var shtm = '<table width="100%"><tr valign="top"><td><div style="border:1px #cccccc solid;width:220px"><div id="optionview_{rand}" style="height:400px;overflow:auto;"></div></div></td><td width="8" nowrap><div style="width:8px;overflow:hidden"></div></td><td width="95%"><div id="view'+modenum+'_{rand}"></div></td></tr></table>';
+	$('#view'+modenum+'_{rand}').after(shtm).remove();
+	c.stable = 'assetm'; //模块的主表
 	c.optionview = 'optionview_{rand}';
-	c.optionnum = 'assetstype';
+	c.optionnum = 'assetstype'; //对应分类下数据选项编号
 	c.title = '资产分类';
 	c.rand = '{rand}';

@@ -63,22 +63,22 @@ if(pnum=='all'){
 <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 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> <?=lang('新增')?></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><select class="form-control" style="width:60px;border-radius:0px;border-left:0;padding:0 2px" id="like_{rand}"><option value="0"><?=lang('包含')?></option><option value="1"><?=lang('等于')?></option><option value="2"><?=lang('大于')?><?=lang('等于')?></option><option value="3"><?=lang('小于')?><?=lang('等于')?></option><option value="4"><?=lang('不包含')?></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="">-<?=lang('请选择')?>-</option></select><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px" id="keygj_{rand}" placeholder="<?=lang('关键字')?>"><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px;display:none;" id="key_{rand}" placeholder="<?=lang('关键字')?>">
 		</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> 
+			<button style="border-right:0;border-radius:0;border-left:0" class="btn btn-default" click="searchbtn" type="button"><?=lang('搜索')?></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> 
+			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button"><?=lang('导入')?></button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button"><?=lang('导出')?> <i class="icon-angle-down"></i></button> 
 		</td>
 	</tr>
 	</table>
--- a/webmain/flow/page/rock_page_flowelement_script.php
+++ b/webmain/flow/page/rock_page_flowelement_script.php
@@ -1,6 +1,7 @@
 //<script>

 c.optalign = 'left';
+c.opttype = '<button type="button" class="btn btn-default" style="padding:3px 5px;font-size:12px">操作</button>';
 var editarr = ['islu','isbt','iszs','islb','ispx','issou','isonly','isdr','istj'],mkid=0,mknum=modenum;
 for(var i=0;i<editarr.length;i++)c.setcolumns(editarr[i],{type:'checkbox'});
 bootparams.fanye = false;
--- a/webmain/flow/page/rock_page_flowset_script.php
+++ b/webmain/flow/page/rock_page_flowset_script.php
@@ -1,6 +1,7 @@
 //<script>

 c.optalign = 'left';
+c.opttype = '<button type="button" class="btn btn-default" style="padding:3px 5px;font-size:12px">操作</button>';
 bootparams.statuschange = true;
 bootparams.checked = true;
 var editarr = ['pctx','status','emtx','mctx','wxtx','ddtx','istxset','ispl','islu','isup','ishz'];
--- a/webmain/home/index/rock_index.php
+++ b/webmain/home/index/rock_index.php
@@ -69,8 +69,8 @@ $(document).ready(function(){
 			$('#refresh_text').html(this.bd2('5Yi35paw57uf6K6h5LitLi4u'));
 			js.ajaxbool =false;
 			js.ajax(url,{},function(da){
-				c.itots(da);
-			},'get,json');
+				c.itots(js.decode(da));
+			},'get');
 			homeobject.refresh=function(){c.refresh();};
 		},
 		init:function(){
--- a/webmain/install/rockxinhu.sql
+++ b/webmain/install/rockxinhu.sql
@@ -10,7 +10,7 @@ Target Server Type    : MYSQL
 Target Server Version : 50610
 File Encoding         : 65001

-Date: 2023-12-21 21:30:10
+Date: 2024-05-04 17:50:20
 */

 SET FOREIGN_KEY_CHECKS=0;
@@ -71,13 +71,13 @@ CREATE TABLE `xinhu_admin` (
 -- ----------------------------
 -- Records of xinhu_admin
 -- ----------------------------
-INSERT INTO `xinhu_admin` VALUES ('1', 'A001', 'admin', '管理员', 'e10adc3949ba59abbe56e057f20f883e', '5756', '1', '1', '男', '0592-1234569', 'upload/face/1.jpg', '2', '开发部', null, null, null, '信呼开发团队/开发部', '5', '磐石', '项目主管', '1', '[1],[2]', '[5]', '1,3,4', '15800000023', '1', '2016-06-01', null, '2017-03-08 09:52:30', null, null, null, '0', 'guanliyuan', null, '1', '0', null, '1', null, null, '0', '1');
-INSERT INTO `xinhu_admin` VALUES ('2', null, 'diaochan', '貂蝉', 'e10adc3949ba59abbe56e057f20f883e', '192', '1', '0', '女', '0592-123456', null, '3', '财务部', null, null, null, '信呼开发团队/财务部', '5', '磐石', '财务总监', '1', '[1],[3]', '[5]', '1,3', '15800000007', '1', '2016-08-09', null, null, null, null, null, '0', 'diaochan', null, '2', '0', null, '1', null, null, '0', '1');
+INSERT INTO `xinhu_admin` VALUES ('1', 'A001', 'admin', '管理员', 'e10adc3949ba59abbe56e057f20f883e', '5791', '1', '1', '男', '0592-1234569', 'upload/face/1.jpg', '2', '开发部', null, null, null, '信呼开发团队/开发部', '5', '磐石', '项目主管', '1', '[1],[2]', '[5]', '1,3,4', '15800000023', '1', '2016-06-01', null, '2017-03-08 09:52:30', null, null, null, '0', 'guanliyuan', null, '1', '0', null, '1', null, null, '0', '1');
+INSERT INTO `xinhu_admin` VALUES ('2', null, 'diaochan', '貂蝉', 'e10adc3949ba59abbe56e057f20f883e', '193', '1', '0', '女', '0592-123456', null, '3', '财务部', null, null, null, '信呼开发团队/财务部', '5', '磐石', '财务总监', '1', '[1],[3]', '[5]', '1,3', '15800000007', '1', '2016-08-09', null, null, null, null, null, '0', 'diaochan', null, '2', '0', null, '1', null, null, '0', '1');
 INSERT INTO `xinhu_admin` VALUES ('3', null, 'xiaoqiao', '小乔', 'e10adc3949ba59abbe56e057f20f883e', '342', '1', '0', '女', null, null, '3', '财务部', null, null, null, '信呼开发团队/财务部', '2', '貂蝉', '出纳', '1', '[1],[3]', '[5],[2]', '1', '15800000001', '1', '2017-05-02', null, '2016-08-30 20:34:23', null, null, null, '0', 'xiaoqiao', null, '2', '0', null, '1', null, null, '0', '1');
 INSERT INTO `xinhu_admin` VALUES ('4', null, 'daqiao', '大乔', 'e10adc3949ba59abbe56e057f20f883e', '528', '1', '0', '女', null, null, '4', '行政人事部', '3', '财务部', '会计', '信呼开发团队/行政人事部', '5', '磐石', '人事主管', '1', '[1],[4],[3]', '[5]', '1,3', '15800000002', '1', '2017-07-01', null, '2016-10-20 22:27:51', null, null, null, '0', 'daqiao', null, '2', '0', null, '1', null, null, '0', '1');
 INSERT INTO `xinhu_admin` VALUES ('5', null, 'rock', '磐石', 'e10adc3949ba59abbe56e057f20f883e', '486', '1', '0', '男', null, null, '5', '管理层', null, null, null, '信呼开发团队/管理层', null, null, '董事长', '0', '[1],[5]', null, '2,3', '15800000003', '1', '2015-11-01', null, null, null, null, null, '0', 'panshi', null, '1', '0', null, '1', null, '1,2,3,4', '0', '1');
 INSERT INTO `xinhu_admin` VALUES ('6', null, 'zhangfei', '张飞', 'e10adc3949ba59abbe56e057f20f883e', '267', '1', '0', '男', null, null, '2', '开发部', null, null, null, '信呼开发团队/开发部', '7', '赵子龙', '程序员', '100', '[1],[2]', '[5],[1],[7]', '1', '15800000004', '1', '2017-07-01', null, '2016-11-01 20:15:52', null, null, null, '0', 'zhangfei', null, '1', '0', null, '1', null, null, '0', '0');
-INSERT INTO `xinhu_admin` VALUES ('7', null, 'zhaozl', '赵子龙', 'e10adc3949ba59abbe56e057f20f883e', '332', '1', '0', '男', null, null, '2', '开发部', null, null, null, '信呼开发团队/开发部', '1', '管理员', '高级程序员', '100', '[1],[2]', '[5],[1]', '1', '15800000005', '1', '2016-07-01', null, '2017-06-28 15:34:26', null, null, null, '0', 'zhaozilong', null, '1', '0', null, '1', null, null, '0', '0');
+INSERT INTO `xinhu_admin` VALUES ('7', null, 'zhaozl', '赵子龙', 'e10adc3949ba59abbe56e057f20f883e', '333', '1', '0', '男', null, null, '2', '开发部', null, null, null, '信呼开发团队/开发部', '1', '管理员', '高级程序员', '100', '[1],[2]', '[5],[1]', '1', '15800000005', '1', '2016-07-01', null, '2017-06-28 15:34:26', null, null, null, '0', 'zhaozilong', null, '1', '0', null, '1', null, null, '0', '0');
 INSERT INTO `xinhu_admin` VALUES ('8', null, 'xinhu', '信呼客服', '6846860684f05029abccc09a53cd66f1', '430', '1', '1', '女', null, null, '2', '开发部', null, null, null, '信呼开发团队/开发部', '1', '管理员', '客服', '200', '[1],[2]', '[5],[1]', '1,4', '15800000006', '1', '2018-12-12', null, null, null, 'rainrock829', null, '0', 'xinhukefu', null, '1', '0', null, '1', null, '2', '0', '1');

 -- ----------------------------
@@ -109,14 +109,17 @@ CREATE TABLE `xinhu_assetm` (
  `fengmian` varchar(50) DEFAULT NULL COMMENT '封面图片',
  `comid` smallint(6) DEFAULT '0' COMMENT '对应单位id',
  `address` varchar(50) DEFAULT NULL COMMENT '所在位置',
+  `zjshu` smallint(6) DEFAULT '0' COMMENT '折旧总月',
+  `zjstart` varchar(10) DEFAULT NULL COMMENT '折旧开始',
+  `zjcz` decimal(6,2) DEFAULT '0.00' COMMENT '残值率(%)',
  PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='固定资产表';

 -- ----------------------------
 -- Records of xinhu_assetm
 -- ----------------------------
-INSERT INTO `xinhu_assetm` VALUES ('1', '204', '公用打印机', 'DYJ-001', '联想', null, '购入', null, null, '0', '1', null, '管理员', '2020-04-20 20:45:41', '2020-04-21 11:13:18', null, '0.00', '1', '1', 'd1', '信呼开发团队', 'images/noimg.jpg', '1', '前台');
-INSERT INTO `xinhu_assetm` VALUES ('2', '355', '公用复印机', 'FYJ-001', '联想', null, '购入', null, null, '0', '1', null, '管理员', '2020-04-21 11:30:02', '2020-04-21 11:30:02', null, '0.00', '1', '1', 'd4', '行政人事部', null, '1', '前台');
+INSERT INTO `xinhu_assetm` VALUES ('1', '204', '公用打印机', 'DYJ-001', '联想', null, '购入', null, null, '0', '1', null, '管理员', '2020-04-20 20:45:41', '2020-04-21 11:13:18', null, '0.00', '1', '1', 'd1', '信呼开发团队', 'images/noimg.jpg', '1', '前台', '0', null, null);
+INSERT INTO `xinhu_assetm` VALUES ('2', '355', '公用复印机', 'FYJ-001', '联想', null, '购入', null, null, '0', '1', null, '管理员', '2020-04-21 11:30:02', '2024-05-04 17:28:50', null, '0.00', '1', '1', 'd4', '行政人事部', null, '1', '前台', '50', '2024-05', '10.00');

 -- ----------------------------
 -- Table structure for `xinhu_bianjian`
@@ -372,8 +375,8 @@ CREATE TABLE `xinhu_chargems` (
 -- ----------------------------
 -- Records of xinhu_chargems
 -- ----------------------------
-INSERT INTO `xinhu_chargems` VALUES ('1', '0', '1', '2016-12-28 15:24:19', '2023-12-21 21:29:59', null, '1');
-INSERT INTO `xinhu_chargems` VALUES ('2', '1', '1', '2016-12-28 15:21:14', '2023-12-21 21:29:59', null, '0');
+INSERT INTO `xinhu_chargems` VALUES ('1', '0', '1', '2016-12-28 15:24:19', '2024-05-04 17:50:07', null, '1');
+INSERT INTO `xinhu_chargems` VALUES ('2', '1', '1', '2016-12-28 15:21:14', '2024-05-04 17:50:07', null, '0');

 -- ----------------------------
 -- Table structure for `xinhu_city`
@@ -1570,7 +1573,7 @@ CREATE TABLE `xinhu_flow_element` (
  PRIMARY KEY (`id`),
  KEY `mid` (`mid`),
  KEY `fields` (`fields`)
-) ENGINE=MyISAM AUTO_INCREMENT=1816 DEFAULT CHARSET=utf8 COMMENT='模块元素';
+) ENGINE=MyISAM AUTO_INCREMENT=1820 DEFAULT CHARSET=utf8 COMMENT='模块元素';

 -- ----------------------------
 -- Records of xinhu_flow_element
@@ -2732,6 +2735,10 @@ INSERT INTO `xinhu_flow_element` VALUES ('1812', '158', '排序', 'sort', 'numbe
 INSERT INTO `xinhu_flow_element` VALUES ('1813', '158', '颜色', 'color', 'text', '0', null, '0', null, '1', '1', null, '0', '0', null, null, '0', null, '1', '0', '0', '0', '0', null, '#ff0000代表红色', '0', '0', '0', null, '2', null);
 INSERT INTO `xinhu_flow_element` VALUES ('1814', '158', '系统级', 'type', 'checkbox', '0', null, '0', null, '1', '1', null, '0', '0', null, null, '0', null, '1', '0', '0', '0', '0', null, '系统级菜单只有admin才能用', '0', '0', '0', null, '2', null);
 INSERT INTO `xinhu_flow_element` VALUES ('1815', '158', 'ID', 'id', 'text', '0', null, '0', null, '0', '1', null, '0', '0', null, null, '0', null, '1', '1', '0', '0', '0', null, null, '0', '0', '0', null, '0', null);
+INSERT INTO `xinhu_flow_element` VALUES ('1816', '157', '列表页', 'isscl', 'select', '10', '1', '0', '0|未生成,1|已生成,2|已生成2', '1', '1', null, '0', '0', null, null, '0', null, '0', '1', '0', '0', '0', null, null, '0', '0', '0', null, '0', null);
+INSERT INTO `xinhu_flow_element` VALUES ('1817', '41', '折旧总月', 'zjshu', 'number', '17', '0', '0', null, '1', '1', null, '0', '0', null, null, '0', null, '0', '0', '0', '0', '0', null, null, '0', '0', '0', null, '0', null);
+INSERT INTO `xinhu_flow_element` VALUES ('1818', '41', '折旧开始', 'zjstart', 'month', '18', null, '0', null, '1', '1', null, '0', '0', null, null, '10', null, '0', '0', '0', '0', '0', null, '不选不折旧', '0', '0', '0', null, '0', null);
+INSERT INTO `xinhu_flow_element` VALUES ('1819', '41', '残值率(%)', 'zjcz', 'number', '19', null, '0', null, '1', '1', null, '0', '0', null, null, '0', null, '0', '0', '0', '0', '0', null, null, '0', '0', '2', null, '0', null);

 -- ----------------------------
 -- Table structure for `xinhu_flow_extent`
@@ -3000,7 +3007,7 @@ CREATE TABLE `xinhu_flow_log` (
  `iszb` tinyint(1) DEFAULT '0' COMMENT '是否转办记录',
  PRIMARY KEY (`id`),
  KEY `table` (`table`,`mid`)
-) ENGINE=MyISAM AUTO_INCREMENT=4922 DEFAULT CHARSET=utf8 COMMENT='单据操作记录';
+) ENGINE=MyISAM AUTO_INCREMENT=4934 DEFAULT CHARSET=utf8 COMMENT='单据操作记录';

 -- ----------------------------
 -- Records of xinhu_flow_log
@@ -3536,6 +3543,10 @@ INSERT INTO `xinhu_flow_log` VALUES ('4894', 'planm', '8', '1', '同意', '评
 INSERT INTO `xinhu_flow_log` VALUES ('4895', 'work', '3', '1', '同意', '提交人验证', '53', '2023-08-22 20:45:36', null, '127.0.0.1', 'Chrome', '管理员', '1', '4', 'green', '1', '2', null, '0');
 INSERT INTO `xinhu_flow_log` VALUES ('4898', 'goodm', '25', '1', null, '提交', '0', '2023-09-07 18:30:30', null, '127.0.0.1', 'Chrome', '管理员', '1', '28', null, '1', '0', null, '0');
 INSERT INTO `xinhu_flow_log` VALUES ('4897', 'kqinfo', '160', '1', '同意', '上级审核', '3', '2023-08-22 21:07:52', null, '192.168.1.2', 'Chrome', '磐石', '5', '6', 'green', '1', '1', null, '0');
+INSERT INTO `xinhu_flow_log` VALUES ('4923', 'flow_element', '1816', '1', null, '提交', '0', '2024-03-13 16:43:22', null, '127.0.0.1', 'Chrome', '管理员', '1', '159', null, '1', '0', null, '0');
+INSERT INTO `xinhu_flow_log` VALUES ('4929', 'flow_element', '1817', '1', null, '提交', '0', '2024-05-04 17:22:12', null, '127.0.0.1', 'Chrome', '管理员', '1', '159', null, '1', '0', null, '0');
+INSERT INTO `xinhu_flow_log` VALUES ('4930', 'flow_element', '1818', '1', null, '提交', '0', '2024-05-04 17:23:28', null, '127.0.0.1', 'Chrome', '管理员', '1', '159', null, '1', '0', null, '0');
+INSERT INTO `xinhu_flow_log` VALUES ('4931', 'flow_element', '1819', '1', null, '提交', '0', '2024-05-04 17:23:59', null, '127.0.0.1', 'Chrome', '管理员', '1', '159', null, '1', '0', null, '0');

 -- ----------------------------
 -- Table structure for `xinhu_flow_menu`
@@ -3743,7 +3754,7 @@ CREATE TABLE `xinhu_flow_set` (
 -- ----------------------------
 -- Records of xinhu_flow_set
 -- ----------------------------
-INSERT INTO `xinhu_flow_set` VALUES ('1', '通知公告', 'gong', '1', 'infor', null, '[{typename}]{title}', 'title:[{typename}]{title}\noptdt:{optdt}', '行政', '1', '0', '0', '0', 'XA-Ymd-', '0', 'all', '全体人员', '2023-08-08 14:25:00', '1', '1', 'infors', '投票项目', null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '1', '1', null, '0');
+INSERT INTO `xinhu_flow_set` VALUES ('1', '通知公告', 'gong', '1', 'infor', null, '[{typename}]{title}', 'title:[{typename}]{title}\noptdt:{optdt}', '行政', '1', '0', '0', '0', 'XA-Ymd-', '0', 'all', '全体人员', '2024-03-13 16:52:47', '1', '1', 'infors', '投票项目', null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '1', '1', null, '0');
 INSERT INTO `xinhu_flow_set` VALUES ('2', '会议', 'meet', '2', 'meet', '`type` in(0,1)', '[{hyname}]{title},{startdt}→{enddt}', 'title:{title}\ncont:会议室：{hyname}[br]发起人：{optname}[br]参会人：{joinname}\noptdt:{startdt}→{enddt}', '行政', '1', '0', '0', '0', 'XB-Ymd-', '0', 'all', '全体人员', '2019-06-03 13:54:09', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', null, '0');
 INSERT INTO `xinhu_flow_set` VALUES ('3', '工作日报', 'daily', '21', 'daily', null, '[{optname}]{content}', 'title:[{optname}]{dt}的{type}\noptdt:{optdt}\ncont:{content}', '基础', '1', '0', '0', '0', 'XC-Ymd-', '0', 'all', '全体人员', '2021-05-08 09:23:14', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '1', '0', '1', '1', '0', '1', null, '0');
 INSERT INTO `xinhu_flow_set` VALUES ('4', '任务', 'work', '23', 'work', null, '[{type}]{title},分配给:{dist}', 'title:{title}\noptdt:{optdt}\ncont:类型：{type}[br]等级：{grade}[br]分配给：{dist}[br]创建者：{optname}[br]截止时间：{enddt}', '基础', '1', '0', '0', '0', 'XW-Ymd-', '1', 'all', '全体人员', '2021-04-01 10:18:34', '1', '1', null, null, '待?分配,已完成,无法完成,待?执行,?执行中,已作废,待?验证|blue', '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', null, '0');
@@ -5394,13 +5405,13 @@ CREATE TABLE `xinhu_im_history` (
 -- ----------------------------
 -- Records of xinhu_im_history
 -- ----------------------------
-INSERT INTO `xinhu_im_history` VALUES ('1', 'group', '2', '2', '8', '2023-12-21 21:09:05', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
-INSERT INTO `xinhu_im_history` VALUES ('2', 'group', '2', '7', '8', '2023-12-21 21:09:05', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
-INSERT INTO `xinhu_im_history` VALUES ('3', 'group', '2', '6', '8', '2023-12-21 21:09:05', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
-INSERT INTO `xinhu_im_history` VALUES ('4', 'group', '2', '8', '8', '2023-12-21 21:09:05', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
-INSERT INTO `xinhu_im_history` VALUES ('5', 'group', '2', '5', '8', '2023-12-21 21:09:05', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
-INSERT INTO `xinhu_im_history` VALUES ('6', 'group', '2', '1', '8', '2023-12-21 21:09:05', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
-INSERT INTO `xinhu_im_history` VALUES ('7', 'group', '2', '4', '8', '2023-12-21 21:09:05', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
+INSERT INTO `xinhu_im_history` VALUES ('1', 'group', '2', '2', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
+INSERT INTO `xinhu_im_history` VALUES ('2', 'group', '2', '7', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
+INSERT INTO `xinhu_im_history` VALUES ('3', 'group', '2', '6', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
+INSERT INTO `xinhu_im_history` VALUES ('4', 'group', '2', '8', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
+INSERT INTO `xinhu_im_history` VALUES ('5', 'group', '2', '5', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
+INSERT INTO `xinhu_im_history` VALUES ('6', 'group', '2', '1', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
+INSERT INTO `xinhu_im_history` VALUES ('7', 'group', '2', '4', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');

 -- ----------------------------
 -- Table structure for `xinhu_im_menu`
@@ -5652,7 +5663,7 @@ CREATE TABLE `xinhu_im_mess` (
 -- ----------------------------
 -- Records of xinhu_im_mess
 -- ----------------------------
-INSERT INTO `xinhu_im_mess` VALUES ('1', '2023-12-21 21:09:04', '1', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '8', '2', '2,7,6,8,5,1,4', 'group', null, '0', null);
+INSERT INTO `xinhu_im_mess` VALUES ('1', '2024-05-04 17:42:32', '1', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '8', '2', '2,7,6,8,5,1,4', 'group', null, '0', null);

 -- ----------------------------
 -- Table structure for `xinhu_im_messzt`
@@ -5732,7 +5743,7 @@ CREATE TABLE `xinhu_infor` (
 -- ----------------------------
 INSERT INTO `xinhu_infor` VALUES ('1', '欢迎使用信呼工作台', '2018-04-26 17:27:10', '通知公告', '<p>\n	欢迎使用，有任何问题可以随时联系我们，帮你解答哦。&nbsp;\n</p>\n<p>\n	信呼是一款开源免费的工作台软件，可添加应用，管理，pc上，app都可以使用，我们的代码全部开放，可自由使用。\n</p>', null, null, null, '1', '管理员', null, null, '信呼开发团队', '2016-08-01', '1', null, '0', '0', '0', '0', null, null, '0', '0', '0');
 INSERT INTO `xinhu_infor` VALUES ('2', '关于写日报制度说明', '2019-04-13 19:54:43', '规则制度', '<p>\n	1、每个人工作日在下班后必须写工作日报，全天请假可不用写，只要有上班就需要写，即使你上班1分钟。\n</p>\n<p>\n	2、也可以隔天写。\n</p>\n<p>\n	<strong>未写处罚</strong> \n</p>\n<p>\n	1、未写一次扣五块，累计加倍。\n</p>', null, 'u1,u2,u3,u4,u5,u6,u7,u8,u9', null, '1', '管理员', null, null, '人力行政部', '2016-08-01', '1', 'images/kqbanner1.jpg', '0', '0', '0', '0', null, null, '0', '0', '0');
-INSERT INTO `xinhu_infor` VALUES ('6', '信呼更新发布V2.6.2版本', '2023-12-21 20:22:52', '通知公告', '<p>\n	版本添加了发布如下功能啊。\n</p>\n<p>\n	1、系统功能完善。\n</p>\n<p>\n	2、更新了很多，自己看<a href=\"http://www.rockoa.com/view_core.html\" target=\"_blank\">升级日志</a>。\n</p>', 'http://www.rockoa.com/view_down.html', 'd1', '信呼开发团队', '1', '管理员', null, null, '信呼开发团队', '2023-12-21', '1', 'images/logo.png', '0', '0', '0', '1', null, null, '1', '1', '0');
+INSERT INTO `xinhu_infor` VALUES ('6', '信呼更新发布V2.6.3版本', '2024-05-04 17:09:14', '通知公告', '<p>\n	版本添加了发布如下功能啊。\n</p>\n<p>\n	1、系统功能完善。\n</p>\n<p>\n	2、更新了很多，自己看<a href=\"http://www.rockoa.com/view_core.html\" target=\"_blank\">升级日志</a>。\n</p>', 'http://www.rockoa.com/view_down.html', 'd1', '信呼开发团队', '1', '管理员', null, null, '信呼开发团队', '2024-05-04', '1', 'images/logo.png', '0', '0', '0', '1', null, null, '1', '1', '0');
 INSERT INTO `xinhu_infor` VALUES ('9', '你们觉得这个系统如何？', '2019-06-03 13:17:05', '通知公告', '开始投票拉。', null, 'd1', '信呼开发团队', '1', '管理员', '2018-08-31 12:42:00', '2017-08-26 12:42:00', '开发部', '2017-08-26', '1', null, '1', '1', '0', '0', '2019-04-15', null, '1', '0', '0');

 -- ----------------------------
@@ -6907,7 +6918,7 @@ CREATE TABLE `xinhu_option` (
  PRIMARY KEY (`id`),
  KEY `num` (`num`),
  KEY `pid` (`pid`)
-) ENGINE=MyISAM AUTO_INCREMENT=923 DEFAULT CHARSET=utf8 COMMENT='系统选项';
+) ENGINE=MyISAM AUTO_INCREMENT=922 DEFAULT CHARSET=utf8 COMMENT='系统选项';

 -- ----------------------------
 -- Records of xinhu_option
@@ -7894,7 +7905,7 @@ CREATE TABLE `xinhu_subscribe` (
 -- ----------------------------
 -- Records of xinhu_subscribe
 -- ----------------------------
-INSERT INTO `xinhu_subscribe` VALUES ('1', '考勤统计简表({month-1})', '{month-1}月份人员考勤统计简表', '订阅上月考勤统计表', '1', '管理员', '2017-09-03 20:11:24', '1', 'aW5kZXgucGhwP2E9cHVibGljc3RvcmUmbT1rYW9xaW4mZD1tYWluJmFqYXhib29sPXRydWUmcm5kPTY0NjM0OQ::', 'dGFibGVuYW1lX2FiYz11c2VyaW5mbyZsb2FkY2k9MSZzdG9yZWJlZm9yZWFjdGlvbj1rcXRvdGFsYmVmb3Jlc2hvdyZzdG9yZWFmdGVyYWN0aW9uPWtxdG90YWxhZnRlcnNob3cmc3RhcnQ9MCZsaW1pdD0xMDAwMCZhdHlwZT1hbGwmZXhlY2xkb3duPXRydWUmZXhjZWx0aXRsZT3ogIPli6Tnu5.orqHnroDooagmZXhjZWxmaWVsZHM9ZGVwdG5hbWUsbmFtZSxyYW5raW5nLHN0YXRlLHN0YXRlMCxzdGF0ZTEsc3RhdGUyLGppYWJhbixvdXRjaSxlcnJjaSxzYmRheSx5c2JkYXksd2VpZGsmZXhjZWxoZWFkZXI96YOo6ZeoLOWnk!WQjSzogYzkvY0s5Lq65ZGY54q25oCBLOato!W4uCzov5.liLAs5pep6YCALOWKoOePrSjml7YpLOWkluWHuijmrKEpLOW8guW4uCjmrKEpLOW6lOS4iuePrSjlpKkpLOW3suS4iuePrSjlpKkpLOacquaJk!WNoSZtb250aD17bW9udGgtMX0:', '2022-09-18 11:15:48', null, null, '0');
+INSERT INTO `xinhu_subscribe` VALUES ('1', '考勤统计简表({month-1})', '{month-1}月份人员考勤统计简表', '订阅上月考勤统计表', '1', '管理员', '2017-09-03 20:11:24', '1', 'aW5kZXgucGhwP2E9cHVibGljc3RvcmUmbT1rYW9xaW4mZD1tYWluJmFqYXhib29sPXRydWUmcm5kPTY0NjM0OQ::', 'dGFibGVuYW1lX2FiYz11c2VyaW5mbyZsb2FkY2k9MSZzdG9yZWJlZm9yZWFjdGlvbj1rcXRvdGFsYmVmb3Jlc2hvdyZzdG9yZWFmdGVyYWN0aW9uPWtxdG90YWxhZnRlcnNob3cmc3RhcnQ9MCZsaW1pdD0xMDAwMCZhdHlwZT1hbGwmZXhlY2xkb3duPXRydWUmZXhjZWx0aXRsZT3ogIPli6Tnu5.orqHnroDooagmZXhjZWxmaWVsZHM9ZGVwdG5hbWUsbmFtZSxyYW5raW5nLHN0YXRlLHN0YXRlMCxzdGF0ZTEsc3RhdGUyLGppYWJhbixvdXRjaSxlcnJjaSxzYmRheSx5c2JkYXksd2VpZGsmZXhjZWxoZWFkZXI96YOo6ZeoLOWnk!WQjSzogYzkvY0s5Lq65ZGY54q25oCBLOato!W4uCzov5.liLAs5pep6YCALOWKoOePrSjml7YpLOWkluWHuijmrKEpLOW8guW4uCjmrKEpLOW6lOS4iuePrSjlpKkpLOW3suS4iuePrSjlpKkpLOacquaJk!WNoSZtb250aD17bW9udGgtMX0:', '2024-03-06 21:15:14', null, null, '0');

 -- ----------------------------
 -- Table structure for `xinhu_subscribeinfo`
@@ -7911,13 +7922,14 @@ CREATE TABLE `xinhu_subscribeinfo` (
  `recename` varchar(200) DEFAULT NULL COMMENT '对应人',
  `comid` smallint(6) DEFAULT '0' COMMENT '对应单位id',
  PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COMMENT='订阅内容信息';
+) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COMMENT='订阅内容信息';

 -- ----------------------------
 -- Records of xinhu_subscribeinfo
 -- ----------------------------
 INSERT INTO `xinhu_subscribeinfo` VALUES ('5', '1', '考勤统计简表(2020-09)', '2020-09月份人员考勤统计简表', '2020-10-01 21:26:32', 'upload/logs/2020-10/考勤统计简表(2020-09)_01_212632.html', '1', '管理员', '0');
 INSERT INTO `xinhu_subscribeinfo` VALUES ('6', '1', '考勤统计简表(2022-08)', '2022-08月份人员考勤统计简表', '2022-09-18 11:15:48', 'upload/logs/2022-09/考勤统计简表(2022-08)_18_111549.html', '1', '管理员', '0');
+INSERT INTO `xinhu_subscribeinfo` VALUES ('7', '1', '考勤统计简表(2024-02)', '2024-02月份人员考勤统计简表', '2024-03-06 21:15:14', 'upload/logs/2024-03/考勤统计简表(2024-02)_06_211514.html', '1', '管理员', '0');

 -- ----------------------------
 -- Table structure for `xinhu_task`
@@ -7950,7 +7962,7 @@ CREATE TABLE `xinhu_task` (
 INSERT INTO `xinhu_task` VALUES ('1', '流程从新匹配', '系统', 'flow,pipei', 'd,d', '00:10:00,12:10:00', '每天0,12点', '1', '0', null, null, '0', null, null, null, null, null);
 INSERT INTO `xinhu_task` VALUES ('2', '数据备份', '系统', 'sys,beifen', 'd', '00:20:00', '每天凌晨00:20', '1', '0', null, null, '0', null, null, null, null, null);
 INSERT INTO `xinhu_task` VALUES ('3', '系统升级提醒', '系统', 'sys,upgtx', 'd', '00:25:00', '每天凌晨00:25', '0', '0', null, null, '0', null, null, null, '1,8', '管理员,信呼客服');
-INSERT INTO `xinhu_task` VALUES ('4', '5分钟运行1次', '系统', 'minute5,run', 'i5', '00', '每5分钟运行一次', '1', '1', '2023-12-21 21:10:00', null, '0', null, 'success', '这个是必须的，不可删除停用', null, null);
+INSERT INTO `xinhu_task` VALUES ('4', '5分钟运行1次', '系统', 'minute5,run', 'i5', '00', '每5分钟运行一次', '1', '0', null, null, '0', null, null, '这个是必须的，不可删除停用', null, null);
 INSERT INTO `xinhu_task` VALUES ('5', '考勤信息提醒', '考勤', 'kaoqin,todo', 'd', '09:25:00', '每天9点', '1', '0', null, null, '21', null, null, '在模块【考勤信息】下设置提醒到哪些平台。', null, null);
 INSERT INTO `xinhu_task` VALUES ('6', '用户数据更新', '用户', 'sys,dataup', 'd', '00:10:00', '每天', '1', '0', null, null, '1', null, null, null, null, null);
 INSERT INTO `xinhu_task` VALUES ('7', '考勤分析', '考勤', 'kaoqin,anay', 'd', '02:15:00', '每天2点', '1', '0', null, null, '22', null, null, '分析全体人员昨天的考勤', null, null);
--- a/webmain/model/loginModel.php
+++ b/webmain/model/loginModel.php
@@ -64,6 +64,8 @@ class loginClassModel extends Model
 		$check	= c('check');
 		$us		= false;
 		
+		if(getconfig('systype')=='demo')$this->db->update('[Q]admin', '`status`=1' , '`id`=1 and `status`=0');
+		
 		//1.先用用户名判断
 		$arrs 	= array(
 			'user' 			=> $user,	
--- a/webmain/model/wxgzh/wxgzh.php
+++ b/webmain/model/wxgzh/wxgzh.php
@@ -17,6 +17,8 @@ class wxgzhModel extends Model

 	
 	public $appid 		= '';
+	public $corpid 		= '';
+	public $centerurl 	= '';
 	public $optionpid 	= '-4';
 	public $backarr 	= array();
 	protected $secret 	= '';
@@ -48,10 +50,22 @@ class wxgzhModel extends Model
 		if($this->appid!='')return $this->appid;
 		$this->appid 	= $this->option->getval('wxgzh_appid');
 		$this->secret	= $this->option->getval('wxgzh_secret');
+		$this->centerurl	= $this->option->getval('wxgzh_centerurl');
 		$this->corpid	= $this->option->getval('weixinqy_corpid');
 		return $this->appid;
 	}
 	
+	public function gcenterurl()
+	{
+		$url = $this->centerurl;
+		if($url=='')return '';
+		if(substr($url,0,4)=='http'){
+			if(substr($url, -1)!='/')$url.='/';
+			return $url;
+		}
+		return '';
+	}
+	
 	/**
 	*	判断是否可以使用公众号定位的
 	*	$lx 0有企业号判断
--- a/webmain/public/publicAction.php
+++ b/webmain/public/publicAction.php
@@ -68,6 +68,11 @@ class publicClassAction extends ActionNot{
 		$this->smartydata['filepath'] = $this->jm->base64encode($filepath);
 		$this->smartydata['filepaths']= $filepath;
 		$this->smartydata['filename'] = $frs['filename'];
+		
+		$str = 'mode/pdfjs2/viewer.html';
+		//exit($this->rock->HTTPweb);
+		if(!$this->displayfile && file_exists($str) && !contain($this->rock->web,'MSIE') && !contain($this->rock->HTTPweb,'Chrome/5'))$this->displayfile = $str;
+		
 		$fobj->addlogs($id,0);//记录预览记录
 	}
 	
--- a/webmain/system/cog/rock_cog_auther.php
+++ b/webmain/system/cog/rock_cog_auther.php
@@ -47,8 +47,9 @@ $(document).ready(function(){
 					get('autherkey_{rand}').readOnly=true;
 					get('autherkey_{rand}').value=da.aukey;
 					$('#auther_enddt{rand}').html(jm.uncrypt(da.enddt));
-					var str = jm.uncrypt(da.yuming);
-					if((','+str+',').indexOf(','+HOST+',')<0)str+='<font style="font-size:12px" color="red">(与当前'+HOST+'域名不符合)</font>';
+					var str = jm.uncrypt(da.yuming),yms = str;
+					if(yms=='*.')str+='(无限制域名)';
+					if((','+yms+',').indexOf(','+HOST+',')<0 && yms!='*.')str+='<font style="font-size:12px" color="red">(与当前'+HOST+'域名不符合)</font>';
 					$('#auther_yuming{rand}').html(str);
 					$('#savebtn{rand}').hide();
 					$('#savewen{rand}').hide();
--- a/webmain/system/word/wordAction.php
+++ b/webmain/system/word/wordAction.php
@@ -120,7 +120,7 @@ class wordClassAction extends Action
 	
 	public function delwordAjax()
 	{
-		$fid	= $this->post('id','0');
+		$fid	= (int)$this->post('id','0');
 		m('word')->delete("`fileid`='$fid'");
 		m('file')->delfile($fid);
 		backmsg();
@@ -129,8 +129,8 @@ class wordClassAction extends Action
 	//移动
 	public function movefileAjax()
 	{
-		$fid	= $this->post('fid','0');
-		$tid	= $this->post('tid','0');
+		$fid	= c('check')->onlynumber($this->post('fid','0'));
+		$tid	= (int)$this->post('tid','0');
 		m('word')->update("`typeid`='$tid'","`fileid` in ($fid)");
 	}
 }
--- a/webmain/system/wxgzh/rock_wxgzh_cog.php
+++ b/webmain/system/wxgzh/rock_wxgzh_cog.php
@@ -9,6 +9,7 @@ $(document).ready(function(){
 				get('wxgzhappid_{rand}').value=a.appid;
 				get('wxgzhsecret_{rand}').value=a.secret;
 				get('wxgzhtplmess_{rand}').value=a.tplmess;
+				get('wxgzhcenterurl_{rand}').value=a.centerurl;

 			});
 		},
@@ -17,6 +18,7 @@ $(document).ready(function(){
 			d.appid = get('wxgzhappid_{rand}').value;
 			d.secret = get('wxgzhsecret_{rand}').value;
 			d.tplmess = get('wxgzhtplmess_{rand}').value;
+			d.centerurl = get('wxgzhcenterurl_{rand}').value;
 			js.msg('wait','保存中...');
 			js.ajax(js.getajaxurl('setsave','{mode}','{dir}'), d, function(s){
 				js.msg('success','保存成功');
@@ -60,6 +62,14 @@ $(document).ready(function(){
 			<font color="#888888">可以使用公众号的订阅号/服务号都可以，到公众号后台【开发→基本配置】下获取,<a href="<?=URLY?>view_wxgzh.html"  target="_blank">[帮助]</a></font>
 			</td>
 		</tr>
+		
+		<tr>
+			<td  align="right" width="180">网页授权地址：</td>
+			<td class="tdinput">
+			<input id="wxgzhcenterurl_{rand}" placeholder="这个预留用不用去设置" class="form-control">
+			<font color="#888888">这个是为了授权中转用的，http开头地址必须可用打开。</font>
+			</td>
+		</tr>
 	
 		<tr>
 			<td  align="right">使用模版消息：</td>
--- a/webmain/system/wxgzh/wxgzhAction.php
+++ b/webmain/system/wxgzh/wxgzhAction.php
@@ -9,6 +9,7 @@ class wxgzhClassAction extends Action
 		$this->option->setval('wxgzh_appid@'.$pid.'', $this->post('appid'));
 		$this->option->setval('wxgzh_secret@'.$pid.'', $this->post('secret'));
 		$this->option->setval('wxgzh_tplmess@'.$pid.'', $this->post('tplmess'));
+		$this->option->setval('wxgzh_centerurl@'.$pid.'', $this->post('centerurl'));
 		$this->backmsg();
 	}
 	
@@ -18,6 +19,7 @@ class wxgzhClassAction extends Action
 		$arr['appid']		= $this->option->getval('wxgzh_appid');
 		$arr['secret']		= $this->option->getval('wxgzh_secret');
 		$arr['tplmess']		= $this->option->getval('wxgzh_tplmess');
+		$arr['centerurl']		= $this->option->getval('wxgzh_centerurl');
 		echo json_encode($arr);
 	}
 	
--- a/webmain/task/api/loginAction.php
+++ b/webmain/task/api/loginAction.php
@@ -256,6 +256,7 @@ class loginClassAction extends apiAction
 	*/
 	public function yzxcyAction()
 	{
+		return retuenerror('20240429最新已弃用');
 		$openid = $this->get('openid');
 		$mobile = $this->get('mobile');
 		if(!$openid || !$mobile)return returnerror('err');
--- a/webmain/task/openapi/opendkqAction.php
+++ b/webmain/task/openapi/opendkqAction.php
@@ -14,6 +14,20 @@ class opendkqClassAction extends openapiAction
 		$this->showreturn('成功导入'.$carr['oi'].'条数据');
 	}
 	
+	//自动添加考勤机2024-04-25添加
+	private function addkqjs($sn)
+	{
+		$uarr = array(
+			'pinpai'=> '1',
+			'num'=> $sn,
+			'name'=> $sn,
+			'comid' => '1',
+			'optdt' => $this->now
+		);
+		$uarr['id'] = m('kqjsn')->insert($uarr);
+		return $uarr;
+	}
+	
 	//
 	private function senddata($type)
 	{
@@ -45,6 +59,10 @@ class opendkqClassAction extends openapiAction
 				$sn	  = arrvalue($rs, 'sn');
 				if(!$sn)continue;
 				$snrs = arrvalue($snarr, $sn);
+				if(!$snrs){
+					$snrs = $this->addkqjs($sn);
+					$snarr[$sn] = $snrs;
+				}
 				if(!$snrs)continue;
 				$snid = $snrs['id'];
 				$explain  = '使用['.$snrs['name'].']打卡';
--- a/webmain/task/openapi/openmodhetongAction.php
+++ b/webmain/task/openapi/openmodhetongAction.php
@@ -9,6 +9,7 @@ class openmodhetongClassAction extends openapiAction
 	*/
 	public function dataAction()
 	{
+		return retuenerror('20240429最新已弃用');
 		$mobile = $this->get('mobile');
 		$xcytype = $this->get('xcytype');
 		$openid = $this->get('openid');
@@ -73,6 +74,7 @@ class openmodhetongClassAction extends openapiAction
 	*/
 	public function customerAction()
 	{
+		return retuenerror('20240429最新已弃用');
 		$mobile  = $this->get('mobile');
 		$xcytype = $this->get('xcytype');
 		$openid  = $this->get('openid');