修正价格调整的BUG

global/js/swfuplad2/swfupload.js

@@ -868,6 +868,31 @@ function delEnclosurName(name,id){
 	
 }
 
+function delEnclosurByKey(id){
+	
+	var url = "/ajaxRemEnclousur";
+	$.ajax({
+		url : url,
+		type : "post",
+		cache : false,
+		dataType : "json",
+		data : {
+			key : id
+		},
+		global : true,
+		success : function(data) {
+			
+			if (data.status == 1) {
+				$('#'+id).remove(); 
+			} 
+		},
+		error : function(err) {
+		}
+	});
+	
+	
+}
+
 SWFUpload.prototype.uploadSuccess = function (file, serverData) {
 	file = this.unescapeFilePostParams(file);
 	

protected/config/routes.conf.php

@@ -108,6 +108,8 @@ $route['*']['/searchMyCompany'] = array('MainController', 'mycompany');
 $route['*']['/ajaxSetCompanyAddress'] = array('MainController', 'ajaxSetCompanyAddress');
 
 
+
+
 $route['*']['/addDoLockLog'] = array('MainController', 'addDoLockLog');
 
 $route['*']['/ajaxAddServiceLog'] = array('MainController', 'ajaxAddServiceLog');
@@ -162,7 +164,7 @@ $route['*']['/expenses'] = array('ReceiptController', 'expenses');
 $route['*']['/expenses/:item'] = array('ReceiptController', 'expenses');
 $route['*']['/expensesCollect/:rid'] = array('ReceiptController', 'expensesCollect');
 
-$route['*']['/saeaLoanEdi/:rid'] = array('ReceiptController', 'saeaLoanEdi');
+$route['*']['/saeaLoanEdi/:rid'] = array('ReceiptController', 'saeaLoanEdi','extension'=>'.html');
 $route['*']['/saeaLoanEdiDo'] = array('ReceiptController', 'saeaLoanEdiDo');
 
 $route['*']['/confirmation/:rid'] = array('ReceiptController', 'confirmation');
@@ -184,7 +186,7 @@ $route['*']['/approvalExpenses/:status/:page'] = array('ReceiptController', 'app
 $route['*']['/saeaLoanReceiptAdd/:rid'] = array('ReceiptController', 'saeaLoanReceiptAdd');
 $route['*']['/saeaLoanReceiptAddDo'] = array('ReceiptController', 'saeaLoanReceiptAddDo');
 
-$route['*']['/saeaLoanReceiptEdi/:rid'] = array('ReceiptController', 'saeaLoanReceiptEdi');
+$route['*']['/saeaLoanReceiptEdi/:rid'] = array('ReceiptController', 'saeaLoanReceiptEdi','extension'=>'.html');
 
 
 $route['*']['/implementDo'] = array('ReceiptController', 'implementDo');
@@ -193,7 +195,7 @@ $route['*']['/ajaxExamineExe'] = array('ReceiptController', 'ajaxExamineExe');
 
 $route['*']['/remitAdd'] = array('ReceiptController', 'remitAdd');
 $route['*']['/remitAddDo'] = array('ReceiptController', 'remitAddDo');
-$route['*']['/remitEdit/:rid'] = array('ReceiptController', 'remitEdit');
+$route['*']['/remitEdit/:rid'] = array('ReceiptController', 'remitEdit','extension'=>'.html');
 
 
 $route['*']['/remitEdiDo'] = array('ReceiptController', 'remitEdiDo');
@@ -211,6 +213,7 @@ $route['*']['/remittanceHky/:k/:page'] = array('ReceiptController', 'remittanceH
 $route['*']['/remittancep/:timeStamp'] = array('ReceiptController', 'remittancep','extension'=>'.html');
 $route['*']['/ajaxGetReceiptDetails'] = array('ReceiptController', 'ajaxGetReceiptDetails');
 
+$route['post']['/ajaxRemEnclousur'] = array('ReceiptController', 'ajaxRemEnclousur');
 
 $route['*']['/myReceipt'] = array('ReceiptController', 'myReceipt');
 $route['*']['/myReceipt/:item'] = array('ReceiptController', 'myReceipt');

protected/controller/InvoiceController.php

@@ -4619,7 +4619,7 @@ class InvoiceController extends DooController {
 							<th class="taC" width="150">邮寄物品</th><td colspan="3">' . $detail ['mailItems'] . '</td>
 						</tr>
 									';
-									
+								
 					if ($detail ['expressCom']=='SF')
 						$html .= '<tr><th class="taC" width="150">快递单号</th><td colspan="3">' . $detail ['expressCompany'] . ' <a target="_blank" href="http://www.sf-express.com/cn/sc/dynamic_function/waybill/#search/bill-number/">' . $detail ['expressNumber'] . '</a> </td></tr>';
 					else 

protected/controller/MainController.php

@@ -282,8 +282,11 @@ class MainController extends DooController {
 				'where' => ' username!="admin" ' . $staffCondition,
 				'asArray' => true 
 		) );
+		
+		$alCondition=' aid>'.REMIT.'  ';
+		
 		$actionLogList = $action_log->find ( array (
-				'where' => ' 1 ' . $condition,
+				'where' =>$alCondition . $condition,
 				'limit' => $page . ',' . $limit,
 				'desc' => 'aid',
 				'asArray' => true 
@@ -294,7 +297,7 @@ class MainController extends DooController {
 		// 抽取日期 ,'groupby'=>'updatetime'
 		$dateLog = $action_log->find ( array (
 				'select' => 'updatetime',
-				'where' => ' 1 ' . $condition,
+				'where' => $alCondition . $condition,
 				'limit' => $limit,
 				'desc' => 'aid',
 				'asArray' => true 
@@ -566,7 +569,7 @@ class MainController extends DooController {
 		$max = array ();
 		$sum=0;
 		//客户总数
-		$redisKey=date('Y-m-d').'_logStatisticsCSum';
+		$redisKey=date('Y-m-d').'_logStatisticsCSum_'.$this->staff [0] ['cid'];
 		$redisValue = $redis->lrange($redisKey, 0, -1);
 		if (empty($redisValue)){
 			$kkk = array ();
@@ -707,6 +710,10 @@ class MainController extends DooController {
 			
 		//添加客户 数30天 
 		$redisKey=date('Y-m-d').'SC_'.$redisCid.'_'.$redisSid;
+		
+// 		echo $redisKey;
+// 		echo "<br/> date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime) and status=1" . $categoryCondition . $sidCondition;
+		
 		$redisValue=$redis->get($redisKey);
 		if (empty($redisValue)){
 			$actionLogClient = $action_log->find ( array (
@@ -749,9 +756,6 @@ class MainController extends DooController {
 		
 		
 		
-		
-		
-		
 		// / Year(updatetime)=".date('Y')." and Month(updatetime)=".date('m')." and
 		$categoryList = $lcategory->find ( array (
 				'asArray' => true 
@@ -1466,6 +1470,9 @@ class MainController extends DooController {
 			Doo::loadModel ( 'client' );
 			$client = new client ();
 			
+			$redis = new Redis();
+			$redis->connect('127.0.0.1', '6379');
+			
 			$cinfo = $client->getClientByNameT ( $clientname );
 			if (! empty ( $cinfo )) {
 				$ninfo = $company->getCompanyByCompanyname ( $companyname );
@@ -1544,11 +1551,8 @@ class MainController extends DooController {
 			       //
 			       // $company->update();
 				$diqu = $local1 . "," . $local2 . "," . $local3;
-				
 				$cid = $companyInfo ['cid'];
-				
 				$company2 = new company ();
-				
 				$companyList = $company2->find ( array (
 						'where' => " companyname like '" . $companyname . "'",
 						"asArray" => true 
@@ -1558,36 +1562,26 @@ class MainController extends DooController {
 				// print_r($companyList);
 				foreach ( $companyList as $key => $value ) {
 					if ($value ['district'] != $diqu) {
-						
 						$falg = true;
 					} elseif ($value ['district'] == $diqu) {
 						$falg = false;
-						
 						$cid = $value ['cid'];
-						
 						break;
 					}
 				}
 				
-				// var_dump($falg) ;die;
-				
 				if ($falg) {
 					$company->companyname = $companyname;
-					
 					$company->staffid = $this->staff [0] ['sid'];
-					
 					$cid = $company->insert ();
 				}
 			}
 			
 			Doo::loadModel ( 'client_staff' );
-			
 			$client_staff = new client_staff ();
 			
 			$client->clientname = $clientname;
-			
 			$client->gender = $gender;
-			
 			$client->priority = $priority;
 			
 			if (! empty ( $nicename ))
@@ -1602,9 +1596,7 @@ class MainController extends DooController {
 				$client->qq = $qq;
 			
 			$client->companyid = $cid;
-			
 			$client->companyname = $companyname;
-			
 			$client->district = $local1 . "," . $local2 . "," . $local3;
 			// echo $client->district;
 			// die;
@@ -1650,13 +1642,9 @@ class MainController extends DooController {
 			
 			// 加入地区记录
 			Doo::loadModel ( "district_staff" );
-			
 			$district_staff = new district_staff ();
-			
 			$district_staff->did = $lv1 [0] ['id'];
-			
 			$district_staff->sid = $this->staff [0] ['sid'];
-			
 			$district_staff->insert ();
 			
 			// 日常行为
@@ -1675,10 +1663,105 @@ class MainController extends DooController {
 			if (isset ( $nature [0] ))
 				$action_log->nature = $nature [0];
 			$action_log->company = $companyname;
-			
 			$action_log->class = $action_log->iconContacts;
-			
 			$action_log->insert ();
+			
+			//事实更新信息中心记录数量 需要更新3个redis 内的值
+			$categoryCondition = " and cid=" . $this->staff [0] ['cid'];
+			$sidCondition = " and sid=" . $this->staff [0] ['sid'];
+			
+			//actionlog免查询值 $alCondition='';
+			$alCondition=' aid>'.REMIT.' and ';
+			
+			//个人添加数量redis值
+			$redisKeyCS=date('Y-m-d').'SC_'.$this->staff [0] ['cid'].'_'.$this->staff [0] ['sid'];
+			$action_log = new action_log ();
+			$actionLogClient = $action_log->find ( array (
+					'select' => 'date_format(updatetime,"%m-%d") as updatetime,COUNT(*) as count',
+					'where' => $alCondition." status=1" . $sidCondition . $categoryCondition.' and date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime)',
+					'groupby' => 'date_format(updatetime,"%m-%d")',
+					'asArray' => true
+			) );
+			
+			$statisticsClient = array ();
+			for($d = 0; $d <= 29; $d ++) {
+				$MD = date ( "m-d", strtotime ( "-" . $d . " day" ) );
+				$falgClient  = true;
+			
+				foreach ( $actionLogClient as $value ) {
+					if ($value ['updatetime'] == $MD) {
+						array_push ( $statisticsClient, $value ['count'] );
+						$falgClient = false;
+						break;
+					}
+				}
+				if ($falgClient)
+					array_push ( $statisticsClient, 0 );
+						
+			}
+			$statisticsClient = array_reverse ( $statisticsClient );
+			$jsc=json_encode ( $statisticsClient );
+			$redis->set($redisKeyCS,$jsc);
+			
+			//办事处添加数量reids值
+			$redisKeyC=date('Y-m-d').'SC_'.$this->staff [0] ['cid'].'_';
+			$action_log = new action_log ();
+			$actionLogClient = $action_log->find ( array (
+					'select' => 'date_format(updatetime,"%m-%d") as updatetime,COUNT(*) as count',
+					'where' => $alCondition." status=1" .  $categoryCondition.' and date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime)',
+					'groupby' => 'date_format(updatetime,"%m-%d")',
+					'asArray' => true
+			) );
+			
+			$statisticsClient = array ();
+			for($d = 0; $d <= 29; $d ++) {
+				$MD = date ( "m-d", strtotime ( "-" . $d . " day" ) );
+				$falgClient  = true;
+					
+				foreach ( $actionLogClient as $value ) {
+					if ($value ['updatetime'] == $MD) {
+						array_push ( $statisticsClient, $value ['count'] );
+						$falgClient = false;
+						break;
+					}
+				}
+				if ($falgClient)
+					array_push ( $statisticsClient, 0 );
+			
+			}
+			$statisticsClient = array_reverse ( $statisticsClient );
+			$jsc=json_encode ( $statisticsClient );
+			$redis->set($redisKeyC,$jsc);
+			
+			//全员添加数量的redis值
+			$redisKey=date('Y-m-d').'SC__';
+			$action_log = new action_log ();
+			$actionLogClient = $action_log->find ( array (
+					'select' => 'date_format(updatetime,"%m-%d") as updatetime,COUNT(*) as count',
+					'where' => $alCondition.' status=1  and date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime)',
+					'groupby' => 'date_format(updatetime,"%m-%d")',
+					'asArray' => true
+			) );
+			$statisticsClient = array ();
+			for($d = 0; $d <= 29; $d ++) {
+				$MD = date ( "m-d", strtotime ( "-" . $d . " day" ) );
+				$falgClient  = true;
+					
+				foreach ( $actionLogClient as $value ) {
+					if ($value ['updatetime'] == $MD) {
+						array_push ( $statisticsClient, $value ['count'] );
+						$falgClient = false;
+						break;
+					}
+				}
+				if ($falgClient)
+					array_push ( $statisticsClient, 0 );
+						
+			}
+			$statisticsClient = array_reverse ( $statisticsClient );
+			$jsc=json_encode ( $statisticsClient );
+			$redis->set($redisKey,$jsc);
+		
 		}
 		
 		return "/contacts";
@@ -4842,6 +4925,10 @@ class MainController extends DooController {
 			) );
 		die ();
 	}
+	
+	/**
+	 * 为客户添加服务日志
+	 */
 	function ajaxAddServiceLog() {
 		$status = $this->get_args('status') ? $this->get_args('status') : "";   
 		$clientid = $this->get_args('cid') ? $this->get_args('cid') : "";   
@@ -4917,6 +5004,101 @@ class MainController extends DooController {
 			$action_log->class = $action_log->iconContacts;
 			$action_log->insert ();
 			
+			//更新信息中心服务日志统计数量
+			$redis = new Redis();
+			$redis->connect('127.0.0.1', '6379');
+			
+			$categoryCondition = " and cid=" . $this->staff [0] ['cid'];
+			$sidCondition = " and sid=" . $this->staff [0] ['sid'];
+			//actionlog免查询值 $alCondition='';
+			$alCondition=' aid>'.REMIT.' and ';
+			
+			//个人服务日志数量redis值
+			$redisKeyCS=date('Y-m-d').'SL_'.$this->staff [0] ['cid'].'_'.$this->staff [0] ['sid'];
+			$action_log = new action_log ();
+			
+			$actionLogLongle = $action_log->find ( array (
+					'select' => 'date_format(updatetime,"%m-%d") as updatetime,COUNT(*) as count',
+					'where' => $alCondition." status=3 ".$categoryCondition.$sidCondition." and date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime)  " ,
+					'groupby' => 'date_format(updatetime,"%m-%d")',
+					'asArray' => true
+			) );
+				
+			$statisticsLongle = array ();
+			for($d = 0; $d <= 29; $d ++) {
+				$MD = date ( "m-d", strtotime ( "-" . $d . " day" ) );
+				$falgLongle = true;
+					
+				foreach ( $actionLogLongle as $value ) {
+					if ($value ['updatetime'] == $MD) {
+						array_push ( $statisticsLongle, $value ['count'] );
+						$falgLongle = false;
+						break;
+					}
+				}
+				if ($falgLongle)
+					array_push ( $statisticsLongle, 0 );
+			}
+			$statisticsLongle = array_reverse ( $statisticsLongle );
+			$jsl=json_encode ( $statisticsLongle );
+			$redis->set($redisKeyCS,$jsl);
+			
+			//办事处服务日志数量reids值
+			$redisKeyC=date('Y-m-d').'SL_'.$this->staff [0] ['cid'].'_';
+			$action_log = new action_log ();
+			$actionLogLongle = $action_log->find ( array (
+					'select' => 'date_format(updatetime,"%m-%d") as updatetime,COUNT(*) as count',
+					'where' => $alCondition." status=3 ".$categoryCondition." and date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime)  " ,
+					'groupby' => 'date_format(updatetime,"%m-%d")',
+					'asArray' => true
+			) );
+			$statisticsLongle = array ();
+			for($d = 0; $d <= 29; $d ++) {
+				$MD = date ( "m-d", strtotime ( "-" . $d . " day" ) );
+				$falgLongle = true;
+					
+				foreach ( $actionLogLongle as $value ) {
+					if ($value ['updatetime'] == $MD) {
+						array_push ( $statisticsLongle, $value ['count'] );
+						$falgLongle = false;
+						break;
+					}
+				}
+				if ($falgLongle)
+					array_push ( $statisticsLongle, 0 );
+			}
+			$statisticsLongle = array_reverse ( $statisticsLongle );
+			$jsl=json_encode ( $statisticsLongle );
+			$redis->set($redisKeyC,$jsl);
+				
+			//全员处服务日志数量的redis值
+			$redisKey=date('Y-m-d').'SL__';
+			$action_log = new action_log ();
+			$actionLogLongle = $action_log->find ( array (
+					'select' => 'date_format(updatetime,"%m-%d") as updatetime,COUNT(*) as count',
+					'where' => $alCondition." status=3  and date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime)  " ,
+					'groupby' => 'date_format(updatetime,"%m-%d")',
+					'asArray' => true
+			) );
+			$statisticsLongle = array ();
+			for($d = 0; $d <= 29; $d ++) {
+				$MD = date ( "m-d", strtotime ( "-" . $d . " day" ) );
+				$falgLongle = true;
+					
+				foreach ( $actionLogLongle as $value ) {
+					if ($value ['updatetime'] == $MD) {
+						array_push ( $statisticsLongle, $value ['count'] );
+						$falgLongle = false;
+						break;
+					}
+				}
+				if ($falgLongle)
+					array_push ( $statisticsLongle, 0 );
+			}
+			$statisticsLongle = array_reverse ( $statisticsLongle );
+			$jsl=json_encode ( $statisticsLongle );
+			$redis->set($redisKey,$jsl);
+			
 			if (! empty ( $Remind )) {
 				Doo::loadModel ( 'remind' );
 				$remindObj = new remind ();
@@ -6444,7 +6626,7 @@ class MainController extends DooController {
 				$eMailList->districtId = $did;
 				$eMailList->nature = implode ( ",", $nature );
 			}
-			//$eMailList->insert ();
+			$eMailList->insert ();
 			
 			//创建邮件地址
 			//'http://sendcloud.sohu.com/webapi/list_member.add.json';

protected/model/enclosur.php

@@ -1,19 +1,51 @@
 <?php
-
-Doo::loadCore('db/DooModel');
-
+Doo::loadCore ( 'db/DooModel' );
 class enclosur extends DooModel {
-
-    public $eid;
-    
-    public $name;
-    public $rid;
-   
-    public $_table = 'cld_enclosur';
-    public $_primarykey = 'eid';
-    
-    public $_fields = array('eid', 'name', 'rid');
-
+	public $eid;
+	public $name;
+	public $rid;
+	public $_table = 'cld_enclosur';
+	public $_primarykey = 'eid';
+	public $_fields = array (
+			'eid',
+			'name',
+			'rid' 
+	);
+	
+	/**
+	 * 根据报销单ID获得所有附件
+	 * @param number $rid
+	 * @return unknown
+	 */
+	function getEnclosurByRid($rid = 0) {
+		if (empty ( $rid ))
+			return array ();
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 7 );
+		$list = $this->find ( array (
+				'where' => 'rid=' . $rid,
+				'asArray' => TRUE 
+		) );
+		foreach ( $list as $key => $value ) {
+			$list [$key] ['eidKey'] = $XDeode->encode ( $value ['eid'] );
+		}
+		return $list;
+	}
+	/**
+	 * 
+	 * @param number $eid
+	 */
+	function delEnclosurByEid($eid = 0) {
+		if (empty ( $eid ))
+			return 0;
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 7 );
+		$eid = $XDeode->decode ( $eid );
+		$id=$this->delete ( array (
+				'where' => 'eid=' . $eid
+		) );
+		return $id;
+	}
 }
 
 ?>

protected/model/invoice.php

@@ -376,6 +376,8 @@ class invoice extends DooModel {
 				'asArray' => TRUE 
 		) );
 		
+		$detail ['expressCompany'] = '';
+		$detail ['expressCom'] = '';
 		if (! empty ( $detail ['expressCompany'] )) {
 			$express = explode ( ":", $detail ['expressCompany'] );
 			$detail ['expressCompany'] = $express [0];
@@ -523,7 +525,7 @@ class invoice extends DooModel {
 		if (! empty ( $sid ) && empty ( $iid ))
 			$list = $this->find ( array (
 					'where' => "status=2 and printStatus=" . $status . " and untreadStatus=0 and moldManage like '%[\"" . $sid . "\",%'",
-					'desc' => 'iid',
+					'desc' => 'approvalTime',
 					'asArray' => TRUE 
 			) );
 		elseif (! empty ( $sid ) && ! empty ( $iid ))

protected/plugin/TemplateTag.php

@@ -296,6 +296,7 @@ function getReceiptCount() {
 			'desc' => 'rid',
 			'asArray' => true 
 	) );
+	
 	$GLOBALS ['NEW'] = count ( $receiptList );
 }
 /**

protected/view/admin/expensesCollect.html

@@ -53,7 +53,7 @@
 							<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><tr><td colspan="2">{{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.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td></tr>

protected/view/admin/receiptburEdi.html

@@ -56,7 +56,7 @@
 							<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><tr><td colspan="2">{{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.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
@@ -187,15 +187,12 @@
 	  						<!-- elseif -->
 	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
 	  						<!-- loop receiptList' value.reviseDetail -->
-	  						<tr><th><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<tr><th><a href="/revocationAdjustment/{{receiptList' value' value.sid}}/{{receiptList' value' value.price}}/{{receiptList' value.rid}}">撤销</a><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colOrange taR">￥{{receiptList' value.revisePrice}}</td></tr>
 	  						<!-- endif -->
 	  						
-	  						<!-- loop receiptList' value.reviseDetail -->
-	  						<tr><th><a href="/revocationAdjustment/{{receiptList' value' value.sid}}/{{receiptList' value' value.price}}/{{receiptList' value.rid}}">撤销</a><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
-	  						<!-- endloop -->
-	  						<tr><th class="taR">合计</th><td class="colOrange taR">￥{{receiptList' value.revisePrice}}</td></tr>
+	  						
 	  						
 	  						
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>

protected/view/admin/remitEdit.html

@@ -1,12 +1,67 @@
  <!-- include 'header' -->
+   <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css"> 
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
  <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
+ 
+ 
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/swfupload.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/swfupload.queue.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/fileprogress.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/handlers.js"></script>
+
+<script type="text/javascript">
+		var swfu;
+
+		window.onload = function() {
+			var settings = {
+				flash_url : "<?= WEB_SITE_GLOBAL ?>js/swfuplad2/swfupload.swf",
+				upload_url: "/swfupload",	// Relative to the SWF file
+				
+				file_size_limit : "8 MB",
+				file_types : "*.jpg;*.png;*.doc;*.docx;*.els;*.elsx;",
+				file_types_description : "*.jpg;*.png;*.doc;*.docx;*.els;*.elsx",
+				file_upload_limit : 8,
+				file_queue_limit : 2,
+				custom_settings : {
+					progressTarget : "fsUploadProgress",
+					cancelButtonId : "btnCancel"
+				},
+				debug: true,
+
+				// Button settings
+				button_image_url: "<?= WEB_SITE_GLOBAL ?>js/swfuplad2/TestImageNoText_65x29.png",	// Relative to the Flash file
+				button_width: "65",
+				button_height: "29",
+				button_placeholder_id: "spanButtonPlaceHolder",
+				button_text: '<span class="theFont">浏览</span>',
+				button_text_style: ".theFont { font-size: 16; }",
+				button_text_left_padding: 12,
+				button_text_top_padding: 3,
+
+				// The event handler functions are defined in handlers.js
+				file_queued_handler : fileQueued,
+				file_queue_error_handler : fileQueueError,
+				file_dialog_complete_handler : fileDialogComplete,
+				upload_start_handler : uploadStart,
+				upload_progress_handler : uploadProgress,
+				upload_error_handler : uploadError,
+				upload_success_handler : uploadSuccess,
+				upload_complete_handler : uploadComplete,
+				queue_complete_handler : queueComplete	// Queue plugin event
+			};
+
+			swfu = new SWFUpload(settings);
+	     };
+	</script>
+ 
 <body>
 	<div class="mainLayout">
 		<div class="mainMenu">
 			<div class="menuItem">
 				<a href="#" class="mLogo">CLD</a>
 				<ul>
-					<!-- include 'menu' -->
+					<!-- include 'menuReceipt' -->
 				</ul>
 			</div>
 		</div>
@@ -93,11 +148,57 @@
 	  						</th></tr>
 	  						
 	  						
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">附件</th></tr>
+	  						<tr><td colspan="2">
+	  							
+	  							<!--已上传文件-->
+	  							<table class="table" >
+	  								<thead>
+	  								<tr>
+	  								<th>
+	  									<span id="spanButtonPlaceHolder"></span>
+										<span>支持jpg、png、doc、docx、els、elsx；最大8M文件。</span>
+										<input id="btnCancel" type="button" value="取消所有上传" style="display:none"  onclick="swfu.cancelQueue();" disabled="disabled" style="margin-left: 2px; font-size: 8pt; height: 29px;" />
+									
+										<input type="hidden" id="enclosurName" name="enclosurName" value="">
+	  								
+	  								</th>
+	  								<th colspan="2">
+	  								<span class="fieldset flash" id="fsUploadProgress"></span>
+									<span id="divStatus">0 个文件已上传</span>
+									
+										
+	  								</th></tr>
+	  								<tr><th>文件名</th><th>大小</th><th>操作</th></tr></thead>
+	  								<tbody id="KT">
+	  								<!-- loop enclosurList -->
+	  								<tr id="{{enclosurList' value.eidKey}}">
+	  								<td><a href="/upload/swfupload/{{enclosurList' value.name}}" target="_blank">{{enclosurList' value.name}}</a></td>
+	  								<td></td>
+	  								<td><a href="javascript:void(0)" onclick="delEnclosurByKey('{{enclosurList' value.eidKey}}')">删除</a></td>
+	  								</tr>
+	  								<!-- endloop -->
+	  								
+	  				</tbody>
+	  							</table>		
+	  						</td></tr>
+	  						
+	  						
+	  						
+	  						
 	  						</tbody>
 	  					</table>
 	  					<table class="table">
 	  						<tr><td><input type="submit" value="生成对公汇款单 >>" class="button" /></td></tr>
 	  					</table>
+	  					
+	  					
+	  					
+	  					
+	  					
+	  					
 	  				</form>	
 	  				</div>
 	  				<div class="seCensor  public-censor">

protected/view/admin/saeaLoanEdi.html

@@ -81,10 +81,8 @@
 	  					借款说明
 	  					</div>
 		  				<div class="detail">
-		  					<p>1 内容内容内容内容</p>
-		  					<p>2 内容内容内容内容</p>
-		  					<p>3 内容内容内容内容</p>
-		  					<p>4 <b>内容内容内容内容</b> 内容内容内容内容</p>
+		  					<p>1 把借款（备用金）用途在“借款说明”中填写清楚。</p>
+		  					
 	  					</div>
 	  				</div>
 	  			</div>

protected/view/admin/saeaLoanEdiReceipt.html

@@ -6,7 +6,7 @@
 			<div class="menuItem">
 				<a href="#" class="mLogo">CLD</a>
 				<ul>
-					<!-- include 'menu' -->
+					<!-- include 'menuReceipt' -->
 				</ul>
 			</div>
 		</div>

protected/view/admin/saea_edit.html

@@ -1,9 +1,12 @@
  <!-- include 'header' -->
+  <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css"> 
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
  <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
  
  
  
- <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/swfupload.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/swfupload.js"></script>
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/swfupload.queue.js"></script>
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/fileprogress.js"></script>
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/handlers.js"></script>
@@ -190,9 +193,15 @@
 	  								</th></tr>
 	  								<tr><th>文件名</th><th>大小</th><th>操作</th></tr></thead>
 	  								<tbody id="KT">
-	  							<!--已上传文件-->
 	  								
-	  				</tbody>
+	  								<!-- loop enclosurList -->
+	  								<tr id="{{enclosurList' value.eidKey}}">
+	  								<td><a href="/upload/swfupload/{{enclosurList' value.name}}" target="_blank">{{enclosurList' value.name}}</a></td>
+	  								<td></td>
+	  								<td><a href="javascript:void(0)" onclick="delEnclosurByKey('{{enclosurList' value.eidKey}}')">删除</a></td>
+	  								</tr>
+	  								<!-- endloop -->
+	  								</tbody>
 	  							</table>		
 	  						</td></tr>