daxi20/xinhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发布v2.5.5版本

Browse Source
This commit is contained in:
雨中磐石
2023-04-05 13:00:20 +08:00
parent bc69541c7b
commit 33ce4c6298
102 changed files with 570 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
webmain/flow/input/inputAction.php
View File

@@ -4,6 +4,7 @@ class inputAction extends Action
public $mid = 0;
public $flow;
public $rs = array();
public $gongsiarr,$actclss,$fieldarrall,$inputobj,$subfielsa,$checkobj,$mdb;
public function initAction()
{
@@ -241,8 +242,13 @@ class inputAction extends Action
if(!$bo)$this->backmsg($this->db->lasterror());
if($id==0)$id = $this->db->insert_id();
m('file')->addfile($this->post('fileid'), $table, $id, $modenum);
if($this->otherfileid!='')m('file')->addfile(substr($this->otherfileid,1), '', $id, $modenum);
$fobj = m('file');
$fobj->addfile($this->post('fileid'), $table, $id, $modenum);
if($this->otherfileid!=''){
$ofid1 = substr($this->otherfileid,1);
$fobj->addxuan($ofid1,$this->post('sxuanfileid'),''.$modenum.'|'.$id.'');
$fobj->addfile($ofid1, '', $id, $modenum);
}
$newrs = $db->getone($id);
$this->companyid = isset($newrs['companyid']) ? (int)$newrs['companyid'] : (int)arrvalue($newrs, 'comid', '0');
if($this->companyid==0)$this->companyid = m('admin')->getcompanyid();
@@ -529,7 +535,7 @@ class inputAction extends Action
if(file_exists($path))$pclucont = file_get_contents($path);
$isupfile = 0;
$nameaas = explode(',', $moders['names']); //子表名
$nameaas = explode(',', (string)$moders['names']); //子表名
//PC端
if($this->ismobile==0){
@@ -808,6 +814,8 @@ class inputAction extends Action
/**
* 公共读取数据之前处理
*/
public $atypearr;
public $modeid;
public function storebeforeshow($table)
{
$this->atypearr = false;
@@ -1182,6 +1190,21 @@ class inputAction extends Action
}
return returnsuccess();
}
public function flow5importAjax()
{
$modeid = (int)$this->get('modeid');
$msg = '没有找到相应记录';
$onrs = m('flowbill')->getone('`modeid`='.$modeid.' and `uid`='.$this->adminid.' and ifnull(flow5str,\'\')<>\'\'','*','id desc');
$flow5str= '';
if($onrs){
$flow5str = $onrs['flow5str'];
$msg = '引入成功';
}
$barr = returnsuccess($flow5str);
$barr['msg'] = $msg;
return $barr;
}
}
class inputClassAction extends inputAction{}

14
webmain/flow/input/inputjs/input.js
View File

@@ -37,6 +37,10 @@ function initbody(){
for(var oi in inputtwo)c[oi]=inputtwo[oi];
initbody_tmp();
});
if(get('flow5div'))js.importjs('webmain/flow/input/inputjs/input_twp.js?'+Math.random()+'', function(){
for(var oj in inputtwp)c[oj]=inputtwp[oj];
c.flow5init();
});
}
function initbody_tmp(){
initother();
@@ -292,6 +296,15 @@ var c={
return false;
}
if(this.flow5get){
var d1 = this.flow5get();
if(d1.length==0){
this.showtx('请先设置审核流程');
return false;
}
d.sysflow5str = JSON.stringify(d1);
}
var s=changesubmit(d);
if(typeof(s)=='string'&&s!=''){
this.showtx(s);
@@ -443,6 +456,7 @@ var c={
}
}
c.initinput();
if(c.flow5initdata)c.flow5initdata();
initbodys(form('id').value);
if(isedit==0){
this.formdisabled();

10
webmain/flow/input/inputjs/input_two.js
View File

@@ -260,6 +260,7 @@ var inputtwo={
c.showfileup(this.fid, seld);
c.showupid(this.fid);
}
c.showxuanfile(seld);
}
}
});
@@ -267,6 +268,13 @@ var inputtwo={
js.msg('msg','无法操作');
}
},
showxuanfile:function(xda){
var ob = form('sxuanfileid'),st1;
st1 = ob.value;
if(st1)st1+=',';
st1+=''+xda.id+'';
ob.value = st1;
},
//上传完成
showupid:function(sna){
var os = $('div[upid_'+sna+']'),fvid='';
@@ -294,7 +302,7 @@ var inputtwo={
if(jg=='yes'){
o.remove();
c.showupid(sna);
if(!f.xuanbool)$.get(js.getajaxurl('delfile','upload','public',{id:fid}));
if(!f.xuanbool)$.get(js.getajaxurl('delfile','upload','public',{id:fid,mid:mid,num:moders.num}));
}
});
}

