修改

application/index/view/finance/daily_details.html

@@ -1689,4 +1689,34 @@
 		<!-- /.modal-content -->
 	</div>
 	<!-- /.modal -->
+</div>
+
+<!-- /#撤销调整 -->
+<div class="modal fade" id="modal_adjust" 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">
+                    &times;
+                </button>
+				<h4 class="modal-title">
+                    撤销调整
+                </h4>
+			</div>
+			<div class="modal-body">
+				<div class="modal-body">
+					<input type="hidden" value="" id="delete_id" /> 确认撤销调整吗？
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">取消
+                </button>
+				<button type="button" class="btn btn-primary" id="confirm_adjusment" data-dismiss="modal">
+                    确定
+                </button>
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
 </div>
\ No newline at end of file

public/appnew/src/components/achieveMain/achieveFork.vue

@@ -146,8 +146,8 @@
 				let _this = this;
 				_this.axios({
 					method: 'get',
-//					url: '/broker/getSiteListApp',
-					url: '/broker/getAgentSiteList',
+					url: '/broker/getSiteListApp',
+//					url: '/broker/getAgentSiteList',
 					responseType: 'json',
 					data: {
 						'AuthToken': _this.token,
@@ -160,7 +160,7 @@
 							localStorage.setItem('tlAppSiteList',encodeURIComponent(JSON.stringify(response.data.data)));
 							let _tempSiteId = _this.$route.query.siteId;
 							let _tempAgentId = localStorage.getItem('userid');
-							console.log(_tempSiteId);
+//							console.log(_tempSiteId);
 							if(!_tempSiteId){
 								//如果app里没传siteid，则默认为上海
 								_tempSiteId = '10001';
@@ -321,6 +321,7 @@
 			changeCity(c) {
 				let _this = this;
 				console.log(c);
+//				localStorage.setItem('tlSiteid',);
 				_this.realSearch('normal');
 			}
 		}

public/appnew/src/components/achieveMain/citySelect.vue

@@ -29,7 +29,8 @@
 			changeCity(e) {
 				let _this = this;
 				let _tempValue = JSON.parse(e.target.value);
-				localStorage.setItem('tlSiteid', _tempValue.site_id);
+//				localStorage.setItem('tlSiteid', _tempValue.site_id);
+				localStorage.setItem('tlSiteid', _tempValue.id);
 				localStorage.setItem('tlYjAgentId', _tempValue.id);//业绩里业务员id会变
 				_this.$emit('changeCity', _tempValue.site_id);
 			}

public/resource/js/financial_manager_daily_list.js

@@ -19,7 +19,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 		house_fatherid:'',//收款id
 		house_id: '',
 		caiwu_site_id: '',
-		
+		adjusment_id:'',
 		
 		init: function() {
 			//初始化时间
@@ -94,6 +94,18 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 				e.stopPropagation();
                 bargain.delDetail();;
 			});
+			//点击撤销调整
+			_doc.on('click', '.modal-adjust', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+				bargain.adjusment_id = e.target.dataset.id;
+			});
+			_doc.on('click', '#confirm_adjusment', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+				bargain.deleteTableRow(bargain.adjusment_id);
+			});
+			
 			//点击资料 显示图片
 			_doc.on('click', '.record-pic', function(e) {
 				e.preventDefault();
@@ -1075,6 +1087,18 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
                 }
             });
         },
+        deleteTableRow : function(id){//撤销调整
+			var params = {
+				'id' : id
+			};
+			$.post('/index/delAdjustment',params , function(data){
+				if(data.code == 200) {
+                    bargain.getList();
+                } else {
+                	alert(data.msg);
+                }
+			},'json')
+		},
         //获取收款详情
         getMoneyDetail : function(id){
 			var that = bargain;

public/resource/template/financial_manager_daily_list_template_tpl.html

@@ -174,6 +174,7 @@
         <td>
         	<a class="btn1 btn-info add-pic-liu" href="#modal-addPicLiu" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
         	<a class="btn1 btn-info record-pic" href="#modal_financial" data-recordid="[%= it[item]['pay_log_id'] %]" data-toggle="modal">资料</a>
+        	<a class="btn1 btn-info modal-adjust" href="#modal_adjust" data-id="[%= it[item]['id'] %]" data-toggle="modal">撤销调整</a>
         	
         </td>
     </tr>