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

no commit message

Browse Source
This commit is contained in:
雨中磐石
2024-10-18 15:27:40 +08:00
parent 9a2a3a2c8a
commit 559c388ea0
103 changed files with 2021 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webmain/main/flow/flowAction.php
View File

@@ -1050,6 +1050,9 @@ class mode_'.$modenum.'ClassAction extends inputAction{
if(!$mrs)return '模块不存在';
$num = $mrs['num'];
if($num!='demo' && $mrs['type']=='系统')return '系统类型模块不能删除清空';
/*
//防止误删2024-09-11已弃用
$flow = m('flow')->initflow($num);
$table = $mrs['table'];
$where = $mrs['where'];
@@ -1066,6 +1069,7 @@ class mode_'.$modenum.'ClassAction extends inputAction{
$flow->loaddata($ssid, false);
$flow->deletebill('清空模块数据', false);
}
*/
$name = $mrs['name'];
if($dm){

22
webmain/main/flow/rock_flow_course.php
View File

@@ -295,6 +295,26 @@ $(document).ready(function(){
});
</script>
<style>
/*图形样式*/
.rf{position:absolute;background-color:rgba(var(--rgb-r),var(--rgb-g),var(--rgb-b),0.2);border:var(--border);text-align:center;max-width:150px;min-width:100px;border-radius:5px}
.rf_nei{padding:5px 10px}
.rf_ract{}
.rf_yuan{border-radius:20%}
.rf-text{font-size:14px;word-wrap:nowrap;height:20px;line-height:20px;overflow:hidden}
.rf-texts{font-size:12px;word-wrap:nowrap;height:20px;line-height:20px;overflow:hidden}
.rf-txt{position:absolute;color:var(--main-color)}
.rf-active{background-color:#60C2F7}
/*箭头的*/
.rf_shu{position:absolute;height:100px;border:none;width:12px;overflow:hidden;transform-origin:0px 0px;-webkit-transform-origin:0px 0px;-ms-transform-origin:0px 0px;-moz-transform-origin:0px 0px;}
.rf_shu1{width:6px;height:94px;background-color:rgba(var(--rgb-r),var(--rgb-g),var(--rgb-b),0.2);margin-left:3px}
.rf_shu2{width:0px;height:0px; overflow:hidden;border-width:6px;border-style:solid;border-color:rgba(var(--rgb-r),var(--rgb-g),var(--rgb-b),0.2) transparent transparent transparent;}
.rf_shus{position:absolute;height:100px;border:none;width:6px;overflow:hidden;background-color:rgba(var(--rgb-r),var(--rgb-g),var(--rgb-b),0.1)}
.rf_hens{position:absolute;height:6px;border:none;width:100px;overflow:hidden;background-color:rgba(var(--rgb-r),var(--rgb-g),var(--rgb-b),0.1)}
</style>
<table width="100%">
<tr valign="top">
@@ -341,7 +361,7 @@ $(document).ready(function(){
<div id="view_{rand}"></div>
<div class="blank10"></div>
<div id="mainvss{rand}" style="background:#f1f1f1;border:1px #dddddd solid;border-radius:5px;padding:10px;display:none;">
<div id="mainvss{rand}" style="background:rgba(0,0,0,0.1);border:var(--border);border-radius:5px;padding:10px;display:none;">
<div oncontextmenu="return false" id="mainv{rand}" class="notsel" style="position:relative;height:auto;"></div>
</div>
</td>

2
webmain/main/goods/goodsAction.php
View File

@@ -305,7 +305,7 @@ class goodsClassAction extends Action
}
$where .= m('admin')->getcompanywhere(1,'a.');
return array(
'where' => 'and a.`status`=1 and a.`state`<>1 '.$where.'',
'where' => 'and a.`status`=1 and a.`type`<>6 and a.`state`<>1 '.$where.'',
'table' => '`[Q]'.$table.'` a left join `[Q]flow_bill` b on a.id=b.mid and b.`table`=\''.$table.'\'',
'fields' => 'a.id,a.applydt,a.optdt,a.`explain`,a.`state`,a.`type`,b.uname,b.sericnum,b.udeptname'
);

4
webmain/main/kaoqin/rock_kaoqin_geren.php
View File

@@ -18,7 +18,7 @@ $(document).ready(function(){
var d1,s='';
for(d1 in da){
s=da[d1];
if(s!='')$('#s'+d1+'_{rand}').html('<div style="border-top:1px #eeeeee solid;margin-top:3px;">'+s+'</div>');
if(s!='')$('#s'+d1+'_{rand}').html('<div style="border-top:var(--border);margin-top:3px;">'+s+'</div>');
}
s='';var toarr = da['total'];
for(d1 in toarr)s+='，'+d1+':'+toarr[d1]+'';
@@ -73,5 +73,5 @@ $(document).ready(function(){
</table>
</div>
<div class="blank10"></div>
<div style="height:30px;line-height:30px;border-top:1px #dddddd solid">&nbsp;统计：<span id="total_{rand}"></span></div>
<div style="height:30px;line-height:30px;border-top:var(--border)">&nbsp;统计：<span id="total_{rand}"></span></div>
<div id="veiw_{rand}"></div>

2
webmain/main/salary/salaryAction.php
View File

@@ -58,6 +58,8 @@ class salaryClassAction extends Action
public function xinziafter($table, $rows)
{
$heji = 0;
return array(
'rows' => $rows,
'isdaochu' => m('view')->isdaochu($this->flow->modeid, $this->adminid)