|
|
@@ -1930,7 +1930,7 @@ class ReceiptController extends DooController {
|
|
|
$receiptList=$receipt->find(array('where'=>'staff='.$this->staff[0]['sid'].' and rid='.$rid,'desc'=>'rid','asArray'=>true));
|
|
|
|
|
|
$loanList=$loanReceipt->find(array('where'=>'rid='.$receiptList[0]['loanRid'],'desc'=>'rid','asArray'=>true));
|
|
|
-
|
|
|
+ /*
|
|
|
$Locate=0;$roleId=0;$button=0;
|
|
|
foreach ($loanList as $key=>$value){
|
|
|
$loanList[$key]['Locate']=$Locate;$Locate++;
|
|
|
@@ -2081,6 +2081,7 @@ class ReceiptController extends DooController {
|
|
|
|
|
|
}
|
|
|
$data['loanList']=$loanList;
|
|
|
+ */
|
|
|
|
|
|
$Locate=0;$roleId=0;$button=0;
|
|
|
foreach ($receiptList as $key=>$value){
|
|
|
@@ -2258,6 +2259,8 @@ class ReceiptController extends DooController {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ //print_r($receiptList);
|
|
|
+
|
|
|
$data['receiptList']=$receiptList;
|
|
|
|
|
|
$data['memu']="receipt";
|
|
|
@@ -3141,8 +3144,13 @@ $verifyDetail=$verify->find(array('where'=>' (staff not like "%\"'.$this->staff[
|
|
|
|
|
|
//print_r($verifyDetail);
|
|
|
//die;
|
|
|
- $nowStaff=implode(',', $nowStaffList);
|
|
|
- $verifyStaff=array($this->staff[0]['sid']."_R"=>array('date'=>date('Y-m-d'),'opinion'=>$opinion,'status'=>$status,'nextStaff'=>$verifyDetail[0][0],'ROLE'=>1));
|
|
|
+ if (!empty($nowStaffList)){
|
|
|
+ $nowStaff=implode(',', $nowStaffList);
|
|
|
+ $verifyStaff=array($this->staff[0]['sid']."_R"=>array('date'=>date('Y-m-d'),'opinion'=>$opinion,'status'=>$status,'nextStaff'=>$verifyDetail[0][0],'ROLE'=>1));
|
|
|
+ }else{
|
|
|
+ $nowStaff=$verifyDetail[1][0];
|
|
|
+ $verifyStaff=array($this->staff[0]['sid']."_R"=>array('date'=>date('Y-m-d'),'opinion'=>$opinion,'status'=>$status,'nextStaff'=>$verifyDetail[1][0]));
|
|
|
+ }
|
|
|
}else{
|
|
|
|
|
|
if ($verifyDetail[1][1]=='ROLE'){
|
