上线修正相关功能以及收款录入发送微信通知

global/css/global.css

@@ -3742,10 +3742,3 @@ td div.dlLev3{
 .invoButton a.buttonUndone:active{
   background:#790000;
 }
-
-.colTip{
-	position:relative;
-  margin-left: 2px;
-  display:inline-block;
-  line-height: 19px;
-}

global/js/invoice.validator.js

@@ -42,15 +42,15 @@ $(function () {
 	        	return $('#isMail').prop('checked');
 	        }
 	    },
-	    fields: {
+	    fields: {//tel(invoiceCompany);digits(invoiceCompany)
 	    	invoiceTitle: 'required(invoiceTitle);',
 	    	invoiceCompany:'required(invoiceCompany);',
 	    	TIN:'required(invoiceCompany);',
 	    	address:'required(invoiceCompany);',
-	    	phone:'required(invoiceCompany);tel(invoiceCompany);',
+	    	phone:'required(invoiceCompany);tel|mobile;',
 	    	bank:'required(invoiceCompany);',
-	    	bankAccount:'required(invoiceCompany);',
-	    	invoicePrice: 'required; '
+	    	bankAccount:'required(invoiceCompany);'
+	    	//invoicePrice: 'required; '
 	    	,invoiceQuantity: 'required; '
 	    	,invoiceUnitPrice: 'required; '
 	    		

protected/config/routes.conf.php

@@ -404,7 +404,7 @@ $route['post']['/invoiceUntreadMailDo'] = array('InvoiceController', 'invoiceUnt
 
 $route['post']['/ajaxCheckInvoiceNoUniqueness'] = array('InvoiceController', 'ajaxCheckInvoiceNoUniqueness');
 
-//$route['*']['/testSend'] = array('InvoiceController', 'testSend');
+$route['*']['/testSend'] = array('InvoiceController', 'testSend');
 
 
 //删除核销相关操作

protected/controller/InvoiceController.php

@@ -76,6 +76,7 @@ class InvoiceController extends DooController {
 				$this->ACTION = $uriPartsOrig [1];
 				
 				$this->data ['new'] = $this->isInvoiceNew ();
+				
 				$this->staff = $staff->getUserByIdList ( $_COOKIE ["staff"] );
 				return "/";
 			}
@@ -93,11 +94,16 @@ class InvoiceController extends DooController {
 	
 	function testSend(){
 		
-		$title2 = '[结果]您的发票333完成打印';
-			
-		$msg = '';
-		$url = 'http://m.cld.smartcost.com.cn/invoicePrintDetail/1.html';
-		$hfreult = $this->msgSend ( $msg, $title2, $url, 'caipin' );
+		$msTouser='caipin|outaozhen';
+		
+		
+		$toparty= $this->getToparty('广东办');
+		
+		$msg = '[测试]你有一笔待认领款项，请及时领取';
+			$toparty=26;
+		//$msg = '';
+		//$url = 'http://m.cld.smartcost.com.cn/invoicePrintDetail/1.html';
+		$hfreult = $this->msgSendToparty ( $msg, '', '', $toparty,'text' );
 	}
 	
 	function invoice() {
@@ -434,6 +440,10 @@ class InvoiceController extends DooController {
 		$invoiceType = $this->get_args ( 'invoiceType' ) && is_numeric ( $this->get_args ( 'invoiceType' ) ) ? $this->get_args ( 'invoiceType' ) : 0;
 		$doPost = $this->get_args ( 'doPost' ) && is_numeric ( $this->get_args ( 'doPost' ) ) ? $this->get_args ( 'doPost' ) : 0;
 		$invoicePrice = $this->get_args ( 'invoicePrice' ) ? $this->get_args ( 'invoicePrice' ) : "";
+		
+		$invoiceQuantity = $this->get_args ( 'invoiceQuantity' ) && is_numeric ( $this->get_args ( 'invoiceQuantity' ) ) ? $this->get_args ( 'invoiceQuantity' ) : 0;
+		$invoiceUnitPrice = $this->get_args ( 'invoiceUnitPrice' ) && is_numeric ( $this->get_args ( 'invoiceUnitPrice' ) ) ? $this->get_args ( 'invoiceUnitPrice' ) : 0;
+		
 		$invoiceElement = $this->get_args ( 'invoiceElement' ) ? $this->get_args ( 'invoiceElement' ) : "";
 		$invoiceTitle = $this->get_args ( 'invoiceTitle' ) ? $this->get_args ( 'invoiceTitle' ) : "";
 		$invoiceCompany = $this->get_args ( 'invoiceCompany' ) ? $this->get_args ( 'invoiceCompany' ) : "";
@@ -463,7 +473,7 @@ class InvoiceController extends DooController {
 		$instructionsNum = $this->get_args ( 'instructionsNum' ) ? $this->get_args ( 'instructionsNum' ) : 0;
 		$remittance = $this->get_args ( 'remittance' ) ? $this->get_args ( 'remittance' ) : 0;
 		
-		if (! empty ( $cid ) && ! empty ( $invoicePrice ) && ! empty ( $invoiceElement ) && ! empty ( $iid )) {
+		if (! empty ( $cid ) && ! empty ( $invoiceQuantity ) && ! empty ( $invoiceUnitPrice ) && ! empty ( $invoiceElement ) && ! empty ( $iid )) {
 			
 			Doo::loadModel ( 'invoiceManage' );
 			$invoiceManage = new invoiceManage ();
@@ -485,11 +495,17 @@ class InvoiceController extends DooController {
 					$moldManage [$value ['mold']] = $value ['staffList'];
 			}
 			
+			$invoicePrice=$invoiceQuantity*$invoiceUnitPrice;
+			
 			$item = array (
 					'iid' => $iid,
 					'cid' => $cid [0],
 					'categoryName' => $cid [1],
 					'invoiceElement' => $invoiceElement,
+					
+					'invoiceQuantity' => $invoiceQuantity,
+					'invoiceUnitPrice' => $invoiceUnitPrice,
+					
 					'invoicePrice' => $invoicePrice,
 					'invoiceType' => $invoiceType,
 					'doPost' => $doPost,
@@ -1042,6 +1058,7 @@ class InvoiceController extends DooController {
 			$invoicePrintDetail = $invoice->getInvoiceByPrint ( $iid );
 			if (empty ( $invoicePrintDetail ))
 				die ( 'illegal request' );
+			
 			$item = array (
 					'iid' => $iid,
 					'printStatus' => 1,
@@ -1064,15 +1081,16 @@ class InvoiceController extends DooController {
 			$invoiceOperationLog->setInvoiceOperationLog ( $item );
 			
 			// 去统计--负票不汇总
-			$item = array (
-					'date' => date ( "Y-m-d H:i:s" ),
-					'priceClass' => 1,
-					'cid' => $invoicePrintDetail ['cid'],
-					'staff' => $invoicePrintDetail ['sid'],
-					'invoicePrice' => $invoicePrintDetail ['invoicePrice'] 
-			);
-			$invoiceStatistics->setInvoiceStatisticsByCondition ( $item );
-			
+			if($invoicePrintDetail['untreadStatus']!=4){
+				$item = array (
+						'date' => date ( "Y-m-d H:i:s" ),
+						'priceClass' => 1,
+						'cid' => $invoicePrintDetail ['cid'],
+						'staff' => $invoicePrintDetail ['sid'],
+						'invoicePrice' => $invoicePrintDetail ['invoicePrice'] 
+				);
+				$invoiceStatistics->setInvoiceStatisticsByCondition ( $item );
+			}
 			// 发送通知信息到微信-去除
 			// $this->setWXMsg($iid,'PRINT');
 			
@@ -1112,6 +1130,7 @@ class InvoiceController extends DooController {
 		$invoicePosted = $invoice->getPostByInvoice ( 1 );
 		$expressList = $express->getExpressByAll ();
 		
+		
 		$this->data ['expressList'] = $expressList;
 		$this->data ['invoicePost'] = $invoicePost;
 		$this->data ['invoicePosted'] = $invoicePosted;
@@ -1242,7 +1261,7 @@ class InvoiceController extends DooController {
 				'previous' => '' 
 		);
 		// printStatus=1 and
-		$sql = "  untreadStatus=0  and status=2 and sid=" . $this->staff [0] ['sid'] . $con;
+		$sql = "  (untreadStatus=0 or untreadStatus=3)  and status=2 and sid=" . $this->staff [0] ['sid'] . $con;
 		$action = "invoiceUntreadIsAchieve";
 		
 		$pageinfo = $this->get_page ( "CLD_invoice", $sql, $page, $page_size, $action, $get, "" );
@@ -1402,6 +1421,9 @@ class InvoiceController extends DooController {
 					'userName' => $this->staff [0] ['username'],
 					'cid' => $this->staff [0] ['cid'],
 					'categoryName' => $this->staff [0] ['category'],
+					
+					'invoiceQuantity'=>-$invoiceDetail['invoiceQuantity'],
+					
 					'invoicePrice' => -$invoiceDetail['invoicePrice'],
 					
 					'invoiceSerial' => $invoiceSerial,
@@ -1538,6 +1560,9 @@ class InvoiceController extends DooController {
 			$iidKey = $XDeode->decode ( $iidKey );
 			
 			$invoiceDetail = $invoice->getInvoiceByIid ( $iidKey );
+			if (!($invoiceDetail['status']==2&&$invoiceDetail['printStatus']==1&&$invoiceDetail['untreadStatus']==0))
+				die ( 'illegal request' );
+			
 			$receivablesSerial = "#SK" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
 			
 			// 收款录入 并绑定发票
@@ -1669,6 +1694,8 @@ class InvoiceController extends DooController {
 		Doo::loadModel ( 'invoiceStatistics' );
 		$invoiceStatistics = new invoiceStatistics ();
 		
+		
+		
 		if (! empty ( $receivablesPrice ) && ! empty ( $receivablesMessage ) && ! empty ( $receivablesBank ) && ! empty ( $receivablesDate ) && ! empty ( $receivablesCategory ) && ! empty ( $receivablesStaff )) {
 			
 			$item = array (
@@ -1738,6 +1765,12 @@ class InvoiceController extends DooController {
 				);
 			}
 			$invoiceStatistics->setInvoiceStatisticsByCondition ( $item );
+			
+			$toparty= $this->getToparty($receivablesCategory[1]);
+			$msg = '[通知]你有一笔待认领款项，请及时领取';
+			if ($toparty!=0)
+				$this->msgSendToparty ( $msg, '', '', $toparty,'text' );
+			
 		}
 		
 		return "/invoiceReceivables";
@@ -2647,17 +2680,19 @@ class InvoiceController extends DooController {
 			$D2 = $dateArr [1];
 		}
 		
-		$con = '1';
+		$con = ' status=2  ';
 		if (! empty ( $D1 ) && ! empty ( $D2 ))
 			$con .= ' and date BETWEEN "' . $D1 . '" AND "' . $D2 . '" ';
 		
 		if ($status == 'UNRECORD')
-			$con .= ' and untreadStatus=0';
+			$con .= ' and printStatus=1 and untreadStatus=0';
 		elseif ($status == 'RECORD')
-			$con .= ' and untreadStatus=3';
+			$con .= ' and printStatus=1 and untreadStatus=3';
 		elseif ($status == 'BOUNCED')
 			$con .= ' and untreadStatus=2';
-		
+		elseif($status == 'All'){
+			$con .= ' and ( untreadStatus=2 or untreadStatus=0 or untreadStatus=3 )';
+		}
 		$get = "/" . $status . "?date=" . urlencode ( $date ) . "&MebSea=" . urlencode ( $MebSea );
 		
 		if (! empty ( $MebSea )) {
@@ -2783,7 +2818,7 @@ class InvoiceController extends DooController {
 		$pageinfo ['page'] = array (
 				'previous' => '' 
 		);
-		$sql = '(status=1 or status=3 or status=4) and processApprovals!=""' . $con;
+		$sql = '(status=1 or status=2 or status=3 or status=4) and processApprovals!=""' . $con; //echo $sql;
 		$pageinfo = $this->get_page ( "CLD_invoice", $sql, $page, $page_size, "invoiceApprovalAchieve", $get, "" );
 		
 		$limit = $pageinfo ['lower'] . ',' . $page_size;
@@ -2843,8 +2878,8 @@ class InvoiceController extends DooController {
 			// and untreadStatus=0
 			$sql = "postStatus=1 and doPost=1 and status=2 and isDelete=0" . $con;
 			$action = "invoicePostAchieve";
-		} elseif ($this->ACTION == 'invoiceUntreadAchieve') {
-			$sql = " printStatus=1 and untreadStatus=2 and status=2 " . $con;
+		} elseif ($this->ACTION == 'invoiceUntreadAchieve') {//printStatus=1 and
+			$sql = "  untreadStatus=2 and status=2 " . $con;
 			$action = "invoiceUntreadAchieve";
 		}
 		
@@ -4155,7 +4190,7 @@ class InvoiceController extends DooController {
 		) );
 		// 发票邮寄
 		$post = $invoice->getOne ( array (
-				'where' => "postStatus=0 and doPost=1 and status=2",
+				'where' => "postStatus=0 and  printStatus=1 and isDelete=0 and doPost=1 and status=2",
 				'asArray' => TRUE 
 		) );
 		// 发票打印
@@ -4231,6 +4266,41 @@ class InvoiceController extends DooController {
 			}
 		}
 	}
+	
+	function getToparty($category=''){
+		$token = $this->getAccessToken ();//
+		$result = json_decode ( $this->httpGet ( "https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token={$token}&id=5" ),true );
+		$toparty=0;
+		foreach ($result['department'] as $key=>$value){
+			if ($value['name']==$category)
+				$toparty=$value['id'];
+		}
+		return $toparty;
+	}
+	
+	function msgSendToparty($msg, $title, $url, $toparty, $text = '') {
+		$token = $this->getAccessToken ();
+		if ($text == 'text') {
+			$data = '{
+   				"touser": "",
+   				"toparty": "' . $toparty . '",
+   				"totag": "",
+  				"msgtype": "text",
+   				"agentid": 1000002,
+   				"text": {
+       				"content": "' . $msg . '"
+   				},
+   				"safe":0
+			}';
+		}
+		$result = json_decode ( $this->httpPOST ( "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token={$token}", $data ) );
+		if ($result->errmsg != 'ok') {
+			return 0;
+		} else {
+			return 1;
+		}
+	}
+	
 	private function msgSend($msg, $title, $url, $user, $text = '') {
 		$token = $this->getAccessToken ();
 		if ($text == 'text') {

protected/controller/ReceiptController.php

@@ -2593,18 +2593,18 @@ class ReceiptController extends DooController {
 		// ) );
 		// //echo 'status!=5 '.$dateCondition.$cateCondition.$staffCondition.' and verify in ('.$vid.')';
 		// } else
-		if ($status == 'done' || $status == 'termination') {
-			$pageinfo = $this->get_page ( "CLD_receipt", $dateCondition . $cateCondition . $staffCondition . $approvalCondition . ' and verify in (' . $vid . ') and status!=5', $page, $page_size, "approvalExpenses/" . $status, $get, "" );
+		if ($status == 'done' || $status == 'termination') {//$dateCondition .
+			$pageinfo = $this->get_page ( "CLD_receipt",  $cateCondition . $staffCondition . $approvalCondition . ' and verify in (' . $vid . ') and status!=5', $page, $page_size, "approvalExpenses/" . $status, $get, "" );
 			
-			$receiptList = $receipt->find ( array (
-					'where' => 'status!=5  ' . $dateCondition . $cateCondition . $staffCondition . $approvalCondition . ' and verify in (' . $vid . ')',
+			$receiptList = $receipt->find ( array (//$dateCondition.
+					'where' => 'status!=5  ' .   $cateCondition . $staffCondition . $approvalCondition . ' and verify in (' . $vid . ')',
 					'limit' => $pageinfo ['lower'] . ',' . $page_size,
 					'desc' => 'rid',
 					'asArray' => true 
 			) );
 		} else
-			$receiptList = $receipt->find ( array (
-					'where' => 'status!=5 ' . $dateCondition . $cateCondition . $staffCondition . $approvalCondition . ' and verify in (' . $vid . ')',
+			$receiptList = $receipt->find ( array (//$dateCondition
+					'where' => 'status!=5 ' .  $cateCondition . $staffCondition . $approvalCondition . ' and verify in (' . $vid . ')',
 					'desc' => 'rid',
 					'asArray' => true 
 			) );
@@ -2615,8 +2615,8 @@ class ReceiptController extends DooController {
 				'asArray' => true 
 		) );
 		
-		// echo '1 '.$dateCondition.$cateCondition.$staffCondition.' and verify in ('.$vid.')';
-		// print_r($pageinfo);
+		//echo 'status!=5 ' . $dateCondition . $cateCondition . $staffCondition . $approvalCondition . ' and verify in (' . $vid . ')';
+		//print_r($receiptList);
 		
 		$Locate = 0;
 		
@@ -5058,8 +5058,10 @@ class ReceiptController extends DooController {
 		$statusCon = '(status=8 or status=9 or status=1 or status=6 )';
 		$sopString = "";
 		
+		$lastYear=date("Y", strtotime("-1 year"));
+		
 		if (empty ( $rdate ))
-			$dateCondition = " and Year(date) =" . $year;
+			$dateCondition = " and (Year(date) =" . $year." or Year(date) = ".$lastYear.") ";
 		else
 			$dateCondition = " and date_format(date,'%Y-%m-%d')='" . $rdate . "' ";
 		

protected/plugin/TemplateTag.php

@@ -72,7 +72,7 @@ function isInvoiceNew($type = "GLOBAL") {
 	) );
 	// 发票邮寄
 	$post = $invoice->getOne ( array (
-			'where' => "postStatus=0 and doPost=1 and status=2",
+			'where' => "postStatus=0 and  printStatus=1 and isDelete=0 and doPost=1 and status=2",
 			'asArray' => TRUE 
 	) );
 	// 发票打印
@@ -81,6 +81,7 @@ function isInvoiceNew($type = "GLOBAL") {
 			'desc' => 'iid',
 			'asArray' => TRUE 
 	) );
+	
 	// 发票退票
 	$untread = $invoice->getOne ( array (
 			'where' => " printStatus=1 and untreadStatus=1 and status=2 ",

protected/view/admin/invoice.html

@@ -68,7 +68,7 @@
 										
 										<!-- elseif {{handleInvoice' value.status}}==2 and {{handleInvoice' value.printStatus}}==1 and {{handleInvoice' value.untreadStatus}}==2  -->
 										<span class="colRed">已退票</span>
-										<!-- elseif {{handleInvoice' value.status}}==2 and {{handleInvoice' value.printStatus}}==1 and {{handleInvoice' value.untreadStatus}}==1 and {{handleInvoice' value.untreadPost}}==1 -->
+										<!-- elseif {{handleInvoice' value.status}}==2  and {{handleInvoice' value.untreadStatus}}==1  -->
 										<span class="colRed">退票中</span>
 										<!-- endif -->
 										</td>
@@ -106,7 +106,7 @@
 										<!-- elseif {{pendingInvoice' value.status}}==2 and {{pendingInvoice' value.printStatus}}==1 and {{pendingInvoice' value.untreadStatus}}==2  -->
 										<a class="button btn-gray btn-block" href="/invoiceDelDo/{{pendingInvoice' value.iidKeyUrl}}.do">从待处理移除</a>
 										
-										<!-- elseif {{handleInvoice' value.status}}==2 and {{handleInvoice' value.printStatus}}==1 and {{handleInvoice' value.untreadStatus}}==1 and {{handleInvoice' value.untreadPost}}==1 -->
+										<!-- elseif {{handleInvoice' value.status}}==2  and {{handleInvoice' value.untreadStatus}}==1 and {{handleInvoice' value.untreadPost}}==1 -->
 										<a class="button btn-block" diss-data="{{handleInvoice' value.iidKey}}" node-invoice="untreadInvoice" data-toggle="modal" href="#return">填写快递</a>
 										<!-- endif -->
 										</td>

protected/view/admin/invoiceAS.html

@@ -96,7 +96,7 @@
 							
 							</td>
 							<td>
-							<!-- if ({{list' value.sumPrice}}<{{list' value.invoicePrice}}||{{list' value.sumPrice}}==0)&& {{list' value.untreadStatus}}==0 -->
+							<!-- if ({{list' value.sumPrice}}<{{list' value.invoicePrice}}||{{list' value.sumPrice}}==0)&& {{list' value.untreadStatus}}==0 && {{list' value.status}}==2 && {{list' value.printStatus}}==1 -->
 							<a href="#recorded" node-invoiceReceivables='INFO' data-isKey="{{list' value.iidKeyK}}" data-toggle="modal">入账</a>
 							<!-- endif -->
 							</td>

protected/view/admin/invoiceAdd.html

@@ -55,7 +55,7 @@
 									<th class="taC"><span class="colRed">*</span>开票金额</th>
 									<td colspan="3">
 									
-										<p class="colGray">单价*数量=开票金额</p>
+										<p class="colGray">数量*单价=开票金额</p>
 										<b class="colOrange" id="tp" style="font-size:18px">￥0</b>
 									
 									<input value="0"  placeholder="输入开票金额" pattern="[0-9]" name="invoicePrice" id="invoicePrice" type="hidden" min="0" step="0.01">
@@ -64,7 +64,7 @@
 								</tr>
 								
 								<tr>
-									<th class="taC">发票备注</th><td colspan="3"><textarea name="remark" style="width:550px"></textarea>
+									<th class="taC">发票备注</th><td colspan="3"><textarea placeholder="用于发票右下角备注栏内容，如项目名称、项目地点" name="remark" style="width:550px"></textarea>
 									</td>
 								</tr>
 								
@@ -118,7 +118,6 @@
 									<td><input type="text" name="TIN" id="TIN"></td>
 
 								</tr>
-								
 								<tr>
 									<th class="taC"><span class="colRed">*</span>注册地址</th>
 									<td><input type="text" name="address" id="address"></td>
@@ -133,6 +132,8 @@
 								</tr>
 								</tbody>
 							</table>
+							
+							
 						<table class="table table-bordered table-condensed">
 								
 								<tr>
@@ -192,7 +193,9 @@
 									<div class="checkbox">
 									  <label>
 									    <input type="checkbox" checked="" disabled="">
-									    备注<br><input type="text" class="span4" name="mailItems" placeholder="备注信息或其他需要邮寄物品请填写在这，写明数量。">
+									    备注<br>
+									    <textarea style="width:550px" placeholder="备注信息或其他需要邮寄物品请填写在这，写明数量。"></textarea>
+									    
 									  </label>
 									</div>
 								</td>

protected/view/admin/invoiceEdit.html

@@ -52,19 +52,38 @@
 									<!-- endloop -->
 									</select>
 								</td>
-								<th class="taC" width="150">备注</th><td><input name="remark" placeholder="" value="{{invoiceDetail.remark}}" type="text"></td>
+								<th class="taC" width="150"><span class="colRed">*</span>开票内容</th><td><select name="invoiceElement" >
+								<!-- include 'invoiceElement' -->
+							</select></td>
 							</tr>
+							
+							<tr>
+									<th class="taC"><span class="colRed">*</span>数量</th>
+									<td>
+										<input style="width:60px" name="invoiceQuantity" id="invoiceQuantity" value="{{invoiceDetail.invoiceQuantity}}" placeholder="输入数量" pattern="[0-9]" type="number" min="1" step="1">
+									</td>
+									<th class="taC"><span class="colRed">*</span>单价</th>
+									<td><input style="width:100px" name="invoiceUnitPrice" id="invoiceUnitPrice" value="{{invoiceDetail.invoiceUnitPrice}}"  placeholder="输入单价" pattern="[0-9]" type="number" min="1" step="100"></td>
+								</tr>
+							
 							<tr>
 								<th class="taC"><span class="colRed">*</span>开票金额</th>
-								<td><input value="{{invoiceDetail.invoicePrice}}" name="invoicePrice" placeholder="输入开票金额" pattern="[0-9]" type="number" min="0" step="0.01">
-								</td>
-								<th class="taC"><span class="colRed">*</span>开票内容</th>
-								<td>
-								<select name="invoiceElement" >
-								<!-- include 'invoiceElement' -->
-							</select>
-							</td>
+								
+								<td colspan="3">
+									
+										<p class="colGray">数量*单价=开票金额</p>
+										<b class="colOrange" id="tp" style="font-size:18px">￥{{invoiceDetail.invoicePrice}}</b>
+									
+									<input value="{{invoiceDetail.invoicePrice}}"  placeholder="输入开票金额" pattern="[0-9]" name="invoicePrice-del" id="invoicePrice" type="hidden" min="0" step="0.01">
+									</td>
+								
 							</tr>
+							
+							<tr>
+									<th class="taC">发票备注</th><td colspan="3"><textarea placeholder="用于发票右下角备注栏内容，如项目名称、项目地点" name="remark" style="width:550px">{{invoiceDetail.remark}}</textarea>
+									</td>
+								</tr>
+							
 							<tr>
 								<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
 								<label class="radio inline"><input name="invoiceType" id="invoicePlain" onclick="invoiceShow()"  value="0" <!-- if {{invoiceDetail.invoiceType}}==0 --> checked <!-- endif --> type="radio">增值税普通发票</label>

protected/view/admin/invoiceMenu.html

@@ -37,4 +37,56 @@
 <!-- if isInvoiceMoldShow({{staff.0.sid}},'公司汇总查阅') -->
 	<li><a <!-- if {{receiptMemu}}=="invoiceAggregate" --> class="selected" <!-- endif --> href="/invoiceAggregate">公司汇总</a></li>
 	<!-- endif -->
-</ul>
+	
+	<li class="topLine"><a href="#invhelp" data-toggle="modal">使用帮助</a></li>
+	
+</ul>
+<div class="modal fade " id="invhelp" aria-hidden="false" >
+	<div class="modal-dialog">
+		<div class="modal-content">
+		    <div class="modal-header">
+		    <h3>欢迎使用申请开票</h3>
+		    </div>
+		    <div class="modal-body saeaList">
+		    	<p style="font-size:18px">请查阅以下文档，了解新的申请开票</p>
+		    	<br>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">如何申请开票</th>
+						<td class="taC"><a target="_Blank" href="http://cld.smartcost.com.cn/global/handbook/如何申请开票使用教程.pdf">在线查阅《如何申请开票使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">开票进度跟踪</th>
+						<td class="taC"><a target="_Blank" href="http://cld.smartcost.com.cn/global/handbook/开票进度跟踪使用教程.pdf">在线查阅《开票进度跟踪使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">如何申请退票</th>
+						<td class="taC"><a target="_Blank" href="http://cld.smartcost.com.cn/global/handbook/如何申请退票使用教程.pdf">在线查阅《如何申请退票使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">收款跟踪</th>
+						<td class="taC"><a target="_Blank" href="http://cld.smartcost.com.cn/global/handbook/收款跟踪使用教程.pdf">在线查阅《收款跟踪使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+		    </div>
+			<div class="modal-footer">
+			    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+			</div>
+		</div>
+	</div>
+</div>
+	<!-- 帮助中心 -->

protected/view/admin/invoicePostAchieve.html

@@ -19,7 +19,7 @@
 			</div>
 			<div class="adminContent autoHeight">
 				<legend>
-					已打印发票
+					已邮寄发票
 				</legend>
 				<div class="demandCate">
 					<ul class="cateList">