06cf2936 by wang

Merge remote-tracking branch 'origin/develop' into develop

2 parents 3c0d4628 523ef211
...@@ -118,6 +118,8 @@ ...@@ -118,6 +118,8 @@
118 aoData.proposerName = $('[name="proposerName"]').val() || ''; 118 aoData.proposerName = $('[name="proposerName"]').val() || '';
119 aoData.phoneNumber = $('[name="phoneNumber"]').val() || ''; 119 aoData.phoneNumber = $('[name="phoneNumber"]').val() || '';
120 aoData.role = $('[name="role"]').val() || ''; 120 aoData.role = $('[name="role"]').val() || '';
121 aoData.code = $('[name="code"]').val() || '';
122 aoData.repayStatus = $('[name="repayStatus"]').val() || '';
121 }, 123 },
122 }); 124 });
123 125
......
1 <div class="date mb-20"> 1 <div class="date mb-20">
2 <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })" id="min" class="input-text Wdate"> - 2 <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}'})" id="min" class="input-text Wdate"> -
3 <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })" id="max" class="input-text Wdate"> 3 <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d'})" id="max" class="input-text Wdate">
4 </div> 4 </div>
5 <div class="row cl mb-20"> 5 <div class="row cl mb-20">
6 <div class="col-xs-2"> 6 <div class="col-xs-2">
7 <span class="select-box"> 7 <span class="select-box">
8 <select class="select table_search" column="17"> 8 <select class="select table_search" column="17" name="repayStatus">
9 <option value="" selected>还款状态</option> 9 <option value="" selected>还款状态</option>
10 <?php foreach ($this->session->repayStatus as $k=>$v):?> 10 <?php foreach ($this->session->repayStatus as $k=>$v):?>
11 <option value="<?=$v->id?>"><?=$v->name?></option> 11 <option value="<?=$v->id?>"><?=$v->name?></option>
......
1 <div class="date mb-20"> 1 <div class="date mb-20 row">
2 <div class="col-xs-2"> 2 <div class="col-xs-2">
3 <span class="select-box"> 3 <span class="select-box">
4 <select class="select table_search" column="17" name="code"> 4 <select class="select table_search" column="17" name="code">
5 <option value=""></option> 5 <option value=""></option>
6 <option value="0" >进件时间</option> 6 <option value="0">进件时间</option>
7 <option value="1" >放款时间</option> 7 <option value="1">放款时间</option>
8 <option value="2" >计划还款日期</option> 8 <option value="2">计划还款日期</option>
9
10 </select> 9 </select>
11 </span> 10 </span>
12 </div> 11 </div>
13 12
14 <input type="text" 13 <input type="text"
15 onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'enterMaxDate\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })" 14 onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}'})"
16 id="enterMinDate" class="input-text Wdate"> - 15 id="min" class="input-text Wdate"> -
17 <input type="text" 16 <input type="text"
18 onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'enterMinDate\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })" 17 onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d'})"
19 id="enterMaxDate" class="input-text Wdate"> 18 id="max" class="input-text Wdate">
20 </div> 19 </div>
21 <div class="row cl mb-20"> 20 <div class="row cl mb-20">
22 <div class="col-xs-2"> 21 <div class="col-xs-2">
......
1 <div class="date mb-20"> 1 <div class="date mb-20">
2 <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })" id="min" class="input-text Wdate"> - 2 <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}'})" id="min" class="input-text Wdate"> -
3 <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })" id="max" class="input-text Wdate"> 3 <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d')" id="max" class="input-text Wdate">
4 </div> 4 </div>
5 <div class="row cl mb-20"> 5 <div class="row cl mb-20">
6 <div class="col-xs-2"> 6 <div class="col-xs-2">
......
1 <div class="date mb-20"> 1 <div class="date mb-20">
2 <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })" id="min" class="input-text Wdate"> - 2 <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}'})" id="min" class="input-text Wdate"> -
3 <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })" id="max" class="input-text Wdate"> 3 <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d'})" id="max" class="input-text Wdate">
4 </div> 4 </div>
5 <div class="row cl mb-20"> 5 <div class="row cl mb-20">
6 <div class="col-xs-2"> 6 <div class="col-xs-2">
......
...@@ -17,7 +17,10 @@ ...@@ -17,7 +17,10 @@
17 </div> 17 </div>
18 18
19 <div class="tabCon"> 19 <div class="tabCon">
20 <?php $this->load->view('/work/审批/电核结果'); ?> 20 <form action="" id="form1">
21 <input type="hidden" name="orderId" value="<?=$id?>">
22 <?php $this->load->view('/work/审批/电核结果'); ?>
23 </form>
21 </div> 24 </div>
22 <div class="tabCon pb-20"> 25 <div class="tabCon pb-20">
23 <div class="cl pd-5 bg-1"> 26 <div class="cl pd-5 bg-1">
...@@ -64,11 +67,11 @@ ...@@ -64,11 +67,11 @@
64 <div class="col-sm-offset-3 col-sm-2"> 67 <div class="col-sm-offset-3 col-sm-2">
65 <button class="btn btn-warning btn-block">退回订单</button> 68 <button class="btn btn-warning btn-block">退回订单</button>
66 </div> 69 </div>
67 <div class="col-sm-2"> 70 <!--<div class="col-sm-2">
68 <button class="btn btn-danger btn-block" onclick="refuse()">拒绝</button> 71 <button class="btn btn-danger btn-block" onclick="refuse()">拒绝</button>
69 </div> 72 </div>-->
70 <div class="col-sm-2"> 73 <div class="col-sm-2">
71 <button class="btn btn-primary btn-block" onclick="loadIframe('<?=site_url('/work/check/9');?>', '审核意见');">通过</button> 74 <button class="btn btn-primary btn-block" onclick="pass()">通过</button>
72 </div> 75 </div>
73 </div> 76 </div>
74 77
...@@ -104,6 +107,38 @@ ...@@ -104,6 +107,38 @@
104 content: '<?=site_url('work/telRefuse')?>' 107 content: '<?=site_url('work/telRefuse')?>'
105 }); 108 });
106 } 109 }
110
111 function pass() {
112 var data = $("#form1").serializeJson();
113 var url = '<?=site_url('/work/check/9/' . $id);?>';
114 $.ajax({
115 type: 'post',
116 url: apiBaseUrl + 'audit/phoneAudit',
117 cache: false,
118 data: JSON.stringify(data),
119 dataType: 'json',
120 contentType: "application/json; charset=UTF-8",
121 success: function (data) {
122 if (data.msg) {
123 layer.alert(data.msg);
124 } else if (data.code != 0) {
125 layer.alert('操作失败');
126 } else {
127 layer.alert('操作成功');
128 }
129 if(!data.code){
130 setTimeout(function () {
131 loadIframe(url, '审核意见');
132 }, 500)
133 }
134 },
135 error: function () {
136 layer.alert("操作失败")
137 }
138
139 })
140
141 }
107 </script> 142 </script>
108 </body> 143 </body>
109 </html> 144 </html>
......
1 <?php $this->load->view('common/header'); ?> 1 <?php $this->load->view('common/header'); ?>
2 2
3 <body> 3 <body>
4 <form action="" id="form1">
4 <div class="panel panel-default mb-20"> 5 <div class="panel panel-default mb-20">
5 <div class="panel-body cl"> 6 <div class="panel-body cl">
6 <div class="row cl"> 7 <div class="row cl">
7 <div class="form-group col-sm-3 col-md-1"> 8 <div class="form-group col-sm-3 col-md-1">
8 <label>电核时间</label> 9 <label>电核时间</label>
9 <input type="text" class="form-control input-text Wdate" value="" onfocus="WdatePicker()"> 10 <input name="phoneAuditTime" type="text" class="form-control input-text Wdate" value="" onfocus="WdatePicker()">
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-3 col-md-1"> 14 <div class="form-group col-sm-3 col-md-1">
14 <label>是否拨通</label> 15 <label>是否拨通</label>
15 <span class="form-control select-box"> 16 <span class="form-control select-box">
16 <select class="select" size="1"> 17 <select class="select" size="1" name="hasPutThrough">
17 <option value="1"></option> 18 <option value="1"></option>
18 <option value="2"></option> 19 <option value="0"></option>
19 </select> 20 </select>
20 </span> 21 </span>
21 </div> 22 </div>
...@@ -23,18 +24,25 @@ ...@@ -23,18 +24,25 @@
23 <div class="row cl"> 24 <div class="row cl">
24 <div class="form-group col-sm-12 col-md-12"> 25 <div class="form-group col-sm-12 col-md-12">
25 <label>备注</label> 26 <label>备注</label>
26 <textarea class="textarea"></textarea> 27 <textarea class="textarea" name="remark"></textarea>
27 </div> 28 </div>
28 </div> 29 </div>
29 </div> 30 </div>
30 </div> 31 </div>
31 32
33 </form>
34
32 <div class="row cl col-sm-12"> 35 <div class="row cl col-sm-12">
33 <div class="col-sm-2"> 36 <div class="col-sm-2">
34 <button class="btn btn-primary btn-block" onclick="layer_close();">保存</button> 37 <button class="btn btn-primary btn-block" onclick="save();">保存</button>
35 </div> 38 </div>
36 </div> 39 </div>
37 40
38 <?php $this->load->view('common/footer'); ?> 41 <?php $this->load->view('common/footer'); ?>
39 </body> 42 </body>
43 <script>
44
45
46 layer_close();
47 </script>
40 </html> 48 </html>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
3 <div class="panel-body"> 3 <div class="panel-body">
4 <div class="row cl"> 4 <div class="row cl">
5 <div class="form-group col-sm-6 col-md-2"> 5 <div class="form-group col-sm-6 col-md-2">
6 <input type="text" class="form-control input-text" value=""> 6 <input type="text" class="form-control input-text" name="identityCheckDetail" value="">
7 </div> 7 </div>
8 <div class="form-group col-sm-3 col-md-2"> 8 <div class="form-group col-sm-3 col-md-2">
9 <div class="info"> 9 <div class="info">
10 <div class="live-info"> 10 <div class="live-info">
11 <input type="radio" name=""> 11 <input type="radio" name="identityCheck" value="1">
12 <span></span> 12 <span></span>
13 </div> 13 </div>
14 <div class="live-info"> 14 <div class="live-info">
15 <input type="radio" name=""> 15 <input type="radio" name="identityCheck" value="0">
16 <span></span> 16 <span></span>
17 </div> 17 </div>
18 </div> 18 </div>
...@@ -26,16 +26,16 @@ ...@@ -26,16 +26,16 @@
26 <div class="panel-body"> 26 <div class="panel-body">
27 <div class="row cl"> 27 <div class="row cl">
28 <div class="form-group col-sm-6 col-md-2"> 28 <div class="form-group col-sm-6 col-md-2">
29 <input type="text" class="form-control input-text" value=""> 29 <input type="text" class="form-control input-text" name="contactCheckDetail" value="">
30 </div> 30 </div>
31 <div class="form-group col-sm-3 col-md-2"> 31 <div class="form-group col-sm-3 col-md-2">
32 <div class="info"> 32 <div class="info">
33 <div class="live-info"> 33 <div class="live-info">
34 <input type="radio" name=""> 34 <input type="radio" name="contactCheck" value="1">
35 <span></span> 35 <span></span>
36 </div> 36 </div>
37 <div class="live-info"> 37 <div class="live-info">
38 <input type="radio" name=""> 38 <input type="radio" name="contactCheck" value="0">
39 <span></span> 39 <span></span>
40 </div> 40 </div>
41 </div> 41 </div>
...@@ -49,16 +49,16 @@ ...@@ -49,16 +49,16 @@
49 <div class="panel-body"> 49 <div class="panel-body">
50 <div class="row cl"> 50 <div class="row cl">
51 <div class="form-group col-sm-6 col-md-2"> 51 <div class="form-group col-sm-6 col-md-2">
52 <input type="text" class="form-control input-text" value=""> 52 <input type="text" class="form-control input-text" name="familyConditionCheckDetail" value="">
53 </div> 53 </div>
54 <div class="form-group col-sm-3 col-md-2"> 54 <div class="form-group col-sm-3 col-md-2">
55 <div class="info"> 55 <div class="info">
56 <div class="live-info"> 56 <div class="live-info">
57 <input type="radio" name=""> 57 <input type="radio" name="familyConditionCheck" value="1">
58 <span></span> 58 <span></span>
59 </div> 59 </div>
60 <div class="live-info"> 60 <div class="live-info">
61 <input type="radio" name=""> 61 <input type="radio" name="familyConditionCheck" value="0">
62 <span></span> 62 <span></span>
63 </div> 63 </div>
64 </div> 64 </div>
...@@ -72,16 +72,16 @@ ...@@ -72,16 +72,16 @@
72 <div class="panel-body"> 72 <div class="panel-body">
73 <div class="row cl"> 73 <div class="row cl">
74 <div class="form-group col-sm-6 col-md-2"> 74 <div class="form-group col-sm-6 col-md-2">
75 <input type="text" class="form-control input-text" value=""> 75 <input type="text" class="form-control input-text" name="assetInformationCheckDetail" value="">
76 </div> 76 </div>
77 <div class="form-group col-sm-3 col-md-2"> 77 <div class="form-group col-sm-3 col-md-2">
78 <div class="info"> 78 <div class="info">
79 <div class="live-info"> 79 <div class="live-info">
80 <input type="radio" name=""> 80 <input type="radio" name="assetInformationCheck" value="1">
81 <span></span> 81 <span></span>
82 </div> 82 </div>
83 <div class="live-info"> 83 <div class="live-info">
84 <input type="radio" name=""> 84 <input type="radio" name="assetInformationCheck" value="0">
85 <span></span> 85 <span></span>
86 </div> 86 </div>
87 </div> 87 </div>
...@@ -95,16 +95,16 @@ ...@@ -95,16 +95,16 @@
95 <div class="panel-body"> 95 <div class="panel-body">
96 <div class="row cl"> 96 <div class="row cl">
97 <div class="form-group col-sm-6 col-md-2"> 97 <div class="form-group col-sm-6 col-md-2">
98 <input type="text" class="form-control input-text" value=""> 98 <input type="text" class="form-control input-text" name="debtInformationCheckDetail" value="">
99 </div> 99 </div>
100 <div class="form-group col-sm-3 col-md-2"> 100 <div class="form-group col-sm-3 col-md-2">
101 <div class="info"> 101 <div class="info">
102 <div class="live-info"> 102 <div class="live-info">
103 <input type="radio" name=""> 103 <input type="radio" name="debtInformationCheck" value="1">
104 <span></span> 104 <span></span>
105 </div> 105 </div>
106 <div class="live-info"> 106 <div class="live-info">
107 <input type="radio" name=""> 107 <input type="radio" name="debtInformationCheck" value="0">
108 <span></span> 108 <span></span>
109 </div> 109 </div>
110 </div> 110 </div>
...@@ -118,16 +118,16 @@ ...@@ -118,16 +118,16 @@
118 <div class="panel-body"> 118 <div class="panel-body">
119 <div class="row cl"> 119 <div class="row cl">
120 <div class="form-group col-sm-6 col-md-2"> 120 <div class="form-group col-sm-6 col-md-2">
121 <input type="text" class="form-control input-text" value=""> 121 <input type="text" class="form-control input-text" name="otherFinancingInstitutionBusinessDetail" value="">
122 </div> 122 </div>
123 <div class="form-group col-sm-3 col-md-2"> 123 <div class="form-group col-sm-3 col-md-2">
124 <div class="info"> 124 <div class="info">
125 <div class="live-info"> 125 <div class="live-info">
126 <input type="radio" name=""> 126 <input type="radio" name="otherFinancingInstitutionBusinessCheck" value="1">
127 <span></span> 127 <span></span>
128 </div> 128 </div>
129 <div class="live-info"> 129 <div class="live-info">
130 <input type="radio" name=""> 130 <input type="radio" name="otherFinancingInstitutionBusinessCheck" value="0">
131 <span></span> 131 <span></span>
132 </div> 132 </div>
133 </div> 133 </div>
...@@ -141,16 +141,16 @@ ...@@ -141,16 +141,16 @@
141 <div class="panel-body"> 141 <div class="panel-body">
142 <div class="row cl"> 142 <div class="row cl">
143 <div class="form-group col-sm-6 col-md-2"> 143 <div class="form-group col-sm-6 col-md-2">
144 <input type="text" class="form-control input-text" value=""> 144 <input type="text" class="form-control input-text" name="operateBasicInformationDetail">
145 </div> 145 </div>
146 <div class="form-group col-sm-3 col-md-2"> 146 <div class="form-group col-sm-3 col-md-2">
147 <div class="info"> 147 <div class="info">
148 <div class="live-info"> 148 <div class="live-info">
149 <input type="radio" name=""> 149 <input type="radio" name="operateBasicInformationCheck" value="1">
150 <span></span> 150 <span></span>
151 </div> 151 </div>
152 <div class="live-info"> 152 <div class="live-info">
153 <input type="radio" name=""> 153 <input type="radio" name="operateBasicInformationCheck" value="0">
154 <span></span> 154 <span></span>
155 </div> 155 </div>
156 </div> 156 </div>
...@@ -164,20 +164,20 @@ ...@@ -164,20 +164,20 @@
164 <div class="panel-body"> 164 <div class="panel-body">
165 <div class="row cl"> 165 <div class="row cl">
166 <div class="form-group col-sm-6 col-md-2"> 166 <div class="form-group col-sm-6 col-md-2">
167 <input type="text" class="form-control input-text" value=""> 167 <input type="text" class="form-control input-text" name="operateFinanceDataDetail" value="">
168 </div> 168 </div>
169 <div class="form-group col-sm-3 col-md-2"> 169 <div class="form-group col-sm-3 col-md-2">
170 <div class="info"> 170 <div class="info">
171 <div class="live-info"> 171 <div class="live-info">
172 <input type="radio" name=""> 172 <input type="radio" name="operateFinanceDataCheck" value="1">
173 <span></span> 173 <span></span>
174 </div> 174 </div>
175 <div class="live-info"> 175 <div class="live-info">
176 <input type="radio" name=""> 176 <input type="radio" name="operateFinanceDataCheck" value="0">
177 <span></span> 177 <span></span>
178 </div> 178 </div>
179 </div> 179 </div>
180 </div> 180 </div>
181 </div> 181 </div>
182 </div> 182 </div>
183 </div>
...\ No newline at end of file ...\ No newline at end of file
183 </div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!