07fc7fc0 by Zelig

Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

2 parents 6ae3965e d0d966ac
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <ul> 3 <ul>
4 <li><a data-href="<?=site_url('/work/add')?>" data-title="开始进件" href="javascript:void(0)"><i class="Hui-iconfont">&#xe600;</i>&nbsp;开始进件</a></li> 4 <li><a data-href="<?=site_url('/work/add')?>" data-title="开始进件" href="javascript:void(0)"><i class="Hui-iconfont">&#xe600;</i>&nbsp;开始进件</a></li>
5 <li><a data-href="<?=site_url('/work/index')?>" data-title="全部进件" href="javascript:void(0)"><i class="Hui-iconfont">&#xe687;</i>&nbsp;全部进件</a></li> 5 <li><a data-href="<?=site_url('/work/index')?>" data-title="全部进件" href="javascript:void(0)"><i class="Hui-iconfont">&#xe687;</i>&nbsp;全部进件</a></li>
6 <li><a data-href="<?=site_url('/work/side/1')?>" data-title="预算管理" href="javascript:void(0)"><i class="Hui-iconfont">&#xe636;</i>&nbsp;预算管理</a></li> 6 <li><a data-href="<?=site_url('/work/side/1')?>" data-title="预审管理" href="javascript:void(0)"><i class="Hui-iconfont">&#xe636;</i>&nbsp;预审管理</a></li>
7 <li><a data-href="<?=site_url('/work/side/2')?>" data-title="资料补录" href="javascript:void(0)"><i class="Hui-iconfont">&#xe692;</i>&nbsp;资料补录</a></li> 7 <li><a data-href="<?=site_url('/work/side/2')?>" data-title="资料补录" href="javascript:void(0)"><i class="Hui-iconfont">&#xe692;</i>&nbsp;资料补录</a></li>
8 </ul> 8 </ul>
9 <dl> 9 <dl>
......
1 <?php $this->load->view('common/header'); ?> 1 <?php $this->load->view('common/header'); ?>
2 2
3 <body> 3 <body>
4 <div class="panel panel-default mb-20"> 4 <div class="panel panel-default mb-20">
5 <div class="panel-body cl"> 5 <div class="panel-body cl">
6 <form action='config/product' method="post" class="form form-horizontal" id="add">
6 <div class="row cl"> 7 <div class="row cl">
7 <div class="form-group col-sm-4 col-md-2"> 8 <div class="form-group col-sm-4 col-md-2">
8 <label>产品名称</label> 9 <label>产品名称</label>
9 <input type="text" class="form-control input-text" value=""> 10 <input type="text" name="productName" class="form-control input-text" value="">
10 </div> 11 </div>
11 </div> 12 </div>
12 <div class="row cl"> 13 <div class="row cl">
13 <div class="form-group col-sm-4 col-md-2"> 14 <div class="form-group col-sm-4 col-md-2">
14 <label>年化利率</label> 15 <label>年化利率</label>
15 <input type="text" class="form-control input-text" value=""> 16 <input type="text" class="form-control input-text" name="annualInterestRate" value="">
16 <span class="glyphicon form-control-feedback">%</span> 17 <span class="glyphicon form-control-feedback">%</span>
17 </div> 18 </div>
18 </div> 19 </div>
19 <div class="row cl"> 20 <div class="row cl">
20 <div class="form-group col-sm-4 col-md-2"> 21 <div class="form-group col-sm-4 col-md-2">
21 <label>罚息</label> <smail class="c-999">罚息=利率*N%</smail> 22 <label>罚息</label>
22 <input type="text" class="form-control input-text" value="" placeholder="请输入N"> 23 <smail class="c-999">罚息=利率*N%</smail>
24 <input name="interestPenalty" type="text" class="form-control input-text" value="" placeholder="请输入N">
23 </div> 25 </div>
24 </div> 26 </div>
25 <div class="row cl"> 27 <div class="row cl">
26 <div class="form-group col-sm-4 col-md-2"> 28 <div class="form-group col-sm-4 col-md-2">
27 <label>滞纳金</label> 29 <label>滞纳金</label>
28 <input type="text" class="form-control input-text" value=""> 30 <input name="overdueFine" type="text" class="form-control input-text" value="">
29 </div> 31 </div>
30 </div> 32 </div>
31 <div class="row cl"> 33 <div class="row cl">
32 <div class="form-group col-sm-4 col-md-2"> 34 <div class="form-group col-sm-4 col-md-2">
33 <label>还款方式</label> 35 <label>还款方式</label>
34 <span class="form-control select-box"> 36 <span class="form-control select-box">
35 <select class="select" size="1"> 37 <select class="select" size="1" name="repaymentMode">
36 <option>请选择</option> 38 <option>请选择</option>
39 <option value="1">1</option>
37 </select> 40 </select>
38 </span> 41 </span>
39 </div> 42 </div>
...@@ -41,41 +44,67 @@ ...@@ -41,41 +44,67 @@
41 <div class="row cl"> 44 <div class="row cl">
42 <div class="form-group col-sm-4 col-md-2"> 45 <div class="form-group col-sm-4 col-md-2">
43 <label>借款期限</label> 46 <label>借款期限</label>
44 <input type="text" class="form-control input-text" value=""> 47 <input name="loanDeadline" type="text" class="form-control input-text" value="">
45 <span class="glyphicon form-control-feedback"></span> 48 <span class="glyphicon form-control-feedback"></span>
46 </div> 49 </div>
47 </div> 50 </div>
48 <div class="row cl"> 51 <div class="row cl">
49 <div class="form-group col-sm-4 col-md-2"> 52 <div class="form-group col-sm-4 col-md-2">
50 <label>授额上限</label> 53 <label>授额上限</label>
51 <input type="text" class="form-control input-text" value=""> 54 <input type="text" name="loanLimit" class="form-control input-text" value="">
52 <span class="glyphicon form-control-feedback"></span> 55 <span class="glyphicon form-control-feedback"></span>
53 </div> 56 </div>
54 </div> 57 </div>
55 <div class="row cl"> 58 <div class="row cl">
56 <div class="form-group col-sm-12 col-md-12"> 59 <div class="form-group col-sm-12 col-md-12">
57 <label>备注</label> 60 <label>备注</label>
58 <textarea class="textarea"></textarea> 61 <textarea name="remark" class="textarea"></textarea>
59 </div>
60 </div> 62 </div>
61 </div> 63 </div>
64 </form>
62 </div> 65 </div>
66 </div>
63 67
64 <div class="row cl col-sm-12 pb-20"> 68 <div class="row cl col-sm-12 pb-20">
65 <div class="col-sm-2"> 69 <div class="col-sm-2">
66 <button class="btn btn-primary btn-block" onclick="save();">保存</button> 70 <button class="btn btn-primary btn-block" onclick="save();">保存</button>
67 </div> 71 </div>
68 <div class="col-sm-2"> 72 <div class="col-sm-2">
69 <button class="btn btn-warning btn-block" onclick="layer_close();">取消</button> 73 <button class="btn btn-warning btn-block" onclick="layer_close();">取消</button>
70 </div> 74 </div>
71 </div> 75 </div>
72 76
73 <?php $this->load->view('common/footer'); ?> 77 <?php $this->load->view('common/footer'); ?>
74 78
75 <script> 79 <script>
76 function save() { 80 function save() {
77 window.parent.location.reload(); 81 var targetUrl = $("#add").attr("action");
82 var data = $("#add").serializeJson();
83 $.ajax({
84 type: 'post',
85 url: apiBaseUrl + targetUrl,
86 cache: false,
87 data: JSON.stringify(data),
88 dataType: 'json',
89 contentType: "application/json; charset=UTF-8",
90 success: function (data) {
91 if (data.msg) {
92 layer.alert(data.msg);
93 } else if (data.code != 0) {
94 layer.alert('请求失败');
95 } else {
96 layer.alert('请求成功');
97 }
98 if(!data.code) {
99 window.parent.reload();
100 layer_close();
101 }
102 },
103 error: function () {
104 layer.alert("请求失败")
105 }
106 })
78 } 107 }
79 </script> 108 </script>
80 </body> 109 </body>
81 </html> 110 </html>
......
...@@ -39,17 +39,20 @@ ...@@ -39,17 +39,20 @@
39 iDisplayLength: 6, 39 iDisplayLength: 6,
40 bLengthChange: false, 40 bLengthChange: false,
41 ajax: { 41 ajax: {
42 url: apiBaseUrl + '/order/into/getAllApplyOrder', 42 url: apiBaseUrl + 'config/products',
43 dataFilter: function (json) { 43 dataFilter: function (json) {
44 var ret = {}, json = jQuery.parseJSON(json); 44 var ret = {}, json = jQuery.parseJSON(json);
45 ret.data = json.data; 45 ret.data = json.data || [];
46 var draw = getUrlParam('draw'); 46 var draw = getUrlParam('draw');
47 if(draw) { 47 if(draw) {
48 ret.draw = draw; 48 ret.draw = draw;
49 } 49 }
50 // ret.draw = parseInt(json.page.currentPage); 50 ret.recordsTotal = 0;
51 ret.recordsFiltered = 0;
52 if (json.page) {
51 ret.recordsTotal = parseInt(json.page.totalNumber); 53 ret.recordsTotal = parseInt(json.page.totalNumber);
52 ret.recordsFiltered = parseInt(json.page.totalNumber); 54 ret.recordsFiltered = parseInt(json.page.totalNumber);
55 }
53 return JSON.stringify(ret); 56 return JSON.stringify(ret);
54 }, 57 },
55 data: function (data) { 58 data: function (data) {
...@@ -69,15 +72,15 @@ ...@@ -69,15 +72,15 @@
69 </ul></span>'; 72 </ul></span>';
70 } 73 }
71 }, 74 },
72 {data: "orderId"},//产品名称 75 {data: "productName"},//产品名称
73 {data: "createUser"},//年化利率 76 {data: "annualInterestRate"},//年化利率
74 {data: "idCard"},//罚息 77 {data: "interestPenalty"},//罚息
75 {data: "phoneNumber"},//滞纳金 78 {data: "overdueFine"},//滞纳金
76 {data: "createTime"},//还款方式 79 {data: "repaymentMode"},//还款方式
77 {data: "createTime"},//借款期限 80 {data: "loanDeadline"},//借款期限
78 {data: "createTime"},//授额上限 81 {data: "loanLimit"},//授额上限
79 {data: "createTime"},//录入时间 82 {data: "createTime"},//录入时间
80 {data: "createTime"},//备注 83 {data: "remark"},//备注
81 ] 84 ]
82 }); 85 });
83 86
...@@ -87,9 +90,35 @@ ...@@ -87,9 +90,35 @@
87 title: '删除产品', 90 title: '删除产品',
88 icon: 3 91 icon: 3
89 }, function(){ 92 }, function(){
90 layer.msg('删除'); 93 $.ajax({
94 type: 'delete',
95 url: apiBaseUrl + 'config/product/' + id,
96 cache: false,
97 dataType: 'json',
98 contentType: "application/json; charset=UTF-8",
99 success: function (data) {
100 if (data.msg) {
101 layer.alert(data.msg);
102 } else if (data.code != 0) {
103 layer.alert('请求失败');
104 } else {
105 layer.msg('删除成功');
106 }
107 if(!data.code) {
108 window.parent.reload();
109 layer_close();
110 }
111 },
112 error: function () {
113 layer.alert("请求失败")
114 }
115 })
116
91 }); 117 });
92 } 118 }
119 function reload() {
120 table.fnDraw();
121 }
93 </script> 122 </script>
94 </body> 123 </body>
95 <html> 124 <html>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 <div class="Hui-tabNav-wp"> 19 <div class="Hui-tabNav-wp">
20 <ul id="min_title_list" class="acrossTab cl"> 20 <ul id="min_title_list" class="acrossTab cl">
21 <li class="active"> 21 <li class="active">
22 <span title="我的桌面" data-href="welcome.html">我的桌面</span> 22 <span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
23 <em></em></li> 23 <em></em></li>
24 </ul> 24 </ul>
25 </div> 25 </div>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 <div id="iframe_box" class="Hui-article"> 28 <div id="iframe_box" class="Hui-article">
29 <div class="show_iframe"> 29 <div class="show_iframe">
30 <div style="display:none" class="loading"></div> 30 <div style="display:none" class="loading"></div>
31 <iframe scrolling="yes" frameborder="0" src="welcome.html"></iframe> 31 <iframe scrolling="yes" frameborder="0" src="<?=site_url('welcome/desk')?>"></iframe>
32 </div> 32 </div>
33 </div> 33 </div>
34 </section> 34 </section>
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
101 <div class="Hui-tabNav-wp"> 101 <div class="Hui-tabNav-wp">
102 <ul id="min_title_list" class="acrossTab cl"> 102 <ul id="min_title_list" class="acrossTab cl">
103 <li class="active"> 103 <li class="active">
104 <span title="我的桌面" data-href="welcome.html">我的桌面</span> 104 <span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
105 <em></em></li> 105 <em></em></li>
106 </ul> 106 </ul>
107 </div> 107 </div>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
110 <div id="iframe_box" class="Hui-article"> 110 <div id="iframe_box" class="Hui-article">
111 <div class="show_iframe"> 111 <div class="show_iframe">
112 <div style="display:none" class="loading"></div> 112 <div style="display:none" class="loading"></div>
113 <iframe scrolling="yes" frameborder="0" src="welcome.html"></iframe> 113 <iframe scrolling="yes" frameborder="0" src="<?=site_url('welcome/desk')?>"></iframe>
114 </div> 114 </div>
115 </div> 115 </div>
116 </section> 116 </section>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 <div class="Hui-tabNav-wp"> 23 <div class="Hui-tabNav-wp">
24 <ul id="min_title_list" class="acrossTab cl"> 24 <ul id="min_title_list" class="acrossTab cl">
25 <li class="active"> 25 <li class="active">
26 <span title="我的桌面" data-href="welcome.html">我的桌面</span> 26 <span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
27 <em></em></li> 27 <em></em></li>
28 </ul> 28 </ul>
29 </div> 29 </div>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 <div id="iframe_box" class="Hui-article"> 32 <div id="iframe_box" class="Hui-article">
33 <div class="show_iframe"> 33 <div class="show_iframe">
34 <div style="display:none" class="loading"></div> 34 <div style="display:none" class="loading"></div>
35 <iframe scrolling="yes" frameborder="0" src="welcome.html"></iframe> 35 <iframe scrolling="yes" frameborder="0" src="<?=site_url('welcome/desk')?>"></iframe>
36 </div> 36 </div>
37 </div> 37 </div>
38 </section> 38 </section>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <div class="Hui-tabNav-wp"> 14 <div class="Hui-tabNav-wp">
15 <ul id="min_title_list" class="acrossTab cl"> 15 <ul id="min_title_list" class="acrossTab cl">
16 <li class="active"> 16 <li class="active">
17 <span title="我的桌面" data-href="welcome.html">我的桌面</span> 17 <span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
18 <em></em></li> 18 <em></em></li>
19 </ul> 19 </ul>
20 </div> 20 </div>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 <div id="iframe_box" class="Hui-article"> 23 <div id="iframe_box" class="Hui-article">
24 <div class="show_iframe"> 24 <div class="show_iframe">
25 <div style="display:none" class="loading"></div> 25 <div style="display:none" class="loading"></div>
26 <iframe scrolling="yes" frameborder="0" src="welcome.html"></iframe> 26 <iframe scrolling="yes" frameborder="0" src="<?=site_url('welcome/desk')?>"></iframe>
27 </div> 27 </div>
28 </div> 28 </div>
29 </section> 29 </section>
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
101 <div class="Hui-tabNav-wp"> 101 <div class="Hui-tabNav-wp">
102 <ul id="min_title_list" class="acrossTab cl"> 102 <ul id="min_title_list" class="acrossTab cl">
103 <li class="active"> 103 <li class="active">
104 <span title="我的桌面" data-href="welcome.html">我的桌面</span> 104 <span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
105 <em></em></li> 105 <em></em></li>
106 </ul> 106 </ul>
107 </div> 107 </div>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
110 <div id="iframe_box" class="Hui-article"> 110 <div id="iframe_box" class="Hui-article">
111 <div class="show_iframe"> 111 <div class="show_iframe">
112 <div style="display:none" class="loading"></div> 112 <div style="display:none" class="loading"></div>
113 <iframe scrolling="yes" frameborder="0" src="welcome.html"></iframe> 113 <iframe scrolling="yes" frameborder="0" src="<?=site_url('welcome/desk')?>"></iframe>
114 </div> 114 </div>
115 </div> 115 </div>
116 </section> 116 </section>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <div class="Hui-tabNav-wp"> 8 <div class="Hui-tabNav-wp">
9 <ul id="min_title_list" class="acrossTab cl"> 9 <ul id="min_title_list" class="acrossTab cl">
10 <li class="active"> 10 <li class="active">
11 <span title="我的桌面" data-href="welcome.html">我的桌面</span> 11 <span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
12 <em></em></li> 12 <em></em></li>
13 </ul> 13 </ul>
14 </div> 14 </div>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 <div id="iframe_box" class="Hui-article"> 17 <div id="iframe_box" class="Hui-article">
18 <div class="show_iframe"> 18 <div class="show_iframe">
19 <div style="display:none" class="loading"></div> 19 <div style="display:none" class="loading"></div>
20 <iframe scrolling="yes" frameborder="0" src="welcome.html"></iframe> 20 <iframe scrolling="yes" frameborder="0" src="<?=site_url('welcome/desk')?>"></iframe>
21 </div> 21 </div>
22 </div> 22 </div>
23 </section> 23 </section>
......
...@@ -18,7 +18,7 @@ $this->load->view('common/user_menu'); ...@@ -18,7 +18,7 @@ $this->load->view('common/user_menu');
18 <div class="Hui-tabNav-wp"> 18 <div class="Hui-tabNav-wp">
19 <ul id="min_title_list" class="acrossTab cl"> 19 <ul id="min_title_list" class="acrossTab cl">
20 <li class="active"> 20 <li class="active">
21 <span title="我的桌面" data-href="welcome.html">我的桌面</span> 21 <span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
22 <em></em></li> 22 <em></em></li>
23 </ul> 23 </ul>
24 </div> 24 </div>
...@@ -27,7 +27,7 @@ $this->load->view('common/user_menu'); ...@@ -27,7 +27,7 @@ $this->load->view('common/user_menu');
27 <div id="iframe_box" class="Hui-article"> 27 <div id="iframe_box" class="Hui-article">
28 <div class="show_iframe"> 28 <div class="show_iframe">
29 <div style="display:none" class="loading"></div> 29 <div style="display:none" class="loading"></div>
30 <iframe scrolling="yes" frameborder="0" src="welcome.html"></iframe> 30 <iframe scrolling="yes" frameborder="0" src="<?=site_url('welcome/desk')?>"></iframe>
31 </div> 31 </div>
32 </div> 32 </div>
33 </section> 33 </section>
......
...@@ -69,15 +69,15 @@ ...@@ -69,15 +69,15 @@
69 contentType: "application/json; charset=UTF-8", 69 contentType: "application/json; charset=UTF-8",
70 success:function(data){ 70 success:function(data){
71 if(data.msg){ 71 if(data.msg){
72 alert(data.msg); 72 layer.alert(data.msg);
73 } else if(data.code != 0){ 73 } else if(data.code != 0){
74 alert('请求失败'); 74 layer.alert('请求失败');
75 } else { 75 } else {
76 alert('请求成功'); 76 layer.alert('请求成功');
77 } 77 }
78 }, 78 },
79 error:function(){ 79 error:function(){
80 alert("请求失败") 80 layer.alert("请求失败")
81 } 81 }
82 }) 82 })
83 83
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <div class="flow pb-20"> 16 <div class="flow pb-20">
17 </div> 17 </div>
18 <div> 18 <div>
19 <button onclick="loadIframe('<?=site_url('/work')?>', '全部进件');" class="btn btn-primary size-M radius mr-20">返回【进行记录】</a> 19 <button onclick="loadIframe('<?=site_url('/work')?>', '全部进件');" class="btn btn-primary size-M radius mr-20">返回【进行记录】</button>
20 <button onclick="loadIframe('<?=site_url('/work/add')?>', '开始进件');" class="btn btn-primary size-M radius ml-20">继续【添加进行】</button> 20 <button onclick="loadIframe('<?=site_url('/work/add')?>', '开始进件');" class="btn btn-primary size-M radius ml-20">继续【添加进行】</button>
21 </div> 21 </div>
22 </div> 22 </div>
......
...@@ -113,14 +113,17 @@ ...@@ -113,14 +113,17 @@
113 url: apiBaseUrl + '/order/into/getAllApplyOrder', 113 url: apiBaseUrl + '/order/into/getAllApplyOrder',
114 dataFilter: function (json) { 114 dataFilter: function (json) {
115 var ret = {}, json = jQuery.parseJSON(json); 115 var ret = {}, json = jQuery.parseJSON(json);
116 ret.data = json.data; 116 ret.data = json.data || [];
117 var draw = getUrlParam('draw'); 117 var draw = getUrlParam('draw');
118 if(draw) { 118 if(draw) {
119 ret.draw = draw; 119 ret.draw = draw;
120 } 120 }
121 // ret.draw = parseInt(json.page.currentPage); 121 ret.recordsTotal = 0;
122 ret.recordsFiltered = 0;
123 if (json.page) {
122 ret.recordsTotal = parseInt(json.page.totalNumber); 124 ret.recordsTotal = parseInt(json.page.totalNumber);
123 ret.recordsFiltered = parseInt(json.page.totalNumber); 125 ret.recordsFiltered = parseInt(json.page.totalNumber);
126 }
124 return JSON.stringify(ret); 127 return JSON.stringify(ret);
125 }, 128 },
126 data: function (data) { 129 data: function (data) {
...@@ -140,19 +143,19 @@ ...@@ -140,19 +143,19 @@
140 </ul></span>'; 143 </ul></span>';
141 } 144 }
142 }, 145 },
143 {data: "orderId"},//订单编号 146 {data: "orderNo"},//订单编号
144 {data: "createUser"},//申请人 147 {data: "userName"},//申请人
145 {data: "idCard"},//身份证 148 {data: "idCard"},//身份证
146 {data: "phoneNumber"},//手机号 149 {data: "phoneNumber"},//手机号
147 {data: "createTime"},//进件时间 150 {data: "createTime"},//进件时间
148 {data: "createTime"},//网点 151 {data: "departmentName"},//网点
149 {data: "createTime"},//产品名称 152 {data: "productName"},//产品名称
150 {data: "createTime"},//申请金额 153 {data: "applyMoney"},//申请金额
151 {data: "createTime"},//审批金额 154 {data: "agreeMoney"},//审批金额
152 {data: "createTime"},//客户经理 155 {data: "createUser"},//客户经理
153 {data: "createTime"},//流程节点 156 {data: "statusDesc"},//流程节点
154 {data: "createTime"},//流转时间 157 {data: "modifyTime"},//流转时间
155 {data: "createTime"}//处理人 158 {data: "modifyUser"}//处理人
156 ] 159 ]
157 }); 160 });
158 161
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
113 url: apiBaseUrl + '/order/getStatus11', 113 url: apiBaseUrl + '/order/getStatus11',
114 dataFilter: function (json) { 114 dataFilter: function (json) {
115 var ret = {}, json = jQuery.parseJSON(json); 115 var ret = {}, json = jQuery.parseJSON(json);
116 ret.data = json.data; 116 ret.data = json.data || [];
117 var draw = getUrlParam('draw'); 117 var draw = getUrlParam('draw');
118 if(draw) { 118 if(draw) {
119 ret.draw = draw; 119 ret.draw = draw;
...@@ -143,19 +143,19 @@ ...@@ -143,19 +143,19 @@
143 </ul></span>'; 143 </ul></span>';
144 } 144 }
145 }, 145 },
146 {data: "orderId"},//订单编号 146 {data: "orderNo"},//订单编号
147 {data: "createUser"},//申请人 147 {data: "userName"},//申请人
148 {data: "idCard"},//身份证 148 {data: "idCard"},//身份证
149 {data: "phoneNumber"},//手机号 149 {data: "phoneNumber"},//手机号
150 {data: "createTime"},//进件时间 150 {data: "createTime"},//进件时间
151 {data: "createTime"},//网点 151 {data: "departmentName"},//网点
152 {data: "createTime"},//产品名称 152 {data: "productName"},//产品名称
153 {data: "createTime"},//申请金额 153 {data: "applyMoney"},//申请金额
154 {data: "createTime"},//审批金额 154 {data: "agreeMoney"},//审批金额
155 {data: "createTime"},//客户经理 155 {data: "createUser"},//客户经理
156 {data: "createTime"},//流程节点 156 {data: "statusDesc"},//流程节点
157 {data: "createTime"},//流转时间 157 {data: "modifyTime"},//流转时间
158 {data: "createTime"}//处理人 158 {data: "modifyUser"}//处理人
159 ] 159 ]
160 }); 160 });
161 161
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
113 url: apiBaseUrl + '/order/getStatus12', 113 url: apiBaseUrl + '/order/getStatus12',
114 dataFilter: function (json) { 114 dataFilter: function (json) {
115 var ret = {}, json = jQuery.parseJSON(json); 115 var ret = {}, json = jQuery.parseJSON(json);
116 ret.data = json.data; 116 ret.data = json.data || [];
117 var draw = getUrlParam('draw'); 117 var draw = getUrlParam('draw');
118 if(draw) { 118 if(draw) {
119 ret.draw = draw; 119 ret.draw = draw;
...@@ -143,19 +143,19 @@ ...@@ -143,19 +143,19 @@
143 </ul></span>'; 143 </ul></span>';
144 } 144 }
145 }, 145 },
146 {data: "orderId"},//订单编号 146 {data: "orderNo"},//订单编号
147 {data: "createUser"},//申请人 147 {data: "userName"},//申请人
148 {data: "idCard"},//身份证 148 {data: "idCard"},//身份证
149 {data: "phoneNumber"},//手机号 149 {data: "phoneNumber"},//手机号
150 {data: "createTime"},//进件时间 150 {data: "createTime"},//进件时间
151 {data: "createTime"},//网点 151 {data: "departmentName"},//网点
152 {data: "createTime"},//产品名称 152 {data: "productName"},//产品名称
153 {data: "createTime"},//申请金额 153 {data: "applyMoney"},//申请金额
154 {data: "createTime"},//审批金额 154 {data: "agreeMoney"},//审批金额
155 {data: "createTime"},//客户经理 155 {data: "createUser"},//客户经理
156 {data: "createTime"},//流程节点 156 {data: "statusDesc"},//流程节点
157 {data: "createTime"},//流转时间 157 {data: "modifyTime"},//流转时间
158 {data: "createTime"}//处理人 158 {data: "modifyUser"}//处理人
159 ] 159 ]
160 }); 160 });
161 161
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
113 url: apiBaseUrl + 'order/getStatus13', 113 url: apiBaseUrl + 'order/getStatus13',
114 dataFilter: function (json) { 114 dataFilter: function (json) {
115 var ret = {}, json = jQuery.parseJSON(json); 115 var ret = {}, json = jQuery.parseJSON(json);
116 ret.data = json.data; 116 ret.data = json.data || [];
117 var draw = getUrlParam('draw'); 117 var draw = getUrlParam('draw');
118 if(draw) { 118 if(draw) {
119 ret.draw = draw; 119 ret.draw = draw;
...@@ -143,19 +143,19 @@ ...@@ -143,19 +143,19 @@
143 </ul></span>'; 143 </ul></span>';
144 } 144 }
145 }, 145 },
146 {data: "orderId"},//订单编号 146 {data: "orderNo"},//订单编号
147 {data: "createUser"},//申请人 147 {data: "userName"},//申请人
148 {data: "idCard"},//身份证 148 {data: "idCard"},//身份证
149 {data: "phoneNumber"},//手机号 149 {data: "phoneNumber"},//手机号
150 {data: "createTime"},//进件时间 150 {data: "createTime"},//进件时间
151 {data: "createTime"},//网点 151 {data: "departmentName"},//网点
152 {data: "createTime"},//产品名称 152 {data: "productName"},//产品名称
153 {data: "createTime"},//申请金额 153 {data: "applyMoney"},//申请金额
154 {data: "createTime"},//审批金额 154 {data: "agreeMoney"},//审批金额
155 {data: "createTime"},//客户经理 155 {data: "createUser"},//客户经理
156 {data: "createTime"},//流程节点 156 {data: "statusDesc"},//流程节点
157 {data: "createTime"},//流转时间 157 {data: "modifyTime"},//流转时间
158 {data: "createTime"}//处理人 158 {data: "modifyUser"}//处理人
159 ] 159 ]
160 }); 160 });
161 161
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
118 url: apiBaseUrl + '/order/getStatus4', 118 url: apiBaseUrl + '/order/getStatus4',
119 dataFilter: function (json) { 119 dataFilter: function (json) {
120 var ret = {}, json = jQuery.parseJSON(json); 120 var ret = {}, json = jQuery.parseJSON(json);
121 ret.data = json.data; 121 ret.data = json.data || [];
122 var draw = getUrlParam('draw'); 122 var draw = getUrlParam('draw');
123 if(draw) { 123 if(draw) {
124 ret.draw = draw; 124 ret.draw = draw;
...@@ -154,19 +154,19 @@ ...@@ -154,19 +154,19 @@
154 </ul></span>'; 154 </ul></span>';
155 } 155 }
156 }, 156 },
157 {data: "orderId"},//订单编号 157 {data: "orderNo"},//订单编号
158 {data: "createUser"},//申请人 158 {data: "userName"},//申请人
159 {data: "idCard"},//身份证 159 {data: "idCard"},//身份证
160 {data: "phoneNumber"},//手机号 160 {data: "phoneNumber"},//手机号
161 {data: "createTime"},//进件时间 161 {data: "createTime"},//进件时间
162 {data: "createTime"},//网点 162 {data: "departmentName"},//网点
163 {data: "createTime"},//产品名称 163 {data: "productName"},//产品名称
164 {data: "createTime"},//申请金额 164 {data: "applyMoney"},//申请金额
165 {data: "createTime"},//审批金额 165 {data: "agreeMoney"},//审批金额
166 {data: "createTime"},//客户经理 166 {data: "createUser"},//客户经理
167 {data: "createTime"},//流程节点 167 {data: "statusDesc"},//流程节点
168 {data: "createTime"},//流转时间 168 {data: "modifyTime"},//流转时间
169 {data: "createTime"}//处理人 169 {data: "modifyUser"}//处理人
170 ] 170 ]
171 }); 171 });
172 172
......
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
108 url: apiBaseUrl + '/order/getStatus5', 108 url: apiBaseUrl + '/order/getStatus5',
109 dataFilter: function (json) { 109 dataFilter: function (json) {
110 var ret = {}, json = jQuery.parseJSON(json); 110 var ret = {}, json = jQuery.parseJSON(json);
111 ret.data = json.data; 111 ret.data = json.data || [];
112 var draw = getUrlParam('draw'); 112 var draw = getUrlParam('draw');
113 if(draw) { 113 if(draw) {
114 ret.draw = draw; 114 ret.draw = draw;
...@@ -145,19 +145,19 @@ ...@@ -145,19 +145,19 @@
145 </ul></span>'; 145 </ul></span>';
146 } 146 }
147 }, 147 },
148 {data: "orderId"},//订单编号 148 {data: "orderNo"},//订单编号
149 {data: "createUser"},//申请人 149 {data: "userName"},//申请人
150 {data: "idCard"},//身份证 150 {data: "idCard"},//身份证
151 {data: "phoneNumber"},//手机号 151 {data: "phoneNumber"},//手机号
152 {data: "createTime"},//进件时间 152 {data: "createTime"},//进件时间
153 {data: "createTime"},//网点 153 {data: "departmentName"},//网点
154 {data: "createTime"},//产品名称 154 {data: "productName"},//产品名称
155 {data: "createTime"},//申请金额 155 {data: "applyMoney"},//申请金额
156 {data: "createTime"},//审批金额 156 {data: "agreeMoney"},//审批金额
157 {data: "createTime"},//客户经理 157 {data: "createUser"},//客户经理
158 {data: "createTime"},//流程节点 158 {data: "statusDesc"},//流程节点
159 {data: "createTime"},//流转时间 159 {data: "modifyTime"},//流转时间
160 {data: "createTime"}//处理人 160 {data: "modifyUser"}//处理人
161 ] 161 ]
162 }); 162 });
163 163
......
...@@ -184,14 +184,17 @@ ...@@ -184,14 +184,17 @@
184 url: apiBaseUrl + '/order/getStatus1', 184 url: apiBaseUrl + '/order/getStatus1',
185 dataFilter: function (json) { 185 dataFilter: function (json) {
186 var ret = {}, json = jQuery.parseJSON(json); 186 var ret = {}, json = jQuery.parseJSON(json);
187 ret.data = json.data; 187 ret.data = json.data || [];
188 var draw = getUrlParam('draw'); 188 var draw = getUrlParam('draw');
189 if(draw) { 189 if(draw) {
190 ret.draw = draw; 190 ret.draw = draw;
191 } 191 }
192 // ret.draw = parseInt(json.page.currentPage); 192 ret.recordsTotal = 0;
193 ret.recordsFiltered = 0;
194 if (json.page) {
193 ret.recordsTotal = parseInt(json.page.totalNumber); 195 ret.recordsTotal = parseInt(json.page.totalNumber);
194 ret.recordsFiltered = parseInt(json.page.totalNumber); 196 ret.recordsFiltered = parseInt(json.page.totalNumber);
197 }
195 return JSON.stringify(ret); 198 return JSON.stringify(ret);
196 }, 199 },
197 data: function (data) { 200 data: function (data) {
...@@ -217,19 +220,19 @@ ...@@ -217,19 +220,19 @@
217 </ul></span>'; 220 </ul></span>';
218 } 221 }
219 }, 222 },
220 {data: "orderId"},//订单编号 223 {data: "orderNo"},//订单编号
221 {data: "createUser"},//申请人 224 {data: "userName"},//申请人
222 {data: "idCard"},//身份证 225 {data: "idCard"},//身份证
223 {data: "phoneNumber"},//手机号 226 {data: "phoneNumber"},//手机号
224 {data: "createTime"},//进件时间 227 {data: "createTime"},//进件时间
225 {data: "createTime"},//网点 228 {data: "departmentName"},//网点
226 {data: "createTime"},//产品名称 229 {data: "productName"},//产品名称
227 {data: "createTime"},//申请金额 230 {data: "applyMoney"},//申请金额
228 {data: "createTime"},//审批金额 231 {data: "agreeMoney"},//审批金额
229 {data: "createTime"},//客户经理 232 {data: "createUser"},//客户经理
230 {data: "createTime"},//流程节点 233 {data: "statusDesc"},//流程节点
231 {data: "createTime"},//流转时间 234 {data: "modifyTime"},//流转时间
232 {data: "createTime"}//处理人 235 {data: "modifyUser"}//处理人
233 ] 236 ]
234 }); 237 });
235 238
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 url: apiBaseUrl + '/order/getStatus8', 107 url: apiBaseUrl + '/order/getStatus8',
108 dataFilter: function (json) { 108 dataFilter: function (json) {
109 var ret = {}, json = jQuery.parseJSON(json); 109 var ret = {}, json = jQuery.parseJSON(json);
110 ret.data = json.data; 110 ret.data = json.data || [];
111 var draw = getUrlParam('draw'); 111 var draw = getUrlParam('draw');
112 if(draw) { 112 if(draw) {
113 ret.draw = draw; 113 ret.draw = draw;
...@@ -144,19 +144,19 @@ ...@@ -144,19 +144,19 @@
144 </ul></span>'; 144 </ul></span>';
145 } 145 }
146 }, 146 },
147 {data: "orderId"},//订单编号 147 {data: "orderNo"},//订单编号
148 {data: "createUser"},//申请人 148 {data: "userName"},//申请人
149 {data: "idCard"},//身份证 149 {data: "idCard"},//身份证
150 {data: "phoneNumber"},//手机号 150 {data: "phoneNumber"},//手机号
151 {data: "createTime"},//进件时间 151 {data: "createTime"},//进件时间
152 {data: "createTime"},//网点 152 {data: "departmentName"},//网点
153 {data: "createTime"},//产品名称 153 {data: "productName"},//产品名称
154 {data: "createTime"},//申请金额 154 {data: "applyMoney"},//申请金额
155 {data: "createTime"},//审批金额 155 {data: "agreeMoney"},//审批金额
156 {data: "createTime"},//客户经理 156 {data: "createUser"},//客户经理
157 {data: "createTime"},//流程节点 157 {data: "statusDesc"},//流程节点
158 {data: "createTime"},//流转时间 158 {data: "modifyTime"},//流转时间
159 {data: "createTime"}//处理人 159 {data: "modifyUser"}//处理人
160 ] 160 ]
161 }); 161 });
162 162
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 url: apiBaseUrl + '/order/getStatus7', 107 url: apiBaseUrl + '/order/getStatus7',
108 dataFilter: function (json) { 108 dataFilter: function (json) {
109 var ret = {}, json = jQuery.parseJSON(json); 109 var ret = {}, json = jQuery.parseJSON(json);
110 ret.data = json.data; 110 ret.data = json.data || [];
111 var draw = getUrlParam('draw'); 111 var draw = getUrlParam('draw');
112 if(draw) { 112 if(draw) {
113 ret.draw = draw; 113 ret.draw = draw;
...@@ -144,19 +144,19 @@ ...@@ -144,19 +144,19 @@
144 </ul></span>'; 144 </ul></span>';
145 } 145 }
146 }, 146 },
147 {data: "orderId"},//订单编号 147 {data: "orderNo"},//订单编号
148 {data: "createUser"},//申请人 148 {data: "userName"},//申请人
149 {data: "idCard"},//身份证 149 {data: "idCard"},//身份证
150 {data: "phoneNumber"},//手机号 150 {data: "phoneNumber"},//手机号
151 {data: "createTime"},//进件时间 151 {data: "createTime"},//进件时间
152 {data: "createTime"},//网点 152 {data: "departmentName"},//网点
153 {data: "createTime"},//产品名称 153 {data: "productName"},//产品名称
154 {data: "createTime"},//申请金额 154 {data: "applyMoney"},//申请金额
155 {data: "createTime"},//审批金额 155 {data: "agreeMoney"},//审批金额
156 {data: "createTime"},//客户经理 156 {data: "createUser"},//客户经理
157 {data: "createTime"},//流程节点 157 {data: "statusDesc"},//流程节点
158 {data: "createTime"},//流转时间 158 {data: "modifyTime"},//流转时间
159 {data: "createTime"}//处理人 159 {data: "modifyUser"}//处理人
160 ] 160 ]
161 }); 161 });
162 162
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
120 url: apiBaseUrl + '/order/getStatus3', 120 url: apiBaseUrl + '/order/getStatus3',
121 dataFilter: function (json) { 121 dataFilter: function (json) {
122 var ret = {}, json = jQuery.parseJSON(json); 122 var ret = {}, json = jQuery.parseJSON(json);
123 ret.data = json.data; 123 ret.data = json.data || [];
124 var draw = getUrlParam('draw'); 124 var draw = getUrlParam('draw');
125 if (draw) { 125 if (draw) {
126 ret.draw = draw; 126 ret.draw = draw;
...@@ -157,19 +157,19 @@ ...@@ -157,19 +157,19 @@
157 </ul></span>'; 157 </ul></span>';
158 } 158 }
159 }, 159 },
160 {data: "orderId"},//订单编号 160 {data: "orderNo"},//订单编号
161 {data: "createUser"},//申请人 161 {data: "userName"},//申请人
162 {data: "idCard"},//身份证 162 {data: "idCard"},//身份证
163 {data: "phoneNumber"},//手机号 163 {data: "phoneNumber"},//手机号
164 {data: "createTime"},//进件时间 164 {data: "createTime"},//进件时间
165 {data: "createTime"},//网点 165 {data: "departmentName"},//网点
166 {data: "createTime"},//产品名称 166 {data: "productName"},//产品名称
167 {data: "createTime"},//申请金额 167 {data: "applyMoney"},//申请金额
168 {data: "createTime"},//审批金额 168 {data: "agreeMoney"},//审批金额
169 {data: "createTime"},//客户经理 169 {data: "createUser"},//客户经理
170 {data: "createTime"},//流程节点 170 {data: "statusDesc"},//流程节点
171 {data: "createTime"},//流转时间 171 {data: "modifyTime"},//流转时间
172 {data: "createTime"}//处理人 172 {data: "modifyUser"}//处理人
173 ] 173 ]
174 }); 174 });
175 175
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 url: apiBaseUrl + '/order/getStatus10', 107 url: apiBaseUrl + '/order/getStatus10',
108 dataFilter: function (json) { 108 dataFilter: function (json) {
109 var ret = {}, json = jQuery.parseJSON(json); 109 var ret = {}, json = jQuery.parseJSON(json);
110 ret.data = json.data; 110 ret.data = json.data || [];
111 var draw = getUrlParam('draw'); 111 var draw = getUrlParam('draw');
112 if(draw) { 112 if(draw) {
113 ret.draw = draw; 113 ret.draw = draw;
...@@ -159,19 +159,19 @@ ...@@ -159,19 +159,19 @@
159 ' </span>'; 159 ' </span>';
160 } 160 }
161 }, 161 },
162 {data: "orderId"},//订单编号 162 {data: "orderNo"},//订单编号
163 {data: "createUser"},//申请人 163 {data: "userName"},//申请人
164 {data: "idCard"},//身份证 164 {data: "idCard"},//身份证
165 {data: "phoneNumber"},//手机号 165 {data: "phoneNumber"},//手机号
166 {data: "createTime"},//进件时间 166 {data: "createTime"},//进件时间
167 {data: "createTime"},//网点 167 {data: "departmentName"},//网点
168 {data: "createTime"},//产品名称 168 {data: "productName"},//产品名称
169 {data: "createTime"},//申请金额 169 {data: "applyMoney"},//申请金额
170 {data: "createTime"},//审批金额 170 {data: "agreeMoney"},//审批金额
171 {data: "createTime"},//客户经理 171 {data: "createUser"},//客户经理
172 {data: "createTime"},//流程节点 172 {data: "statusDesc"},//流程节点
173 {data: "createTime"},//流转时间 173 {data: "modifyTime"},//流转时间
174 {data: "createTime"}//处理人 174 {data: "modifyUser"}//处理人
175 ] 175 ]
176 }); 176 });
177 177
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
106 url: apiBaseUrl + '/order/getStatus6', 106 url: apiBaseUrl + '/order/getStatus6',
107 dataFilter: function (json) { 107 dataFilter: function (json) {
108 var ret = {}, json = jQuery.parseJSON(json); 108 var ret = {}, json = jQuery.parseJSON(json);
109 ret.data = json.data; 109 ret.data = json.data || [];
110 var draw = getUrlParam('draw'); 110 var draw = getUrlParam('draw');
111 if(draw) { 111 if(draw) {
112 ret.draw = draw; 112 ret.draw = draw;
...@@ -143,19 +143,19 @@ ...@@ -143,19 +143,19 @@
143 </ul></span>'; 143 </ul></span>';
144 } 144 }
145 }, 145 },
146 {data: "orderId"},//订单编号 146 {data: "orderNo"},//订单编号
147 {data: "createUser"},//申请人 147 {data: "userName"},//申请人
148 {data: "idCard"},//身份证 148 {data: "idCard"},//身份证
149 {data: "phoneNumber"},//手机号 149 {data: "phoneNumber"},//手机号
150 {data: "createTime"},//进件时间 150 {data: "createTime"},//进件时间
151 {data: "createTime"},//网点 151 {data: "departmentName"},//网点
152 {data: "createTime"},//产品名称 152 {data: "productName"},//产品名称
153 {data: "createTime"},//申请金额 153 {data: "applyMoney"},//申请金额
154 {data: "createTime"},//审批金额 154 {data: "agreeMoney"},//审批金额
155 {data: "createTime"},//客户经理 155 {data: "createUser"},//客户经理
156 {data: "createTime"},//流程节点 156 {data: "statusDesc"},//流程节点
157 {data: "createTime"},//流转时间 157 {data: "modifyTime"},//流转时间
158 {data: "createTime"}//处理人 158 {data: "modifyUser"}//处理人
159 ] 159 ]
160 }); 160 });
161 161
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
106 url: apiBaseUrl + '/order/getStatus2', 106 url: apiBaseUrl + '/order/getStatus2',
107 dataFilter: function (json) { 107 dataFilter: function (json) {
108 var ret = {}, json = jQuery.parseJSON(json); 108 var ret = {}, json = jQuery.parseJSON(json);
109 ret.data = json.data; 109 ret.data = json.data || [];
110 var draw = getUrlParam('draw'); 110 var draw = getUrlParam('draw');
111 if(draw) { 111 if(draw) {
112 ret.draw = draw; 112 ret.draw = draw;
...@@ -137,19 +137,19 @@ ...@@ -137,19 +137,19 @@
137 </ul></span>'; 137 </ul></span>';
138 } 138 }
139 }, 139 },
140 {data: "orderId"},//订单编号 140 {data: "orderNo"},//订单编号
141 {data: "createUser"},//申请人 141 {data: "userName"},//申请人
142 {data: "idCard"},//身份证 142 {data: "idCard"},//身份证
143 {data: "phoneNumber"},//手机号 143 {data: "phoneNumber"},//手机号
144 {data: "createTime"},//进件时间 144 {data: "createTime"},//进件时间
145 {data: "createTime"},//网点 145 {data: "departmentName"},//网点
146 {data: "createTime"},//产品名称 146 {data: "productName"},//产品名称
147 {data: "createTime"},//申请金额 147 {data: "applyMoney"},//申请金额
148 {data: "createTime"},//审批金额 148 {data: "agreeMoney"},//审批金额
149 {data: "createTime"},//客户经理 149 {data: "createUser"},//客户经理
150 {data: "createTime"},//流程节点 150 {data: "statusDesc"},//流程节点
151 {data: "createTime"},//流转时间 151 {data: "modifyTime"},//流转时间
152 {data: "createTime"}//处理人 152 {data: "modifyUser"}//处理人
153 ] 153 ]
154 }); 154 });
155 155
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 url: apiBaseUrl + '/order/getStatus9', 107 url: apiBaseUrl + '/order/getStatus9',
108 dataFilter: function (json) { 108 dataFilter: function (json) {
109 var ret = {}, json = jQuery.parseJSON(json); 109 var ret = {}, json = jQuery.parseJSON(json);
110 ret.data = json.data; 110 ret.data = json.data || [];
111 var draw = getUrlParam('draw'); 111 var draw = getUrlParam('draw');
112 if(draw) { 112 if(draw) {
113 ret.draw = draw; 113 ret.draw = draw;
...@@ -150,19 +150,19 @@ ...@@ -150,19 +150,19 @@
150 </ul> </span>'; 150 </ul> </span>';
151 } 151 }
152 }, 152 },
153 {data: "orderId"},//订单编号 153 {data: "orderNo"},//订单编号
154 {data: "createUser"},//申请人 154 {data: "userName"},//申请人
155 {data: "idCard"},//身份证 155 {data: "idCard"},//身份证
156 {data: "phoneNumber"},//手机号 156 {data: "phoneNumber"},//手机号
157 {data: "createTime"},//进件时间 157 {data: "createTime"},//进件时间
158 {data: "createTime"},//网点 158 {data: "departmentName"},//网点
159 {data: "createTime"},//产品名称 159 {data: "productName"},//产品名称
160 {data: "createTime"},//申请金额 160 {data: "applyMoney"},//申请金额
161 {data: "createTime"},//审批金额 161 {data: "agreeMoney"},//审批金额
162 {data: "createTime"},//客户经理 162 {data: "createUser"},//客户经理
163 {data: "createTime"},//流程节点 163 {data: "statusDesc"},//流程节点
164 {data: "createTime"},//流转时间 164 {data: "modifyTime"},//流转时间
165 {data: "createTime"}//处理人 165 {data: "modifyUser"}//处理人
166 ] 166 ]
167 }); 167 });
168 168
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 </form> 69 </form>
70 70
71 <div class="body mt-20"> 71 <div class="body mt-20">
72 <table class="table table-border table-bordered table-bg"> 72 <table class="table table-border table-bordered table-bg" id="table">
73 <thead class="text-c"> 73 <thead class="text-c">
74 <tr> 74 <tr>
75 <th width="15px"><input type="checkbox"></th> 75 <th width="15px"><input type="checkbox"></th>
...@@ -90,72 +90,112 @@ ...@@ -90,72 +90,112 @@
90 </tr> 90 </tr>
91 </thead> 91 </thead>
92 <tbody class="text-c"> 92 <tbody class="text-c">
93 <tr> 93
94 <td><input type="checkbox"></td>
95 <td>
96 <span class="dropDown dropDown_hover">
97 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>
98 <ul class="dropDown-menu menu radius box-shadow">
99 <li><a href="javascript:;" onclick="pass(1)">通过</a></li>
100 <li><a href="javascript:;" onclick="refuse(1)">拒绝</a></li>
101 </ul>
102 </span>
103 </td>
104 <td>1001</td>
105 <td>张三</td>
106 <td>333333333333333333</td>
107 <td>13333333333</td>
108 <td>2018-01-01 00:00:00</td>
109 <td>下沙网点</td>
110 <td>融易购</td>
111 <td>100.00</td>
112 <td>100.00</td>
113 <td>李四</td>
114 <td class="c-primary">预审</td>
115 <td>2018-01-02 00:00:00</td>
116 <td>小明</td>
117 </tr>
118 <tr>
119 <td><input type="checkbox"></td>
120 <td>
121 <span class="dropDown dropDown_hover">
122 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>
123 <ul class="dropDown-menu menu radius box-shadow">
124 <li><a href="javascript:;" onclick="pass(2)">通过</a></li>
125 <li><a href="javascript:;" onclick="refuse(2)">拒绝</a></li>
126 </ul>
127 </span>
128 </td>
129 <td>1001</td>
130 <td>张三</td>
131 <td>333333333333333333</td>
132 <td>13333333333</td>
133 <td>2018-01-01 00:00:00</td>
134 <td>下沙网点</td>
135 <td>融易购</td>
136 <td>100.00</td>
137 <td>100.00</td>
138 <td>李四</td>
139 <td class="c-999">完成</td>
140 <td>2018-01-02 00:00:00</td>
141 <td>小明</td>
142 </tr>
143 </tbody> 94 </tbody>
144 </table> 95 </table>
145 <div class="paginate">
146 <div class="paginate_info">显示 1 到 1 ,共 1 条</div>
147 <div class="paginate_pagination">
148 <a class="paginate_button">上一页</a>
149 <span>
150 <a class="paginate_button current">1</a>
151 </span>
152 <a class="paginate_button">下一页</a>
153 </div>
154 </div>
155 </div> 96 </div>
156 </div> 97 </div>
157 <?php $this->load->view('common/footer'); ?> 98 <?php $this->load->view('common/footer'); ?>
99 <script>
100 var table = $('#table').dataTable({
101 aaSorting: [[1, "desc"]],
102 serverSide: true,
103 processing: true,
104 bSort: false,
105 searching: false,//是否显示搜索
106 iDisplayLength: 6,
107 bLengthChange: false,
108 ajax: {
109 url: apiBaseUrl + 'order/getStatus1',
110 dataFilter: function (json) {
111 var ret = {}, json = jQuery.parseJSON(json);
112 ret.data = json.data || [];
113 var draw = getUrlParam('draw');
114 if(draw) {
115 ret.draw = draw;
116 }
117 ret.recordsTotal = 0;
118 ret.recordsFiltered = 0;
119 if (json.page) {
120 ret.recordsTotal = parseInt(json.page.totalNumber);
121 ret.recordsFiltered = parseInt(json.page.totalNumber);
122 }
123 return JSON.stringify(ret);
124 },
125 data: function (data) {
126 data.pageSize = data.length;
127 data.currentPage = parseFloat(data.start / data.length) + 1;
128 return data;
129 }
130 },
131 columns: [
132 {
133 // data: "id",
134 render:function (data, type, full) {
135 return '<input value="'+data+'" type="checkbox">';
136 }
137 },
138 {
139 data: "id", render: function (data, type, full) {
140 return '<span class="dropDown dropDown_hover">\
141 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>\
142 <ul class="dropDown-menu menu radius box-shadow">\
143 <li><a href="javascript:;" onclick="pass(1)">通过</a></li>\
144 <li><a href="javascript:;" onclick="refuse(1)">拒绝</a></li>\
145 </ul>\
146 </span>';
147 }
148 },
149 {data: "orderNo"},//订单编号
150 {data: "userName"},//申请人
151 {data: "idCard"},//身份证
152 {data: "phoneNumber"},//手机号
153 {data: "createTime"},//进件时间
154 {data: "departmentName"},//网点
155 {data: "productName"},//产品名称
156 {data: "applyMoney"},//申请金额
157 {data: "agreeMoney"},//审批金额
158 {data: "createUser"},//客户经理
159 {data: "statusDesc"},//流程节点
160 {data: "modifyTime"},//流转时间
161 {data: "modifyUser"}//处理人
162 ]
163 });
164
165 $.fn.dataTableExt.afnFiltering.push(
166 function (oSettings, aData, iDataIndex) {
167 var min = document.getElementById('min').value;
168 var max = document.getElementById('max').value;
169 var iDateCol = 12;
170
171 var dateMin = new Date(aData[iDateCol]);
172 var dateMax = new Date(aData[iDateCol]);
173
174 if (min === '' && max === '')
175 return true;
176 else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
177 return true;
178 else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
179 return true;
180 return false;
181 }
182 );
158 183
184 $('.table_search').on('change', function () {
185 search = $(this).val();
186 column = $(this).attr('column');
187
188 $('#table').DataTable().column(column).search(search).draw();
189 });
190
191 $('#min, #max').on('keyup', function () {
192 $('#table').DataTable().draw();
193 });
194
195 function resetHandler() {
196 $('#table').DataTable().columns().search("").draw();
197 }
198 </script>
159 <script> 199 <script>
160 function pass(id) { 200 function pass(id) {
161 layer.confirm('通过之后, 将立即进入资料补录阶段', { 201 layer.confirm('通过之后, 将立即进入资料补录阶段', {
......
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
203 <div class="Hui-tabNav-wp"> 203 <div class="Hui-tabNav-wp">
204 <ul id="min_title_list" class="acrossTab cl"> 204 <ul id="min_title_list" class="acrossTab cl">
205 <li class="active"> 205 <li class="active">
206 <span title="我的桌面" data-href="welcome.html">我的桌面</span> 206 <span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
207 <em></em></li> 207 <em></em></li>
208 </ul> 208 </ul>
209 </div> 209 </div>
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
212 <div id="iframe_box" class="Hui-article"> 212 <div id="iframe_box" class="Hui-article">
213 <div class="show_iframe"> 213 <div class="show_iframe">
214 <div style="display:none" class="loading"></div> 214 <div style="display:none" class="loading"></div>
215 <iframe scrolling="yes" frameborder="0" src="welcome.html"></iframe> 215 <iframe scrolling="yes" frameborder="0" src="<?=site_url('welcome/desk')?>"></iframe>
216 </div> 216 </div>
217 </div> 217 </div>
218 </section> 218 </section>
......
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
165 <div class="Hui-tabNav-wp"> 165 <div class="Hui-tabNav-wp">
166 <ul id="min_title_list" class="acrossTab cl"> 166 <ul id="min_title_list" class="acrossTab cl">
167 <li class="active"> 167 <li class="active">
168 <span title="我的桌面" data-href="welcome.html">我的桌面</span> 168 <span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
169 <em></em></li> 169 <em></em></li>
170 </ul> 170 </ul>
171 </div> 171 </div>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
174 <div id="iframe_box" class="Hui-article"> 174 <div id="iframe_box" class="Hui-article">
175 <div class="show_iframe"> 175 <div class="show_iframe">
176 <div style="display:none" class="loading"></div> 176 <div style="display:none" class="loading"></div>
177 <iframe scrolling="yes" frameborder="0" src="welcome.html"></iframe> 177 <iframe scrolling="yes" frameborder="0" src="<?=site_url('welcome/desk')?>"></iframe>
178 </div> 178 </div>
179 </div> 179 </div>
180 </section> 180 </section>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!