|
@@ -318,7 +318,7 @@ class ReceiptController extends DooController {
|
|
|
// $receiptDetail=$receipt->getOne(array('where'=>'staff='.$this->staff[0]['sid'].' and status=4','asArray'=>true));
|
|
|
|
|
|
$aItem = $accountItem->find ( array (
|
|
|
- 'where' => '(name like "办公费用" or name like "邮寄费" or name like "其他费用" or name like "公积金" or name like "社保") and category like "'.$this->AGENCY.'"',
|
|
|
+ 'where' => '(name like "办公费用" or name like "服务器费用" or name like "邮寄费" or name like "其他费用" or name like "公积金" or name like "社保") and category like "'.$this->AGENCY.'"',
|
|
|
'asArray' => true
|
|
|
) );
|
|
|
$accountJson [$this->AGENCY] = $accountJson [$this->TRAVEL] = $accountJson [$this->TRAIN] = $accountJson [$this->OTHER] = array ();
|
|
@@ -548,7 +548,7 @@ class ReceiptController extends DooController {
|
|
|
return "/saeaBorad";
|
|
|
|
|
|
$aItem = $accountItem->find ( array (
|
|
|
- 'where' => '(name like "办公费用" or name like "邮寄费" or name like "其他费用" or name like "公积金" or name like "社保") and category like "'.$this->AGENCY.'"',
|
|
|
+ 'where' => '(name like "办公费用" or name like "服务器费用" or name like "邮寄费" or name like "其他费用" or name like "公积金" or name like "社保") and category like "'.$this->AGENCY.'"',
|
|
|
'asArray' => true
|
|
|
) );
|
|
|
$accountJson [$this->AGENCY] = $accountJson [$this->TRAVEL] = $accountJson [$this->TRAIN] = $accountJson [$this->OTHER] = array ();
|
|
@@ -2109,7 +2109,8 @@ class ReceiptController extends DooController {
|
|
|
$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
|
|
|
$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
|
|
|
|
|
|
- if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber ) && ! empty ( $trainName ) && ! empty ( $trainStartDate ) && ! empty ( $trainEndDate ) && ! empty ( $participants ) && ! empty ( $trainAddress )) {
|
|
|
+ //&&! empty ( $participants )
|
|
|
+ if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber ) && ! empty ( $trainName ) && ! empty ( $trainStartDate ) && ! empty ( $trainEndDate ) && ! empty ( $trainAddress )) {
|
|
|
|
|
|
if ($remittanceBankType == 1 && empty ( $coupletNumber )) {
|
|
|
header ( 'Content-Type:text/html;charset=utf-8' );
|
|
@@ -2437,7 +2438,8 @@ class ReceiptController extends DooController {
|
|
|
$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
|
|
|
$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
|
|
|
|
|
|
- if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber ) && ! empty ( $trainName ) && ! empty ( $trainStartDate ) && ! empty ( $trainEndDate ) && ! empty ( $participants ) && ! empty ( $trainAddress )) {
|
|
|
+ //&& ! empty ( $participants )
|
|
|
+ if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber ) && ! empty ( $trainName ) && ! empty ( $trainStartDate ) && ! empty ( $trainEndDate ) && ! empty ( $trainAddress )) {
|
|
|
|
|
|
if ($remittanceBankType == 1 && empty ( $coupletNumber )) {
|
|
|
header ( 'Content-Type:text/html;charset=utf-8' );
|
|
@@ -4071,7 +4073,7 @@ class ReceiptController extends DooController {
|
|
|
$approvalCondition = " and status=3";
|
|
|
}
|
|
|
if ($status == 'finish') {
|
|
|
- $approvalCondition = " and (status=1 or status=8 or status=9)";
|
|
|
+ $approvalCondition = " and (status=1 or status=8 or status=9 or status=10)";
|
|
|
}
|
|
|
|
|
|
$pageinfo ['page'] = array (
|