Skip to content

T
tl_estate
Commit 6562bf05 authored by agping's avatar agping
Browse files
Options

后台 修改

parent 31d15431
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 26 deletions
application/index/view/finance/account_statement.html
View file @ 6562bf05
...@@ -4,6 +4,15 @@ ...@@ -4,6 +4,15 @@
.clear{ .clear{
clear: both; clear: both;
} }
.button-center-bargain{
width: 158px;
margin: 0 auto;
height: 136px;
line-height: 136px;
}
#pass_ok_btn{
margin-left: 12px;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -283,17 +292,17 @@ ...@@ -283,17 +292,17 @@
通过 通过
</h4> </h4>
</div> </div>
<div class="modal-body"> <!--<div class="modal-body">
<label class="control-label">备注：</label> <label class="control-label">备注：</label>
<textarea class="form-control" rows="5" id="pass_beizhu"></textarea> <textarea class="form-control" rows="5" id="pass_beizhu"></textarea>
<!-- <span class="use-span text-danger">(必填)</span> --> <span class="use-span text-danger">(必填)</span>
</div>-->
<div class="modal-footer text-center">
<div class="button-center-bargain">
<button type="button" class="btn btn-default btn-lg" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-info btn-lg" data-dismiss="modal" class="pass-modal-btn-pass" id="pass_ok_btn">确定</button>
</div> </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">
确定
</button>
</div> </div>
</div> </div>
<!-- /.modal-content --> <!-- /.modal-content -->
......
application/index/view/finance/wait_back_out.html
View file @ 6562bf05
...@@ -4,6 +4,15 @@ ...@@ -4,6 +4,15 @@
.clear{ .clear{
clear: both; clear: both;
} }
.button-center-bargain{
width: 158px;
margin: 0 auto;
height: 136px;
line-height: 136px;
}
#pass_ok_btn{
margin-left: 12px;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -283,17 +292,17 @@ ...@@ -283,17 +292,17 @@
通过 通过
</h4> </h4>
</div> </div>
<div class="modal-body"> <!--<div class="modal-body">
<label class="control-label">备注：</label> <label class="control-label">备注：</label>
<textarea class="form-control" rows="5" id="pass_beizhu"></textarea> <textarea class="form-control" rows="5" id="pass_beizhu"></textarea>
<!-- <span class="use-span text-danger">(必填)</span> --> <span class="use-span text-danger">(必填)</span>
</div> </div>-->
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消 <div class="button-center-bargain">
</button> <button type="button" class="btn btn-default btn-lg" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-info" data-dismiss="modal" class="pass-modal-btn-pass" id="pass_ok_btn"> <button type="button" class="btn btn-info btn-lg" data-dismiss="modal" class="pass-modal-btn-pass" id="pass_ok_btn">确定</button>
确定 </div>
</button>
</div> </div>
</div> </div>
<!-- /.modal-content --> <!-- /.modal-content -->
......
public/resource/js/reportList.js
View file @ 6562bf05
...@@ -706,8 +706,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', ' ...@@ -706,8 +706,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
success: function(data) { success: function(data) {
if(data.code == 200) { if(data.code == 200) {
if(data.data) { if(data.data) {
bargain.getList(bargain.pageNo);
//bargain.getList(1);
} }
} else { } else {
alert('获取失败！'); alert('获取失败！');
......
public/resource/js/waitBackout.js
View file @ 6562bf05
...@@ -647,15 +647,16 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css', ...@@ -647,15 +647,16 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css',
//通过 //通过
pass: function() { //点击通过 pass: function() { //点击通过
var a_url = ''; var a_url = '';
if(bargain.mainTabIndex == 0) {
a_url = "/index/checkBackOutOne/1"
};
if(bargain.mainTabIndex == 1) { if(bargain.mainTabIndex == 1) {
a_url = "/index/checkBackOutOne/0" a_url = "/index/checkBackOutTwo/2"
}; };
if(bargain.mainTabIndex == 2) { if(bargain.mainTabIndex == 2) {
a_url = "/index/checkBackOutTwo/1" a_url = "/index/checkBackOutThree/3"
};
if(bargain.mainTabIndex == 3) {
a_url = "/index/checkBackOutThree/2"
}; };
console.log(a_url);
// if(bargain.mainTabIndex == 3) { // if(bargain.mainTabIndex == 3) {
// a_url = "/index/checkReportCashier/3" // a_url = "/index/checkReportCashier/3"
// }; // };
......
public/resource/template/remark_follow_template_tpl.html
View file @ 6562bf05
<script id="remark_follow_tpl" type="text/template"> <script id="remark_follow_tpl" type="text/template">
[% if(it) { %] [% if(it[0]) { %]
[% for(var item in it){ %] [% for(var item in it){ %]
<tr class="text-center"> <tr class="text-center">
<td>[%= it[item]['create_time'] %]</td> <td>[%= it[item]['create_time'] %]</td>
......
public/resource/template/reportList_template_tpl.html
View file @ 6562bf05
...@@ -28,14 +28,17 @@ ...@@ -28,14 +28,17 @@
[% } %] [% } %]
[% } %] [% } %]
[% if(it["step"]<3) { %]
<a class="btn1 btn-success report-back-out" href="#modal-back-out" data-toggle="modal">撤销</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> <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal">时间轴</a>
</td> </td>
</tr> </tr>
[% } %] [% } %]
[% }else{ %] [% }else{ %]
<tr> <tr>
<td colspan="8" style="text-align:center;"> 暂无数据</td> <td colspan="9" style="text-align:center;"> 暂无数据</td>
</tr> </tr>
[% } %] [% } %]
</script> </script>
......
public/resource/template/wait_backout_template_tpl.html
View file @ 6562bf05
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
[% } %] [% } %]
[% }else{ %] [% }else{ %]
<tr> <tr>
<td colspan="8" style="text-align:center;"> 暂无数据</td> <td colspan="9" style="text-align:center;"> 暂无数据</td>
</tr> </tr>
[% } %] [% } %]
</script> </script>
......
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