15
webmain/flow/input/inputjs/mode_company.js
View File

@@ -1,4 +1,17 @@
//流程模块【company.公司单位】下录入页面自定义js页面,初始函数
function initbodys(){
if(form('yuming'))$(form('yuming')).blur(bluryuming);
}
function bluryuming(){
var val = this.value;
if(val){
val = strreplace(val);
val = val.replace('https://','');
val = val.replace('http://','');
if(val.indexOf('/')>-1){
val = val.substr(0, val.indexOf('/'));
}
this.value = val;
}
}

2
webmain/flow/input/mode_dailyAction.php
View File

@@ -1,7 +1,7 @@
<?php
class mode_dailyClassAction extends inputAction{
public $months;
protected function savebefore($table, $arr, $id, $addbo){
$type = arrvalue($arr, 'type');

11
webmain/flow/input/rock_input_daoru.php
View File

@@ -120,7 +120,16 @@ $(document).ready(function(){
<div align="left">
<div>请下面表格格式在Excel中添加数据，并复制到下面文本框中，也可以手动输入，<a click="downxz" href="javascript:;">[下载Excel模版]</a>。<br>多行代表多记录，整行字段用 分开，<a click="insrtss" href="javascript:;">插入间隔符</a></div>
<div style="padding:5px 0px"><input type="button" id="upbtn{rand}" click="addfile" class="btn btn-primary" value="选择Excel文件..."></div>
<div style="padding:5px 0px">
<?php
if(version_compare(PHP_VERSION, '7.5.0','>')){
echo '<font color=red>PHP'.PHP_VERSION.'版本不支持选Excel文件，请使用打开文件复制粘贴。</font>';
}else{
echo '<input type="button" id="upbtn{rand}" click="addfile" class="btn btn-primary" value="选择Excel文件...">';
}
?>
</div>
<div><textarea style="height:250px;" id="maincont_{rand}" class="form-control"></textarea></div>
<div id="showview_{rand}"></div>

1
webmain/flow/input/tpl_input_lu.html
View File

@@ -62,6 +62,7 @@ echo 'body{--main-color:'.$maincolor.';--main-border:rgba('.$maincolors.',0.2)}'
<div class="tdcont" align="left">
<form name="myform" autocomplete="off">
<input name="id" type="hidden" value="<?=$da['mid']?>">
<input name="sxuanfileid" type="hidden" value="">
<?php
$firstrs = array();
$coursestr = '';

1
webmain/flow/input/tpl_input_lum.html
View File

@@ -99,6 +99,7 @@ if($showheader==1)echo '<div id="header_title" style="padding-top:'.$cenghei.'px
<div class="status"></div>
<form name="myform" autocomplete="off">
<input name="id" type="hidden" value="<?=$da['mid']?>">
<input name="sxuanfileid" type="hidden" value="">
<?php
for($i=0;$i<$da['zbshu'];$i++)echo '<input value="0" type="hidden" name="sub_totals'.$i.'">';
?>