发票数量单价相关修改

global/js/invoice.js

@@ -447,6 +447,43 @@ $(function() {
 		});
 	});
 	
+	$("a[node-invoiceLoss='INFO']").click(function() {
+		var postData = $(this).attr("data-isKey");
+		
+		var po='IRTC';
+		
+		$("div[loading-msg='true']").html("<img src='/global/img/loadIco.gif' />");
+		var url = "/ajaxGetInvoiceInfoByType";
+		$.ajax({
+			url : url,
+			type : "post",
+			cache : false,
+			dataType : "json",
+			data : {
+				serial : postData,
+				loss:true,
+				type:po
+			},
+			global : true,
+			success : function(data) {
+				if (data.status == 1) {
+					$("div[loading-msg='true']").html("");
+					$("#inKey").val(data.iidKey);
+					$("#irtc").html(data.html);
+					
+					$("input[name=receivablesPrice]").val(data.receivablesPrice);
+					$("input[name=receivablesMessage]").val(data.receivablesMessage);
+					$("input[name=receivablesDate]").val(data.receivablesDate);
+					
+				} else
+					$("div[loading-msg='true']").html("illegal request");
+			},
+			error : function(err) {
+				$("div[loading-msg='true']").html("");
+			}
+		});
+	});
+	
 	$("a[node-invoice='INFO']").click(function() {
 		var postData = $(this).attr("data-isKey");
 		var type =$(this).attr("data-type");
@@ -596,4 +633,6 @@ $(function() {
 	});
 	
 	
+	
+	
 })

global/js/invoice.validator.js

@@ -51,6 +51,9 @@ $(function () {
 	    	bank:'required(invoiceCompany);',
 	    	bankAccount:'required(invoiceCompany);',
 	    	invoicePrice: 'required; '
+	    	,invoiceQuantity: 'required; '
+	    	,invoiceUnitPrice: 'required; '
+	    		
 		    ,invoiceElement: 'required; '
 		    ,invoiceType: 'required'
 			,recipients: 'required(isMail); '
@@ -176,4 +179,18 @@ $(function () {
 	    }
 	});
 	
+	$('#invoiceQuantity').on('input',function(e) {
+    	var invoiceUnitPrice=$('#invoiceUnitPrice').val();
+    	var invoiceQuantity=$(this).val();
+    	var tp=invoiceUnitPrice*invoiceQuantity;
+    	$("#tp").html('￥'+tp);
+	});
+	
+	$('#invoiceUnitPrice').on('input',function(e) {
+    	var invoiceUnitPrice=$('#invoiceQuantity').val();
+    	var invoiceQuantity=$(this).val();
+    	var tp=invoiceUnitPrice*invoiceQuantity;
+    	$("#tp").html('￥'+tp);
+	});
+	
 })

protected/config/acl.conf.php

@@ -39,8 +39,10 @@ $acl ['ordinary'] ['allow'] = array (
 				'uploadInvoice',
 				'importInvoiceDo',
 				'importInvoiceReceivables',
-				'importInvoiceReceivablesDo'
+				'importInvoiceReceivablesDo',
 				
+				
+				'testSend'
 		) 
 );
 
