发票信息修改

global/js/receipt.js

@@ -16,6 +16,20 @@ function receiptDate(){
 	form.submit();  
 }
 
+function reportCatePM(){
+	var name=$('#reportCate').val();
+	$("option[node-all='true']").show();
+	if(name=='ALL'){
+		$("tr[node-all='true']").show();
+		$("option[node-all='true']").show();
+	}else{
+		$("tr[node-all='true']").hide();
+		$("option[node-all='true']").hide();
+		$("option[node-cate='"+name+"']").show();
+		$("tr[node-boxCate='"+name+"']").show();
+	}
+}
+
 function reportPM(){
 	var name=$('#report').val();
 	if(name=='ALL')
@@ -130,7 +144,7 @@ $(function() {
 				if(data.status==2){
 					alert('参数错误');
 				}else{
-					window.location.href="/approvalExpenses";
+					window.location.href="/approvalExpenses/pendApproval";
 				}
 			},
 			error:function(err){

protected/class/client.php

@@ -349,6 +349,8 @@ EOF;
      * @param $data 数据
      */
     private function _ps_send($action, $data = null) {
+    	
+    	//echo $this->ps_api_url . "api/" . $action;die;
         return $this->_ps_post($this->ps_api_url . "api/" . $action, 500000, $this->auth_data($data));
     }
 
@@ -395,20 +397,23 @@ EOF;
             $out .= "Cookie: $cookie\r\n\r\n";
         }
         $fp = @fsockopen(($ip ? $ip : $host), $port, $errno, $errstr, $timeout);
+        
         if (!$fp)
             return '';
 
+        
+          
         stream_set_blocking($fp, $block);
         stream_set_timeout($fp, $timeout);
         @fwrite($fp, $out);
         $status = stream_get_meta_data($fp);
 
-        if ($status['timed_out'])
-            return '';
-        while (!feof($fp)) {
-            if (($header = @fgets($fp)) && ($header == "\r\n" || $header == "\n"))
-                break;
-        }
+//         if ($status['timed_out'])
+//             return '';
+//         while (!feof($fp)) {
+//             if (($header = @fgets($fp)) && ($header == "\r\n" || $header == "\n"))
+//                 break;
+//         }
 
         $stop = false;
         while (!feof($fp) && !$stop) {
@@ -669,13 +674,13 @@ EOF;
      * @return int {-1:联系人（微信id）为空 ;-2:内容为空;-3:不选定text时标题为空;-4:不选定text时链接为空;-5:发送失败;1:发送成功}
      */
     public function SendMsg($user,$msg,$type='',$title='',$url=''){
-//         if (empty($user) || empty($msg))
-//             return false;
-//         if($type != 'text'){
-//             if (empty($title) || empty($url))
-//                 return false;
-//         }
-//         return $this->_ps_send('sendmsg', array('user' => $user, 'msg' => $msg, 'type' => $type, 'title' => $title, 'url' => $url));
+        if (empty($user) || empty($msg))
+            return false;
+        if($type != 'text'){
+            if (empty($title) || empty($url))
+                return false;
+        }
+        return $this->_ps_send('sendmsg', array('user' => $user, 'msg' => $msg, 'type' => $type, 'title' => $title, 'url' => $url));
     }
 
 }

protected/controller/ReceiptController.php

@@ -617,11 +617,15 @@ class ReceiptController extends DooController {
 		
 		// get Receipt By verifyID status 2
 		$receiptList = $receipt->find ( array (
-				'where' => 'rid =' . $rid,
+				'where' => 'rid =' . $rid.' and status=2',
 				'desc' => 'rid',
 				'asArray' => true 
 		) );
 		
+		if(empty($receiptList)){
+			die('illegal request');
+		}
+		
 		$Locate = 0;
 		$roleId = 0;
 		if ($ap == 4)
@@ -2659,7 +2663,7 @@ class ReceiptController extends DooController {
 		$Locate = 0;
 		
 		
-		$reportList=array();
+		$reportList=$reportCateList=array();
 		foreach ( $receiptList as $key => $value ) {
 			
 			$receiptList [$key] ['Locate'] = $Locate;
@@ -2719,7 +2723,8 @@ class ReceiptController extends DooController {
 					'asArray' => true 
 			) );
 			
-			array_push($reportList, $receiptList [$key] ['staffDetail']['sid'].'-'.$receiptList [$key] ['staffDetail']['username']);
+			array_push($reportList, $receiptList [$key] ['staffDetail']['sid'].'-'.$receiptList [$key] ['staffDetail']['username'].'-'.$receiptList [$key] ['staffDetail']['category']);
+			array_push($reportCateList, $receiptList [$key] ['staffDetail']['cid'].'-'.$receiptList [$key] ['staffDetail']['category']);
 			
 			$receiptList [$key] ['button'] = $button;
 			$receiptList [$key] ['nowStaffArray'] = explode ( ',', $value ['nowStaff'] );
@@ -2730,15 +2735,19 @@ class ReceiptController extends DooController {
 		$reportHtml='';
 		foreach ($reportList as $key=>$value){
 			$v=explode("-", $value);
-			$reportHtml.='<option value="'.$v[1].'">'.$v[1].'</option>';
+			$reportHtml.='<option node-all=\'true\' node-cate=\''.$v[2].'\' value="'.$v[1].'">'.$v[1].'</option>';
 		}
-		
-		//print_r($reportList);
-
+		//print_r($reportList)
 		$data['reportHtml']=$reportHtml;
 
+		$reportCateList=array_unique($reportCateList);
+		$reportCateHtml='';
+		foreach ($reportCateList as $key=>$value){
+			$v=explode("-", $value);
+			$reportCateHtml.='<option value="'.$v[1].'">'.$v[1].'</option>';
+		}
 		//$reportHtml.='<option value="ALL">'.$value[''].'</option>';
-			
+		$data['reportCateHtml']=$reportCateHtml;
 		
 		// print_r($receiptList);die;
 		// $data['verifyDetail']=$verifyDetail;
@@ -3295,11 +3304,15 @@ class ReceiptController extends DooController {
 		
 		// get Receipt By verifyID status 2
 		$receiptList = $receipt->find ( array (
-				'where' => 'rid =' . $rid,
+				'where' => 'rid =' . $rid.' and status=2',
 				'desc' => 'rid',
 				'asArray' => true 
 		) );
 		
+		if (empty($receiptList)){
+			die ( 'illegal request' );
+		}
+		
 		$Locate = 0;
 		$roleId = 0;
 		if ($ap == 4)
@@ -4549,11 +4562,15 @@ class ReceiptController extends DooController {
 		
 		// get Receipt By verifyID status 2
 		$receiptList = $receipt->find ( array (
-				'where' => 'rid =' . $rid,
+				'where' => 'rid =' . $rid.' and status=2',
 				'desc' => 'rid',
 				'asArray' => true 
 		) );
 		
+		if(empty($receiptList)){
+			die ( 'illegal request' );
+		}
+		
 		$loanList = $loanReceipt->find ( array (
 				'where' => 'rid=' . $receiptList [0] ['loanRid'],
 				'desc' => 'rid',
@@ -5002,7 +5019,10 @@ class ReceiptController extends DooController {
 	function hisImplement() {
 		$item = isset ( $this->params ['item'] ) ? $this->params ['item'] : "";
 		if (empty ( $item ))
-			$item = $this->get_args ( 'item' ) ? $this->get_args ( 'item' ) : "";
+			$item = $this->get_args ( 'item' ) ? $this->get_args ( 'item' ) : "pendImplement";
+		
+		
+		$rdate = $this->get_args ( 'date' ) ? $this->get_args ( 'date' ) : "";
 		
 		$year = $this->get_args ( 'year' ) ? $this->get_args ( 'year' ) : date ( "Y" );
 		$moth = $this->get_args ( 'moth' ) ? $this->get_args ( 'moth' ) : 'MONTH';
@@ -5029,13 +5049,36 @@ class ReceiptController extends DooController {
 			$condition = " and Rtype=0 ";
 		elseif ($item == "remits")
 			$condition = " and Rtype=2 ";
-		$sopString = "";
+		elseif($item =="pendImplement"){
+			$condition = ' and (status=1 or status=6) and (executeCopy like "%[\"' . $this->staff [0] ['sid'] . '\"%" and executeStaff not like "%{\"' . $this->staff [0] ['sid'] . '\"%" ) ';
+		}
 		
-		$dateCondition = " and Year(date) =" . $year;
-		if ($sop != 'SOP')
-			$sopString = " and staff=" . $sop;
+		
+		//'and (executeCopy like "%["' . $this->staff [0] ['sid'] . '"%" and executeStaff not like "%{"' . $this->staff [0] ['sid'] . '"%" )';
+			
 		
 		$statusCon = '(status=8 or status=9 or status=1 or status=6 )';
+		$sopString = "";
+		
+		if (empty($rdate))
+			$dateCondition = " and Year(date) =" . $year;
+		else 
+			$dateCondition=" and date_format(date,'%Y-%m-%d')='".$rdate."' ";
+		
+		if ($item == 'teipts') {
+			$statusCon = '(status=1 or status=6 )';
+			$dateCondition=" and date_format(pastDate,'%Y-%m-%d')='".$rdate."' ";
+			
+		} elseif ($item == 'alerpts') {
+			$statusCon = '(status=8 or status=9 )';
+			if (empty($rdate))
+				$dateCondition = " and Year(date) =" . $year;
+			else
+				$dateCondition=" and date_format(executeDate,'%Y-%m-%d')='".$rdate."' ";
+		}
+		
+		
+		/*
 		if ($item == 'teipts') {
 			$statusCon = '(status=1 or status=6 )';
 			$dateCondition = " and Year(pastDate) =" . $year;
@@ -5051,6 +5094,13 @@ class ReceiptController extends DooController {
 			if ($day != 'DAY')
 				$dateCondition = " and Year(executeDate) =" . $year . " and Month(executeDate) = " . $moth . " and day(executeDate)=" . $day;
 		}
+		*/
+		
+		if ($sop != 'SOP')
+			$sopString = " and staff=" . $sop;
+		
+		
+		
 		// $noPassSum=$receipt->receiptByYear($year,$this->staff[0]['sid']); and (status=1 or status=6)
 		
 		$receiptList = $receipt->find ( array (
@@ -5271,6 +5321,8 @@ class ReceiptController extends DooController {
 				$sopHtml .= '<option value="' . $key . '" >' . $value . '</option>';
 		}
 		
+		
+		$data['rdate']=$rdate;
 		$data ['sopHtml'] = $sopHtml;
 		$data ['dayHtml'] = $dayHtml;
 		$data ['mothHtml'] = $mothHtml;
@@ -8359,9 +8411,17 @@ class ReceiptController extends DooController {
 			$verify = new verify ();
 			
 			$receiptInfo = $receipt->getOne ( array (
-					'where' => 'rid=' . $rid,
+					'where' => 'rid=' . $rid.' and status=2',
 					'asArray' => true 
 			) );
+			
+			if(empty($receiptInfo)){
+				echo json_encode ( array (
+						'status' => 2
+				) );
+				die ();
+			}
+			
 			$vr = $verify->getOne ( array (
 					'where' => 'vid=' . $receiptInfo ['verify'],
 					'asArray' => true 
@@ -8413,7 +8473,11 @@ class ReceiptController extends DooController {
 			echo json_encode ( array (
 					'status' => 1 
 			) );
-			die ();
+			
+			//Header("HTTP/1.1 303 See Other");
+			//Header("Location: /approvalExpenses/pendApproval");
+			
+			die;
 		}
 		
 		echo json_encode ( array (

protected/model/invoice.php

@@ -151,6 +151,7 @@ class invoice extends DooModel {
 	 * @var string $mailItems 邮寄物品
 	 */
 	public $mailItems;
+	public $mailItemsJson;
 	public $expressCompany;
 	public $expressNumber;
 	public $actualItems;
@@ -213,6 +214,7 @@ class invoice extends DooModel {
 			'recipientsPhone',
 			'recipientsAddress',
 			'mailItems',
+			'mailItemsJson',
 			'expressCompany',
 			'expressNumber',
 			'actualItems',

protected/view/admin/approvalExpenses.html

@@ -44,6 +44,12 @@
 	  					<!-- if {{status}}=='pendApproval'  -->
 	  					
 	  					<li>
+	  					
+	  					<select id="reportCate" onChange="reportCatePM();">
+	  						<option value="ALL">办事处</option>
+	  						{{reportCateHtml}}
+	  						</select>
+	  					
 	  					<select id="report" onChange="reportPM();">
 	  					<option value="ALL">员工</option>
 	  					{{reportHtml}}
@@ -98,7 +104,7 @@
 	  					<th width="120">费用所在办事处</th><th width="120">报销单号</th><th>报销说明</th><th width="100">状态</th><th width="100">操作</th></tr></thead>
 	  					<tbody>
 	  					<!-- loop receiptList -->
-	  						<tr node-all='true' node-box='{{receiptList' value.staffDetail.username}}' >
+	  						<tr node-all='true' node-box='{{receiptList' value.staffDetail.username}}' node-boxCate='{{receiptList' value.staffDetail.category}}' >
 	  							<td><div class="avtra"><img src="{{receiptList' value.staffDetail.avatar}}_2.jpg" width="32"><br>{{receiptList' value.staffDetail.username}}</div></td>
 	  							<td><!-- if {{receiptDetail' value.Rtype}}==1 --> 
 	  							借款

protected/view/admin/hisImplement.html

@@ -22,7 +22,7 @@
 				<legend><div class="fR"></div>费用执行历史数据</legend>
 				<div class="demandCate">
 				<form action="/hisImplement" id="up" method="post">
-					<input type="hidden" name="item" <!-- if {{item}}=="" --> value="all" <!-- else --> value="{{item}}" <!-- endif -->  />
+					<input type="hidden" name="item" <!-- if {{item}}=="pendImplement" --> value="pendImplement" <!-- else --> value="{{item}}" <!-- endif -->  />
 					
 					<input type="hidden" name="year" id="year"  />
 					<input type="hidden" name="moth" id="month" value="MONTH"  />
@@ -30,20 +30,43 @@
 					<input type="hidden" name="sop" id="sop" value="SOP"  />
 					
 					<ul class="cateList ">
+						
+						
 						<li>
+							<a <!-- if {{item}}=="pendImplement"||{{item}}=="" --> class="now" <!-- endif -->  href="/hisImplement/pendImplement">待执行</a>
+							<a href="/hisImplement/expenses" <!-- if {{item}}=="expenses" --> class="now" <!-- endif --> >借款</a>
+						<a href="/hisImplement/receipts" <!-- if {{item}}=="receipts" --> class="now" <!-- endif --> >报销单</a>
+						<a href="/hisImplement/remits" <!-- if {{item}}=="remits" --> class="now" <!-- endif --> >对公汇款</a>
+						</li>
+						<li >
+	  					
+	  					<a href="/hisImplement/alerpts" <!-- if {{item}}=="alerpts" --> class="now" <!-- endif --> >已执行</a>
+	  					</li>
+						<li><input type="date" name="date" id="date" value="{{rdate}}" onChange="receiptDate();" style="width:120px"></li>
+						
+						<li>
+							<select  id="S" onchange="receiptSop();">
+		  					<option value="SOP" <!-- if {{sop}}=='SOP' --> selected <!-- endif --> >所有</option>
+		  					{{sopHtml}}
+		  					</select>
+						</li>
+						
+						
+						
+						
+						
+						<li style="display:none">
 						<a href="/hisImplement" <!-- if {{item}}=="all"||{{item}}=="" --> class="now" <!-- endif --> >所有</a>
 						<a href="/hisImplement/expenses" <!-- if {{item}}=="expenses" --> class="now" <!-- endif --> >借款申请</a>
 						<a href="/hisImplement/receipts" <!-- if {{item}}=="receipts" --> class="now" <!-- endif --> >报销单</a>
 						<a href="/hisImplement/remits" <!-- if {{item}}=="remits" --> class="now" <!-- endif --> >对公汇款</a>
+						<a href="/hisImplement/teipts" <!-- if {{item}}=="teipts" --> class="now" <!-- endif --> >待执行</a>
 						</li>
 					
-	  					<li>
-	  					<a href="/hisImplement/teipts" <!-- if {{item}}=="teipts" --> class="now" <!-- endif --> >待执行</a>
-	  					<a href="/hisImplement/alerpts" <!-- if {{item}}=="alerpts" --> class="now" <!-- endif --> >已执行</a>
-	  					</li>
 	  					
 	  					
-	  					<li>
+	  					
+	  					<li style="display:none">
 	  					<select  id="Y" onchange="receiptYear();">
 	  					<!-- include 'year' -->
 	  					</select> 
@@ -55,6 +78,9 @@
 	  					<option value="DAY" <!-- if {{day}}=='DAY' --> selected <!-- endif --> >所有</option>
 	  					{{dayHtml}}
 	  					</select>
+	  					
+	  					
+	  					
 	  					<select  id="S" onchange="receiptSop();">
 	  					<option value="SOP" <!-- if {{sop}}=='SOP' --> selected <!-- endif --> >所有</option>
 	  					{{sopHtml}}
@@ -75,6 +101,8 @@
 						<thead><tr><th width="54" >上报人</th><th width="100" class="taC">费用类型</th><th width="100" class="taC">费用金额金额</th><th width="120" class="taC">费用所在办事处</th><th width="120" class="taC">费用单号</th><th class="taC">费用说明</th><th width="100" class="taC">状态</th><th width="80" class="taC">操作</th></tr></thead>
 						<tbody>
 						<!-- loop receiptList -->
+						<!-- if {{item}}=="pendImplement" -->
+						<!-- if {{receiptList' value.Texe}}=='true'&&{{receiptList' value.TRexe}}=='true'&&({{receiptList' value.status}}==1 || {{receiptList' value.status}}==6) -->
 						<tr>
 						<td><div class="avtra"><img src="{{receiptList' value.staffDetail.avatar}}_2.jpg" width="32"><br>{{receiptList' value.staffDetail.username}}</div></td>
 						
@@ -95,7 +123,7 @@
 			  				<!-- endif -->
 							</td>
 							<td>{{receiptList' value.category}}</td>
-							<td>{{receiptList' value.receiptOrder}}<p class="colGray"></p></td>
+							<td>{{receiptList' value.receiptOrder}}<p class="colGray">{{receiptDetail' value.date}}</p></td>
 							<td>{{receiptList' value.explanation}}</td>
 							<td>
 							<!-- if {{receiptList' value.status}}==1 -->
@@ -132,6 +160,69 @@
 							
 							</td>
 						</tr>
+						<!-- endif -->
+						<!-- else -->
+						
+						
+						<tr>
+						<td><div class="avtra"><img src="{{receiptList' value.staffDetail.avatar}}_2.jpg" width="32"><br>{{receiptList' value.staffDetail.username}}</div></td>
+						
+							<td>
+							<!-- if {{receiptList' value.Rtype}}==1 -->
+			  					借款申请
+			  				<!-- elseif {{receiptList' value.Rtype}}==2 -->
+			  					对公汇款
+			  				<!-- else -->	
+			  					报销单
+			  				<!-- endif -->
+							</td>
+							<td class="taR ">
+							<b class="colOrange">￥{{receiptList' value.sum}}</b>
+							<!-- if {{receiptList' value.Rtype}}==1 -->
+			  					<b <!-- if {{receiptList' value.sum}}>{{receiptList' value.loanSum}} --> class="colRed" <!-- else --> class="colGreen" <!-- endif --> > 
+			  					￥{{receiptList' value.loanSum}}</b>
+			  				<!-- endif -->
+							</td>
+							<td>{{receiptList' value.category}}</td>
+							<td>{{receiptList' value.receiptOrder}}<p class="colGray">{{receiptDetail' value.date}}</p></td>
+							<td>{{receiptList' value.explanation}}</td>
+							<td>
+							<!-- if {{receiptList' value.status}}==1 -->
+								执行中
+								<p class="colGray ">{{receiptList' value.pastDate}}</p>
+							<!-- elseif {{receiptList' value.status}}==2 -->
+								审批中
+							<!-- elseif {{receiptList' value.status}}==3 -->
+							终止
+							<!-- elseif {{receiptList' value.status}}==4 -->
+							撤回
+							<!-- elseif {{receiptList' value.status}}==5 -->
+							待提交
+							<!-- elseif {{receiptList' value.status}}==6 -->
+							执行中
+							<!-- elseif {{receiptList' value.status}}==7 -->
+							待提交
+							<!-- elseif {{receiptList' value.status}}==8 and {{receiptList' value.Rtype}}==1  -->
+							借款完成
+							<!-- elseif ({{receiptList' value.status}}==8 and {{receiptList' value.Rtype}}!=1 ) or {{receiptList' value.status}}==9 -->
+							费用完成
+							{{receiptList' value.executeDate}}
+							<!-- endif -->
+							
+							</td>
+							<td>
+							
+							<!-- if {{receiptList' value.Texe}}=='true'&&{{receiptList' value.TRexe}}=='true'&&({{receiptList' value.status}}==1 || {{receiptList' value.status}}==6) -->
+								<a href="/implement/{{receiptList' value.ridKey}}.html" class="button" target="_blank">去执行</a>
+							<!-- else -->
+							<a href="/expensesDoc/{{receiptList' value.rid}}" target="_blank">详情</a>
+							
+							<!-- endif -->
+							
+							</td>
+						</tr>
+						
+						<!-- endif -->
 						<!-- endloop -->
 						
 						</tbody>

protected/view/admin/invoiceAdd.html

@@ -66,11 +66,27 @@
 								</tr>
 								<tr>
 									<th class="taC" width="150"><span class="colRed">*</span>发票抬头</th>
-									<td colspan="3">
-									<input type="text" name="invoiceTitle" id="invoiceTitle"  value="" class="span6">
+									<td >
+									<input type="text" name="invoiceTitle" id="invoiceTitle"  value="" >
 									</td>
-
+									<th class="taC" width="150"><span class="colRed"></span>纳税人识别码</th>
+									<td><input type="text" name="TINT" id="TINT"></td>
 								</tr>
+								
+								<tr>
+									<th class="taC"><span class="colRed"></span>注册地址</th>
+									<td><input type="text" name="addressT" id="addressT"></td>
+									<th class="taC"><span class="colRed"></span>注册电话</th>
+									<td><input type="text" name="phoneT" id="phoneT"></td>
+								</tr>
+								<tr>
+									<th class="taC"><span class="colRed"></span>开户银行</th>
+									<td><input type="text" name="bankT" id="bankT"></td>
+									<th class="taC"><span class="colRed"></span>银行账号</th>
+									<td><input type="text" name="bankAccountT" id="bankAccountT"></td>
+								</tr>
+								
+								
 								</tbody>
 							</table>
 						<table id="specialInvoice_box" class="table table-bordered table-condensed" style="display:none">
@@ -124,7 +140,48 @@
 								</tr>
 								<tr>
 									<th class="taC" width="150">邮寄物品</th><td colspan="3">
-									<input placeholder="请详细填写需要邮寄的物品及数量，如：锁套装x1、合同x1" name="mailItems" type="text" class="span6"></td>
+									
+									
+									<div class="checkbox">
+									  <label>
+									    <input type="checkbox" name="softLock" value="1">
+									    软件锁 <br><input type="number" name="softLockNum" class="span1" placeholder="数量" value="1">
+									  </label>
+									</div>
+									<div class="checkbox">
+									  <label>
+									    <input type="checkbox" checked disabled value="1">
+									    发票 <br>1
+									  </label>
+									</div>
+									<div class="checkbox">
+									  <label>
+									    <input type="checkbox" name="contract" value="1">
+									    合同 <br><input type="number" name="contractNum" class="span1" placeholder="数量" value="1">
+									  </label>
+									</div>
+									<div class="checkbox">
+									  <label>
+									    <input type="checkbox" name="instructions" value="1">
+									    说明书 <br><input type="number" name="instructionsNum" class="span1" placeholder="数量" value="1">
+									  </label>
+									</div>
+									<div class="checkbox">
+									  <label>
+									    <input type="checkbox" name="remittance" value="1">
+									    汇款账号单
+									  </label>
+									</div>
+									<div class="checkbox">
+									  <label>
+									    <input type="checkbox" checked="" disabled="">
+									    备注<br><input type="text" class="span4" name="mailItems" placeholder="备注信息或其他需要邮寄物品请填写在这，写明数量。">
+									  </label>
+									</div>
+								</td>
+									
+									
+<!-- <input placeholder="请详细填写需要邮寄的物品及数量，如：锁套装x1、合同x1" name="mailItems" type="text" class="span6"></td>  -->
 								</tr>
 								</tbody>
 							</table>

protected/view/admin/invoiceApprovalDetail.html

@@ -52,9 +52,21 @@
 								<th colspan="4" class="taC">增值税普通发票</th>
 							</tr>
 							<tr>
-								<th class="taC" width="150">发票抬头</th><td colspan="3">{{invoiceDetail.invoiceTitle}}</td>
-
+								<th class="taC" width="150">发票抬头</th>
+								<td >{{invoiceDetail.invoiceTitle}}</td>
+								<th class="taC" width="150">纳税人识别码</th><td>{{invoiceDetail.TIN}}</td>
+	
+							</tr>
+							
+							<tr>
+								<th class="taC">注册地址</th><td>{{invoiceDetail.address}}</td>
+								<th class="taC">注册电话</th><td>{{invoiceDetail.phone}}</td>
+							</tr>
+							<tr>
+								<th class="taC">开户银行</th><td>{{invoiceDetail.bank}}</td>
+								<th class="taC">银行账号</th><td>{{invoiceDetail.bankAccount}}</td>
 							</tr>
+							
 							</tbody>
 						</table>
 						<!-- else -->
@@ -68,7 +80,7 @@
 								<th class="taC" width="150">纳税人识别码</th><td>{{invoiceDetail.TIN}}</td>
 
 							</tr>
-							</tr>
+							
 							<tr>
 								<th class="taC">注册地址</th><td>{{invoiceDetail.address}}</td>
 								<th class="taC">注册电话</th><td>{{invoiceDetail.phone}}</td>

protected/view/admin/invoiceEdit.html

@@ -79,9 +79,26 @@
 								<th colspan="4" class="taC">增值税普通发票</th>
 							</tr>
 							<tr>
-								<th class="taC" width="150"><span class="colRed">*</span>发票抬头</th><td colspan="3"><input name="invoiceTitle" id="invoiceTitle" value="{{invoiceDetail.invoiceTitle}}" type="text" class="span6"></td>
-
+								<th class="taC" width="150"><span class="colRed">*</span>发票抬头</th>
+								<td ><input name="invoiceTitle" id="invoiceTitle" value="{{invoiceDetail.invoiceTitle}}" type="text" ></td>
+						<th class="taC" width="150"><span class="colRed"></span>纳税人识别码</th>
+									<td><input name="TINT" id="TINT" value="{{invoiceDetail.TIN}}" type="text"></td>
 							</tr>
+							
+							<tr>
+									<th class="taC"><span class="colRed"></span>注册地址</th>
+									<td><input type="text" name="addressT" id="addressT" value="{{invoiceDetail.address}}"></td>
+									<th class="taC"><span class="colRed"></span>注册电话</th>
+									<td><input type="text" name="phoneT" id="phoneT" value="{{invoiceDetail.phone}}"></td>
+								</tr>
+								<tr>
+									<th class="taC"><span class="colRed"></span>开户银行</th>
+									<td><input type="text" name="bankT" id="bankT" value="{{invoiceDetail.bank}}"></td>
+									<th class="taC"><span class="colRed"></span>银行账号</th>
+									<td><input type="text" name="bankAccountT" id="bankAccountT" value="{{invoiceDetail.bankAccount}}"></td>
+								</tr>
+							
+							
 							</tbody>
 						</table>
 						<table id="specialInvoice_box" class="table table-bordered table-condensed" <!-- if {{invoiceDetail.invoiceType}}==0 --> style="display:none" <!-- endif --> >
@@ -138,7 +155,51 @@
 							</tr>
 							<tr>
 								<th class="taC" width="150">邮寄物品</th>
-								<td colspan="3"><input name="mailItems" value="{{invoiceDetail.mailItems}}" placeholder="请详细填写需要邮寄的物品及数量，如：锁套装x1、合同x1" type="text" class="span6"></td>
+								<td colspan="3">
+								
+								
+								<div class="checkbox">
+									  <label>
+									    <input <!-- if !empty({{invoiceDetail.mailItemsJson.softLock}}) --> checked <!-- endif --> type="checkbox" name="softLock" value="1">
+									    软件锁 <br><input type="number" name="softLockNum" class="span1" placeholder="数量" value="{{invoiceDetail.mailItemsJson.softLock}}">
+									  </label>
+									</div>
+									<div class="checkbox">
+									  <label>
+									    <input type="checkbox" checked disabled value="1">
+									    发票 <br>1
+									  </label>
+									</div>
+									<div class="checkbox">
+									  <label>
+									    <input <!-- if !empty({{invoiceDetail.mailItemsJson.contract}}) --> checked <!-- endif --> type="checkbox" name="contract" value="1">
+									    合同 <br><input type="number" name="contractNum" class="span1" placeholder="数量" value="{{invoiceDetail.mailItemsJson.contract}}">
+									  </label>
+									</div>
+									<div class="checkbox">
+									  <label>
+									    <input <!-- if !empty({{invoiceDetail.mailItemsJson.instructions}}) --> checked <!-- endif --> type="checkbox" name="instructions" value="1">
+									    说明书 <br><input type="number" name="instructionsNum" class="span1" placeholder="数量" value="{{invoiceDetail.mailItemsJson.instructions}}">
+									  </label>
+									</div>
+									<div class="checkbox">
+									  <label>
+									    <input <!-- if !empty({{invoiceDetail.mailItemsJson.remittance}}) --> checked <!-- endif --> type="checkbox" name="remittance" value="1">
+									    汇款账号单
+									  </label>
+									</div>
+									<div class="checkbox">
+									  <label>
+									    <input type="checkbox" checked="" disabled="">
+									    备注<br><input type="text" class="span4" name="mailItems" value="{{invoiceDetail.mailItemsJson.mailItems}}" placeholder="备注信息或其他需要邮寄物品请填写在这，写明数量。">
+									  </label>
+									</div>
+								
+								
+								
+								
+								
+								</td>
 							</tr>
 							</tbody>
 						</table>