|
@@ -129,6 +129,8 @@ class InvoiceController extends DooController {
|
|
|
foreach ( $invoiceManageList as $key => $value ) {
|
|
|
if ($value ['mold'] == '发票打印')
|
|
|
$moldManage [$value ['mold']] = $value ['staffList'];
|
|
|
+ elseif ($value ['mold'] == '发票邮寄')
|
|
|
+ $moldManage [$value ['mold']] = $value ['staffList'];
|
|
|
}
|
|
|
|
|
|
$item = array (
|
|
@@ -386,8 +388,8 @@ class InvoiceController extends DooController {
|
|
|
Doo::loadModel ( 'staff' );
|
|
|
$staff = new staff ();
|
|
|
|
|
|
- $toPrint = $invoice->getPrintInvoiceByManage ( $this->staff [0] ['sid'], 2 );
|
|
|
- $printed = $invoice->getPrintInvoiceByManage ( $this->staff [0] ['sid'], 5 );
|
|
|
+ $toPrint = $invoice->getPrintInvoiceByManage ( $this->staff [0] ['sid'], 0 );
|
|
|
+ $printed = $invoice->getPrintInvoiceByManage ( $this->staff [0] ['sid'], 1 );
|
|
|
|
|
|
foreach ( $toPrint as $key => $value ) {
|
|
|
$toPrint [$key] ['iidKey'] = $XDeode->encode ( $value ['iid'] );
|
|
@@ -450,9 +452,9 @@ class InvoiceController extends DooController {
|
|
|
Doo::loadModel ( 'invoiceOperationLog' );
|
|
|
$invoiceOperationLog = new invoiceOperationLog ();
|
|
|
|
|
|
- $invoiceDetail = $invoice->getPrintInvoiceByManage ( $this->staff [0] ['sid'], 2, $iid );
|
|
|
- if (empty ( $invoiceDetail ))
|
|
|
- die ( 'illegal request' );
|
|
|
+ $invoiceDetail = $invoice->getPrintInvoiceByManage ( $this->staff [0] ['sid'], 0, $iid );
|
|
|
+ // if (empty ( $invoiceDetail ))
|
|
|
+ // die ( 'illegal request' );
|
|
|
|
|
|
$invoiceOperationLogList = $invoiceOperationLog->getInvoiceOperationLogByIid ( $iid );
|
|
|
|
|
@@ -486,7 +488,7 @@ class InvoiceController extends DooController {
|
|
|
die ( 'illegal request' );
|
|
|
$item = array (
|
|
|
'iid' => $iid,
|
|
|
- 'status' => 5,
|
|
|
+ 'printStatus' => 1,
|
|
|
'updateTime' => date ( "Y-m-d H:i:s" ),
|
|
|
'printTime' => date ( "Y-m-d H:i:s" ),
|
|
|
'invoiceNo' => $invoiceNo
|
|
@@ -513,45 +515,51 @@ class InvoiceController extends DooController {
|
|
|
function invoicePost() {
|
|
|
Doo::loadModel ( 'invoice' );
|
|
|
$invoice = new invoice ();
|
|
|
+ Doo::loadClass ( 'XDeode' );
|
|
|
+ $XDeode = new XDeode ( 5 );
|
|
|
|
|
|
$invoicePost = $invoice->getPostByInvoice ();
|
|
|
+ $invoicePosted = $invoice->getPostedByInvoice ();
|
|
|
|
|
|
- $data ['invoicePost'] = $invoicePost;
|
|
|
+ foreach ( $invoicePost as $key => $value ) {
|
|
|
+ $invoicePost [$key] ['iidKey'] = $XDeode->encode ( $value ['iid'] );
|
|
|
+ }
|
|
|
|
|
|
+ $data ['invoicePost'] = $invoicePost;
|
|
|
+ $data ['invoicePosted'] = $invoicePosted;
|
|
|
$data ['memu'] = "invoice";
|
|
|
$data ['staff'] = $this->staff;
|
|
|
$data ['receiptMemu'] = 'invoicePost';
|
|
|
$this->render ( "/admin/invoicePost", $data );
|
|
|
}
|
|
|
- private function getExeCount() {
|
|
|
- Doo::loadModel ( 'receipt' );
|
|
|
- $receipt = new receipt ();
|
|
|
- $receiptList = $receipt->find ( array (
|
|
|
- 'where' => '(executeCopy like \'%["' . $this->staff [0] ['sid'] . '%\' and executeStaff NOT LIKE \'%' . $this->staff [0] ['sid'] . '%\' ) and (status=1 or status=6)',
|
|
|
- 'desc' => 'rid',
|
|
|
- 'asArray' => true
|
|
|
- ) );
|
|
|
-
|
|
|
- return count ( $receiptList );
|
|
|
+ function invoiceExpressAddDo() {
|
|
|
}
|
|
|
- private function getReceiptCount() {
|
|
|
- $status = 2;
|
|
|
- $year = date ( 'Y' );
|
|
|
-
|
|
|
- Doo::loadModel ( 'receipt' );
|
|
|
- $receipt = new receipt ();
|
|
|
- Doo::loadModel ( 'verify' );
|
|
|
+ /**
|
|
|
+ * 异步获取一条发票的邮寄信息
|
|
|
+ */
|
|
|
+ function ajaxGetInvoicePostDetail() {
|
|
|
+ Doo::loadClass ( 'XDeode' );
|
|
|
+ $XDeode = new XDeode ( 5 );
|
|
|
|
|
|
- $dateCondition = " and Year(date) =" . $year;
|
|
|
+ $iid = $this->get_args ( 'iidKey' ) ? $this->get_args ( 'iidKey' ) : "";
|
|
|
+ $iid = $XDeode->decode ( $iid );
|
|
|
+ if (! is_numeric ( $iid )) {
|
|
|
+ echo json_encode ( array (
|
|
|
+ 'status' => 0,
|
|
|
+ 'msg' => 'illegal request'
|
|
|
+ ) );
|
|
|
+ die ();
|
|
|
+ }
|
|
|
|
|
|
- $approvalCondition = ' and nowStaff like "%' . $this->staff [0] ['sid'] . '%" ';
|
|
|
- $receiptList = $receipt->find ( array (
|
|
|
- 'where' => ' status=' . $status . $dateCondition . $approvalCondition,
|
|
|
- 'desc' => 'rid',
|
|
|
- 'asArray' => true
|
|
|
+ Doo::loadModel ( 'invoice' );
|
|
|
+ $invoice = new invoice ();
|
|
|
+ $select="recipients,recipientsPhone,recipientsAddress,mailItems";
|
|
|
+ $invoiceDetail=$invoice->getInvoiceByIid($iid,$select);
|
|
|
+ echo json_encode ( array (
|
|
|
+ 'status' => 1,
|
|
|
+ 'invoiceDetail' => $invoiceDetail
|
|
|
) );
|
|
|
|
|
|
- return count ( $receiptList );
|
|
|
}
|
|
|
function _GetFileEXT($filename) {
|
|
|
$pics = explode ( '.', $filename );
|