调整时间

public/resource/js/financial_manager_daily_list.js

@@ -1906,11 +1906,9 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 			var params = {
 				'order_id' : that.order_id ,
 				'order_no' : that.order_no,
-//				'agent_id' : that.agent_id,
 				'agent_id' : JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))).id,
 				'report_id' : that.report_id,
 				'industry_type' : that.yetai ? that.yetai : '' ,
-				'income_time' : that.income_time ,
 				'pay_id' : that.pay_id ,
 				'transfer_name' : that.transfer_name,
 			};
@@ -1958,18 +1956,28 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 			params.house_number = $('#shop_id_change_shop').val()
 			if ( $('#change_type').val() == 10 || $('#change_type').val() == 30 ){
 				if ($('#change_time').val()){//最后转定时间
+			    if(bargain.isOffice == 1){//商铺
 					params.last_transfer_time = $('#change_time').val()
+			    }else{//办公楼
+					params.last_transfer_time = (new Date($('#change_time').val())).getTime()*0.001;
+			    }
+
 				};	
 			} else {
 				if ($('#change_fenhong').text()){//分红
 					params.is_dividend = $('#change_fenhong').val()
 				};
-				if($('#change_kaiye').val() == 3){//中介费 案场费
-						alert('请选择是否开业');
-						return;
-				}else{
-						params.is_open = $('#change_kaiye').val();
-				}
+			   if(bargain.isOffice == 1){//商铺 调整
+				   	if($('#change_kaiye').val() == 3){//中介费 案场费
+							alert('请选择是否开业');
+							return;
+					}else{
+							params.is_open = $('#change_kaiye').val();
+					}
+			   }else{
+			   	   
+			   }
+				
 			}
 			params.receipt_number = that.receipt_number ;
 			if ($('#into_id_change').val()){//带看id
@@ -1993,13 +2001,19 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 			//上传数据
 			if(bargain.isOffice == 1){
 					bargain.isOfficeUrl = '/index/collectingBill';//商铺
+				    params.income_time = that.income_time;
+					
 				}else{
 					bargain.isOfficeUrl = '/office/collectingBill';//办公楼
+        	        params.AuthToken = user_info_obj.AuthToken;
+				    params.income_time = (new Date(that.income_time)).getTime()*0.001;
+        	        
 			}
+				
 			$.post(bargain.isOfficeUrl,params,function( data ){
 				if(data.code == 200) {
 					$('#modal-linetime').modal('hide');
-                	alert(data.msg);
+                	alert('提交成功');
                 	bargain.getList();//调整后的
 					
                 } else {
@@ -2117,13 +2131,13 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 			return params ; 
 		},
 		getReportDataByDetail : function(val){//调整页面 搜索成交报告id相关
-			$.post('/office_index/getCollection',{'val':val},function(data){
-				if(data.code == 200) {
-					return data ;
-                } else {
-                	alert(data.msg);
-                }
-			})
+//			$.post('/office_index/getCollection',{'val':val},function(data){
+//				if(data.code == 200) {
+//					return data ;
+//              } else {
+//              	alert(data.msg);
+//              }
+//			})
 		},
 		search_phone : function(){//成交报告id  下拉列表
 			var that = bargain ;
@@ -2169,8 +2183,13 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 		},
 		search_into : function(){//带看id  下拉列表
 			var that = bargain; 
+			if(bargain.isOffice == 1){
+					bargain.isOfficeUrl = '/broker/searchOrder';//商铺
+				}else{
+					bargain.isOfficeUrl = '/office/searchOrder';//办公楼
+			}
 			$.ajax({
-				url: '/broker/searchOrder',
+				url: bargain.isOfficeUrl,
 				type: 'GET',
 				async: true,
 				data: {

public/resource/template/financial_manager_daily_list_template_tpl.html

@@ -34,7 +34,11 @@
         <td>[%= sw(it[item]['pay_type'])%]</td>
 		<td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
         <td>[%= it[item]['current_agent_name'] %]</td>
+        [% if(it[item]["type"] == 1) { %]
         <td>[%= swopen(it[item]['is_open']) %]</td>
+		[% } else{ %]
+        <td></td>
+		[% } %]
         <td>[%= swred(it[item]['is_dividend'])%]</td>
         <td>[%= it[item]['income_time'] %]</td>
         
@@ -100,7 +104,11 @@
         <td>[%= sw(it[item]['pay_type']) %]</td>
 		<td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
         <td>[%= it[item]['current_agent_name']%]</td>
+        [% if(it[item]["type"] == 1) { %]
         <td>[%= swopen(it[item]['is_open']) %]</td>
+		[% } else{%]
+        <td></td>
+		[%}%]
         <td>[%= swred(it[item]['is_dividend'])%]</td>
         <td>[%= it[item]['remark'] %]</td>
         <td>[%= it[item]['income_time'] %]</td>