发布v2.5.5版本

webmain/model/adminModel.php

@@ -2,7 +2,7 @@
 class adminClassModel extends Model
 {
 	private $_getjoinstr = array();
-	public $nowurs;
+	public $nowurs,$allshow,$getsuperarrba;
 	
 	public function gjoin($joinid, $glx='', $blx='bxl')
 	{

webmain/model/agent/meetModel.php

@@ -3,6 +3,7 @@ class agent_meetClassModel extends agentModel
 {
 	
 	private $joinwhere='';
+	public $dtobj;
 	
 	public function initModel()
 	{

webmain/model/cityModel.php

@@ -3,6 +3,7 @@
 class cityClassModel extends Model
 {
 	//获取城市路径
+	public $pathss;
 	public function getpath($id)
 	{
 		$this->pathss = array();

webmain/model/deptModel.php

@@ -1,6 +1,8 @@
 <?php
 class deptClassModel extends Model
 {
+	public $firstpid,$groupids,$temparaa;
+	
 	/**
 	*	$uarr 相应人员才能查看对应部门数据
 	*/

webmain/model/emailmModel.php

@@ -1,6 +1,8 @@
 <?php
 class emailmClassModel extends Model
 {
+	private $adminobj,$optionobj,$upfileobj,$recehost,$receyumi;
+	
 	public function initModel()
 	{
 		$this->adminobj 	= m('admin');

webmain/model/fileModel.php

@@ -1,6 +1,7 @@
 <?php
 class fileClassModel extends Model
 {
+	public $fileall,$mimitype;
 	
 	public function initModel()
 	{
@@ -25,6 +26,15 @@ class fileClassModel extends Model
 		return m('files')->insert($uarr);
 	}
 	
+	/**
+	*	添加所选的文件提示
+	*/
+	public function addxuan($fids,$xfids,$mknum)
+	{
+		if(!$xfids)return;
+		$this->db->insert('[Q]files','`fileid`,`type`,`optname`,`optid`,`optdt`,`ip`',"select `id`,3,'{$this->adminname}','{$this->adminid}','{$this->rock->now}','{$mknum}' from `[Q]file` where `id` in($xfids) and `id` in($fids) and `mid`>0", true);
+	}
+	
 	public function getmime($lx)
 	{
 		if(!isset($this->mimitype[$lx]))$lx = 'unkown';
@@ -264,7 +274,7 @@ class fileClassModel extends Model
 			if(!$this->isempt($path) && substr($path,0,4)!='http' && file_exists($path))unlink($path);
 			
 			if(!isempt($rs['filenum']))c('rockqueue')->push('flow,uptodelete', array('filenum'=>$rs['filenum']));//发送同步删除
-
+			m('files')->delete('`fileid`='.$rs['id'].'');
 		}
 		$this->delete($where);
 	}
@@ -330,11 +340,14 @@ class fileClassModel extends Model
 					return;
 				}
 				
-				if($filesize > 10*1024*1024 && 1==1){
+				if($filesize > 10*1024*1024 && 1==1 && $fileext!='pdf'){
 					header('location:'.$filepath.'');
 				}else{
-					//echo file_get_contents($filepath);
-					ob_clean();flush();readfile($filepath);
+					ob_clean();flush();
+					//$fileo = fopen($filepath,'rb');
+					//while(!feof($fileo))echo fread($fileo, 1024*20);
+					//fclose($fileo);
+					readfile($filepath);
 				}
 			}
 		}

webmain/model/flow/assetmModel.php

@@ -1,6 +1,7 @@
 <?php
 class flow_assetmClassModel extends flowModel
 {
+	public $statearr;
 	public function initModel()
 	{
 		$this->statearr = c('array')->strtoarray('blue|闲置,#ff6600|在用,red|维修,gray|报废,gray|丢失');

webmain/model/flow/caigouModel.php

@@ -3,6 +3,9 @@ class flow_caigouClassModel extends flowModel
 {
 	public $minwidth	= 600;//子表最小宽
 	
+	
+	private $goodsobj;
+	
 	public function initModel()
 	{
 		$this->goodsobj = m('goods');

webmain/model/flow/carmModel.php

@@ -2,6 +2,7 @@
 //车辆管理模块接口
 class flow_carmClassModel extends flowModel
 {
+	public $statearr,$publiarr,$carms;
 	public function initModel()
 	{
 		$this->statearr = c('array')->strtoarray('blue|办理中,green|可用,red|维修中,gray|报废');

webmain/model/flow/custfinaModel.php

@@ -2,7 +2,7 @@
 //客户收付款单
 class flow_custfinaClassModel extends flowModel
 {
-	
+	public $statearrs,$statearrf;
 	public function initModel(){
 		$this->statearrs		= c('array')->strtoarray('未收款|red,已收款|green');
 		$this->statearrf		= c('array')->strtoarray('未付款|red,已付款|green');

webmain/model/flow/custfinbModel.php

@@ -2,7 +2,7 @@
 //客户收付款单
 class flow_custfinbClassModel extends flowModel
 {
-	
+	public $statearrs,$statearrf;
 	public function initModel(){
 		$this->statearrs		= c('array')->strtoarray('未收款|red,已收款|green');
 		$this->statearrf		= c('array')->strtoarray('未付款|red,已付款|green');

webmain/model/flow/customerModel.php

@@ -1,6 +1,7 @@
 <?php
 class flow_customerClassModel extends flowModel
 {
+	public $statearr,$statarr;
 	public function initModel()
 	{
 		$this->statearr		 = c('array')->strtoarray('停用|#888888,启用|green');

webmain/model/flow/custractModel.php

@@ -2,6 +2,8 @@
 
 class flow_custractClassModel extends flowModel
 {
+	public $typearr,$typesarr,$statearr,$dtobj,$crmobj,$goodmobj;
+	
 	public function initModel(){
 		$this->typearr		= array('收款合同','付款合同');
 		$this->typesarr		= array('收','付');

webmain/model/flow/custsaleModel.php

@@ -2,6 +2,7 @@
 
 class flow_custsaleClassModel extends flowModel
 {
+	public $statearr;
 	public function initModel(){
 		$this->statearr		 = c('array')->strtoarray('跟进中|blue,已成交|green,已丢失|#888888,暂缓|#ff6600');
 	}

webmain/model/flow/custxiaoModel.php

@@ -2,6 +2,7 @@
 class flow_custxiaoClassModel extends flowModel
 {
 	public $minwidth	= 600;//子表最小宽
+	public $goodsobj,$custractobj,$crmobj;
 	
 	public function initModel()
 	{

webmain/model/flow/dailyModel.php

@@ -1,6 +1,7 @@
 <?php
 class flow_dailyClassModel extends flowModel
 {
+	public $typearr,$logobj;
 	public function initModel()
 	{
 		$this->typearr = explode(',','日报,周报,月报,年报');

webmain/model/flow/diaoboModel.php

@@ -3,6 +3,7 @@
 class flow_diaoboClassModel extends flowModel
 {
 	public $minwidth	= 600;//子表最小宽
+	public $goodsobj,$cangobj;
 	
 	public function initModel()
 	{

webmain/model/flow/gongModel.php

@@ -2,6 +2,7 @@
 class flow_gongClassModel extends flowModel
 {
 	private $readunarr = array();//未读人员
+	private $logobj;
 	
 	public function initModel()
 	{

webmain/model/flow/goodghModel.php

@@ -2,6 +2,7 @@
 //物品归还
 class flow_goodghClassModel extends flowModel
 {
+	public $goodsobj;
 	public function initModel()
 	{
 		$this->goodsobj = m('goods');

webmain/model/flow/goodlyModel.php

@@ -1,6 +1,8 @@
 <?php
 class flow_goodlyClassModel extends flowModel
 {
+	
+	public $goodsobj;
 	public function initModel()
 	{
 		$this->goodsobj = m('goods');

webmain/model/flow/hrcheckModel.php

@@ -2,6 +2,7 @@
 //模块 hrcheck.考核评分
 class flow_hrcheckClassModel extends flowModel
 {
+	public $dtobj;
 	//审核完成处理
 	protected function flowcheckfinsh($zt){
 		//最后得分计算，

webmain/model/flow/hrkaohemModel.php

@@ -2,6 +2,7 @@
 //考核项目
 class flow_hrkaohemClassModel extends flowModel
 {
+	public $pinlva = array();
 	public function initModel()
 	{
 		$this->pinlva['d'] = '每天';

webmain/model/flow/knowtikuModel.php

@@ -5,7 +5,7 @@ class flow_knowtikuClassModel extends flowModel
 		$this->rs['content'] = c('html')->replace($this->rs['content']);
 		
 	}
-	
+	public $logobj,$typearr;
 	public function initModel()
 	{
 		$this->logobj = m('log');

webmain/model/flow/knowtraimModel.php

@@ -4,6 +4,7 @@
 */
 class flow_knowtraimClassModel extends flowModel
 {
+	public $statearr;
 	public function initModel()
 	{
 		$this->statearr = explode(',','<font color=#ff6600>还未开始</font>,<font color=green>进行中</font>,<font color=#888888>已结束</font>');

webmain/model/flow/kqdkjlModel.php

@@ -3,6 +3,7 @@ class flow_kqdkjlClassModel extends flowModel
 {
 	
 	protected $flowcompanyidfieds	= 'uid'; //多单位用这个关联 
+	public $dateobj,$typearr;
 	
 	public function initModel()
 	{

webmain/model/flow/kqdwModel.php

@@ -2,7 +2,7 @@
 class flow_kqdwClassModel extends flowModel
 {
 	protected $flowcompanyidfieds	= 'uid'; //多单位用这个关联 
-	
+	public $dateobj,$typearr;
 	public function initModel()
 	{
 		$this->dateobj = c('date');

webmain/model/flow/meetModel.php

@@ -2,6 +2,8 @@
 
 class flow_meetClassModel extends flowModel
 {
+	public $hyarra,$hyarrb,$dbobj,$reatearr;
+	
 	public function initModel()
 	{
 		$this->hyarra 	= array('正常','会议中','结束','取消');

webmain/model/flow/newsModel.php

@@ -2,7 +2,7 @@
 class flow_newsClassModel extends flowModel
 {
 	private $readunarr = array();//未读人员
-	
+	public $logobj,$htmlobj;
 	public function initModel()
 	{
 		$this->logobj = m('log');

webmain/model/flow/projectModel.php

@@ -4,7 +4,7 @@
 */
 class flow_projectClassModel extends flowModel
 {
-	
+	public $workobj;
 	public function initModel()
 	{
 		$this->workobj = m('work');

webmain/model/flow/repairModel.php

@@ -2,6 +2,7 @@
 //维修报备
 class flow_repairClassModel extends flowModel
 {
+	public $iswxarr;
 	public function initModel()
 	{
 		$this->iswxarr		 = c('array')->strtoarray('否|#888888,是|#ff6600');

webmain/model/flow/rewardModel.php

@@ -1,6 +1,7 @@
 <?php
 class flow_rewardClassModel extends flowModel
 {
+	public $typearr;
 	
 	public function initModel(){
 		$this->typearr		= array('<font color=green>奖励</font>','<font color=red>处罚</font>');

webmain/model/flow/scheduleModel.php

@@ -1,7 +1,7 @@
 <?php
 class flow_scheduleClassModel extends flowModel
 {
-
+	public $ratearr;
 	protected function flowinit(){
 		$this->ratearr		 = array('d'=>'天','w'=>'周','m'=>'月');
 	}

webmain/model/flow/tuihuoModel.php

@@ -3,6 +3,7 @@
 class flow_tuihuoClassModel extends flowModel
 {
 	public $minwidth	= 600;//子表最小宽
+	public $goodsobj,$cangobj;
 	
 	public function initModel()
 	{

webmain/model/flow/userinfoModel.php

@@ -4,6 +4,7 @@ class flow_userinfoClassModel extends flowModel
 	public  $uidfields = 'id';
 	protected  $flowviewufieds = 'id';
 	protected  $flowcompanyidfieds = 'companyid';
+	public $statearr,$statearrs,$birtypearr;
 	
 	public function flowsearchfields()
 	{

webmain/model/flow/userractModel.php

@@ -2,6 +2,7 @@
 class flow_userractClassModel extends flowModel
 {
 	protected $flowcompanyidfieds	= 'companyid';
+	public $statearr;
 
 	public function initModel()
 	{

webmain/model/flow/workModel.php

@@ -2,6 +2,7 @@
 class flow_workClassModel extends flowModel
 {
 	private $absfile = false;
+	private $statearr;
 
 	public function initModel()
 	{

webmain/model/flowcourseModel.php

@@ -5,6 +5,7 @@
 class flowcourseClassModel extends Model
 {
 	private $courserows = array();
+	private $getCoursedatasarr,$getTreedatada;
 	
 	public function initModel()
 	{

webmain/model/kaoqinModel.php

@@ -7,6 +7,8 @@ class kaoqinClassModel extends Model
 	private $userarr 	= array();
 	private $_pipeiarr 	= array();
 	
+	public $admindb,$sjoindb,$dtobj,$_dkarr,$tempsbstatus;
+	
 	public function initModel()
 	{
 		$this->settable('kqdist');
@@ -285,7 +287,7 @@ class kaoqinClassModel extends Model
 		$utid  	= $dtid  =  array();$allars=false;$dttime = 0;
 		if($dt!='')$dttime	= strtotime($dt);
 		foreach($garrs as $k=>$rs){
-			$artid = explode(',', $rs['receid']);
+			$artid = explode(',', (string)$rs['receid']);
 			if($dttime>0){
 				if(!isset($rs['starttime'])){
 					$rs['starttime'] 	= strtotime($rs['startdt']);

webmain/model/loginModel.php

@@ -2,6 +2,7 @@
 class loginClassModel extends Model
 {
 	private $loginrand = '';
+	private $admintoken;
 	
 	public function initModel()
 	{

webmain/model/modeModel.php

@@ -310,7 +310,7 @@ $rstr 	= "".$hstart."
 		
 		$arr['finbei'] 	= '330,331,335,333,332,334';
 		$arr['wxgzh']	= '180,181,284,285,366';
-		$arr['weixinqy']	= '171,172,155,173,174,370';
+		$arr['weixinqy']	= '171,172,155,173,174,370,47,48,49,50,51,52';
 		$arr['ding']	= '208,209,210,211,212';
 		$arr['gongcheng']	= '345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,373,374,375,376,377,378,379,380,381,382,383,384,385';
 		$arr['officidu']	= '361,362,363,364,365';

webmain/model/reimModel.php

@@ -6,7 +6,7 @@ class reimClassModel extends Model
 	public $serverpushurl 	= '';
 	public $serverhosturl 	= '';
 	public $servertitle		= '';
-	
+	private $hisobj,$option,$optiondb;
 	
 	
 	public function initModel()
@@ -344,8 +344,8 @@ class reimClassModel extends Model
 		if($mr=='')$mr 	= 'images/noface.png';
 		$url = URL;
 		if(!$url)$url = getconfig('outurl');
-		if(substr($mr,0,4)!='http')$mr = $url.''.$mr.'';
-		if(substr($face,0,4)!='http' && !$this->isempt($face))$face = $url.''.$face.'';
+		if(substr((string)$mr,0,4)!='http')$mr = $url.''.$mr.'';
+		if(substr((string)$face,0,4)!='http' && !$this->isempt($face))$face = $url.''.$face.'';
 		$face 			= $this->rock->repempt($face, $mr);
 		return $face;
 	}

webmain/model/scheduleModel.php

@@ -2,6 +2,7 @@
 class scheduleClassModel extends Model
 {
 	private $datarows = array();
+	private $dtobj;
 	
 	public function initModel()
 	{

webmain/model/viewModel.php

@@ -6,6 +6,8 @@ class viewClassModel extends Model
 	
 	private $ursarr	= array();
 	
+	private $addb,$whereobj,$urs,$modrs;
+	
 	public function initModel()
 	{
 		$this->settable('flow_extent');

webmain/model/whereModel.php

@@ -3,6 +3,7 @@ class whereClassModel extends Model
 {
 	private $moders	= array();
 	private $ursarr	= array();
+	private $admindbs;
 	
 	public function initModel()
 	{

webmain/model/wordModel.php

@@ -1,7 +1,7 @@
 <?php
 class wordClassModel extends Model
 {
-	private $optionobj;
+	private $optionobj,$pathss;
 	
 	public function initModel()
 	{
@@ -295,6 +295,7 @@ class wordClassModel extends Model
 	}
 		
 	//获取文件夹,获取对应子目录
+	private $getfoldersa;
 	public function getfolders($cid, $typeid=0)
 	{
 		$rows = $this->getall('`cid`='.$cid.' and `type`=1','`id`,`name`,`typeid`','`sort`');