成交报告修改

application/index/view/finance/account_statement.html

@@ -300,7 +300,35 @@
 	</div>
 	<!-- /.modal -->
 </div>
-
+<!-- 弹出框 撤销成交报告 -->
+<div class="modal fade" id="modal-back-out" 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">
+				<label class="control-label">撤销原因：</label>
+				<textarea class="form-control" rows="5" id="pass_cexiao"></textarea>
+				<!-- <span class="use-span text-danger">(必填)</span> -->
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">取消
+                </button>
+				<button type="button" class="btn btn-info" data-dismiss="modal" class="pass-modal-btn-pass" id="pass_ok_btn_back">
+                 确定
+                </button>
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
+</div>
 <!-- 弹出框 时间轴 -->
 <div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">

application/index/view/finance/wait_back_out.html

@@ -12,7 +12,7 @@
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>
-							<a href="#">成交报告</a>
+							<a href="#">成交报告撤销</a>
 						</li>
 					</div>
 					<div class="panel-body">
@@ -24,7 +24,7 @@
 											<a class="btn btn-info liudan_pic_btn">第一级审核</a>
 											<a class="btn btn-default liudan_pic_btn">第二级审核</a>
 											<a class="btn btn-default liudan_pic_btn">第三级审核</a>
-											<a class="btn btn-default liudan_pic_btn">已结单</a>
+											<a class="btn btn-default liudan_pic_btn">已撤销</a>
 
 										</td>
 									</tr>

public/resource/js/reportList.js

@@ -87,6 +87,15 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 			_doc.on('click', '#pass_ok_btn', function() { 
 				bargain.pass();
 			});
+			//点击撤销,修改全局bargain_id,弹出框出来
+			_doc.on('click', '.report-back-out', function() {
+				bargain.bargain_id = $(this).closest('tr').attr("data-id");
+			});
+			
+			//点击撤销，确定按钮触发的事件
+			_doc.on('click', '#pass_ok_btn_back', function() { 
+				bargain.passBack();
+			});
 			
 			//点击详情按钮事件，获取报告详情
 			_doc.on('click', '.details-btn', function() {
@@ -684,7 +693,28 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 				}
 			});
 		},
+		//撤销成交报告 通过
+		passBack: function() { //点击通过
+			$.ajax({
+				'type': 'POST',
+				'url': '/index/backOutToOne',
+				data: {
+					"bargain_id": bargain.bargain_id,
+					"content": $.trim($("#pass_cexiao").val())
+				},
+				dataType: "json",
+				success: function(data) {
+					if(data.code == 200) {
+						if(data.data) {
 							
+							//bargain.getList(1);
+						}
+					} else {
+						alert('获取失败！');
+					}
+				}
+			});
+		},
 		// 开票税费
 		taxShow: function() {
 			$.ajax({

public/resource/js/waitBackout.js

@@ -648,14 +648,14 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css',
 		pass: function() { //点击通过
 			var a_url = '';
 			if(bargain.mainTabIndex == 0) {
-				a_url = "/index/checkReportAttache/0"
+				a_url = "/index/checkBackOutOne/0"
 			};
 			if(bargain.mainTabIndex == 1) {
-				a_url = "/index/checkReportManager/1"
+				a_url = "/index/checkBackOutTwo/1"
+			};
+			if(bargain.mainTabIndex == 2) {
+				a_url = "/index/checkBackOutThree/2"
 			};
-//			if(bargain.mainTabIndex == 2) {
-//				a_url = "/index/checkReportMajordomo/2"
-//			};
 //			if(bargain.mainTabIndex == 3) {
 //				a_url = "/index/checkReportCashier/3"
 //			};
@@ -666,8 +666,8 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css',
 				'url': a_url,
 				data: {
 					"id": bargain.bargain_id,
-					"source": 1,
-					"status": 10,
+					"source": 3,
+					"status": 20,
 					"remark": $.trim($("#pass_beizhu").val()),
 					'step': bargain.mainTabIndex+1
 				},
@@ -1316,13 +1316,13 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css',
 		switchUrl: function(){
 			switch (Number(this.mainTabIndex)){
 				case 0:
-					return '/index/reportListOne/1';
+					return '/index/backOutOne/5';
 				case 1:
-					return '/index/reportListTwo/2';
+					return '/index/backOutTwo/7';
 				case 2:
-					return '/index/reportListThree/3';
+					return '/index/backOutThree/8';
 				case 3:
-					return '/index/reportListStatement/4';
+					return '/index/reportListUndone/6';
 				default:
 					return '';
 			}

public/resource/template/reportList_template_tpl.html

@@ -27,6 +27,7 @@
 	            <a class="btn1 btn-success maintable-btn-account">结单</a>
 	        [% } %]
         [% } %]
+            <a class="btn1 btn-success report-back-out" href="#modal-back-out" data-toggle="modal">撤销</a>
             <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal">时间轴</a>
         </td>
     </tr>

public/resource/template/wait_backout_template_tpl.html

@@ -15,17 +15,10 @@
         [% if(check_auth('index/bargainInfo')) { %]
             <a class="btn1 btn-success details-btn" href="#modal_detail" data-toggle="modal">详情</a>
         [% } %] 
-        [% if(it["step"]<3) { %]
+        [% if(it["step"]!=6) { %]
 	        [% if(check_auth('index/checkReportAttache/0')||check_auth('index/checkReportManager/1')||check_auth('index/checkReportMajordomo/2')||check_auth('index/checkReportCashier/3')) { %]
 	            <a class="btn1 btn-success"  href="#modal-pass" data-toggle="modal">通过</a>
 	        [% } %]
-        [% }else if(it["step"]==3) { %]
-        	[% if(check_auth('index/toReportListOne')) { %]
-	            <a class="btn1 btn-success maintable-btn-trans-one">转到一级审核</a>
-	        [% } %]
-	        [% if(check_auth('index/checkOver')) { %]
-	            <a class="btn1 btn-success maintable-btn-account">结单</a>
-	        [% } %]
         [% } %]
             <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal">时间轴</a>
         </td>