caipin 7 tahun lalu
induk
melakukan
4d035b797e

+ 2 - 2
global/js/invoice.validator.js

@@ -47,14 +47,14 @@ $(function () {
 	    	invoiceCompany:'required(invoiceCompany);',
 	    	TIN:'required(invoiceCompany);',
 	    	address:'required(invoiceCompany);',
-	    	phone:'required(invoiceCompany);',
+	    	phone:'tel;required(invoiceCompany);',
 	    	bank:'required(invoiceCompany);',
 	    	bankAccount:'required(invoiceCompany);',
 	    	'invoicePrice': 'required; '
 		    ,invoiceElement: 'required; '
 		    ,'invoiceType': 'required'
 			,recipients: 'required(isMail); '
-			,recipientsPhone: 'required(isMail); '
+			,recipientsPhone: 'digits;required(isMail); '
 			,recipientsAddress: 'required(isMail); '
 	    }
 	});

+ 2 - 2
protected/controller/InvoiceController.php

@@ -3622,8 +3622,8 @@ class InvoiceController extends DooController {
 		$st = $staff->getUserByIdList ( $_COOKIE ["staff"] );
 		
 		// 我的发票待处理
-		$pendingInvoice = $invoice->getOne ( array (
-				'where' => "(status=3 or status=4 or (status=2 and printStatus=1 and untreadStatus=0 ) or (status=2 and printStatus=1 and untreadStatus=2 )  )  and isDelete=0 and sid=" . $st [0] ['sid'],
+		$pendingInvoice = $invoice->getOne ( array (//or (status=2 and printStatus=1 and untreadStatus=0 ) or (status=2 and printStatus=1 and untreadStatus=2 )
+				'where' => "(status=3 or status=4   )  and isDelete=0 and sid=" . $st [0] ['sid'],
 				'desc' => 'iid',
 				'asArray' => TRUE 
 		) );