财务日报

application/index/view/finance/daily_details.html

@@ -869,7 +869,9 @@
 					<!--<div  class="is-submit">提交</div>-->
 					<a class="btn btn-primary is-submit">提交</a>
 					<a class="btn btn-primary is-submit-pass-btn" href="#modal_financialremark" data-toggle="modal">审核通过</a>
-					<a class="btn btn-primary is-submit-passed" style="margin-left: 20px;">转到已审核</a>
+					<a class="btn btn-primary is-submit-passed-btn" href="#modal_financialremarked" data-toggle="modal">转到已审核</a>
+					
+					<!--<a class="btn btn-primary is-submit-passed" style="margin-left: 20px;">转到已审核</a>-->
 					
 				</div>
 				<div class="tips-dian text-danger text-center" style="font-size: 16px; font-weight: 600;">
@@ -995,6 +997,35 @@
 	</div>
 	<!-- /.modal -->
 </div>
+<!--转到已审核 备注-->
+<div class="modal fade" id="modal_financialremarked" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    ×
+                </button>
+				<h4 class="modal-title">
+                    审核通过
+                </h4>
+            </div>
+            <div class="modal-body">
+            	
+                	备注：	<textarea name="" rows="" cols=""style="width: 500px;height: 160px;" class="remark-financialed"></textarea>
+            </div>
+			<div class="modal-footer">
+				<button type="button btn2" class="btn btn-primary is-submit-passed">
+                    保存
+                </button>
+				
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
+</div>
+
+
 <!-- 收款详情 -->
 <div class="modal fade" id="modal-addPic" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 	<div class="modal-dialog modal-body-width-du">

public/resource/js/financial_manager_daily_list.js

@@ -46,7 +46,7 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 				$('#create_time_start').hide();
 				$('.is-submit').hide();
 				$('.is-print').show();
-				$('.is-submit-passed').show();
+				$('.is-submit-passed-btn').show();
 				$('.is-submit-pass-btn').show();
 				bargain.financialTime = getUrlParam('time');
 				var managerTitle=localStorage.getItem('financial_check_string_liu') +'  '+ bargain.financialTime;
@@ -55,7 +55,7 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 				
 			}else{
 				$('.is-close').hide();
-				$('.is-submit-passed').hide();
+				$('.is-submit-passed-btn').hide();
 				$('.is-submit-pass-btn').hide();
 				bargain.isFinancial = 0;
 				bargain.financialTime = $('#create_time_start').val();
@@ -1072,7 +1072,7 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 							if(data.data.commit_info){
 								if(data.data.commit_info.status*1){
 									$('.is-submit-pass-btn').hide();
-				                    $('.is-submit-passed').hide();
+				                    $('.is-submit-passed-btn').hide();
 				                    $('#maintable_list_total').hide();
 							        if(bargain.isFinancial*1 == 1){
 				                       $('.add-pic').hide();//财务看的 财务日报 已审核 不显示编辑按钮
@@ -1087,7 +1087,7 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 									}
 									if(getUrlParam('time')){
 										$('.is-submit-pass-btn').show();
-					                    $('.is-submit-passed').show();
+					                    $('.is-submit-passed-btn').show();
 				                        $('#maintable_list_total').show();
 					                    
 									}
@@ -1368,8 +1368,12 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
         	params.daily_id=bargain.daily_id;
         	params.agent_id=user_info_obj.id;
         	params.agent_name=user_info_obj.name;
-        	params.remark=(bargain.operationStatus)*1?'审核通过':($.trim($('.remark-financial').val()));
         	params.operation_status=bargain.operationStatus//0审核通过 1转为已审核
+        	if(bargain.operationStatus == 0){
+        	   params.remark=$.trim($('.remark-financial').val());
+        	}else{
+        	   params.remark=$.trim($('.remark-financialed').val());
+        	}
         	if(bargain.caiwu_site_id == 10003){//深圳
 	        	params.alipay=$('#total_yun_zhihubao').html();
 	        	params.tenpay=$('#total_yun_weixin').html();
@@ -1429,6 +1433,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
                     	   bargain.saveHtml2Image();//截图 转为已审核
                     	}
 					    $("#modal_financialremark").modal('hide');//提交成功后 关闭弹窗
+					    $("#modal_financialremarked").modal('hide');//提交成功后 关闭弹窗
+					    
                     	bargain.getList();
 //                  	location.href='/index/dailyList'
                     }else{