caipin vor 4 Jahren
Ursprung
Commit
ee7d485731

+ 18 - 54
global/vue/fee/receipt_create_fn.js

@@ -43,46 +43,18 @@ function checkReceipt(event, obj) {
 
     for (let i = 0; i < obj.receiptTypeMenu[1]['traveList'].length; i++) {
       let dateArray = obj.receiptTypeMenu[1]['traveList'][i].tripTime.split(" - ");
-      if (dateArray.length != 2) {
-        obj.alertDia("差旅行程时间填写有误");
-        event.preventDefault();
-        return
-      }
-      let dateFormat = /^(\d{4})-(\d{2})-(\d{2})$/;
-      if (!dateFormat.test(dateArray[0])) {
-        obj.alertDia("差旅行程时间填写有误");
-        event.preventDefault();
-        return
-      }
-      if (!dateFormat.test(dateArray[1])) {
+
+      if(ValidTraveDate(dateArray)){
         obj.alertDia("差旅行程时间填写有误");
         event.preventDefault();
-        return
+        return 
       }
 
       let item = new Array(new Date(dateArray[0]).getTime() / 1000 - 28800, new Date(dateArray[1]).getTime() / 1000 - 28800);
       sortList.push(item);
     }
 
-
-    //验证差旅时间
-    console.log(obj.receiptTypeMenu[1]['traveList'])
-    //  let dateFormat = /^(\d{4})-(\d{2})-(\d{2})$/;
-    //  if (sortList[i].length != 2) {
-    //   flag = true;
-    //   break;
-    // } else {
-    //   if (!dateFormat.test(sortList[i][0])) {
-    //     flag = true;
-    //     break;
-    //   }
-    //   if (!dateFormat.test(sortList[i][1])) {
-    //     flag = true;
-    //     break;
-    //   }
-    // }
-
-
+    
     let alertDia = obj.alertDia;
     $.ajax({
       type: "GET",
@@ -298,27 +270,19 @@ function isTraveDate(sortList) {
     }
 
   }
-
-  // sortList.forEach((element, index) => {
-  //   let start = element[0];
-  //   let end = element[1];
-  //   itemIndex = index + 1;
-  //   if (sortList.length === itemIndex) {
-  //     return true;
-  //   }
-  //   let isRangeStartAndEnd = sortList.some((item, i) => {
-  //     if (i != index) {
-  //       return (item[0] <= start && item[1] >= start) || (item[0] <= end && item[1] >= end)
-  //     }
-  //     //return (sortList[itemIndex][0]<=start&&sortList[itemIndex][1]>=start)||(sortList[itemIndex][0]<=end&&sortList[itemIndex][1]>=end)
-  //   })
-  //   if (isRangeStartAndEnd) {
-  //     // 有重复区间
-  //     //flag = true;
-  //     flag = 2;
-  //     return true;
-  //   }
-  // });
-
   return flag;
+}
+
+function ValidTraveDate(dateArray) {
+  if (dateArray.length != 2) {
+    return true;
+  }
+  let dateFormat = /^(\d{4})-(\d{2})-(\d{2})$/;
+  if (!dateFormat.test(dateArray[0])) {
+    return true;
+  }
+  if (!dateFormat.test(dateArray[1])) {
+    return true;
+  }
+  return false
 }

+ 18 - 31
global/vue/fee/receipt_trave_component.js

@@ -52,20 +52,25 @@ Vue.component("trave", {
             this.tripTime = event.target.value;
             this.tripTimeEdi = event.target.value;
             let dateArray = event.target.value.split(" - ");
-            if (dateArray.length != 2) {
-                this.alertDia("差旅行程时间填写有误");
-                return 
-            }
-            let dateFormat = /^(\d{4})-(\d{2})-(\d{2})$/;
-            if (!dateFormat.test(dateArray[0])) {
-                this.alertDia("差旅行程时间填写有误");
-                return 
-            }
-            if (!dateFormat.test(dateArray[1])) {
-                this.alertDia("差旅行程时间填写有误");
-                return 
+
+
+            if (dateArray.length == 2) {
+                let dateFormat = /^(\d{4})-(\d{2})-(\d{2})$/;
+                if (!dateFormat.test(dateArray[0])) {
+                    this.alertDia("差旅行程时间填写有误");
+                    return 
+                }
+                if (!dateFormat.test(dateArray[1])) {
+                    this.alertDia("差旅行程时间填写有误");
+                    return 
+                }
             }
+              
 
+            // if(ValidTraveDate(dateArray)){
+            //     this.alertDia("差旅行程时间填写有误");
+            //     return 
+            // }
 
 
             traveDay = (Math.abs(Date.parse(dateArray[0]) - Date.parse(dateArray[1]))) / (1000 * 60 * 60 * 24) + 1;
@@ -86,25 +91,7 @@ Vue.component("trave", {
                     if (TraveStatus == 2) {
                         alertDia("差旅行程日期段-有重复");
                     }
-                    // console.log(sortList);
-                    // sortList.forEach((element,index) => {
-                    //     const start = element[0];
-                    //     const end = element[1];
-                    //     itemIndex=index+1;
-                    //     if(sortList.length===itemIndex){
-                    //       return 
-                    //     }
-                    //     const isRangeStartAndEnd = sortList.some(item => {
-                    //       return (sortList[itemIndex][0]<=start&&sortList[itemIndex][1]>=start)||(sortList[itemIndex][0]<=end&&sortList[itemIndex][1]>=end)
-                    //     })
-                    //     if(isRangeStartAndEnd) {
-                    //       // 有重复区间
-                    //       alertDia("历史差旅行程时间段-有重复");
-                    //       flag = true;
-                    //       return ;
-                    //     } 
-                    // });
-
+                   
 
                 }).fail(function (msg) {
                     alertDia("历史差旅时间获取失败");

+ 17 - 3
protected/controller/ReceiptExtendController.php

@@ -2608,6 +2608,8 @@ class ReceiptExtendController extends DooController {
 		}
 		
 		
+		//include Doo::conf ()->BASE_PATH . 'diagnostic/debug.php';
+		
 		/*
 		$expensesType = $this->get_args ( 'expensesType' ) ? $this->get_args ( 'expensesType' ) : "";
 		$expenditureBank = $this->get_args ( 'expenditureBank' ) ? $this->get_args ( 'expenditureBank' ) : "";
@@ -2665,7 +2667,8 @@ class ReceiptExtendController extends DooController {
 			$accountType = 3;
 			$expensesType='EXPENDITURE';
 		} elseif ($detail ['Rtype'] == 1) {
-			if (! empty ( $rinfo ['accountItem'] )){
+			
+			if($detail['version']==1){
 				$accountType = 2;
 				if ($amount>=0){
 					$expensesType='EXPENDITURE';
@@ -2673,9 +2676,20 @@ class ReceiptExtendController extends DooController {
 					$expensesType='INCOME';
 				}
 			}else{
-				$accountType = 1;
-				$expensesType='EXPENDITURE';
+				if (! empty ( $detail ['accountItem'] )){
+					$accountType = 2;
+					if ($amount>=0){
+						$expensesType='EXPENDITURE';
+					}else{
+						$expensesType='INCOME';
+					}
+				}else{
+					$accountType = 1;
+					$expensesType='EXPENDITURE';
+				}
 			}
+			
+			
 		} elseif ($detail ['Rtype'] == 2) {
 			$accountType = 4;
 			$expensesType='EXPENDITURE';

+ 124 - 139
protected/controller/fee/fee_controller.php

@@ -13,127 +13,6 @@ class fee_controller extends DooController {
 	private $feeService;
 	private $regionService;
 	private $officeService;
-	public function beforeRun($resource, $action) {
-		$this->accessAuth ( $resource, $action );
-	}
-	function __construct() {
-		$this->session ();
-		$this->feeService = new fee_service ();
-		$this->regionService = new region_service ();
-		$this->officeService = new office_service ();
-	}
-	
-	// 访问权限-费用管理
-	private function accessAuth($resource, $action) {
-		Doo::loadClass ( 'XDeode' );
-		$XDeode = new XDeode ( 5 );
-		$sid = $XDeode->decode ( $_COOKIE ["staff"] );
-		// 1.单独判断公司汇总的访问权限
-		if ($action == 'companyCategoryCollect') {
-			Doo::loadModel ( "receiptAuthorityManage" );
-			$invoiceCompanyManage = new receiptAuthorityManage ();
-			
-			$icm = $invoiceCompanyManage->getInvoiceCMByStaff ( $sid );
-			if (empty ( $icm ))
-				die ( 'illegal request-无权访问该页面' );
-		}
-		
-		// 2.获得登陆用户信息
-		Doo::loadModel ( 'cld/staff_cld' );
-		$staff = new staff_cld ();
-		$this->staff = $staff->Get ( $sid );
-		
-		// 3.是否有权限访问
-		$accessModular = 'RECEIPTS';
-		if (empty ( $this->staff ['cldAccessArray'] )) {
-			die ( 'illegal request-无权访问费用页面,向总部申请权限' );
-		} else {
-			if (in_array ( $accessModular, $this->staff ['cldAccessArray'] )) {
-				if (Doo::acl ()->isAllowed ( $accessModular, $resource, $action )) {
-					$flag = true;
-				} else {
-					$flag = false;
-				}
-			} else {
-				die ( 'illegal request-无权访问费用页面' );
-			}
-		}
-		if (! $flag)
-			die ( 'illegal request-无权访问费用页面' );
-	}
-	
-	// 登陆判定
-	private function session() {
-		if (isset ( $_COOKIE ["staff"] )) {
-			
-			if (! empty ( $_COOKIE ["staff"] )) {
-				
-				Doo::loadModel ( 'staff' );
-				Doo::loadModel ( 'verify' );
-				$verify = new verify ();
-				$staff = new staff ();
-				Doo::loadModel ( "execute" );
-				$execute = new execute ();
-				
-				$verifyList = $verify->find ( array (
-						'select' => 'staff',
-						'asArray' => true 
-				) );
-				$list = array ();
-				
-				// 判断角色的审批权限
-				foreach ( $verifyList as $key => $value ) {
-					$ver = json_decode ( $value ['staff'] );
-					
-					foreach ( $ver as $k => $v ) {
-						if ($v [1] == 'ROLE') {
-							$roleList = json_decode ( $v [3] );
-							foreach ( $roleList as $t => $g ) {
-								$gList = explode ( "_", $g );
-								array_push ( $list, $gList [0] );
-								// print_r($list);
-							}
-						} else
-							array_push ( $list, $v [0] );
-					}
-				}
-				
-				// 判断执行人的审批权限
-				$executeList = $execute->find ( array (
-						'where' => 'mold !="日常收支"',
-						'select' => 'staff',
-						'asArray' => true 
-				) );
-				$list2 = array ();
-				foreach ( $executeList as $key => $value ) {
-					$ver = json_decode ( $value ['staff'] );
-					
-					foreach ( $ver as $k => $v ) {
-						array_push ( $list2, $v [0] );
-					}
-				}
-				
-				$eidList = file_get_contents ( "protected/config/execute/execute.ini" );
-				$eidList = array_filter ( explode ( ",", $eidList ) );
-				
-				$this->executeId = array_merge ( $list2, $eidList );
-				// print_r($this->executeId);
-				$this->verifyId = $list;
-				// $this->staff = $staff->getUserByIdList ( $_COOKIE ["staff"] );
-				
-				return "/";
-			}
-		}
-		
-		Doo::loadCore ( 'uri/DooUriRouter' );
-		$router = new DooUriRouter ();
-		$routeRs = $router->execute ( Doo::app ()->route, Doo::conf ()->SUBFOLDER );
-		
-		if ($routeRs ['1'] != "login") {
-			header ( 'Content-Type:text/html;charset=utf-8' );
-			@header ( "Location: /login" );
-		}
-	}
 	
 	// 构建申请报销单页面
 	public function GetViewReceiptCreate() {
@@ -161,24 +40,6 @@ class fee_controller extends DooController {
 		$data['defaultTraveProvince']=$traveDefault['defaultTraveProvince'];
 		$data['defaultTraveProvinceIndex']=$traveDefault['defaultTraveProvinceIndex'];
 		
-// 		$defaultTraveProvince="";
-// 		if($this->staff['category']=="总部"){
-// 			$defaultTraveProvince="广东省";
-// 		}else{
-// 			$defaultTraveProvince=str_replace("办","省",$this->staff['category']);
-// 		}
-// 		$data['defaultTraveProvince']=$defaultTraveProvince;
-		
-// 		// 获得二级地区的index
-// 		$defaultTraveProvinceIndex=0;
-// 		foreach ($region as $key=>$value){
-// 			if($value['name']==$defaultTraveProvince){
-// 				$defaultTraveProvinceIndex=$key;
-// 			}
-// 		}
-// 		$data['defaultTraveProvinceIndex']=$defaultTraveProvinceIndex;
-		
-		
 		// 附件
 		$data ['enclosurList'] = array ();
 		
@@ -431,6 +292,130 @@ class fee_controller extends DooController {
 		echo json_encode($traveData);
 	}
 	
+	public function beforeRun($resource, $action) {
+		$this->accessAuth ( $resource, $action );
+	}
+	function __construct() {
+		$this->session ();
+		$this->feeService = new fee_service ();
+		$this->regionService = new region_service ();
+		$this->officeService = new office_service ();
+	}
+	
+	// 访问权限-费用管理
+	private function accessAuth($resource, $action) {
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
+		$sid = $XDeode->decode ( $_COOKIE ["staff"] );
+		// 1.单独判断公司汇总的访问权限
+		if ($action == 'companyCategoryCollect') {
+			Doo::loadModel ( "receiptAuthorityManage" );
+			$invoiceCompanyManage = new receiptAuthorityManage ();
+				
+			$icm = $invoiceCompanyManage->getInvoiceCMByStaff ( $sid );
+			if (empty ( $icm ))
+				die ( 'illegal request-无权访问该页面' );
+		}
+	
+		// 2.获得登陆用户信息
+		Doo::loadModel ( 'cld/staff_cld' );
+		$staff = new staff_cld ();
+		$this->staff = $staff->Get ( $sid );
+	
+		// 3.是否有权限访问
+		$accessModular = 'RECEIPTS';
+		if (empty ( $this->staff ['cldAccessArray'] )) {
+			die ( 'illegal request-无权访问费用页面,向总部申请权限' );
+		} else {
+			if (in_array ( $accessModular, $this->staff ['cldAccessArray'] )) {
+				if (Doo::acl ()->isAllowed ( $accessModular, $resource, $action )) {
+					$flag = true;
+				} else {
+					$flag = false;
+				}
+			} else {
+				die ( 'illegal request-无权访问费用页面' );
+			}
+		}
+		if (! $flag)
+			die ( 'illegal request-无权访问费用页面' );
+	}
+	
+	// 登陆判定
+	private function session() {
+		if (isset ( $_COOKIE ["staff"] )) {
+				
+			if (! empty ( $_COOKIE ["staff"] )) {
+	
+				Doo::loadModel ( 'staff' );
+				Doo::loadModel ( 'verify' );
+				$verify = new verify ();
+				$staff = new staff ();
+				Doo::loadModel ( "execute" );
+				$execute = new execute ();
+	
+				$verifyList = $verify->find ( array (
+						'select' => 'staff',
+						'asArray' => true
+				) );
+				$list = array ();
+	
+				// 判断角色的审批权限
+				foreach ( $verifyList as $key => $value ) {
+					$ver = json_decode ( $value ['staff'] );
+						
+					foreach ( $ver as $k => $v ) {
+						if ($v [1] == 'ROLE') {
+							$roleList = json_decode ( $v [3] );
+							foreach ( $roleList as $t => $g ) {
+								$gList = explode ( "_", $g );
+								array_push ( $list, $gList [0] );
+								// print_r($list);
+							}
+						} else
+							array_push ( $list, $v [0] );
+					}
+				}
+	
+				// 判断执行人的审批权限
+				$executeList = $execute->find ( array (
+						'where' => 'mold !="日常收支"',
+						'select' => 'staff',
+						'asArray' => true
+				) );
+				$list2 = array ();
+				foreach ( $executeList as $key => $value ) {
+					$ver = json_decode ( $value ['staff'] );
+						
+					foreach ( $ver as $k => $v ) {
+						array_push ( $list2, $v [0] );
+					}
+				}
+	
+				$eidList = file_get_contents ( "protected/config/execute/execute.ini" );
+				$eidList = array_filter ( explode ( ",", $eidList ) );
+	
+				$this->executeId = array_merge ( $list2, $eidList );
+				// print_r($this->executeId);
+				$this->verifyId = $list;
+				// $this->staff = $staff->getUserByIdList ( $_COOKIE ["staff"] );
+	
+				return "/";
+			}
+		}
+	
+		Doo::loadCore ( 'uri/DooUriRouter' );
+		$router = new DooUriRouter ();
+		$routeRs = $router->execute ( Doo::app ()->route, Doo::conf ()->SUBFOLDER );
+	
+		if ($routeRs ['1'] != "login") {
+			header ( 'Content-Type:text/html;charset=utf-8' );
+			@header ( "Location: /login" );
+		}
+	}
+	
+	
+	
 	private function makeTraveDefault($region){
 		$defaultTraveProvince="";
 		if($this->staff['category']=="总部"||$this->staff['category']=="总部1"){

+ 3 - 0
protected/services/fee_service.php

@@ -49,6 +49,9 @@ class fee_service {
 			$data ['traveJson'] = json_decode ( $data ['traveData'], true );
 			if ($data ['traveJson'] ['show']) {
 				$hasType ++;
+				// 日期合法性检查
+				
+				//print_r($data ['traveJson']);die;
 			}
 		}
 		if ($data ['officeData'] != "") {

+ 1 - 1
protected/view/admin/approvalExpenses.html

@@ -37,7 +37,7 @@
 	  					
 	  					<a <!-- if {{status}}=='finish' --> class="now" <!-- endif --> href="/approvalExpenses/finish" >审批完成</a>
 	  					
-	  					<a <!-- if {{status}}=='loan' --> class="now" <!-- endif --> href="/approvalExpenses/loan" >借款相关</a>
+	  					<!-- <a <!-- if {{status}}=='loan' --> class="now" <!-- endif --> href="/approvalExpenses/loan" >借款相关</a>  -->
 	  					</li>
 	  					
 	  					<!-- if {{status}}=='pendApproval'|| {{status}}=='ongoing'  -->

+ 1 - 0
protected/view/admin/invoiceAdd.html

@@ -350,6 +350,7 @@ $('input[type=radio][name=invoiceForm]').change(function() {
 								
 								<tr paperTR>
 									<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
+									<!-- id="invoicePlain" -->
 									<label class="radio inline"><input checked name="invoiceType" id="invoicePlain" onclick="invoiceShow()"  value="0" type="radio"  >增值税普通发票</label>
 									<label class="radio inline colRed"><input name="invoiceType" id="invoiceSpecial" onclick="invoiceShow()"  value="1" type="radio">增值税专用发票</label>
 									</td>

+ 31 - 3
protected/view/admin/invoiceAddFill.html

@@ -91,6 +91,33 @@ $('button[invoiceDetalfn]').click(function() {
 		
 });
 
+$('input[amount]').keyup(function() {
+	var invoiceQuantity=$('#invoiceQuantity').val();
+	var invoiceUnitPrice=$('#invoiceUnitPrice').val();
+	
+	var invoiceType=$("input[name='invoiceType']:checked").val();
+	//invoiceType==1&&
+	if(invoiceQuantity != "" && invoiceQuantity != null && invoiceQuantity != 'undefined' && invoiceUnitPrice != "" && invoiceUnitPrice != null && invoiceUnitPrice != 'undefined'){ // "",null,undefined
+		var amount=invoiceQuantity*invoiceUnitPrice;
+		
+		if (!isNaN(amount) ){
+			$("#invoicePrice").val(amount);
+			if(amount>100001){
+				var msgHtml='<span class="msg-box n-right" for="invoicePrice"><span role="alert" class="msg-wrap n-error"><span class="n-icon"></span><span class="n-msg">此处必须小于100000</span></span></span>';
+				$("#msgMaxPrice").html(msgHtml);
+			}else{
+				$("#msgMaxPrice").html('');
+			}
+		}else{
+			$("#invoicePrice").val('');
+			$("#msgMaxPrice").html('');
+		}
+    }else{
+		$("#invoicePrice").val('');
+		$("#msgMaxPrice").html('');
+	}
+});
+
 $("input[autoIFBTitle]").autocomplete({
     source: function( request, response ) {
         $.ajax({
@@ -257,10 +284,10 @@ $('input[type=radio][name=invoiceForm]').change(function() {
 								<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">
+										<input style="width:60px" name="invoiceQuantity" amount 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"  placeholder="输入单价" pattern="[0-9]" value='{{invoiceDetail.invoiceUnitPrice}}' type="number" min="1" step="100"></td>
+									<td><input style="width:100px" name="invoiceUnitPrice" amount id="invoiceUnitPrice"  placeholder="输入单价" pattern="[0-9]" value='{{invoiceDetail.invoiceUnitPrice}}' type="number" min="1" step="100"></td>
 								</tr>
 								<tr>
 									<th class="taC"><span class="colRed">*</span>开票金额</th>
@@ -268,7 +295,8 @@ $('input[type=radio][name=invoiceForm]').change(function() {
 									
 										<p class="colGray">数量*单价=开票金额</p>
 										<b class="colOrange" id="tp" style="font-size:18px">¥{{invoiceDetail.invoicePrice}}</b>
-									
+									<span id="msgMaxPrice"></span>
+										<input  name="10000" id="10000" type="hidden" value="10000">
 									<input value="0"  placeholder="输入开票金额" pattern="[0-9]" name="invoicePrice" id="invoicePrice" type="hidden" min="0" step="0.01">
 									</td>
 									

+ 2 - 1
protected/view/fee/approval/receipt.html

@@ -41,7 +41,8 @@
 
 
 								<!-- if isset({{loan}}) -->
-								<table class="table table-bordered table-condensed table-hover">
+								<p class="taC" style="margin-bottom: 20px" id="open">借款费用详情已收起 <a href="javascript:void(0)" onclick="$('#loanTable').toggle();" >点击</a></p>
+								<table class="table table-bordered table-condensed table-hover" id="loanTable">
 									<tbody>
 										<tr>
 											<th colspan="2" class="taC">借款费用</th>

+ 28 - 7
protected/view/fee/approval/receipt_compatible.html

@@ -74,13 +74,31 @@ $(function(){
 	  			<div class="seTable reportTable">
 	  			<!-- if {{receiptList' value.Rtype}}==1 -->
 	  			
-	  			
 	  			<table class="table table-bordered table-condensed table-hover">
 							<tbody>
-							<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"><span class="colGray">报销 - 借款 = </span><b>差额</b></td>
+	  						<td class="taR"><b style="font-size:24px">¥{{receiptDetail' value.relust}}</b><br>{{receiptDetail' value.relustCN}}</td></tr>
+	  						</tbody>
+	  					</table>
+	  			
+	  			
+	  			<p class="taC" style="margin-bottom: 20px" id="open">借款费用详情已收起 <a href="javascript:void(0)" onclick="$('#loanTable').toggle();" >点击</a></p>
+	  			
+	  			<table class="table table-bordered table-condensed table-hover hide" id="loanTable">
+							<tbody>
+							 <tr class="warning"><td class="taR"><b>({{receiptDetail' value.receiptOrder}})本次费用合计</b></td>
 							<td class="taR"><b style="font-size:24px">¥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
 							</tr>
-							
+							 
 							<tr><th class="taC" colspan="2">费用说明</th>
 							</tr><tr><td colspan="2">{{explanation}}</td></tr>
 							
@@ -109,7 +127,7 @@ $(function(){
 	  					
 	  			<!-- endif -->
 	  			<!-- 报销单  -->
-	  					
+	  					<!-- 
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
 	  						
@@ -119,7 +137,7 @@ $(function(){
 	  						
 	  					</tbody>
 	  					</table>	
-	  						
+	  						 -->
 	  						<!-- if !empty({{receiptDetail' value.officeJson}}) -->
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
@@ -160,7 +178,7 @@ $(function(){
 	  						
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 		  						<tr><td colspan="2">{{receiptDetail' value.traveExplain}}</td></tr>
-		  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+		  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 		  						<!-- loop receiptDetail' value.traveJson.traveList -->
 		  							<tr><th colspan="2" class="taL">行程{{item' value' value.index}}# {{item' value' value.tripTime}}<br>
 		  							<i class="contactsMark icon-">P</i> {{item' value' value.detailCity}}</th></tr>
@@ -319,7 +337,10 @@ $(function(){
 	  						
 	  						</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>
 	  						
 
 						</tbody>

+ 0 - 72
protected/view/fee/create/loanDetail.html

@@ -1,72 +0,0 @@
-<div class="entry loan-list">
-    <div class="seTable">
-        <table class="table table-bordered table-condensed table-hover">
-            <tbody>
-                <tr>
-                    <th colspan="2" class="taC">借款费用{{loan.rid}}</th>
-                </tr>
-                <!-- loop loan.loanItem.借款费用 -->
-                <tr>
-                    <th>{{receiptList' value' value.name}}</th>
-                    <td width="140" class="taR">¥{{receiptList' value' value.price}}</td>
-                </tr>
-                <!-- endloop -->
-                <tr>
-                    <th>借款费用</th>
-                    <td width="140" class="taR">¥{{receiptList' value.accountItem.cSum.loanSum}}</td>
-                </tr>
-                <tr>
-                    <th class="taC" colspan="2">产生费用所在办事处</th>
-                </tr>
-                <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>
-                    <td class="taR"><b
-                            style="font-size:24px">¥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.BIGsum}}
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-    <div class="seCensor loan-censor">
-        <div class="title">
-            {{receiptDetail' value.receiptOrder}}
-        </div>
-        <div class="censorList">
-            <ul>
-                <li class="post">
-                    <div class="avtra"><img src="{{staff.0.avatar}}_2.jpg" width="32"></div>
-                    <div class="comment">
-                        <p><span class="fR">{{receiptDetail' value.date}}</span>{{staff.0.username}}</p>
-                        <p>提交审批</p>
-                    </div>
-                </li>
-                <!-- loop receiptDetail' value.verifyList -->
-                <li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done"
-                    <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"
-                    <!-- endif -->>
-                    <div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg"></div>
-
-                    <div class="comment">
-                        <p class="colGray"><span
-                                class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.1}}
-                            <!-- if isset({{receiptDetail' value' value.rolename}}) -->
-                            ({{receiptDetail' value' value.rolename}})
-                            <!-- endif -->
-                        </p>
-                        <p>{{receiptDetail' value' value.opinion}}</p>
-                    </div>
-                </li>
-                <!-- endloop -->
-            </ul>
-        </div>
-    </div>
-</div>

+ 31 - 6
protected/view/fee/detail/receipt_compatible.html

@@ -41,7 +41,27 @@
 	  				<div class="seTable">
 	  				
 	  				<!-- if {{receiptList' value.Rtype}}==1 -->
-	  					<table class="table table-bordered table-condensed table-hover">
+	  				
+	  				<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+	  					<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"><span class="colGray">报销 - 借款 = </span><b>差额</b></td>
+	  						<td class="taR"><b style="font-size:24px">¥{{receiptDetail' value.relust}}</b><br>{{receiptDetail' value.relustCN}}</td></tr>
+	  						</tbody>
+	  					</table>
+	  				
+	  				<p class="taC" style="margin-bottom: 20px" id="open">借款费用详情已收起 <a href="javascript:void(0)" onclick="$('#loanTable').toggle();" >点击</a></p>
+								
+	  				
+	  					<table class="table table-bordered table-condensed table-hover hide" id="loanTable">
 							<tbody>
 							<tr><th colspan="2" class="taC">借款费用</th></tr>
 							
@@ -55,7 +75,7 @@
 							<tr><th class="taC" colspan="2">费用说明</th>
 							</tr><tr><td colspan="2">{{explanation}}</td></tr>
 							
-							<tr class="warning"><td class="taR"><b>({{receiptDetail' value.receiptOrder}})本次费用合计</b></td>
+							 <tr class="warning"><td class="taR"><b>({{receiptDetail' value.receiptOrder}})本次费用合计</b></td>
 							<td class="taR"><b style="font-size:24px">¥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td></tr>
 							</tbody>
 						</table>
@@ -232,21 +252,26 @@
 	  						
 	  						</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>
+	  						
 	  						<!-- if {{receiptList' value.Rtype}}==1 -->  
 	  						
-	  						<tr class="warning">
+	  						<!-- <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>
-	  						<!-- elseif  {{receiptList' value.Rtype}}==0 --> 
+	  						elseif  {{receiptList' value.Rtype}}==0 
 	  						<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>
-	  						
+	  						 -->
 							 <!-- endif -->
 	  						
 	  						</tbody>

+ 6 - 1
protected/view/fee/implement/loan_compatible.html

@@ -96,7 +96,7 @@ $(function(){
 	  						</tbody>
 	  					</table>
 	  					
-	  					<p class="taC" style="margin-bottom: 20px" id="open">借款费用详情已收起 <a href="javascript:$('#loanTable').toggle();" >点击</a></p>
+	  					<p class="taC" style="margin-bottom: 20px" id="open">借款费用详情已收起 <a href="javascript:void(0)" onclick="$('#loanTable').toggle();" >点击</a></p>
 	  					
 	  					<table class="table table-bordered table-condensed table-hover hide" id="loanTable">
 							<tbody>
@@ -351,6 +351,11 @@ $(function(){
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</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>
+	  						
 	  						</tbody>
 	  					</table>