9bff8dab by Zelig

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

2 parents 72803056 b97c32a4
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
25 <meta name="description" content=""> 25 <meta name="description" content="">
26 <title>标题</title> 26 <title>标题</title>
27 <script> 27 <script>
28 var apiBaseUrl = "http://151.28ms.com:8088/"; 28 // var apiBaseUrl = "http://151.28ms.com:8088/";
29 var apiBaseUrl = "http://192.168.11.60:8082/";
30
29 </script> 31 </script>
30 </head> 32 </head>
......
...@@ -30,19 +30,20 @@ ...@@ -30,19 +30,20 @@
30 <input name="overdueFine" type="text" class="form-control input-text" value="<?=$data->overdueFine?>"> 30 <input name="overdueFine" type="text" class="form-control input-text" value="<?=$data->overdueFine?>">
31 </div> 31 </div>
32 </div> 32 </div>
33 <div class="row cl"> 33 <!-- 需求改动先去了-->
34 <!--<div class="row cl">
34 <div class="form-group col-sm-4 col-md-2"> 35 <div class="form-group col-sm-4 col-md-2">
35 <label>还款方式</label> 36 <label>还款方式</label>
36 <span class="form-control select-box"> 37 <span class="form-control select-box">
37 <select class="select" size="1" name="repaymentMode"> 38 <select class="select" size="1" name="repaymentMode">
38 <option>请选择</option> 39 <option>请选择</option>
39 <?php foreach ($this->session->repayments as $k=>$v):?> 40 <?php /*foreach ($this->session->repayments as $k=>$v):*/?>
40 <option <?=$v == $data->repaymentMode ? 'selected' : '' ?> value="<?=$k?>"><?=$v?></option> 41 <option <?/*=$v == $data->repaymentMode ? 'selected' : '' */?> value="<?/*=$k*/?>"><?/*=$v*/?></option>
41 <?php endforeach;?> 42 <?php /*endforeach;*/?>
42 </select> 43 </select>
43 </span> 44 </span>
44 </div> 45 </div>
45 </div> 46 </div>-->
46 <div class="row cl"> 47 <div class="row cl">
47 <div class="form-group col-sm-4 col-md-2"> 48 <div class="form-group col-sm-4 col-md-2">
48 <label>借款期限</label> 49 <label>借款期限</label>
......
...@@ -48,14 +48,14 @@ ...@@ -48,14 +48,14 @@
48 <label>期数</label> 48 <label>期数</label>
49 <input type="text" class="form-control input-text" value=""> 49 <input type="text" class="form-control input-text" value="">
50 </div> 50 </div>
51 <div class="form-group col-sm-4 col-md-2"> 51 <!--<div class="form-group col-sm-4 col-md-2">
52 <label>还款方式</label> 52 <label>还款方式</label>
53 <span class="form-control select-box"> 53 <span class="form-control select-box">
54 <select class="select" size="1"> 54 <select class="select" size="1">
55 <option>请选择</option> 55 <option>请选择</option>
56 </select> 56 </select>
57 </span> 57 </span>
58 </div> 58 </div>-->
59 <div class="form-group col-sm-4 col-md-2"> 59 <div class="form-group col-sm-4 col-md-2">
60 <label>逾期天数</label> 60 <label>逾期天数</label>
61 <input type="text" class="form-control input-text" value=""> 61 <input type="text" class="form-control input-text" value="">
......
...@@ -56,14 +56,17 @@ ...@@ -56,14 +56,17 @@
56 <label>期数</label> 56 <label>期数</label>
57 <input type="text" class="form-control input-text" value=""> 57 <input type="text" class="form-control input-text" value="">
58 </div> 58 </div>
59 <div class="form-group col-sm-4 col-md-2"> 59 <!--<div class="form-group col-sm-4 col-md-2">
60 <label>还款方式</label> 60 <label>还款方式</label>
61 <span class="form-control select-box"> 61 <span class="form-control select-box">
62 <select class="select" size="1"> 62 <select class="select" size="1">
63 <option>请选择</option> 63 <option>请选择</option>
64 <?php /*foreach ($this->session->repayments as $k=>$v):*/?>
65 <option <?/*=$v == $data->repaymentMode ? 'selected' : '' */?> value="<?/*=$k*/?>"><?/*=$v*/?></option>
66 <?php /*endforeach;*/?>
64 </select> 67 </select>
65 </span> 68 </span>
66 </div> 69 </div>-->
67 <div class="form-group col-sm-4 col-md-2"> 70 <div class="form-group col-sm-4 col-md-2">
68 <label>本期应还款日</label> 71 <label>本期应还款日</label>
69 <input type="text" class="form-control input-text" value=""> 72 <input type="text" class="form-control input-text" value="">
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 <body> 3 <body>
4 <div class="panel panel-default mb-20"> 4 <div class="panel panel-default mb-20">
5 <form> 5 <form>
6 <input type="hidden" name="source" value="1">
6 <div class="panel-body cl"> 7 <div class="panel-body cl">
7 <div class="row cl"> 8 <div class="row cl">
8 <input type="hidden" name="id" value="<?=$id?>"> 9 <input type="hidden" name="id" value="<?=$id?>">
...@@ -102,14 +103,18 @@ ...@@ -102,14 +103,18 @@
102 <label>当前期数</label> 103 <label>当前期数</label>
103 <input type="text" class="form-control input-text" value="<?=$currentPeriods?>" name="currentPeriods"> 104 <input type="text" class="form-control input-text" value="<?=$currentPeriods?>" name="currentPeriods">
104 </div> 105 </div>
105 <div class="form-group col-sm-4 col-md-2"> 106 <!-- 需求调整先去了-->
107 <!--<div class="form-group col-sm-4 col-md-2">
106 <label>还款方式</label> 108 <label>还款方式</label>
107 <span class="form-control select-box"> 109 <span class="form-control select-box">
108 <select class="select" size="1"> 110 <select class="select" size="1">
109 <option>请选择</option> 111 <option>请选择</option>
112 <?php /*foreach ($this->session->repayments as $k=>$v):*/?>
113 <option <?/*=$v == $repaymentMode ? 'selected' : '' */?> value="<?/*=$k*/?>"><?/*=$v*/?></option>
114 <?php /*endforeach;*/?>
110 </select> 115 </select>
111 </span> 116 </span>
112 </div> 117 </div>-->
113 <div class="form-group col-sm-4 col-md-2"> 118 <div class="form-group col-sm-4 col-md-2">
114 <label>计划还款日期</label> 119 <label>计划还款日期</label>
115 <input type="text" class="form-control input-text Wdate" onfocus="WdatePicker()" value="<?=date("Y-m-d", $planRepaymentDate / 1000)?>" name="planRepaymentDate"> 120 <input type="text" class="form-control input-text Wdate" onfocus="WdatePicker()" value="<?=date("Y-m-d", $planRepaymentDate / 1000)?>" name="planRepaymentDate">
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 </div> 33 </div>
34 <div> 34 <div>
35 <input class="btn btn-warning radius" type="reset" value="重置搜索"> 35 <input class="btn btn-warning radius" type="reset" value="重置搜索">
36 <button class="btn btn-primary radius" type="button" onclick="add()">添加角色</button> 36 <!-- <button class="btn btn-primary radius" type="button" onclick="add()">添加角色</button>-->
37 </div> 37 </div>
38 </form> 38 </form>
39 39
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 }, 103 },
104 {data: "branchName"},//所属网点 104 {data: "branchName"},//所属网点
105 {data: "nameZh"},//角色 105 {data: "nameZh"},//角色
106 {data: "employeeCount;"},//人数 106 {data: "employeeCount"},//人数
107 ] 107 ]
108 }); 108 });
109 109
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 <option value="<?=$v->id?>"><?=$v->name?></option> 13 <option value="<?=$v->id?>"><?=$v->name?></option>
14 <?php if($v->children && !empty($v->children)):?> 14 <?php if($v->children && !empty($v->children)):?>
15 <?php foreach ($v->children as $kk=>$vv):?> 15 <?php foreach ($v->children as $kk=>$vv):?>
16 <option value="<?=$vv->id?>"><?=$vv->name?></option> 16 <option value="<?=$vv->id?>">&nbsp;&nbsp;<?=$vv->name?></option>
17 <?php endforeach;?> 17 <?php endforeach;?>
18 <?php endif;?> 18 <?php endif;?>
19 <?php endforeach;?> 19 <?php endforeach;?>
......
...@@ -91,7 +91,8 @@ ...@@ -91,7 +91,8 @@
91 newData['DepartmentVO'] = { 91 newData['DepartmentVO'] = {
92 children:data['children'] 92 children:data['children']
93 }; 93 };
94 94 console.log(JSON.stringify(newData));
95 return false;
95 $.ajax({ 96 $.ajax({
96 type: 'post', 97 type: 'post',
97 url: apiBaseUrl + targetUrl, 98 url: apiBaseUrl + targetUrl,
......
...@@ -12,19 +12,19 @@ ...@@ -12,19 +12,19 @@
12 <div class="row cl"> 12 <div class="row cl">
13 <label class="form-label col-xs-4 col-sm-3">姓名</label> 13 <label class="form-label col-xs-4 col-sm-3">姓名</label>
14 <div class="formControls col-xs-3 col-sm-3"> 14 <div class="formControls col-xs-3 col-sm-3">
15 <input type="text" class="input-text" name="name"> 15 <input type="text" class="input-text" name="userName">
16 </div> 16 </div>
17 </div> 17 </div>
18 <div class="row cl"> 18 <div class="row cl">
19 <label class="form-label col-xs-4 col-sm-3">手机号</label> 19 <label class="form-label col-xs-4 col-sm-3">手机号</label>
20 <div class="formControls col-xs-3 col-sm-3"> 20 <div class="formControls col-xs-3 col-sm-3">
21 <input type="text" class="input-text" name="tel"> 21 <input type="text" class="input-text" name="phoneNumber">
22 </div> 22 </div>
23 </div> 23 </div>
24 <div class="row cl"> 24 <div class="row cl">
25 <label class="form-label col-xs-4 col-sm-3">身份证</label> 25 <label class="form-label col-xs-4 col-sm-3">身份证</label>
26 <div class="formControls col-xs-3 col-sm-3"> 26 <div class="formControls col-xs-3 col-sm-3">
27 <input type="text" class="input-text" name="ID"> 27 <input type="text" class="input-text" name="idCard">
28 </div> 28 </div>
29 </div> 29 </div>
30 <div class="row cl"> 30 <div class="row cl">
......
...@@ -68,14 +68,14 @@ ...@@ -68,14 +68,14 @@
68 <div class="form-group col-sm-3 col-md-2"> 68 <div class="form-group col-sm-3 col-md-2">
69 <label>姓名</label> 69 <label>姓名</label>
70 <input type="text" class="form-control input-text" name="userName" 70 <input type="text" class="form-control input-text" name="userName"
71 value="<?= $clientInfoOutputVO->userName ?>"> 71 value="<?= $clientInfoOutputVO ? $clientInfoOutputVO->userName : '' ?>">
72 </div> 72 </div>
73 <div class="form-group col-sm-3 col-md-2"> 73 <div class="form-group col-sm-3 col-md-2">
74 <label>性别</label> 74 <label>性别</label>
75 <span class="form-control select-box"> 75 <span class="form-control select-box">
76 <select class="select" size="1" name="gender"> 76 <select class="select" size="1" name="gender">
77 <?php foreach ($this->session->genderEnum as $k => $v): ?> 77 <?php foreach ($this->session->genderEnum as $k => $v): ?>
78 <option <?= $clientInfoOutputVO->gender == $k ? 'selected' : '' ?> 78 <option <?= $clientInfoOutputVO && $clientInfoOutputVO->gender == $k ? 'selected' : '' ?>
79 value="<?= $k ?>"><?= $v ?></option> 79 value="<?= $k ?>"><?= $v ?></option>
80 <?php endforeach; ?> 80 <?php endforeach; ?>
81 </select> 81 </select>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 <span class="form-control select-box"> 86 <span class="form-control select-box">
87 <select class="select" size="1" name="marriageState"> 87 <select class="select" size="1" name="marriageState">
88 <?php foreach ($this->session->marryEnum as $k => $v): ?> 88 <?php foreach ($this->session->marryEnum as $k => $v): ?>
89 <option <?= $clientInfoOutputVO->marriageState == $k ? 'selected' : '' ?> 89 <option <?= $clientInfoOutputVO && $clientInfoOutputVO->marriageState == $k ? 'selected' : '' ?>
90 value="<?= $k ?>"><?= $v ?></option> 90 value="<?= $k ?>"><?= $v ?></option>
91 <?php endforeach; ?> 91 <?php endforeach; ?>
92 </select> 92 </select>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
95 <div class="form-group col-sm-3 col-md-2"> 95 <div class="form-group col-sm-3 col-md-2">
96 <label>出生日期</label> 96 <label>出生日期</label>
97 <input type="text" name="birthDate" class="form-control input-text Wdate" 97 <input type="text" name="birthDate" class="form-control input-text Wdate"
98 value="<?= $clientInfoOutputVO->birthDate ?>" onfocus="WdatePicker()"> 98 value="<?= $clientInfoOutputVO ? $clientInfoOutputVO->birthDate : '' ?>" onfocus="WdatePicker()">
99 </div> 99 </div>
100 </div> 100 </div>
101 101
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
105 <span class="form-control select-box"> 105 <span class="form-control select-box">
106 <select class="select" size="1" name="educationDegree"> 106 <select class="select" size="1" name="educationDegree">
107 <?php foreach ($this->session->educationEnum as $k => $v): ?> 107 <?php foreach ($this->session->educationEnum as $k => $v): ?>
108 <option <?= $clientInfoOutputVO->educationDegree == $k ? 'selected' : '' ?> 108 <option <?= $clientInfoOutputVO && $clientInfoOutputVO->educationDegree == $k ? 'selected' : '' ?>
109 value="<?= $k ?>"><?= $v ?></option> 109 value="<?= $k ?>"><?= $v ?></option>
110 <?php endforeach; ?> 110 <?php endforeach; ?>
111 </select> 111 </select>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 <div class="form-group col-sm-3 col-md-2"> 114 <div class="form-group col-sm-3 col-md-2">
115 <label>身份证</label> 115 <label>身份证</label>
116 <input type="text" name="idCard" class="form-control input-text" 116 <input type="text" name="idCard" class="form-control input-text"
117 value="<?= $clientInfoOutputVO->idCard ?>"> 117 value="<?= $clientInfoOutputVO ? $clientInfoOutputVO->idCard : '' ?>">
118 </div> 118 </div>
119 </div> 119 </div>
120 120
...@@ -122,16 +122,16 @@ ...@@ -122,16 +122,16 @@
122 <div class="form-group has-feedback col-sm-3 col-md-2"> 122 <div class="form-group has-feedback col-sm-3 col-md-2">
123 <label>月收入</label> 123 <label>月收入</label>
124 <input type="text" name="monthlyIncome" class="form-control input-text" 124 <input type="text" name="monthlyIncome" class="form-control input-text"
125 value="<?= $clientInfoOutputVO->monthlyIncome ?>"> 125 value="<?= $clientInfoOutputVO ? $clientInfoOutputVO->monthlyIncome : '' ?>">
126 <span class="glyphicon glyphicon-rmb form-control-feedback" aria-hidden="true"></span> 126 <span class="glyphicon glyphicon-rmb form-control-feedback" aria-hidden="true"></span>
127 </div> 127 </div>
128 <div class="form-group col-sm-3 col-md-2"> 128 <div class="form-group col-sm-3 col-md-2">
129 <label>有无本地房产</label> 129 <label>有无本地房产</label>
130 <span class="form-control select-box"> 130 <span class="form-control select-box">
131 <select class="select" size="1" name="localHouse"> 131 <select class="select" size="1" name="localHouse">
132 <option <?= $clientInfoOutputVO->localHouse == $k ? 'selected' : '' ?> 132 <option <?= $clientInfoOutputVO && $clientInfoOutputVO->localHouse == $k ? 'selected' : '' ?>
133 value="0"></option> 133 value="0"></option>
134 <option <?= $clientInfoOutputVO->localHouse == $k ? 'selected' : '' ?> 134 <option <?= $clientInfoOutputVO && $clientInfoOutputVO->localHouse == $k ? 'selected' : '' ?>
135 value="1"></option> 135 value="1"></option>
136 </select> 136 </select>
137 </span> 137 </span>
...@@ -144,17 +144,17 @@ ...@@ -144,17 +144,17 @@
144 <div class="info"> 144 <div class="info">
145 <?php foreach ($this->session->dwellEnum as $k => $v): ?> 145 <?php foreach ($this->session->dwellEnum as $k => $v): ?>
146 <div class="live-info"> 146 <div class="live-info">
147 <input type="checkbox" <?= $clientInfoOutputVO->dwellState == $k ? 'checked' : '' ?> 147 <input type="checkbox" <?= $clientInfoOutputVO && $clientInfoOutputVO->dwellState == $k ? 'checked' : '' ?>
148 name="dwellState"> 148 name="dwellState">
149 <span><?= $v ?></span> 149 <span><?= $v ?></span>
150 <?php if ($k == 0): ?> 150 <?php if ($k == 0): ?>
151 <input type="text" <?= $clientInfoOutputVO->dwellState == $k ? $clientInfoOutputVO->dwellDetail : '' ?> 151 <input type="text" <?= $clientInfoOutputVO && $clientInfoOutputVO->dwellState == $k ? $clientInfoOutputVO->dwellDetail : '' ?>
152 class="input-decoration w-50 text-c" name="dwellDetail" value=""> 152 class="input-decoration w-50 text-c" name="dwellDetail" value="">
153 <?php elseif ($k == 1): ?> 153 <?php elseif ($k == 1): ?>
154 <input type="text" <?= $clientInfoOutputVO->dwellState == $k ? $clientInfoOutputVO->dwellDetail : '' ?> 154 <input type="text" <?= $clientInfoOutputVO && $clientInfoOutputVO->dwellState == $k ? $clientInfoOutputVO->dwellDetail : '' ?>
155 name="dwellDetail" class="input-decoration w-50 text-c"> 155 name="dwellDetail" class="input-decoration w-50 text-c">
156 <?php elseif ($k == 2): ?> 156 <?php elseif ($k == 2): ?>
157 <input type="text" <?= $clientInfoOutputVO->dwellState == $k ? $clientInfoOutputVO->dwellDetail : '' ?> 157 <input type="text" <?= $clientInfoOutputVO && $clientInfoOutputVO->dwellState == $k ? $clientInfoOutputVO->dwellDetail : '' ?>
158 name="dwellDetail" class="input-decoration w-50 text-c"> 158 name="dwellDetail" class="input-decoration w-50 text-c">
159 <?php endif; ?> 159 <?php endif; ?>
160 </div> 160 </div>
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
194 <div class="form-group col-sm-3 col-md-2"> 194 <div class="form-group col-sm-3 col-md-2">
195 <label>手机</label> 195 <label>手机</label>
196 <input type="text" class="form-control input-text" 196 <input type="text" class="form-control input-text"
197 value="<?= $clientInfoOutputVO->phoneNumber ?>"> 197 value="<?= $clientInfoOutputVO ? $clientInfoOutputVO->phoneNumber : '' ?>">
198 </div> 198 </div>
199 <div class="form-group col-sm-3 col-md-2"> 199 <div class="form-group col-sm-3 col-md-2">
200 <label>户口所在地</label> 200 <label>户口所在地</label>
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
223 <div class="form-group col-sm-6 col-md-4"> 223 <div class="form-group col-sm-6 col-md-4">
224 <label>户口详细地址</label> 224 <label>户口详细地址</label>
225 <input type="text" class="form-control input-text" id="address" 225 <input type="text" class="form-control input-text" id="address"
226 value="<?= $clientInfoOutputVO->registerDetailAddress ?>"> 226 value="<?= $clientInfoOutputVO ? $clientInfoOutputVO->registerDetailAddress : '' ?>">
227 </div> 227 </div>
228 </div> 228 </div>
229 229
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
231 <div class="form-group col-sm-6 col-md-4"> 231 <div class="form-group col-sm-6 col-md-4">
232 <label>现居住地址</label> 232 <label>现居住地址</label>
233 <input type="text" class="form-control input-text" 233 <input type="text" class="form-control input-text"
234 value="<?= $clientInfoOutputVO->currentAddress ?>"> 234 value="<?= $clientInfoOutputVO ? $clientInfoOutputVO->currentAddress :'' ?>">
235 </div> 235 </div>
236 </div> 236 </div>
237 </div> 237 </div>
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
8 <button class="btn btn-primary radius" type="button" onclick="$('#table').DataTable().draw()">提交搜索</button> 8 <button class="btn btn-primary radius" type="button" onclick="$('#table').DataTable().draw()">提交搜索</button>
9 <input class="btn btn-warning radius" type="reset" value="重置搜索"> 9 <input class="btn btn-warning radius" type="reset" value="重置搜索">
10 10
11 <button class="btn btn-primary radius" type="button" onclick="pass(1)">批量通过</button> 11 <!-- <button class="btn btn-primary radius" type="button" onclick="pass(1)">批量通过</button>-->
12 <button class="btn btn-danger radius" type="button" onclick="refuse(1)">批量拒绝</button> 12 <!-- <button class="btn btn-danger radius" type="button" onclick="refuse(1)">批量拒绝</button>-->
13 </div> 13 </div>
14 </form> 14 </form>
15 15
......
1 <!DOCTYPE HTML>
2 <html>
3 <head>
4 <meta charset="utf-8">
5 <meta name="renderer" content="webkit|ie-comp|ie-stand">
6 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
7 <meta name="viewport"
8 content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
9 <meta http-equiv="Cache-Control" content="no-siteapp"/>
10 <link rel="stylesheet" type="text/css" href="/resource/static/h-ui/css/H-ui.min.css"/>
11
12 <?php
13 if (isset($styles) && is_array($styles)) {
14 foreach ($styles as $style) {
15 echo '<link rel="stylesheet" type="text/css" href="' . $style . '" />';
16 }
17 }
18 ?>
19 <meta name="keywords" content="">
20 <meta name="description" content="">
21 <title></title>
22 <script>
23 var apiBaseUrl = "http://151.28ms.com:8088/";
24 </script>
25 </head>
26
27 <body>
28
29
30 <script type="text/javascript" src="/resource/lib/jquery/1.9.1/jquery.min.js"></script>
31
32
33 <script>
34 $.ajax({
35 type: "GET",
36 url: "http://test.smalldebit.club/api/Debit/GetUserDebitRecords?userId=7",
37 beforeSend: function (request) {
38 request.setRequestHeader("token", "926EE68FEF39A83EBFAAC7AF632A4737");
39 },
40 success: function (result) {
41 console.log(result);
42 }
43 });
44
45 // $.get('http://test.smalldebit.club/api/Debit/GetUserDebitRecords?userId=7', function (d) {
46 // console.log(d)
47 // });
48
49 </script>
50
51 </body>
52
53 </html>
...\ No newline at end of file ...\ No newline at end of file
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!