|
|
@@ -110,7 +110,8 @@ class InvoiceController extends DooController {
|
|
|
|
|
|
// $list = $invoiceReceivables->getInvoiceReceivablesByClaim ( $this->staff [0] ['cid'], $this->staff [0] ['sid'] );
|
|
|
|
|
|
- $list = $invoice->getInvoiceByUntreadStatusPage ( 4, $_COOKIE ["staff"] );
|
|
|
+ $sql = 'status=2 and untreadStatus=3 and sid=' . $_COOKIE ["staff"];
|
|
|
+ $list = $invoice->getInvoiceByUntreadStatusPage ( 4, $sql );
|
|
|
|
|
|
// print_r($list);
|
|
|
|
|
|
@@ -480,7 +481,7 @@ class InvoiceController extends DooController {
|
|
|
if (! empty ( $iid ) && ! is_numeric ( $iid ))
|
|
|
die ( 'illegal request' );
|
|
|
|
|
|
- $lt = $invoiceReceivables->getInvoiceReceivablesByIid ( $iid );
|
|
|
+ $lt = $invoiceReceivables->getInvoiceReceivablesByIid ( $untreadIidKey );
|
|
|
|
|
|
if (! empty ( $lt )) {
|
|
|
header ( 'Content-Type:text/html;charset=utf-8' );
|
|
|
@@ -1037,7 +1038,7 @@ class InvoiceController extends DooController {
|
|
|
|
|
|
$irid = $invoiceReceivables->addInvoiceReceivables ( $item );
|
|
|
|
|
|
- $item=array();
|
|
|
+ $item = array ();
|
|
|
// 收款操作日志
|
|
|
if ($receivablesCategory == 'PUBLIC' && $receivablesStaff == 'PUBLIC')
|
|
|
$item = array (
|
|
|
@@ -1125,23 +1126,19 @@ class InvoiceController extends DooController {
|
|
|
$invoiceReceivables = new invoiceReceivables ();
|
|
|
Doo::loadModel ( 'invoiceROLog' );
|
|
|
$invoiceROLog = new invoiceROLog ();
|
|
|
- $con = ' and iid=0 and receivablesCategory!="PUBLIC" and receivablesStaff!="PUBLIC"';
|
|
|
+ $con = ' and iid=0 and bindStatus=0'; // and receivablesCategory!="PUBLIC" and receivablesStaff!="PUBLIC"
|
|
|
$detail = $invoiceReceivables->getInvoiceReceivablesByIrid ( $claimKey, $con );
|
|
|
if (empty ( $detail ))
|
|
|
die ( 'illegal request' );
|
|
|
|
|
|
$invoiceReceivables = new invoiceReceivables ();
|
|
|
|
|
|
- /*
|
|
|
- * 'receivablesPrice' => $receivablesPrice, 'receivablesMessage' => $receivablesMessage, 'receivablesSerial' => "#SK" . date ( "Ymd" ) . mt_rand ( 1000, 9999 ), 'receivablesBank' => $receivablesBank, 'receivablesDate' => $receivablesDate, 'inputStaff' => $this->staff [0] ['username'], 'date' => date ( "Y-m-d" ), 'receivablesCategory' => $receivablesCategory, 'receivablesStaff' => $receivablesStaff
|
|
|
- */
|
|
|
-
|
|
|
$item = array (
|
|
|
'irid' => $detail ['irid']
|
|
|
);
|
|
|
if ($receivablesCategory != 'PUBLIC' && $receivablesStaff != 'PUBLIC') {
|
|
|
$item += array (
|
|
|
- 'confirmTime' => date ( "Y-m-d H:i:s" )
|
|
|
+ 'confirmTime' => date ( "Y-m-d H:i:s" )
|
|
|
);
|
|
|
}
|
|
|
if (! empty ( $receivablesCategory ))
|
|
|
@@ -1152,10 +1149,26 @@ class InvoiceController extends DooController {
|
|
|
$item += array (
|
|
|
'receivablesStaff' => $receivablesStaff
|
|
|
);
|
|
|
+ if (! empty ( $receivablesPrice ))
|
|
|
+ $item += array (
|
|
|
+ 'receivablesPrice' => $receivablesPrice
|
|
|
+ );
|
|
|
+ if (! empty ( $receivablesMessage ))
|
|
|
+ $item += array (
|
|
|
+ 'receivablesMessage' => $receivablesMessage
|
|
|
+ );
|
|
|
+ if (! empty ( $receivablesBank ))
|
|
|
+ $item += array (
|
|
|
+ 'receivablesBank' => $receivablesBank
|
|
|
+ );
|
|
|
+ if (! empty ( $receivablesDate ))
|
|
|
+ $item += array (
|
|
|
+ 'receivablesDate' => $receivablesDate
|
|
|
+ );
|
|
|
$invoiceReceivables->setInvoiceReceivablesByCondition ( $item );
|
|
|
|
|
|
// 收款操作日志
|
|
|
- $item=array();
|
|
|
+ $item = array ();
|
|
|
if ($receivablesCategory == 'PUBLIC' && $receivablesStaff == 'PUBLIC')
|
|
|
$item = array (
|
|
|
'operation' => $this->staff [0] ['username'] . " 转入 公共待认领款项 "
|
|
|
@@ -1183,6 +1196,23 @@ class InvoiceController extends DooController {
|
|
|
|
|
|
return '/invoiceReceivablesAS';
|
|
|
}
|
|
|
+ function invoiceReceivablesDelete() {
|
|
|
+ $claimKey = $this->get_args ( 'claimKey' ) ? $this->get_args ( 'claimKey' ) : "";
|
|
|
+
|
|
|
+ if (empty ( $claimKey ))
|
|
|
+ die ( 'illegal request' );
|
|
|
+
|
|
|
+ Doo::loadModel ( 'invoiceReceivables' );
|
|
|
+ $invoiceReceivables = new invoiceReceivables ();
|
|
|
+
|
|
|
+ $con = ' and iid=0 and bindStatus=0 and receivablesStaff="PUBLIC"';
|
|
|
+ $detail = $invoiceReceivables->getInvoiceReceivablesByIrid ( $claimKey, $con );
|
|
|
+ if (empty ( $detail ))
|
|
|
+ die ( 'illegal request' );
|
|
|
+
|
|
|
+ $invoiceReceivables->delInvoiceReceivablesByIrid ( $detail ['irid'] );
|
|
|
+ return '/invoiceReceivablesAS';
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 管理员录入的收款 ，确认认领到谁的名下.统计收款金额
|
|
|
@@ -1741,7 +1771,7 @@ class InvoiceController extends DooController {
|
|
|
|
|
|
$limit = $pageinfo ['lower'] . ',' . $page_size;
|
|
|
|
|
|
- $list = $invoice->getInvoiceByUntreadStatusPage ( $limit, $_COOKIE ["staff"], $con );
|
|
|
+ $list = $invoice->getInvoiceByUntreadStatusPage ( $limit, $sql );
|
|
|
// print_r($pageinfo);
|
|
|
$this->data ['MebSeaEn'] = $MebSea;
|
|
|
$this->data ['MebSea'] = urlencode ( $MebSea );
|
|
|
@@ -1857,6 +1887,53 @@ class InvoiceController extends DooController {
|
|
|
$this->data ['receiptMemu'] = 'invoiceReceivables';
|
|
|
$this->render ( "/admin/invoiceReceivablesAS", $this->data );
|
|
|
}
|
|
|
+ function invoiceApprovalAchieve() {
|
|
|
+ Doo::loadModel ( 'invoice' );
|
|
|
+ $invoice = new invoice ();
|
|
|
+
|
|
|
+
|
|
|
+ $MebSea = isset ( $this->params ['MebSea'] ) ? urldecode ( $this->params ['MebSea'] ) : '';
|
|
|
+
|
|
|
+ $page_size = 2;
|
|
|
+ $page = isset ( $this->params ['page'] ) && is_numeric ( $this->params ['page'] ) ? $this->params ['page'] : 1;
|
|
|
+ $date = isset ( $this->params ['date'] ) ? $this->params ['date'] : 'MONTHO';
|
|
|
+
|
|
|
+ $get = "/" . $date;
|
|
|
+
|
|
|
+ $con = '';
|
|
|
+ if ($date == 'MONTHO')
|
|
|
+ $con = ' and updateTime>DATE_SUB(CURDATE(), INTERVAL 1 MONTH)';
|
|
|
+ elseif ($date == 'MONTHT')
|
|
|
+ $con = ' and updateTime>DATE_SUB(CURDATE(), INTERVAL 3 MONTH)';
|
|
|
+ elseif ($date == 'MONTHY')
|
|
|
+ $con = ' and updateTime>DATE_SUB(CURDATE(), INTERVAL 1 YEAR)';
|
|
|
+
|
|
|
+ if (! empty ( $MebSea )) {
|
|
|
+ $con .= ' and ( invoiceTitle like "%' . $MebSea . '%" or invoiceCompany like "%' . $MebSea . '%" or invoicePrice like "%' . $MebSea . '%" )';
|
|
|
+ $get .= "/" . $MebSea;
|
|
|
+ }
|
|
|
+ $pageinfo ['page'] = array (
|
|
|
+ 'previous' => ''
|
|
|
+ );
|
|
|
+ $sql = '(status=1 or status=3 or status=4) and processApprovals!=""'. $con;
|
|
|
+ $pageinfo = $this->get_page ( "CLD_invoice", $sql, $page, $page_size, "invoiceApprovalAchieve", $get, "" );
|
|
|
+
|
|
|
+ $limit = $pageinfo ['lower'] . ',' . $page_size;
|
|
|
+
|
|
|
+ $list = $invoice->getInvoiceByUntreadStatusPage ( $limit, $sql );
|
|
|
+ //print_r($list);
|
|
|
+ $this->data ['MebSeaEn'] = $MebSea;
|
|
|
+ $this->data ['MebSea'] = urlencode ( $MebSea );
|
|
|
+ $this->data ['get'] = $get;
|
|
|
+ $this->data ['page'] = $pageinfo;
|
|
|
+ $this->data ['list'] = $list;
|
|
|
+ $this->data ['date'] = $date;
|
|
|
+
|
|
|
+ $this->data ['memu'] = "invoice";
|
|
|
+ $this->data ['staff'] = $this->staff;
|
|
|
+ $this->data ['receiptMemu'] = 'invoiceApproval';
|
|
|
+ $this->render ( "/admin/invoiceApprovalAchieve", $this->data );
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 获得与我有关可收款的发票
|
|
|
@@ -2467,8 +2544,12 @@ class InvoiceController extends DooController {
|
|
|
if ($type == 'INVOICE') {
|
|
|
Doo::loadModel ( 'invoice' );
|
|
|
$invoice = new invoice ();
|
|
|
+ Doo::loadModel ( 'invoiceOperationLog' );
|
|
|
+ $invoiceOperationLog = new invoiceOperationLog ();
|
|
|
|
|
|
$detail = $invoice->getInvoiceByIsid ( $serial, $this->staff [0] ['sid'] );
|
|
|
+ $invoiceOperationLogList = $invoiceOperationLog->getInvoiceOperationLogByIid ( $detail['iid'] );
|
|
|
+
|
|
|
if (empty ( $detail ))
|
|
|
$html = '';
|
|
|
else {
|
|
|
@@ -2511,7 +2592,22 @@ class InvoiceController extends DooController {
|
|
|
</tr><tr>
|
|
|
<th class="taC" width="150">邮寄物品</th><td colspan="3">' . $detail ['mailItems'] . '</td>
|
|
|
</tr></tbody></table>';
|
|
|
-
|
|
|
+ if(!empty($invoiceOperationLogList)){
|
|
|
+ $html.='<table class="table table-bordered table-condensed"><tbody><tr><th width="60%" class="taC">审批流程</th></tr><tr><td>';
|
|
|
+ foreach($invoiceOperationLogList as $key=>$value){
|
|
|
+ $html.='<blockquote><p><span class="colGray">'.$value['date'].'</span>
|
|
|
+ '.$value['category'].'-'.$value['username'].' ';
|
|
|
+ if($value['status']==2){
|
|
|
+ $html.='<span class="colGreen">同意</span>';
|
|
|
+ }elseif($value['status']==3){
|
|
|
+ $html.='<span class="colOrange">退回</span>';
|
|
|
+ }elseif($value['status']==5){
|
|
|
+ $html.='<span class="colGreen">打印</span>';
|
|
|
+ }
|
|
|
+ $html.=$value['operation'].'</p></blockquote>';
|
|
|
+ }
|
|
|
+ $html.='</td></tr></tbody></table>';
|
|
|
+ }
|
|
|
$html .= '</div><div class="modal-footer"><a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a></div></div></div>';
|
|
|
}
|
|
|
echo json_encode ( array (
|
|
|
@@ -2595,11 +2691,14 @@ class InvoiceController extends DooController {
|
|
|
$staffHtml .= '<option selected value="' . $value ['sid'] . '-' . $value ['username'] . '">' . $value ['category'] . '-' . $value ['username'] . '</option>';
|
|
|
}
|
|
|
|
|
|
+ $rbankHtml = '<option value="广发银行珠海分行柠溪支行">广发银行珠海分行柠溪支行</option>';
|
|
|
+
|
|
|
echo json_encode ( array (
|
|
|
'status' => 1,
|
|
|
'categoryHtml' => $categoryHtml,
|
|
|
- 'staffHtml' => $staffHtml ,
|
|
|
- 'detail'=>$detail
|
|
|
+ 'staffHtml' => $staffHtml,
|
|
|
+ 'rbankHtml' => $rbankHtml,
|
|
|
+ 'detail' => $detail
|
|
|
) );
|
|
|
}
|
|
|
function _GetFileEXT($filename) {
|
