|
@@ -4336,9 +4336,9 @@ class ReceiptController extends DooController {
|
|
|
function implementDo() {
|
|
|
$rid = $this->get_args ( 'rid' ) && is_numeric ( $this->get_args ( 'rid' ) ) ? $this->get_args ( 'rid' ) : 0;
|
|
|
$implementOpinions = $this->get_args ( 'opinion' ) ? $this->get_args ( 'opinion' ) : "";
|
|
|
- $amount = $this->get_args ( 'amount' ) && is_numeric ( $this->get_args ( 'amount' ) ) ? $this->get_args ( 'amount' ) : 0;
|
|
|
+ $amount = $this->get_args ( 'amount' ) && is_numeric ( $this->get_args ( 'amount' ) ) ? $this->get_args ( 'amount' ) : '';
|
|
|
|
|
|
- if (! empty ( $rid ) && ! empty ( $amount )) {
|
|
|
+ if (! empty ( $rid ) && $amount!='') {
|
|
|
Doo::loadModel ( 'receipt' );
|
|
|
$receipt = new receipt ();
|
|
|
Doo::loadClass ( 'XDeode' );
|
|
@@ -7093,7 +7093,7 @@ class ReceiptController extends DooController {
|
|
|
}
|
|
|
function remittanceHky() {
|
|
|
$year = $this->get_args ( 'year' ) ? $this->get_args ( 'year' ) : date ( "Y" );
|
|
|
- $moth = $this->get_args ( 'moth' ) ? $this->get_args ( 'moth' ) : 'MONTH';
|
|
|
+ $moth = $this->get_args ( 'moth' ) ? $this->get_args ( 'moth' ) : date ( "m" );
|
|
|
$day = $this->get_args ( 'day' ) ? $this->get_args ( 'day' ) : 'DAY';
|
|
|
|
|
|
$page = isset ( $this->params ['page'] ) && is_numeric ( $this->params ['page'] ) ? $this->params ['page'] : 1;
|
|
@@ -10586,7 +10586,8 @@ class ReceiptController extends DooController {
|
|
|
'groupby' => 'item,Month(pastDate),itemCategory',
|
|
|
'asArray' => true
|
|
|
) );
|
|
|
-
|
|
|
+ //echo 'staff=' . $staffId . " and cid=" . $pcid . " and status=1 and Year(pastDate)=" . $year;
|
|
|
+ //print_r($receiptCollectList);
|
|
|
$accountList = $accountItem->find ( array (
|
|
|
'asArray' => true
|
|
|
) );
|
|
@@ -10599,6 +10600,10 @@ class ReceiptController extends DooController {
|
|
|
$falg = true;
|
|
|
foreach ( $receiptCollectList as $v ) {
|
|
|
if ($value ['category'] == $v ['itemCategory'] && $v ['item'] == $value ['name'] && $i == $v ['month']) {
|
|
|
+
|
|
|
+ if($v ['item']=='可自加费用'){
|
|
|
+ //echo $v ['item'].'/'.$v ['price'].'/'.$v ['month'].$v ['itemCategory'].'<br/>';
|
|
|
+ }
|
|
|
$asum += $v ['price'];
|
|
|
$html .= '<td class="taR">¥' . $v ['price'] . '</td>';
|
|
|
$falg = false;
|
|
@@ -10613,6 +10618,8 @@ class ReceiptController extends DooController {
|
|
|
}
|
|
|
$data ['collectHtml'] = $collectHtml;
|
|
|
|
|
|
+ //print_r($collectHtml);
|
|
|
+
|
|
|
// create Adjustment price html
|
|
|
$receiptCollectList = $receiptDetail->find ( array (
|
|
|
'select' => 'staff,sum(price) as price,itemCategory,Month(pastDate) as month',
|
|
@@ -10640,6 +10647,7 @@ class ReceiptController extends DooController {
|
|
|
|
|
|
$collectHtml = $this->collectHtml ( $receiptCollectList, '其他', 'b' );
|
|
|
array_push ( $collectArray ['其他'], $collectHtml );
|
|
|
+
|
|
|
$data ['collectArray'] = $collectArray;
|
|
|
|
|
|
$collectHtml = $this->collectHtml ( $receiptCollectList, '报销金额调整' );
|