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 @@
<!-- /.modal -->
</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-dialog modal-body-width">
......@@ -1133,7 +1130,7 @@
</div>
</div>
<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>
<!-- /.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',
// that.changeType(order_id);
});
//操作----删除
//操作----详情
$(document).on('click','.add-status',function(e){
var id = e.target.dataset.id;
// that.deleteId = id ;
......@@ -1355,11 +1355,26 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
if (data.source == 0) {
$("#comes").text('APP');
doc.find("#status").text("正常");
$('#intoPrice').removeAttr("readonly");
$('#shoutiao').removeAttr("readonly");
// $('#payType').removeAttr("readonly");
$("#payType").removeAttr("disabled")
$('#payNo').removeAttr("readonly");
} else if (data.source == 1){
$("#comes").text('智能pos机');
$('#intoPrice').removeAttr("readonly");
$('#shoutiao').removeAttr("readonly");
// $('#payType').removeAttr("readonly");
$("#payType").removeAttr("disabled")
$('#payNo').removeAttr("readonly");
doc.find("#status").text("正常");
} else {
$("#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(data.source_id);
......@@ -1613,45 +1628,74 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
var params = that.buildSearchParams(false);
params.pageNo = that.pageNo;
params.pageSize = that.pageSize ;
$.ajax({
type: 'GET',
url: '/index/getCollection',
data: params,
timeout: 30000,
dataType: 'json',
beforeSend: function() {},
success: function(data) {
if(typeof data === 'object') {
if(data.code == 200) {
that.listData = data.data.list;
console.log("123123123-----------------------------------------");
console.log(data.data.list);
var doTtmpl1 = doT.template(document.getElementById('status_body_1').innerHTML);
$("#statusBody1").html(doTtmpl1(data.data.list));
var testDatas = [
{
'aaa' : 000 ,
'bbb' : 111,
'ccc' : 222,
'ddd' : 333,
'eee' :444,
'fff' : 555,
'ggg' : 666,
'hhh' : 777 ,
'iii' : 888 ,
'jjj' : 999 ,
'kkk' :'---',
'lll' : 'kkk'
},
]
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));
/*分页代码*/
// 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('请求超时');
};
}
});
// $.ajax({
// type: 'GET',
// url: '/index/getCollection',
// data: params,
// timeout: 30000,
// dataType: 'json',
// beforeSend: function() {},
// success: function(data) {
// if(typeof data === 'object') {
// if(data.code == 200) {
// that.listData = data.data.list;
// console.log("123123123-----------------------------------------");
// console.log(data.data.list);
// var doTtmpl1 = doT.template(document.getElementById('status_body_1').innerHTML);
// $("#statusBody1").html(doTtmpl1(data.data.list));
//
// 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