|
@@ -160,7 +160,8 @@ class InvoiceController extends DooController {
|
|
|
}
|
|
|
$invoice->status=1;
|
|
|
$invoice->invoiceSerial="#F".date("Ymd").mt_rand(1000,9999);
|
|
|
- $invoice->date=date("'Y-m-d H:i:s");
|
|
|
+ $invoice->date=date("Y-m-d H:i:s");
|
|
|
+ $invoice->updateTime=date("Y-m-d H:i:s");
|
|
|
$invoice->sid=$this->staff[0]['sid'];
|
|
|
$invoice->userName=$this->staff[0]['username'];
|
|
|
$invoice->invoiceManage=$invoiceManageDetail['staff'];
|
|
@@ -269,12 +270,12 @@ class InvoiceController extends DooController {
|
|
|
//操作日志
|
|
|
}else{
|
|
|
if(empty($processApprovals)){//记录下一个IDKEY
|
|
|
- $processApprovals=array($this->staff[0]['sid']=>array('date'=>date("'Y-m-d H:i:s"),'opinion'=>$opinion,'status'=>$status));
|
|
|
+ $processApprovals=array($this->staff[0]['sid']=>array('date'=>date("Y-m-d H:i:s"),'opinion'=>$opinion,'status'=>$status));
|
|
|
if ($status!=4&&isset($invoiceManage[1]))
|
|
|
$invoice->pendingApprovals=$invoiceManage[1][0];
|
|
|
$invoice->processApprovals=json_encode($processApprovals);
|
|
|
}else{
|
|
|
- $processApprovals[$this->staff[0]['sid']]=array('date'=>date("'Y-m-d H:i:s"),'opinion'=>$opinion,'status'=>$status);
|
|
|
+ $processApprovals[$this->staff[0]['sid']]=array('date'=>date("Y-m-d H:i:s"),'opinion'=>$opinion,'status'=>$status);
|
|
|
|
|
|
$pendingApprovals=0;
|
|
|
foreach ($invoiceManage as $key=>$value){
|
|
@@ -296,7 +297,7 @@ class InvoiceController extends DooController {
|
|
|
}elseif ($status==4)
|
|
|
$invoice->status=$status;
|
|
|
}
|
|
|
- $invoice->updateTime=date("'Y-m-d H:i:s");
|
|
|
+ $invoice->updateTime=date("Y-m-d H:i:s");
|
|
|
$invoice->update(array('where'=>'iid='.$iid));//print_r($processApprovals);
|
|
|
|
|
|
return '/invoiceApproval';
|