From f4d68700c7d38550b2639c976c2a115b12e216b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E4=B8=AD=E7=A3=90=E7=9F=B3?= Date: Thu, 17 Nov 2022 16:20:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E5=91=BCv2.5.1=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +- config/version.php | 4 +- include/chajian/aliossChajian.php | 88 +++++ include/chajian/inputChajian.php | 3 + js/jswx.js | 2 +- js/reim_xina.js | 1 + mode/bootstrapplugin/jquery-bootsform.js | 2 +- web/res/js/jquery-rockupload.js | 10 +- webmain/css/css.css | 4 +- webmain/css/cssm.css | 4 +- webmain/flow/input/inputAction.php | 21 +- webmain/flow/input/inputjs/input.js | 124 +++++-- webmain/flow/input/inputjs/input_two.js | 76 ++++- webmain/flow/input/inputjs/mode_collectm.js | 8 + webmain/flow/input/inputjs/mode_finfybx.js | 2 +- webmain/flow/input/inputjs/mode_userinfo.js | 2 +- webmain/flow/input/inputjs/mode_yqhealthy.js | 4 + webmain/flow/input/mode_collectmAction.php | 21 +- webmain/flow/input/mode_collectsAction.php | 91 ++++++ webmain/flow/input/mode_userAction.php | 8 + webmain/flow/input/mode_yqhealthyAction.php | 30 ++ webmain/flow/input/tpl_input_lu.html | 4 +- webmain/flow/input/tpl_input_lum.html | 4 +- webmain/flow/page/input_collectm.html | 2 +- webmain/flow/page/input_yqhealthy.html | 1 + webmain/flow/page/rock_page.php | 4 +- webmain/flow/page/rock_page_collectm.php | 21 +- webmain/flow/page/rock_page_collects.php | 1 + webmain/flow/page/rock_page_collectstotal.php | 65 ++++ webmain/flow/page/rock_page_news.php | 2 +- webmain/flow/page/rock_page_yqhealthy.php | 70 ++++ webmain/home/index/indexAction.php | 1 + webmain/home/index/rock_index.php | 15 +- webmain/index/indexpublic.js | 19 +- webmain/install/rockxinhu.sql | 308 +++++++++++------- webmain/login/loginAction.php | 85 +++++ webmain/main/flow/rock_flow_setedit.php | 2 +- webmain/main/flowtotal/rock_flowtotal.php | 1 + webmain/main/fwork/rock_fwork_bill.php | 6 +- webmain/main/userinfo/rock_userinfo_anay.php | 4 +- webmain/model/adminModel.php | 9 +- webmain/model/beifenModel.php | 18 +- webmain/model/flow/collectmModel.php | 101 ++++++ webmain/model/flow/collectsModel.php | 159 +++++++++ webmain/model/flow/custractModel.php | 1 + webmain/model/flow/flow.php | 2 +- webmain/model/flow/yqhealthyModel.php | 16 + webmain/model/modeModel.php | 109 ++++++- webmain/public/print/tpl_print.html | 2 +- webmain/reim/login/tpl_login_xina.html | 3 +- webmain/system/beifen/beifenAction.php | 19 +- webmain/system/cog/cogAction.php | 70 +++- webmain/system/cog/rock_cog_moreset.php | 127 ++++++-- webmain/task/api/apiAction.php | 2 +- webmain/task/api/loginAction.php | 26 +- webmain/task/api/uploadAction.php | 2 +- webmain/task/api/uploawAction.php | 25 ++ webmain/task/openapi/openbaseAction.php | 2 +- webmain/task/runt/carmAction.php | 5 +- webmain/task/runt/crmAction.php | 8 +- webmain/task/runt/dayAction.php | 17 + webmain/we/index/tpl_index.html | 3 +- webmain/we/index/tpl_index.mini.js | 2 +- webmain/we/ying/tpl_ying.html | 2 + webmain/we/ying/ying.js | 31 +- 65 files changed, 1642 insertions(+), 245 deletions(-) create mode 100644 include/chajian/aliossChajian.php create mode 100644 webmain/flow/input/inputjs/mode_yqhealthy.js create mode 100644 webmain/flow/input/mode_yqhealthyAction.php create mode 100644 webmain/flow/page/input_yqhealthy.html create mode 100644 webmain/flow/page/rock_page_collectstotal.php create mode 100644 webmain/flow/page/rock_page_yqhealthy.php create mode 100644 webmain/model/flow/collectmModel.php create mode 100644 webmain/model/flow/collectsModel.php create mode 100644 webmain/model/flow/yqhealthyModel.php create mode 100644 webmain/task/api/uploawAction.php diff --git a/README.md b/README.md index 7b7bd2a..e5177ad 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ 官网网站：http://www.rockoa.com/ 源码仅供学习二次开发使用，禁止二次发布，禁止用于商业用途出售等(违者必究) 版权：Copyright @2016-2022 信呼开发团队 -版本整理时间：2022-09-29 23:59:59 -版本号：V2.5.0 +版本整理时间：2022-11-17 23:59:59 +版本号：V2.5.1 -### V2.5.0更新说明 +### V2.5.1更新说明 1、完善系统安全性。 2、更多升级日志详见：http://www.rockoa.com/view_core.html diff --git a/config/version.php b/config/version.php index f62006a..3dba2dc 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ accesskeyid = getconfig('alioss_keyid'); + $this->accesskeysecret = getconfig('alioss_keysecret'); + $this->folder = getconfig('alioss_folder'); + $this->bucket = getconfig('alioss_bucket'); + + $path = ''.ROOT_PATH.'/include/vendor/autoload.php'; + if(file_exists($path) && $this->accesskeysecret){ + require_once($path); + $this->vendorbool = true; + } + } + + public function isbool() + { + return $this->vendorbool; + } + + + + private function getOssClient() + { + if(!$this->ossClient){ + $fq = getconfig('alioss_region'); + $endpoint = 'http://oss-cn-'.$fq.'.aliyuncs.com'; + $this->ossClient = new \OSS\OssClient($this->accesskeyid, $this->accesskeysecret, $endpoint); + } + return $this->ossClient; + } + + /** + * 涓婁紶鏂囦欢鍒皁ss + */ + public function uploadFile($path) + { + if(!$this->isbool())return returnerror('no install alioss'); + try{ + $ossClient = $this->getOssClient(); + $barr = $ossClient->uploadFile($this->bucket, $this->folder.'/'.$path, ROOT_PATH.'/'.$path); + if(is_array($barr)){ + $info = $barr['info']; + $carr = returnsuccess($barr); + $carr['code']= 0; + $carr['url'] = str_replace('http:','https:', $info['url']); + $carr['filesize'] = $info['request_size']; + return $carr; + }else{ + return returnerror(); + } + } catch(\OSS\Core\OssException $e) { + return returnerror($e->getMessage()); + } + } + + /** + * 涓嬭浇鏂囦欢 + */ + public function download($path, $dstPath) + { + if(!$this->isbool())return returnerror('no install alioss'); + try{ + $ossClient = $this->getOssClient(); + $localfile = $dstPath; + $options = array( + \OSS\OssClient::OSS_FILE_DOWNLOAD => $localfile + ); + $ossClient->getObject($this->bucket, $path, $options); + $carr = returnsuccess($barr); + $carr['code']= 0; + return $carr; + } catch(\OSS\Core\OssException $e) { + return returnerror($e->getMessage()); + } + } +} \ No newline at end of file diff --git a/include/chajian/inputChajian.php b/include/chajian/inputChajian.php index 3027a1a..91f8b4a 100644 --- a/include/chajian/inputChajian.php +++ b/include/chajian/inputChajian.php @@ -123,6 +123,9 @@ class inputChajian extends Chajian if($lens>0)$lenstr=' maxlength="'.$lens.'"'; $onblue = ' onblur="c.inputblur(this, '.$iszb.')"'; $iszhang= false; + if($type=='text' && !isempt($data)){ + $attr.=' onkeyup="c.autocomplete(this,\''.$data.'\','.$a['id'].', '.$iszb.',event)" onclick="this.onkeyup()"'; + } $str = ''; diff --git a/js/jswx.js b/js/jswx.js index d758caa..6147238 100644 --- a/js/jswx.js +++ b/js/jswx.js @@ -43,7 +43,7 @@ js.wx.prompt=function(tit,msg,fun,nr){ function func(lx){ if(lx=='yes')fun(get('prompttxt').value); } - var msg = '
'+msg+'
'; + var msg = '
'+msg+'
'; this.alert(msg,func,tit, 1); } js.apiurl = function(m,a,cans){ diff --git a/js/reim_xina.js b/js/reim_xina.js index 93f80ed..7c128ae 100644 --- a/js/reim_xina.js +++ b/js/reim_xina.js @@ -34,6 +34,7 @@ var reim={ //鏁扮 setInterval('reim.timeload()', 1000); var fse=js.getoption('loginface'); + token =js.getoption('admintoken'); if(fse)get('myface').src=fse; nwjs.createtray(document.title+'-'+adminname, 1); diff --git a/mode/bootstrapplugin/jquery-bootsform.js b/mode/bootstrapplugin/jquery-bootsform.js index 5d0d2fc..05e55a4 100644 --- a/mode/bootstrapplugin/jquery-bootsform.js +++ b/mode/bootstrapplugin/jquery-bootsform.js @@ -100,7 +100,7 @@ var s = '',a=can.items,i,i1,style='padding:10px'; if(can.bodyheight!=0)style+=';height:'+can.bodyheight+'px'; s+='
'; - s+='
'; + s+=''; s+=''; s+=''; for(i=0; i-1){ this._error(bstr); }else{ this.onsuccessa(this.filearr,bstr,o); diff --git a/webmain/css/css.css b/webmain/css/css.css index 423cb40..871ae61 100644 --- a/webmain/css/css.css +++ b/webmain/css/css.css @@ -100,4 +100,6 @@ a.webbtn:link,a.webbtn:visited,.webbtn{color:#ffffff; background-color:#1389D3;b .r-tabs .r-tabs-item:first-child{border-top-left-radius:5px} .r-tabs .r-tabs-item:last-child{border-top-right-radius:5px;border-right-width:1px} .r-tabs .r-tabs-item:not(:first-child):not(:last-child){border-radius:0} -.r-tabs .r-tabs-item.r-tabs-item.active{color:#1389D3;color:var(--main-color);} \ No newline at end of file +.r-tabs .r-tabs-item.r-tabs-item.active{color:#1389D3;color:var(--main-color);} + +.list-itemv:hover{color:var(--main-color);cursor:pointer} \ No newline at end of file diff --git a/webmain/css/cssm.css b/webmain/css/cssm.css index 5051d7d..77e8f6b 100644 --- a/webmain/css/cssm.css +++ b/webmain/css/cssm.css @@ -85,4 +85,6 @@ a.webbtn:link,a.webbtn:visited,.webbtn{color:#ffffff;opacity:0.8; background-col .upload_items:active{border:1px var(--main-color) solid} .upload_items img.imgs{width:50px;height:50px;margin:5px} .upload_items_items{padding:5px;text-align:center} -.upload_items_meng{ background:rgba(0,0,0,0.5);position:absolute;left:0px;top:0px;height:60px;overflow:hidden;line-height:60px;text-align:center;width:100%;color:white} \ No newline at end of file +.upload_items_meng{ background:rgba(0,0,0,0.5);position:absolute;left:0px;top:0px;height:60px;overflow:hidden;line-height:60px;text-align:center;width:100%;color:white} + +.list-itemv:active{color:var(--main-color);cursor:pointer} \ No newline at end of file diff --git a/webmain/flow/input/inputAction.php b/webmain/flow/input/inputAction.php index 7052603..77c6642 100644 --- a/webmain/flow/input/inputAction.php +++ b/webmain/flow/input/inputAction.php @@ -255,6 +255,7 @@ class inputAction extends Action //淇濆瓨鍚庡鐞 $this->saveafter($table,$this->getsavenarr($uaarr, $oldrs), $id, $addbo); + if($addbo)c('cache')->del('tempdata_'.$modenum.'_'.$this->adminid.'');//鍒犻櫎鏆傚瓨 //淇濆瓨淇敼璁板綍 $editcont = ''; @@ -675,6 +676,8 @@ class inputAction extends Action $otherfile = 'webmain/flow/input/tpl_input_luother_'.$this->ismobile.'.html'; if(!file_exists($otherfile))$otherfile = ''; $this->assign('otherfile', $otherfile); + $tempdata = ($mid==0) ? c('cache')->get('tempdata_'.$num.'_'.$this->adminid.'') : ''; + $this->assign('tempdata', $tempdata); } //2022-06-15娣诲姞鍒嗙粍鏄剧ず @@ -699,7 +702,7 @@ class inputAction extends Action //澶氳瀛愯〃鍐呮浛鎹 private function pisubduolie($content, $modeid, $nameaas) { - $fieldarr = m('flow_element')->getrows("`mid`='$modeid' and `iszb`>0",'fields,fieldstype,name,dev,data,isbt,islu,attr,iszb,gongsi,lens','`sort`'); + $fieldarr = m('flow_element')->getrows("`mid`='$modeid' and `iszb`>0",'*','`sort`'); if(!$fieldarr)return $content; $this->fieldarr = array(); foreach($fieldarr as $k=>$rs){ @@ -1162,6 +1165,22 @@ class inputAction extends Action } return 'ok'; } + + /** + * 鏆傚瓨7澶 + */ + public function savezhanAjax() + { + $flownum = $this->post('flownum'); + $contstr = $this->post('contstr'); + $key = 'tempdata_'.$flownum.'_'.$this->adminid.''; + if($contstr){ + c('cache')->set($key, $contstr, 3600*24*7); + }else{ + c('cache')->del($key); + } + return returnsuccess(); + } } class inputClassAction extends inputAction{} \ No newline at end of file diff --git a/webmain/flow/input/inputjs/input.js b/webmain/flow/input/inputjs/input.js index 1cf19e5..a825bcc 100644 --- a/webmain/flow/input/inputjs/input.js +++ b/webmain/flow/input/inputjs/input.js @@ -375,6 +375,8 @@ var c={ if(smid=='0'||smid==''){ isedit=1; $('#AltSspan').show(); + $('#Altzhan').show(); + c.loadzhan(); c.initdatelx(); c.initinput(); initbodys(smid); @@ -421,36 +423,9 @@ var c={ var da = a.data; alldata= da; js.setmsg(); - var len = arr.length,i,fid,val,flx,ojb,j; + var len = arr.length,i,j; data=da.data; - for(i=0;i-1)ojb[j].checked=true; - } - }else if(flx=='graph'){ - if(form(fid))form(fid).value=val; - if(val)$('#graphview_'+fid+'').append('
'); - }else if(flx=='checkbox'){ - form(fid).checked = (val=='1'); - }else if(flx=='htmlediter' && this.editorobj[fid]){ - this.editorobj[fid].html(val); - }else if(flx.substr(0,6)=='change'){ - if(form(fid))form(fid).value=val; - fid = arr[i].data; - if(!isempt(fid)&&form(fid))form(fid).value=da.data[fid]; - }else{ - if(form(fid))form(fid).value=val; - } - } - } + for(i=0;i-1)js.importjs('js/rmb.js'); if(gongsistr.indexOf('js.')>-1)js.importjs('js/jsrock.js'); } + this.tempkey = ''+moders.num+'tempdata'; }, getsubdata:function(i){ var d=[]; @@ -729,7 +705,95 @@ var c={ o.show(); o.prev().show(); }, - + savezhan:function(){ + var d = js.getformdata(); + var len = arr.length,i,fid; + for(i=0;i-1)ojb[j].checked=true; + } + }else if(flx=='graph'){ + if(form(fid))form(fid).value=val; + if(val)$('#graphview_'+fid+'').append('
'); + }else if(flx=='checkbox'){ + form(fid).checked = (val=='1'); + }else if(flx=='htmlediter' && this.editorobj[fid]){ + this.editorobj[fid].html(val); + }else if(flx.substr(0,6)=='change'){ + if(form(fid))form(fid).value=val; + fid = fa.data; + if(!isempt(fid)&&form(fid)){ + form(fid).value=da[fid]; + fb.push(fid); + } + }else{ + if(form(fid))form(fid).value=val; + } + } + return fb; + }, + loadzhan:function(){ + var dstr = tempdata; + if(dstr){ + var da = js.decode(jm.base64decode(dstr)); + c.loadzhanshow(da); + } + }, + loadzhanshow:function(da){ + var i,zn,j,sub,len; + for(i=0;i[鍒犻櫎鏆傚瓨]', 10); + this.zhanbool = true; + }, //----寮哄ぇ鍏紡璁＄畻鍑芥暟澶勭悊start----- inputblur:function(o1,zb){ diff --git a/webmain/flow/input/inputjs/input_two.js b/webmain/flow/input/inputjs/input_two.js index 0865676..c13e080 100644 --- a/webmain/flow/input/inputjs/input_two.js +++ b/webmain/flow/input/inputjs/input_two.js @@ -3,6 +3,7 @@ */ var inputtwo={ + onchangebefore:function(){}, selectdatadata:{}, //淇濆瓨鏁版嵁婧 selectdata:function(s1,ced,fid,tit,zbis){ if(isedit==0)return; @@ -144,7 +145,7 @@ var inputtwo={ } this.initupssa[sna]=$.rockupload({ 'inputfile':'filed_'+sna+'_inp', - 'initremove':false,'uptype':uptp, + 'initremove':false,'uptype':uptp,'formming':sna, 'urlparams':{'sysmodenum':modenum,'sysmid':mid}, 'oparams':{sname:sna,snape:tsye}, 'onsuccess':function(f,gstr){ @@ -186,6 +187,13 @@ var inputtwo={ }else if(tsye=='img'){ js.loading('涓婁紶涓...'); } + }, + onerror:function(estr){ + c.upfbo = false; + js.msg('msg',estr); + }, + onchangebefore:function(){ + c.onchangebefore(this); } }); }, @@ -207,7 +215,7 @@ var inputtwo={ js.loading('绛夊緟涓婁紶瀹屾垚...'); setTimeout("c.upimages('"+fid+"','"+fileid+"', true)",3000); }else{ - js.ajax(geturlact('upimagepath'),{fileid:fileid,fid:fid},function(ret){ + js.ajax('api.php?m=login&a=upimagepath',{fileid:fileid,fid:fid},function(ret){ js.unloading(); var da = ret.data; if(da.path)form(da.fid).value=da.path; @@ -379,5 +387,69 @@ var inputtwo={ if(lx==0)obj.create(); if(lx==1)obj.imports(); if(lx==2)obj.clear(); + }, + //鑷姩瀹屾垚2022-10-30娣诲姞 + autocompletearr:{}, + autocomplete:function(o1,s1,id1,zb){ + clearTimeout(this.autoctime); + this.autocompletea=[o1,s1,id1,zb]; + if(this.nowinpvle == o1.value && get('completelist'))return; + if(this.autocompletearr[id1]){ + this.autoctime = setTimeout(function(){c.autocompleteshow(o1,c.autocompletearr[id1]);},10); + return; + } + var a1 = s1.split(','); + var gcan = {'act':a1[0],'actstr':jm.base64encode(s1),'acttyle':'act','sysmodenum':modenum,'sysmid':mid}; + js.ajax(geturlact('getselectdata', gcan),{key:jm.base64encode(o1.value)}, function(ret){ + c.autocompletearr[id1] = ret; + c.autocompleteshow(o1,ret); + },'get,json') + }, + autocompleteshow:function(o1,da){ + if(!da || da.length==0)return; + var o2 = $(o1),lefta=o2.offset(),i,len=da.length,ds=[],zl=10,j=0; + $('#completelist').remove(); + var str= '
'; + var val= strreplace(o1.value); + if(val){ + for(i=0;i-1 || (da[i].subname && da[i].subname.indexOf(val)>-1)){ + ds.push(da[i]);j++;if(j>=zl*3)break; + } + }else{ + ds=da; + } + this.autodata = ds; + this.nowinpvle= o1.value; + $('body').append(str); + this.autocompleteshows(zl,1) + js.addbody('completelist', 'remove','completelist'); + }, + autocompleteshows:function(zl,p){ + var ds = this.autodata; + var str='',i,len=ds.length,j=0; + for(i=(p-1)*zl;i'+ds[i].name+''; + if(ds[i].subname)str+=' ('+ds[i].subname+')'; + str+=''; + j++; + if(j>=zl)break; + } + if(len>zl){ + str+='
鎬昏褰'+len+'鏉'; + if(p>1)str+=' <涓婇〉'; + if(j==zl)str+=' 涓嬮〉>'; + str+='
'; + } + setTimeout(function(){$('#completelist').html(str)},10); + }, + autocompleteclick:function(i){ + var d = this.autodata[i],o1=this.autocompletea[0]; + o1.value=d.name; + var a1 = this.autocompletea[1].split(','); + if(a1[1]){ + if(form(a1[1]))form(a1[1]).value = d.value; + } + this.onselectdataall(o1.name,d); + $('#completelist').remove(); } } \ No newline at end of file diff --git a/webmain/flow/input/inputjs/mode_collectm.js b/webmain/flow/input/inputjs/mode_collectm.js index 41b77b2..d6ff72b 100644 --- a/webmain/flow/input/inputjs/mode_collectm.js +++ b/webmain/flow/input/inputjs/mode_collectm.js @@ -1,4 +1,12 @@ //娴佺▼妯″潡銆恈ollectm.淇℃伅鏀堕泦銆戜笅褰曞叆椤甸潰鑷畾涔塲s椤甸潰,鍒濆鍑芥暟 function initbodys(){ +} + +function changesubmit(d){ + if(d.fenlei=='0' && !d.runren)return '璇烽夋嫨鏀堕泦瀵硅薄'; +} + +js.changeuser_before=function(na){ + if(na=='runren' && form('fenlei').value=='1')return '澶栭儴鏀堕泦涓嶉渶瑕侀夋嫨浜'; } \ No newline at end of file diff --git a/webmain/flow/input/inputjs/mode_finfybx.js b/webmain/flow/input/inputjs/mode_finfybx.js index 2404c0c..26c2864 100644 --- a/webmain/flow/input/inputjs/mode_finfybx.js +++ b/webmain/flow/input/inputjs/mode_finfybx.js @@ -13,7 +13,7 @@ function initbodys(){ addchengesss(); if(mid=='0'){ - if(form('cardid'))js.ajax(geturlact('getlast'),{},function(d){ + if(!c.zhanbool && form('cardid'))js.ajax(geturlact('getlast'),{},function(d){ if(d){ if(form('paytype'))form('paytype').value=d.paytype; if(form('cardid'))form('cardid').value=d.cardid; diff --git a/webmain/flow/input/inputjs/mode_userinfo.js b/webmain/flow/input/inputjs/mode_userinfo.js index 8b2c4bb..46e3f6f 100644 --- a/webmain/flow/input/inputjs/mode_userinfo.js +++ b/webmain/flow/input/inputjs/mode_userinfo.js @@ -4,7 +4,7 @@ function initbodys(){ if(js.request('optlx')=='my'){ for(var i=0;irows($dbs->gjoin($arr['runrenid'], 'ud', 'where')); - + if($arr['fenlei']=='0'){ + $dbs = m('admin'); + $rows['leixing'] = $dbs->rows($dbs->gjoin($arr['runrenid'], 'ud', 'where')); + } return array( 'rows' => $rows ); @@ -34,6 +35,20 @@ class mode_collectmClassAction extends inputAction{ } + public function beizhustring() + { + return '绫诲瀷鏄閮ㄦ敹闆嗭紝瀛楁绫诲瀷浠呮敮鎸佹枃鏈锛屾枃鏈煙锛屾棩鏈熺被鍨嬶紝鍗曢夋锛屽閫夋鐨勭被鍨嬨'; + } + public function createouturlAjax() + { + header("Content-type:image/png"); + $urls= $this->rock->getouturl(); + $id = (int)$this->get('id'); + m('planm')->update('`state`=1', $id); + $url = ''.$urls.'?m=login&a=collect&mid='.$id.''; + $img = c('qrcode')->show($url); + echo $img; + } } \ No newline at end of file diff --git a/webmain/flow/input/mode_collectsAction.php b/webmain/flow/input/mode_collectsAction.php index c5862c3..7cbf7db 100644 --- a/webmain/flow/input/mode_collectsAction.php +++ b/webmain/flow/input/mode_collectsAction.php @@ -31,5 +31,96 @@ class mode_collectsClassAction extends inputAction{ protected function saveafter($table, $arr, $id, $addbo){ } + + protected function storeaftersss($table, $rows, $barr=array()) + { + $arr = array(); + $mid = (int)$this->get('leixingid','0'); + if($mid>0 && isset($barr['listinfo'])){ + $fieldsarr = $barr['listinfo']['fieldsarr']; + + } + return $arr; + } + + public function collectstotal_before() + { + $mid = (int)$this->get('mid','0'); + $this->mid = $mid; + $key = $this->post('key'); + $this->zdarr = m('plans')->getall('mid='.$this->mid.'','*','`sort`'); + $this->zdobj = array(); + $where = ''; + if($key)$where=" and (`optname` like '%".$key."%'"; + $wher1 = ''; + foreach($this->zdarr as $k=>$rs){ + $flx = $rs['zxren']; + $this->zdobj[$rs['id']] = $flx; + } + if($key)$wher1=" a.`zxren` like '%".$key."%'"; + if($wher1)$where.=' or `id` in(select a.`mid` from `[Q]plans` a left join `[Q]planm` b on a.`mid`=b.`id` where b.`type`=3 and b.`leixing`='.$mid.' and '.$wher1.')'; + if($key)$where.=')'; + return 'and `type`=3 and `leixing`='.$mid.''.$where.''; + } + + public function collectstotal_after($table, $rows) + { + $dbs = m('plans'); + $arows= $this->zdarr; + $mrs = m($table)->getone($this->mid); + + if($this->loadci==1){ + $farr = array(); + if($mrs['fenlei']=='0'){ + $farr[] = array( + 'text' => '濉啓浜', + 'dataIndex' => 'optname' + ); + } + foreach($arows as $k=>$rs){ + $sarr = array( + 'text' => $rs['pitem'], + 'dataIndex' => 'items_'.$rs['id'].'', + 'filestype' => $rs['zxren'], + 'sortable' => false + ); + if($rs['zxren']=='uploadfile' || $rs['zxren']=='textarea')$sarr['align']='left'; + $farr[] = $sarr; + } + $farr[] = array( + 'text' => '濉啓鏃堕棿', + 'dataIndex' => 'optdt', + 'sortable' => true + ); + $farr[] = array( + 'text' => '鐘舵', + 'dataIndex' => 'status', + 'sortable' => true + ); + $barr['columns'] = $farr; + } + $faobj = m('file'); + foreach($rows as $k=>$rs){ + $arows= $dbs->getall('mid='.$rs['id'].'','*','`sort`'); + foreach($arows as $k1=>$rs1){ + $flx = arrvalue($this->zdobj, $rs1['itemid']); + $val = $rs1['zxren']; + if($flx=='uploadimg' && !isempt($val)){ + $val = ''; + } + if($flx=='uploadfile' && !isempt($val)){ + $val = $faobj->getstr('', '', 0, "`id` in($val)"); + } + $rows[$k]['items_'.$rs1['itemid'].''] = $val; + } + $status = ''; + if($rs['status']=='0')$status='寰呭鏍'; + if($rs['status']=='1')$status='宸插鏍'; + if($rs['status']=='2')$status='鏈氳繃'; + $rows[$k]['status'] = $status; + } + $barr['rows'] = $rows; + return $barr; + } } \ No newline at end of file diff --git a/webmain/flow/input/mode_userAction.php b/webmain/flow/input/mode_userAction.php index 413b19e..818619d 100644 --- a/webmain/flow/input/mode_userAction.php +++ b/webmain/flow/input/mode_userAction.php @@ -141,5 +141,13 @@ class mode_userClassAction extends inputAction{ m('admin')->updateinfo(); //鏇存柊 return 'ok'; } + + public function rankingdata() + { + $arr = array(); + $rows = $this->db->getall('select `ranking` from `[Q]admin` group by `ranking`'); + foreach($rows as $k=>$rs)$arr[] = array('name'=>$rs['ranking'],'value'=>''); + return $arr; + } } \ No newline at end of file diff --git a/webmain/flow/input/mode_yqhealthyAction.php b/webmain/flow/input/mode_yqhealthyAction.php new file mode 100644 index 0000000..09dd073 --- /dev/null +++ b/webmain/flow/input/mode_yqhealthyAction.php @@ -0,0 +1,30 @@ +'閿欒鎻愮ず鍐呭','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){ + + } +} + \ No newline at end of file diff --git a/webmain/flow/input/tpl_input_lu.html b/webmain/flow/input/tpl_input_lu.html index 0be124b..ba6aa84 100644 --- a/webmain/flow/input/tpl_input_lu.html +++ b/webmain/flow/input/tpl_input_lu.html @@ -17,7 +17,7 @@ -var editor,arr=,moders=,gongsiarr=,subfielsa=,zbnamearr=,isedit=0,mid='',isinput=1,data={},maincolor=''; +var editor,arr=,moders=,gongsiarr=,subfielsa=,zbnamearr=,isedit=0,mid='',isinput=1,data={},maincolor='',tempdata='';