开票

protected/controller/ReceiptController.php

@@ -2475,7 +2475,7 @@ class ReceiptController extends DooController {
 			$receiptList [$key] ['loanSumCN'] = $this->num_to_rmb ( $value ['loanSum'] );
 			$relust = $value ['sum'] - $value ['loanSum'];
 			$receiptList [$key] ['relust'] = $relust;
-			$receiptList [$key] ['relustCN'] = $this->num_to_rmb ( $relust );
+			$receiptList [$key] ['relustCN'] = $this->num_to_rmb ( abs($relust) );
 		}
 		
 		// print_r($receiptList);
@@ -3108,6 +3108,11 @@ class ReceiptController extends DooController {
 			
 			$receiptList [$key] ['sumCN'] = $this->num_to_rmb ( $value ['sum'] );
 			$receiptList [$key] ['loanSumCN'] = $this->num_to_rmb ( $value ['loanSum'] );
+			
+			$relust = $value ['sum'] - $value ['loanSum'];
+			$receiptList [$key] ['relust'] = $relust;
+			$receiptList [$key] ['relustCN'] = $this->num_to_rmb ( abs($relust) );
+			
 		}
 		
 		// print_r($receiptList);
@@ -4822,7 +4827,7 @@ class ReceiptController extends DooController {
 			$receiptList [$key] ['sumCN'] = $this->num_to_rmb ( $value ['sum'] );
 			$relust = $value ['sum'] - $value ['loanSum'];
 			$receiptList [$key] ['relust'] = $relust;
-			$receiptList [$key] ['relustCN'] = $this->num_to_rmb ( $relust );
+			$receiptList [$key] ['relustCN'] = $this->num_to_rmb ( abs($relust) );
 		}
 		// print_r($receiptList);die;
 		// $data['verifyDetail']=$verifyDetail;

protected/plugin/TemplateTag.php

@@ -18,8 +18,11 @@ Doo::conf ()->TEMPLATE_GLOBAL_TAGS = array (
 		'make_date',
 		'inarray',
 		'getGlobals',
-		'isInvoiceMoldShow' 
+		'isInvoiceMoldShow'
 );
+
+
+
 function isTimeTR($day = 3,$cTime) {
 	$flag=false;
 	$thenTime=time();

protected/view/admin/expensesCollect.html

@@ -97,9 +97,15 @@
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
-	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
+	  						
+	  						<tr class="warning">
+	  						<td class="taR"><b>本次借款</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+	  						</tr>
+	  						
+	  						<tr class="warning"><td class="taR"><b>本次报销金额</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
-	  						<tr <!-- if {{receiptDetail' value.relust}}>=0 --> class="success" <!-- else --> class="error" <!-- endif --> ><td class="taR"><b>借款结余</b></td>
+	  						<tr <!-- if {{receiptDetail' value.relust}}>=0 --> class="success" <!-- else --> class="error" <!-- endif --> ><td class="taR"><b>差额</b></td>
 	  						<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.relust}}</b><br>{{receiptDetail' value.relustCN}}</td></tr>
 	  						</tbody>
 	  					</table>

protected/view/admin/expensesDoc.html

@@ -108,9 +108,19 @@
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
-	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
+	  						
+	  						<tr class="warning">
+	  						<td class="taR"><b>本次借款</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+	  						</tr>
+	  						
+	  						<tr class="warning"><td class="taR"><b>本次报销金额</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
 	  					
+	  					<tr <!-- if {{receiptDetail' value.relust}}>=0 --> class="success" <!-- else --> class="error" <!-- endif --> ><td class="taR"><b>差额</b></td>
+	  						<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.relust}}</b><br>{{receiptDetail' value.relustCN}}</td></tr>
+	  					
+	  					
 	  						</tbody>
 	  					</table>
 	  					

protected/view/admin/receiptburEdi.html

@@ -124,10 +124,14 @@
 	  						
 	  						</td></tr>
 	  						
+	  						<tr class="warning">
+	  						<td class="taR"><b>本次借款</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+	  						</tr>
 	  						
-	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
+	  						<tr class="warning"><td class="taR"><b>本次报销金额</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
-							<tr <!-- if {{receiptDetail' value.relust}}>=0 --> class="success" <!-- else --> class="error" <!-- endif --> ><td class="taR"><b>借款结余</b></td>
+							<tr <!-- if {{receiptDetail' value.relust}}>=0 --> class="success" <!-- else --> class="error" <!-- endif --> ><td class="taR"><b>差额</b></td>
 	  						<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.relust}}</b><br>{{receiptDetail' value.relustCN}}</td></tr>
 						</tbody>
 	  					</table>