@@ -96,7 +98,8 @@ $acl ['发票邮寄'] ['allow'] = array (
 $acl ['发票退票'] ['allow'] = array (
 		'InvoiceController' => array (
 				'invoiceUntread',
-				'invoiceUntreadEstablishedDo'
+				'invoiceUntreadEstablishedDo',
+				'invoiceLossDo'
 
 		)
 );

protected/config/execute/invoice.ini

@@ -1 +0,0 @@
-,43,58,50,50,9,2,43,44

protected/config/invoice/invoice.ini

@@ -1 +0,0 @@
-{"\u53d1\u7968\u5ba1\u6279":"43,44"}

protected/config/routes.conf.php

@@ -404,6 +404,8 @@ $route['post']['/invoiceUntreadMailDo'] = array('InvoiceController', 'invoiceUnt
 
 $route['post']['/ajaxCheckInvoiceNoUniqueness'] = array('InvoiceController', 'ajaxCheckInvoiceNoUniqueness');
 
+//$route['*']['/testSend'] = array('InvoiceController', 'testSend');
+
 
 //删除核销相关操作
 $route['post']['/invoiceUntreadDo'] = array('InvoiceController', 'invoiceUntreadDo');
@@ -456,6 +458,10 @@ $route['get']['/invoiceUntreadAchieve/:page'] = array('InvoiceController', 'invo
 $route['get']['/invoiceUntreadAchieve/:page/:date'] = array('InvoiceController', 'invoiceTAchieve');
 $route['get']['/invoiceUntreadAchieve/:page/:date/:MebSea'] = array('InvoiceController', 'invoiceTAchieve');
 
+//新加路由
+$route['post']['/invoiceLossDo'] = array('InvoiceController', 'invoiceLossDo');
+
+
 //收款管理
 $route['*']['/invoiceReceivables'] = array('InvoiceController', 'invoiceReceivables');
 

protected/controller/MainController.php

@@ -4132,8 +4132,8 @@ class MainController extends DooController {
 						      <div style="display:inline-block;margin-right:10px"><label><input name="Remind" onclick="reFK()" type="checkbox" value="1"> 添加提醒</label></div>
 						      <span id="reHL"  class="hide">
 								<div>
-                 	限期：<input class="form-control form_date" size="16" type="text" value="" readonly data-date="" data-date-format="yyyy-mm-dd" data-link-field="dtp_input2" data-link-format="yyyy-mm-dd">
-									<input type="hidden" name="time" id="dtp_input2" value="" class="hide"/>
+                 	限期：
+									<input type="date" name="time" id="dtp_input2" value="" class="hide"/>
 	              </div>
 								<div>
 							    备注：<input id="remark" name="remark" type="text"></span>
@@ -4156,21 +4156,7 @@ class MainController extends DooController {
 
 					' . $u . '
 					
-<script type="text/javascript">
-   
-	$(".form_date").datetimepicker({
-        language:  "zh-CN",
-        weekStart: 1,
-        todayBtn:  1,
-		autoclose: 1,
-		todayHighlight: 1,
-		startView: 2,
-		minView: 2,
-		forceParse: 0,
-		startDate: "' . date ( 'Y-m-d' ) . '"
-    });
-	
-</script>
+
 
 					
 	  	<script type="text/javascript">autoFlashHeight();</script>	</div>' 

protected/plugin/TemplateTag.php

@@ -42,9 +42,12 @@ function isInvoiceNew($type = "GLOBAL") {
 	$invoiceReceivables = new invoiceReceivables ();
 	Doo::loadModel ( 'staff' );
 	$staff = new staff ();
+	Doo::loadModel ( "invoiceManage" );
+	$execute = new invoiceManage ();
 	
 	$st = $staff->getUserByIdList ( $_COOKIE ["staff"] );
 	
+	$exeGlobal=$execute->getInvoiceByStaff($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 )
@@ -58,6 +61,9 @@ function isInvoiceNew($type = "GLOBAL") {
 			'desc' => 'irid',
 			'asArray' => TRUE 
 	) );
+	
+	
+	
 	// 发票审批
 	$approval = $invoice->getOne ( array (
 			'where' => 'status=1 and pendingApprovals=' . $st[0]['sid'],
@@ -91,8 +97,14 @@ function isInvoiceNew($type = "GLOBAL") {
 			'untread' => FALSE 
 	);
 	
-	if (! empty ( $pendingInvoice ) || ! empty ( $myClaim ) || ! empty ( $approval ) || ! empty ( $post ) || ! empty ( $print ) || ! empty ( $untread ))
-		$new ['GLOBAL'] = TRUE;
+	if (!empty($exeGlobal)){
+		if (! empty ( $pendingInvoice ) || ! empty ( $myClaim ) || ! empty ( $approval ) || ! empty ( $post ) || ! empty ( $print ) || ! empty ( $untread ))
+			$new ['GLOBAL'] = TRUE;
+	}else{
+		if (! empty ( $pendingInvoice ) || ! empty ( $myClaim ) )
+			$new ['GLOBAL'] = TRUE;
+	}
+		
 	if (! empty ( $pendingInvoice ))
 		$new ['pendingInvoice'] = TRUE;
 	if (! empty ( $myClaim ))

protected/view/admin/invoiceAS.html

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

protected/view/admin/invoiceAdd.html

@@ -36,14 +36,6 @@
 								<!-- endloop -->
 										</select>
 									</td>
-									<th class="taC" width="150">备注</th>
-									<td><input placeholder="" name="remark" type="text"></td>
-								</tr>
-								<tr>
-									<th class="taC"><span class="colRed">*</span>开票金额</th>
-									<td>
-									<input value="0" placeholder="输入开票金额" pattern="[0-9]" name="invoicePrice" id="invoicePrice" type="number" min="0" step="0.01">
-									</td>
 									<th class="taC"><span class="colRed">*</span>开票内容</th>
 									<td>
 									<select name="invoiceElement" id="invoiceElement">
@@ -52,6 +44,31 @@
 								</td>
 								</tr>
 								<tr>
+									<th class="taC"><span class="colRed">*</span>数量</th>
+									<td>
+										<input style="width:60px" name="invoiceQuantity" id="invoiceQuantity" value="1" 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"  placeholder="输入单价" pattern="[0-9]" type="number" min="1" step="100"></td>
+								</tr>
+								<tr>
+									<th class="taC"><span class="colRed">*</span>开票金额</th>
+									<td colspan="3">
+									
+										<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">
+									</td>
+									
+								</tr>
+								
+								<tr>
+									<th class="taC">发票备注</th><td colspan="3"><textarea name="remark" style="width:550px"></textarea>
+									</td>
+								</tr>
+								
+								<tr>
 									<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
 									<label class="radio inline"><input checked name="invoiceType" id="invoicePlain" onclick="invoiceShow()"  value="0" type="radio"  >增值税普通发票</label>
 									<label class="radio inline"><input name="invoiceType" id="invoiceSpecial" onclick="invoiceShow()"  value="1" type="radio">增值税专用发票</label>

protected/view/admin/invoiceApprovalDetail.html

@@ -37,11 +37,18 @@
 							</tr>
 							<tr>
 								<th class="taC" width="150">所在办事处</th><td>{{invoiceDetail.categoryName}}</td>
-								<th class="taC" width="150">备注</th><td>{{invoiceDetail.remark}}</td>
+								<th class="taC" width="150">开票内容</th><td>{{invoiceDetail.invoiceElement}}</td>
 							</tr>
 							<tr>
-								<th class="taC">开票金额</th><td><b class="colOrange" style="font-size:18px">￥{{invoiceDetail.invoicePrice}}</b></td>
-								<th class="taC">开票内容</th><td>{{invoiceDetail.invoiceElement}}</td>
+								<th class="taC" width="150">发票备注</th><td colspan="3">{{invoiceDetail.remark}}</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">数量</th><td><b>{{invoiceDetail.invoiceQuantity}}</b></td>
+								<th class="taC">单价</th><td><b>￥{{invoiceDetail.invoiceUnitPrice}}</b></td>
+							</tr>
+							<tr>
+								<th class="taC">开票金额</th><td colspan="3"><b class="colOrange" style="font-size:18px">￥{{invoiceDetail.invoicePrice}}</b></td>
+								
 							</tr>
 							</tbody>
 						</table>

protected/view/admin/invoicePrintDetail.html

@@ -35,11 +35,18 @@
 							</tr>
 							<tr>
 								<th class="taC" width="150">所在办事处</th><td>{{invoiceDetail.categoryName}}</td>
-								<th class="taC" width="150">备注</th><td>{{invoiceDetail.remark}}</td>
+								<th class="taC" width="150">开票内容</th><td>{{invoiceDetail.invoiceElement}}</td>
 							</tr>
 							<tr>
-								<th class="taC">开票金额</th><td><b class="colOrange" style="font-size:18px">￥{{invoiceDetail.invoicePrice}}</b></td>
-								<th class="taC">开票内容</th><td>{{invoiceDetail.invoiceElement}}</td>
+								<th class="taC" width="150">发票备注</th><td colspan="3">{{invoiceDetail.remark}}</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">数量</th><td><b>{{invoiceDetail.invoiceQuantity}}</b></td>
+								<th class="taC">单价</th><td><b>￥{{invoiceDetail.invoiceUnitPrice}}</b></td>
+							</tr>
+							<tr>
+								<th class="taC">开票金额</th><td colspan="3"><b class="colOrange" style="font-size:18px">￥{{invoiceDetail.invoicePrice}}</b></td>
+								
 							</tr>
 							</tbody>
 						</table>

protected/view/admin/invoiceReceivables.html

@@ -26,7 +26,6 @@
 					<a href="#inputbill" data-toggle="modal" class="invoice">录入收款</a>
 				</div>
 				
-				
 				<div class="borad-news">
 					<div class="saeaList">
 					
@@ -77,8 +76,6 @@
 							<!-- endif -->
 						</div>
 					
-					
-					
 					<div class="clearfix">
 					
 							<legend><div class="fR"><a href="/invoiceReceivablesAS">查看所有</a></div>最近认领&amp;录入</legend>

protected/view/admin/invoiceUntread.html

@@ -76,7 +76,9 @@
 							<!-- if !empty({{establishedInvoice}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>
-								<tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">快递信息</th><th class="taC">确认退票</th></tr>
+								<tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">快递信息</th><th class="taC">确认退票</th>
+								<th class="taC">负票抵销</th>
+								</tr>
 								
 								<!-- loop establishedInvoice -->
                                 <tr>
@@ -102,6 +104,17 @@
                                     <td>
                                     {{establishedInvoice' value.OperationLog.username}} {{establishedInvoice' value.OperationLog.date}}
                                     </td>
+                                    <td>
+                                    	<!-- if {{establishedInvoice' value.lossShow}} -->
+	                                    	<!-- if {{establishedInvoice' value.lossIid}}==0 -->
+	                                    	<a class="button btn-block" href="#request" node-invoiceLoss='INFO' data-isKey="{{establishedInvoice' value.iidKeyK}}" data-toggle="modal">申请打印</a>
+	                                    	<!-- else -->
+	                                    	<a href="#invdetail" node-invoice='INFO' data-isKey="{{invoiceList' value.lossDetail.iidKeyK}}" data-toggle="modal">{{invoiceList' value.lossDetail.invoiceSerial}}</a>
+	                                    	<!-- endif -->
+                                    	<!-- else -->
+                                   		当月退票
+                                   		<!-- endif -->
+                                    </td>
                                 </tr>
                                 <!-- endloop -->
 								</tbody>
@@ -116,10 +129,40 @@
 		</div>
 	</div>
 <div loading-msg='true' style="position:absolute;  left:50%;  top:50%;  "></div>
-    <div class="modal  fade" id="invdetail">
+<div class="modal  fade" id="invdetail">
+	<div id="nc"></div>
+</div>
+	
+	
+
+<div class="modal hide fade" id="request">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
 		
-		<div id="nc"></div>
+		<form action="/invoiceLossDo" method="post" name="receivablesInvoiceBind">
+			<input type="hidden" name="iidKey" id="inKey" value="">
+			<div class="modal-header">
+				<h3>打印信息</h3>
+			</div>
+			<div class="modal-body saeaList">
+				
+				<div id="irtc"></div>
+			</div>
+			<div class="modal-footer">
+				<input type="submit" class="button"  value="确认提交">
+				
+				<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+			</div>
+		</form>
+		</div>
 	</div>
+</div>
+	
+	
+	
+	
+	
+	
 	<!--弹出退票确认-->
 <div class="modal hide fade" id="return">
 <form action="/invoiceUntreadEstablishedDo" method="post" name="untreadInvoice">

protected/view/admin/invoiceUntreadAchieve.html

@@ -41,7 +41,8 @@
 				<div class="saeaList">
 					<table class="table table-hover">
 						<tbody>
-						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>开票金额</th><th>发票号</th><th>提交退票</th><th>快递信息</th><th>确认退票</th></tr>
+						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>开票金额</th><th>发票号</th><th>提交退票</th><th>快递信息</th><th>确认退票</th>
+						<th >负票抵销</th></tr>
 						
 						<!-- loop list -->
 						<tr>
@@ -67,6 +68,17 @@
                                     <a target="_blank" href="http://www.kuaidi100.com/chaxun?com={{invoiceList' value.untreadCom}}&nu={{invoiceList' value.untreadNumber}}">查询快递</a> 
                                     </td>
 							<td>{{establishedInvoice' value.OperationLog.username}} {{establishedInvoice' value.OperationLog.date}}</td>
+							<td>
+                                   <!-- if {{establishedInvoice' value.lossShow}} -->
+	                                   <!-- if {{establishedInvoice' value.lossIid}}==0 -->
+	                                    <a href="#request" node-invoiceLoss='INFO' data-isKey="{{establishedInvoice' value.iidKeyK}}" data-toggle="modal">申请打印</a>
+	                                   <!-- else -->
+	                                   <a href="#invdetail" node-invoice='INFO' data-isKey="{{invoiceList' value.lossDetail.iidKeyK}}" data-toggle="modal">{{invoiceList' value.lossDetail.invoiceSerial}}</a>
+	                                   <!-- endif -->
+                                   <!-- else -->
+                                   	当月退票
+                                   <!-- endif -->
+                                    </td>
 						</tr>
 						<!-- endloop -->
 						
@@ -108,6 +120,32 @@
 			</div>
 		</div>
 	</div>
+	
+	
+<div class="modal hide fade" id="request">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
+		
+		<form action="/invoiceLossDo" method="post" name="receivablesInvoiceBind">
+			<input type="hidden" name="iidKey" id="inKey" value="">
+			<div class="modal-header">
+				<h3>打印信息</h3>
+			</div>
+			<div class="modal-body saeaList">
+				
+				<div id="irtc"></div>
+			</div>
+			<div class="modal-footer">
+				<input type="submit" class="button"  value="确认提交">
+				
+				<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+			</div>
+		</form>
+		</div>
+	</div>
+</div>
+	
+	
 	<!--弹出快递跟踪-->
 <div class="modal hide fade" id="shipping">
 	<div class="modal-dialog">

protected/view/contacts_client.html

@@ -7,9 +7,7 @@
 <script src="<?= WEB_SITE_GLOBAL ?>/js/jquery.ui.autocomplete.js"></script>
 <script src="<?= WEB_SITE_GLOBAL ?>/js/autoTag.js"></script>
 
-<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>/js/bootstrap-datetimepicker.js" charset="UTF-8"></script>
-<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>/js/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
+
 
 <body>
 	<div class="mainLayout">

protected/view/contacts_company.html

@@ -456,7 +456,6 @@ function deleteTagCompany(tid,cid,obj){
 <div class="modal hide fade" id="editTag">
 <div class="modal-dialog">
  <div class="modal-content">
-
     <div class="modal-header">
     <h3>编辑标签</h3>
     </div>