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

发布v2.5.6版本

Browse Source
This commit is contained in:
雨中磐石
2023-04-26 15:46:53 +08:00
parent 33ce4c6298
commit 8145b2df84
55 changed files with 1193 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,6 +316,7 @@ class inputAction extends Action
$sid = (int)$this->post('sid'.$xu.'_'.$i.'');
$bos = true;
$uaarr['id'] = $sid;
$wkz = 0;
foreach($farr as $k=>$rs){
$fid= $rs['fields'];
$flx= $rs['fieldstype'];
@@ -325,6 +326,7 @@ class inputAction extends Action
if($bos){
$val= $this->post($na);
if($rs['isbt']==1 && isempt($val))$bos=false;
if(isempt($val))$wkz++;
}
if($bos){
$msy = $this->attrcheck($val,$rs['attr'], $this->checkobj);
@@ -346,6 +348,7 @@ class inputAction extends Action
if(!$bos)break;
}
if(!$bos)continue;
//if($wkz==$k+1)continue;
$uaarr['sort'] = $sort;
$sort++;
$arr[] = $uaarr;

51
webmain/flow/input/inputjs/mode_custfina.js
View File

@@ -1,27 +1,41 @@
var kexuan = true;
function initbodys(){
$(form('custid')).change(function(){
var val = this.value,txt='';
if(val!=''){
txt = this.options[this.selectedIndex].text;
}
form('custname').value=txt;
form('htid').value = '';
});
c.onselectdata['custname']=function(){
form('htid').value = '';
form('htid').value = '0';
}
$(form('htid')).change(function(){
var val = this.value,txt='';
salechange(val);
});
var defe = js.request('def_htid');
if(defe && defe<0)salechange(defe);
if(mid>0){
if(data.xgid && data.xgid>0){
form('htid').length=2;
form('money').readOnly=true;
$(form('money')).click(function(){
js.alert('关联了其他单据，金额不能修改');
})
kexuan = false;
}
}else{
if(!defe)form('htid').selectedIndex =1;
}
if(kexuan){
$(form('htid')).change(function(){
var val = this.value,txt='';
salechange(val);
});
}
}
c.onselectdatabefore=function(fid){
if(fid=='custname' && !kexuan)return '已关联其他单据不可选择';
}
function salechange(v){
if(v==''){
if(!kexuan)return;
if(v=='' || v=='0'){
form('custid').value='';
return;
}
@@ -33,4 +47,11 @@ function salechange(v){
form('htnum').value=a.num;
form('dt').value=a.signdt;
},'get,json');
}
function changesubmit(d){
if(d.ispay=='1'){
if(form('paytpye') && !d.paytpye)return '已收款了，收款类型不能为空';
if(!d.paydt)return '已收款了，收款时间不能为空';
}
}

51
webmain/flow/input/inputjs/mode_custfinb.js
View File

@@ -1,27 +1,41 @@
var kexuan = true;
function initbodys(){
$(form('custid')).change(function(){
var val = this.value,txt='';
if(val!=''){
txt = this.options[this.selectedIndex].text;
}
form('custname').value=txt;
form('htid').value = '';
});
c.onselectdata['custname']=function(){
form('htid').value = '';
form('htid').value = '0';
}
$(form('htid')).change(function(){
var val = this.value,txt='';
salechange(val);
});
//var defe = js.request('def_htid');
//if(defe && defe<0)salechange(defe);
if(mid>0){
if(data.xgid && data.xgid>0){
form('htid').length=2;
form('money').readOnly=true;
$(form('money')).click(function(){
js.alert('关联了其他单据，金额不能修改');
})
kexuan = false;
}
}else{
form('htid').selectedIndex =1;
}
if(kexuan){
$(form('htid')).change(function(){
var val = this.value,txt='';
salechange(val);
});
}
}
c.onselectdatabefore=function(fid){
if(fid=='custname' && !kexuan)return '已关联其他单据不可选择';
}
function salechange(v){
if(v==''){
if(!kexuan)return;
if(v=='' || v=='0'){
form('custid').value='';
return;
}
@@ -33,4 +47,11 @@ function salechange(v){
form('htnum').value=a.num;
form('dt').value=a.signdt;
},'get,json');
}
function changesubmit(d){
if(d.ispay=='1'){
if(form('paytpye') && !d.paytpye)return '已付款了，付款类型不能为空';
if(!d.paydt)return '已付款了，付款时间不能为空';
}
}

4
webmain/flow/input/inputjs/mode_jiaban.js
View File

@@ -70,7 +70,9 @@ function changetotal(){
}
var jty = 0;
if(form('jiatype'))jty = form('jiatype').value;
js.ajax(geturlact('total'),{stime:st,etime:et,jiatype:jty}, function(da){
var uid = '';
if(form('uid'))uid = form('uid').value;
js.ajax(geturlact('total'),{stime:st,etime:et,jiatype:jty,uid:uid}, function(da){
var a= js.decode(da);
form('totals').value=a[0];
if(form('jiafee'))form('jiafee').value=a[2];

117
webmain/flow/input/mode_custfinaAction.php
View File

@@ -6,12 +6,30 @@ class mode_custfinaClassAction extends inputAction{
protected function savebefore($table, $arr, $id, $addbo){
$narr = array();
$htid = (int)$arr['htid'];
$money = floatval($arr['money']);
if($money<=0)return '金额必须大于0';
//编辑时判断
if($this->rs && 1==2){
$xgid = arrvalue($this->rs,'xgid');
$xgnum = arrvalue($this->rs,'xgnum');
if($xgnum && $xgid){
$sflow = m('flow:'.$xgnum.'')->initbase($xgnum);
$onrs = $sflow->getone($xgid);
if($onrs){
$jiner = floatval($onrs['money']);
if($money != $jiner)return '此单据关联“'.$sflow->modename.','.$onrs['num'].'”的金额'.$onrs['money'].'不一样';
$narr['custid'] = $onrs['custid'];
$narr['custname'] = $onrs['custname'];
$narr['htnum'] = $onrs['num'];
}
}
}
//从合同读取
if($htid>0){
$htrs = m('custract')->getone($htid);
@@ -67,6 +85,10 @@ class mode_custfinaClassAction extends inputAction{
}
$rows = m('crm')->getmyract($this->adminid, $htid, 0);
$arr = array();
$arr[] = array(
'value' => '0',
'name' => '不选择',
);
foreach($rows as $k=>$rs){
$arr[] = array(
'value' => $rs['id'],
@@ -107,5 +129,98 @@ class mode_custfinaClassAction extends inputAction{
}
$this->returnjson($cars);
}
public function paytypedata()
{
$data = array();
$rows = $this->option->getmnum('paytype');
foreach($rows as $k=>$rs){
$data[] = array(
'name' => $rs['name'],
'value' => $rs['name'],
);
}
return $data;
}
protected function storeafter($table, $rows)
{
$money = 0;
if($rows){
foreach($rows as $k1=>$rs1){
$money+=floatval($rs1['money']);
}
$carr['money'] = $this->rock->number($money);
$carr['htnum'] = '合计';
$carr['id'] = 0;
$rows[] = $carr;
}
$zhangarr = false;
if($this->loadci==1 && $this->get('pnum')=='finall'){
$zhangarr = m('fina')->getzhangtao();
$zhangarrs= array();
foreach($zhangarr as $k=>$rs){
$zhangarrs[] = array('optgroup'=>'start','name'=>$rs['name']);
$arows = m('fina')->getaccount($rs['value']);
if($arows)foreach($arows as $k1=>$rs1){
$zhangarrs[] = $rs1;
}
$zhangarrs[] = array('optgroup'=>'end','name'=>$rs['name']);
}
$zhangarr = $zhangarrs;
}
return array(
'rows' => $rows,
'zhangarr'=> $zhangarr
);
}
public function createjizhangAjax()
{
$accountid = (int)$this->post('accountid','0');
$id = (int)$this->post('id','0');
$sm = $this->post('sm');
$acrs = m('finount')->getone($accountid);
$rs = m('custfina')->getone($id);
$urs = m('admin')->getone($rs['uid']);
$money = floatval($rs['money']);
$jtype = '销售收入';
if($rs['type']=='1'){
$jtype = '购买材料';
$money = 0-$money;
}
$paydt = $rs['paydt'];
if(isempt($paydt))$paydt = $rs['dt'];
$uarr['comid'] = $rs['comid'];
$uarr['type'] = $rs['type'];
$uarr['money'] = $money;
$uarr['custid'] = $rs['custid'];
$uarr['custname'] = $rs['custname'];
$uarr['applydt'] = $paydt;
$uarr['optid'] = $this->adminid;
$uarr['optname'] = $this->adminname;
$uarr['optdt'] = $this->rock->now;
$uarr['uid'] = $this->adminid;
$uarr['xguid'] = $rs['uid'];
$uarr['xgname'] = arrvalue($urs,'name');
$uarr['xgdeptid'] = arrvalue($urs,'deptid');
$uarr['xgdeptname'] = arrvalue($urs,'deptname');
$uarr['xgdeptname'] = arrvalue($urs,'deptname');
$uarr['explain'] = $rs['explain'].$sm;
$uarr['accountid'] = $accountid;
$uarr['zhangid'] = $acrs['zhangid'];
$uarr['jtype'] = $jtype;
$newid = m('finjibook')->insert($uarr);
m('custfina')->update('jzid='.$newid.'', $id);
return returnsuccess();
}
}

36
webmain/flow/input/mode_custfinbAction.php
View File

@@ -69,6 +69,10 @@ class mode_custfinbClassAction extends inputAction{
}
$rows = m('crm')->getmyract($this->adminid, $htid, 1);
$arr = array();
$arr[] = array(
'value' => '0',
'name' => '不选择',
);
foreach($rows as $k=>$rs){
$arr[] = array(
'value' => $rs['id'],
@@ -101,5 +105,37 @@ class mode_custfinbClassAction extends inputAction{
}
$this->returnjson($cars);
}
protected function storeafter($table, $rows)
{
$money = 0;
if($rows){
foreach($rows as $k1=>$rs1){
$money+=floatval($rs1['money']);
}
$carr['money'] = $this->rock->number($money);
$carr['htnum'] = '合计';
$carr['id'] = 0;
$rows[] = $carr;
}
$zhangarr = false;
if($this->loadci==1 && $this->get('pnum')=='finall'){
$zhangarr = m('fina')->getzhangtao();
$zhangarrs= array();
foreach($zhangarr as $k=>$rs){
$zhangarrs[] = array('optgroup'=>'start','name'=>$rs['name']);
$arows = m('fina')->getaccount($rs['value']);
if($arows)foreach($arows as $k1=>$rs1){
$zhangarrs[] = $rs1;
}
$zhangarrs[] = array('optgroup'=>'end','name'=>$rs['name']);
}
$zhangarr = $zhangarrs;
}
return array(
'rows' => $rows,
'zhangarr'=> $zhangarr
);
}
}

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

@@ -31,7 +31,7 @@ class mode_customerClassAction extends inputAction{
$atype = 'allskd'; //所有收款单的
}
if($ind==4){
$bh='custfina';
$bh='custfinb';
$atype = 'allfkd';//所有付款单！
}
if($ind==5){

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

@@ -5,9 +5,11 @@ class mode_jiabanClassAction extends inputAction{
{
$start = $this->post('stime');
$end = $this->post('etime');
$uid = $this->post('uid', $this->adminid);
$jiatype= (int)$this->post('jiatype');
$date = c('date', true);
$sj = $date->datediff('H', $start, $end);
//$sj = m('kaoqin')->getsbtime($uid,$start, $end); //如果想用考勤规则来就去掉前面注释
$jiafee = 0;
if($jiatype==1)$jiafee = m('kaoqin')->jiafee($this->adminid, $sj, $start);

1
webmain/flow/input/mode_userinfoAction.php
View File

@@ -61,6 +61,7 @@ class mode_userinfoClassAction extends inputAction{
}
if(isset($cans['tel']))$uarr['tel'] = $cans['tel'];
if(isset($cans['mobile']))$uarr['mobile'] = $cans['mobile'];
if(isset($cans['sex']))$uarr['sex'] = $cans['sex'];
if($id==1){
unset($uarr['status']);
unset($uarr['quitdt']);