Skip to content

T
tl_estate
Commit 043644c5 authored by duxinyuan's avatar duxinyuan
Browse files
Options

修改，收款详情中泰来苑未调整时的可该项，由于有奇遇而南无也在界面中修改，因此提交当前版本。

parent 925adae3
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 42 deletions
application/index/view/finance/getCollection.html
View file @ 043644c5
...@@ -1059,9 +1059,6 @@ ...@@ -1059,9 +1059,6 @@
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<link href="https://unpkg.com/bootstrap-table/dist/bootstrap-table.min.css" rel="stylesheet">
<script src="https://unpkg.com/bootstrap-table/dist/bootstrap-table.min.js"></script>
<!--状态==详情--> <!--状态==详情-->
<div class="modal fade" id="modal-status" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-status" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-body-width"> <div class="modal-dialog modal-body-width">
...@@ -1133,7 +1130,7 @@ ...@@ -1133,7 +1130,7 @@
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary submit_edit" id="back_saveChangeBtn"> 提交 </button> <button type="button" class="btn btn-primary submit_edit" data-dismiss="modal" aria-hidden="true"> 确定 </button>
</div> </div>
</div> </div>
<!-- /.modal-content --> <!-- /.modal-content -->
......
public/resource/js/getCollection.js
View file @ 043644c5
...@@ -349,7 +349,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -349,7 +349,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
// that.changeType(order_id); // that.changeType(order_id);
}); });
//操作----删除 //操作----详情
$(document).on('click','.add-status',function(e){ $(document).on('click','.add-status',function(e){
var id = e.target.dataset.id; var id = e.target.dataset.id;
// that.deleteId = id ; // that.deleteId = id ;
...@@ -1355,11 +1355,26 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1355,11 +1355,26 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
if (data.source == 0) { if (data.source == 0) {
$("#comes").text('APP'); $("#comes").text('APP');
doc.find("#status").text("正常"); doc.find("#status").text("正常");
$('#intoPrice').removeAttr("readonly");
$('#shoutiao').removeAttr("readonly");
// $('#payType').removeAttr("readonly");
$("#payType").removeAttr("disabled")
$('#payNo').removeAttr("readonly");
} else if (data.source == 1){ } else if (data.source == 1){
$("#comes").text('智能pos机'); $("#comes").text('智能pos机');
$('#intoPrice').removeAttr("readonly");
$('#shoutiao').removeAttr("readonly");
// $('#payType').removeAttr("readonly");
$("#payType").removeAttr("disabled")
$('#payNo').removeAttr("readonly");
doc.find("#status").text("正常"); doc.find("#status").text("正常");
} else { } else {
$("#comes").text('调整'); $("#comes").text('调整');
$('#intoPrice').attr("readonly" , "readonly");
$('#shoutiao').attr("readonly" , "readonly");
// $('#payType').attr("readonly" , "readonly");
$("#payType").attr("disabled","disabled").css("background-color","#EEEEEE;");
$('#payNo').attr("readonly" , "readonly");
doc.find("#status").text("被调整"); doc.find("#status").text("被调整");
} }
// doc.find("#status").text(data.source_id); // doc.find("#status").text(data.source_id);
...@@ -1613,45 +1628,74 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1613,45 +1628,74 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
var params = that.buildSearchParams(false); var params = that.buildSearchParams(false);
params.pageNo = that.pageNo; params.pageNo = that.pageNo;
params.pageSize = that.pageSize ; params.pageSize = that.pageSize ;
$.ajax({ var testDatas = [
type: 'GET', {
url: '/index/getCollection', 'aaa' : 000 ,
data: params, 'bbb' : 111,
timeout: 30000, 'ccc' : 222,
dataType: 'json', 'ddd' : 333,
beforeSend: function() {}, 'eee' :444,
success: function(data) { 'fff' : 555,
if(typeof data === 'object') { 'ggg' : 666,
if(data.code == 200) { 'hhh' : 777 ,
that.listData = data.data.list; 'iii' : 888 ,
console.log("123123123-----------------------------------------"); 'jjj' : 999 ,
console.log(data.data.list); 'kkk' :'---',
var doTtmpl1 = doT.template(document.getElementById('status_body_1').innerHTML); 'lll' : 'kkk'
$("#statusBody1").html(doTtmpl1(data.data.list)); },
]
var doTtmpl1 = doT.template(document.getElementById('status_body_1').innerHTML);
$("#statusBody1").html(doTtmpl1(testDatas));
var doTtmpl2 = doT.template(document.getElementById('status_body_2').innerHTML);
$("#statusBody2").html(doTtmpl2(testDatas));
var doTtmpl3 = doT.template(document.getElementById('status_body_3').innerHTML);
$("#statusBody3").html(doTtmpl3(testDatas));
var doTtmpl2 = doT.template(document.getElementById('status_body_2').innerHTML);
$("#statusBody2").html(doTtmpl2(data.data.list));
var doTtmpl3 = doT.template(document.getElementById('status_body_3').innerHTML);
$("#statusBody3").html(doTtmpl3(data.data.list)); // $.ajax({
/*分页代码*/ // type: 'GET',
// add_page(data.data.total, no, that.pageSize, that.getList); // url: '/index/getCollection',
} else { // data: params,
alert(data['msg']); // timeout: 30000,
}; // dataType: 'json',
} else { // beforeSend: function() {},
alert('数据错误'); // success: function(data) {
}; // if(typeof data === 'object') {
}, // if(data.code == 200) {
error: function() { // that.listData = data.data.list;
alert('error'); // console.log("123123123-----------------------------------------");
}, // console.log(data.data.list);
complete: function(xhr, textStatus) { // var doTtmpl1 = doT.template(document.getElementById('status_body_1').innerHTML);
if(textStatus === 'timeout') { // $("#statusBody1").html(doTtmpl1(data.data.list));
alert('请求超时'); //
}; // var doTtmpl2 = doT.template(document.getElementById('status_body_2').innerHTML);
} // $("#statusBody2").html(doTtmpl2(data.data.list));
}); //
// var doTtmpl3 = doT.template(document.getElementById('status_body_3').innerHTML);
// $("#statusBody3").html(doTtmpl3(data.data.list));
// /*分页代码*/
//// add_page(data.data.total, no, that.pageSize, that.getList);
// } else {
// alert(data['msg']);
// };
// } else {
// alert('数据错误');
// };
// },
// error: function() {
// alert('error');
// },
// complete: function(xhr, textStatus) {
// if(textStatus === 'timeout') {
// alert('请求超时');
// };
// }
// });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment