Startsida Utforska Hjälp
Registrera dig Logga in
depot-tianjin
/
depot-web-tianjin
Bevaka 6
Stjärnmärk 0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 1 Wiki
Bläddra i källkod

员工信息-01

hanqingsong 1 år sedan
förälder
39de4fb2ec
incheckning
592702d5e9
5 ändrade filer med 831 tillägg och 819 borttagningar
Delad Vy Visa Diff Statistik
  1. 574 556
      src/main/resources/static/app/basic/keeper/controller/keeperCtrl.js
  2. 38 0
      src/main/resources/static/app/basic/keeper/service/keeperService.js
  3. 15 24
      src/main/resources/static/app/basic/keeper/views/keeper-list.html
  4. 203 238
      src/main/resources/static/app/basic/keeper/views/keeper-view.html
  5. 1 1
      src/main/resources/static/app/basic/module.js

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 574 - 556
src/main/resources/static/app/basic/keeper/controller/keeperCtrl.js


+ 38 - 0
src/main/resources/static/app/basic/keeper/service/keeperService.js
Visa fil 

@@ -1,6 +1,44 @@
1 1 
 "use strict";
2 2
3 3 
 angular.module('app.basic').service("keeperService", function($http, $q, APP_CONFIG) {
4 
+    // 分页列表-市平台数据
5 
+    this.getPageInfoList = function(pageNum, pageSize, ryxm, orgId) {
6 
+        var d = $q.defer();
7 
+        $http({
8 
+            method : 'GET',
9 
+            url : APP_CONFIG.basicUrl + '/DRyxxsjyController/getPageList',
10 
+            params : {
11 
+                pageNum : pageNum,
12 
+                pageSize : pageSize,
13 
+                ryxm : ryxm, //职员名称
14 
+                orgId : orgId  //单位
15 
+            }
16 
+        }).then(function successCallback(response) {
17 
+            // 请求成功执行代码
18 
+            d.resolve(response.data);
19 
+        }, function errorCallback(response) {
20 
+            // 请求失败执行代码
21 
+            d.reject("error");
22 
+        });
23 
+        return d.promise;
24 
+    };
25 
+
26 
+    // 详情-市平台数据
27 
+    this.getById = function(rybh) {
28 
+        var d = $q.defer();
29 
+        $http({
30 
+            method : 'GET',
31 
+            url : APP_CONFIG.basicUrl + '/DRyxxsjyController/getById/' + rybh
32 
+        }).then(function successCallback(response) {
33 
+            // 请求成功执行代码
34 
+            d.resolve(response.data);
35 
+        }, function errorCallback(response) {
36 
+            // 请求失败执行代码
37 
+            d.reject("error");
38 
+        });
39 
+        return d.promise;
40 
+    };
41 
+
4 42 
 	//查询列表
5 43 
     this.getPageInfo = function(pageNum, pageSize, keeperName, orgId) {
6 44 
         var d = $q.defer();

+ 15 - 24
src/main/resources/static/app/basic/keeper/views/keeper-list.html
Visa fil 

@@ -21,7 +21,7 @@
21 21 
 											<!--<a class="btn btn-primary btn-sm" ng-click="edit(0, 'add')">
22 22 
 												<span class="fa fa-plus"></span>&nbsp;新&nbsp;增
23 23 
 											</a>&emsp;-->
24 
-											<label>员工姓名:&emsp;<input class="form-control input-sm" ng-model="keper.name" placeholder=""> &emsp;
24 
+											<label>员工姓名:&emsp;<input class="form-control input-sm" ng-model="keper.ryxm" placeholder=""> &emsp;
25 25 
 											</label>
26 26 
 											<a class="btn btn-default btn-sm" ng-click="loadData()">
27 27 
 												<i class="fa fa-search"></i>&nbsp;查&nbsp;询
 
@@ -45,7 +45,6 @@
45 45 
 											<th data-hide="expand">员工姓名</th>
46 46 
 											<th data-class="expand">性别</th>
47 47 
 											<th data-class="expand">联系电话</th>
48 
-											<th data-class="expand">岗位角色</th>
49 48 
 											<th data-hide="expand">职务类型</th>
50 49 
 											<th data-hide="expand">所属单位</th>
51 50 
 											<th data-hide="expand">操作</th>
 
@@ -54,25 +53,17 @@
54 53
55 54 
 									<tbody>
56 55 
 										<tr ng-repeat="keeper in pageInfo.list | filter:search">
57 
-											<td>{{keeper.name}}</td>
58 
-											<td>{{dicData[keeper.sex]}}</td>
59 
-											<td>{{keeper.phone}}</td>
60 
-											<td>{{roleObj[keeper.postType]}}</td>
61 
-											<td>{{keeper.zw}}</td>
62 
-											<td>{{orgInfo.orgName}}</td>
56 
+											<td>{{keeper.ryxm}}</td>
57 
+											<td>{{dicData[keeper.xb]}}</td>
58 
+											<td>{{keeper.lxdh}}</td>
59 
+											<!--0:主职，1:副职-->
63 60 
 											<td>
64 
-												<!--<span ng-if="roleObj[keeper.postType]=='保管员'||roleObj[keeper.postType]=='仓储人员'">
65 
-													<a href-void ng-click="getUnitStoreList(keeper.id,keeper.orgId)">
66 
-														<i class="fa fa-cogs"></i>分配仓房
67 
-													</a>
68 
-												</span>
69 
-												<a href-void ng-click="edit(keeper.id, 'update')">
70 
-													<i class="fa fa-edit"></i>修改
71 
-												</a>
72 
-												<a href-void ng-click="remove(keeper.id)">
73 
-													<i class="fa fa-trash-o"></i>删除
74 
-												</a>-->
75 
-												<a href-void ng-click="view(keeper.id)">
61 
+												<span ng-if="keeper.zwlx=='0'">主职</span>
62 
+												<span ng-if="keeper.zwlx=='1'">副职</span>
63 
+											</td>
64 
+											<td>{{keeper.qymc}}</td>
65 
+											<td>
66 
+												<a href-void ng-click="view(keeper.rybh)">
76 67 
 													<i class="fa fa-info-circle"></i>查看
77 68 
 												</a>
78 69 
 											</td>
 
@@ -94,7 +85,7 @@
94 85
95 86
96 87 
 <!-- Modal -->
97 
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
88 
+<!--<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
98 89 
 	aria-labelledby="myModalLabel" aria-hidden="true">
99 90 
 	<div class="modal-dialog">
100 91 
 		<div class="modal-content">
 
@@ -114,8 +105,8 @@
114 105 
 					取消</button>
115 106 
 			</div>
116 107 
 		</div>
117 
-		<!-- /.modal-content -->
108 
+		&lt;!&ndash; /.modal-content &ndash;&gt;
118 109 
 	</div>
119 
-	<!-- /.modal-dialog -->
120 
-</div>
110 
+	&lt;!&ndash; /.modal-dialog &ndash;&gt;
111 
+</div>-->
121 112 
 <!-- /.modal -->

+ 203 - 238
src/main/resources/static/app/basic/keeper/views/keeper-view.html
Visa fil 

@@ -34,30 +34,34 @@
34 34 
 										<section class="col col-3">
35 35 
 											<label class="label">身份证号<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
36 36 
 											<label class="input">
37 
-												<input type="text" ng-model="keeper.idCard" name="idCard" placeholder="" ng-readonly="true" maxlength="18">
37 
+												<input type="text" ng-model="keeper.sfzh" name="sfzh" placeholder="" ng-readonly="true" maxlength="18">
38 38 
 											</label>
39 39 
 										</section>
40 40 
 										<section class="col col-3">
41 41 
 											<label class="label">员工姓名<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
42 42 
 											<label class="input">
43 
-												<input type="text" ng-model="keeper.idCard" name="idCard" placeholder="" ng-readonly="true" maxlength="18">
43 
+												<input type="text" ng-model="keeper.ryxm" name="ryxm" placeholder="" ng-readonly="true" maxlength="18">
44 44 
 											</label>
45 45 
 										</section>
46 46 
 										<section class="col col-3">
47 47 
 											<label class="label">职务类型<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
48 48 
 											<label class="input">
49 
-												<input type="text" ng-model="keeper.idCard" name="idCard" placeholder="" ng-readonly="true" maxlength="18">
49 
+												<label class="select">
50 
+													<select ng-model="keeper.zwlx" name="zwlx" class="form-control" ng-disabled="true">
51 
+														<option value="">--请选择--</option>
52 
+														<option value="0">主职</option>
53 
+														<option value="1">副职</option>
54 
+													</select>
55 
+													<i></i>
56 
+												</label>
50 57 
 											</label>
51 58 
 										</section>
52 
-										<!--<section class="col col-3">
53 
-											<span>职员头像<span style="color: red;margin-left: 5px;text-align: center;">*</span></span>
54 
-										</section>-->
55 59 
 									</div>
56 60 
 									<div class="row">
57 61 
 										<section class="col col-3">
58 62 
 											<label class="label">性别</label>
59 63 
 											<label class="select">
60 
-												<select ng-model="keeper.sex" ng-disabled="true" name="sex"
64 
+												<select ng-model="keeper.xb" ng-disabled="true" name="xb"
61 65 
 														ng-options="enum.enumid as enum.enumname for enum in dicDataList[5287]"
62 66 
 														class="form-control">
63 67 
 													<option value="">--请选择--</option>
 
@@ -77,7 +81,7 @@
77 81 
 										<section class="col col-3">
78 82 
 											<label class="label">政治面貌</label>
79 83 
 											<label class="select">
80 
-												<select ng-model="keeper.political" ng-disabled="true"
84 
+												<select ng-model="keeper.zzmm" ng-disabled="true"
81 85 
 														ng-options="enum.enumid as enum.enumname for enum in dicDataList[1043]"
82 86 
 														class="form-control">
83 87 
 													<option value="">--请选择--</option>
 
@@ -90,22 +94,20 @@
90 94 
 											<label class="label">移动电话</label>
91 95 
 											<label class="input">
92 96 
 												<i class="icon-prepend fa fa-mobile-phone"></i>
93 
-												<input type="text" ng-model="keeper.phone" name="phone"
94 
-													   placeholder="" ng-readonly="true" phonenum="true" maxlength="20">
97 
+												<input type="text" ng-model="keeper.lxdh" name="lxdh" placeholder="" ng-readonly="true" maxlength="20">
95 98 
 											</label>
96 99 
 										</section>
97 100 
 										<section class="col col-3">
98 101 
 											<label class="label">部门名称</label>
99 102 
 											<label class="input">
100 103 
 												<i class="icon-prepend fa fa-mobile-phone"></i>
101 
-												<input type="text" ng-model="keeper.phone" name="phone"
102 
-													   placeholder="" ng-readonly="true">
104 
+												<input type="text" ng-model="keeper.bmmc" name="bmmc" placeholder="" ng-readonly="true">
103 105 
 											</label>
104 106 
 										</section>
105 107 
 										<section class="col col-3">
106 108 
 											<label class="label">职务(岗位)</label>
107 109 
 											<label class="input">
108 
-												<input type="text" ng-model="keeper.zw" name="zw" maxlength="30" ng-readonly="true" />
110 
+												<input type="text" ng-model="keeper.zwmc" name="zwmc" maxlength="30" ng-readonly="true" />
109 111 
 												<i></i>
110 112 
 											</label>
111 113 
 										</section>
 
@@ -113,19 +115,15 @@
113 115 
 									<div class="row">
114 116 
 										<section class="col col-3">
115 117 
 											<label class="label">在岗状态</label>
116 
-											<label class="select">
117 
-												<select ng-model="keeper.zgzt" name="zgzt" class="form-control" ng-disabled="true">
118 
-													<option value="">--请选择--</option>
119 
-													<option value="01">在岗</option>
120 
-													<option value="02">已离职</option>
121 
-												</select>
118 
+											<label class="input">
119 
+												<input type="text" ng-model="keeper.zgzt" name="zgzt" ng-readonly="true" />
122 120 
 												<i></i>
123 121 
 											</label>
124 122 
 										</section>
125 123 
 										<section class="col col-3">
126 124 
 											<label class="label">人员类别</label>
127 125 
 											<label class="select">
128 
-												<select ng-model="keeper.employeeNature" ng-disabled="true" name="employeeNature"
126 
+												<select ng-model="keeper.rylb" ng-disabled="true" name="rylb"
129 127 
 														ng-options="enum.enumid as enum.enumname for enum in dicDataList[6888]"
130 128 
 														class="form-control">
131 129 
 													<option value="">--请选择--</option>
 
@@ -149,22 +147,25 @@
149 147 
 										<section class="col col-3">
150 148 
 											<label class="label">岗位类型</label>
151 149 
 											<label class="select">
152 
-												<select ng-model="keeper.gwlb" name="gwlb" class="form-control"  ng-disabled="true">
150 
+												<select ng-model="keeper.gwdm" name="gwdm" class="form-control"  ng-disabled="true">
153 151 
 													<option value="">--请选择--</option>
154 
-													<option value="1">后勤</option>
155 
-													<option value="2">业务</option>
156 
-													<option value="3">财务</option>
157 
-													<option value="4">统计</option>
158 
-													<option value="5">仓储</option>
159 
-													<option value="6">化验</option>
160 
-													<option value="7">管理</option>
152 
+													<option value="11">后勤</option>
153 
+													<option value="12">业务</option>
154 
+													<option value="13">财务</option>
155 
+													<option value="14">统计</option>
156 
+													<option value="15">仓储</option>
157 
+													<option value="16">化验</option>
158 
+													<option value="17">管理</option>
159 
+													<option value="18">防治</option>
160 
+													<option value="19">保安</option>
161 
+													<option value="20">其他</option>
161 162 
 												</select>
162 163 
 											</label>
163 164 
 										</section>
164 165 
 										<section class="col col-3">
165 166 
 											<label class="label">入职日期</label>
166 167 
 											<label class="input">
167 
-												<input type="text" ng-model="keeper.entryTime" name="entryTime" id="entryTime" ng-disabled="true"
168 
+												<input type="text" ng-model="keeper.rzrq" name="rzrq" id="rzrq" ng-disabled="true"
168 169 
 													   class="form-control" onClick="WdatePicker({lang:'zh-cn'})" />
169 170 
 											</label>
170 171 
 										</section>
 
@@ -172,7 +173,7 @@
172 173 
 											<label class="label">参加涉粮企业工作时间<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
173 174 
 											<label class="input">
174 175 
 												<input type="text" ng-model="keeper.cjslqygzsj" class="form-control" onClick="WdatePicker({lang:'zh-cn'})"
175 
-													   name="cjslqygzsj" ng-disabled="isNotEdit" required >
176 
+													   name="cjslqygzsj" ng-disabled="true" >
176 177 
 											</label>
177 178 
 										</section>
178 179 
 									</div>
 
@@ -181,20 +182,20 @@
181 182 
 											<label class="label">参加工作时间<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
182 183 
 											<label class="input">
183 184 
 												<input type="text" ng-model="keeper.cjgzsj" name="cjgzsj"
184 
-													   class="form-control" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isNotEdit" />
185 
+													   class="form-control" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="true" />
185 186 
 											</label>
186 187 
 										</section>
187 188 
 										<section class="col col-3">
188 189 
 											<label class="label">最高职称</label>
189 190 
 											<label class="input">
190 
-												<input type="text" ng-model="keeper.zw" name="zw" maxlength="30" ng-readonly="true" />
191 
+												<input type="text" ng-model="keeper.zgzc" name="zgzc" ng-readonly="true" />
191 192 
 												<i></i>
192 193 
 											</label>
193 194 
 										</section>
194 195 
 										<section class="col col-3">
195 196 
 											<label class="label">取得最高职称或职业资格时间</label>
196 197 
 											<label class="input">
197 
-												<input type="text" ng-model="keeper.zw" name="zw" maxlength="30" ng-readonly="true" />
198 
+												<input type="text" ng-model="keeper.zgzctqsj" name="zgzctqsj" ng-readonly="true" />
198 199 
 												<i></i>
199 200 
 											</label>
200 201 
 										</section>
 
@@ -206,70 +207,30 @@
206 207 
 									</h3>
207 208 
 								</header>
208 209 
 								<fieldset>
209 
-									<div>
210 
+									<div ng-repeat="educationVO in educationVOList">
210 211 
 										<div class="row">
211 
-											<input type="hidden" ng-model="keeperedu[0].datatype" />
212 212 
 											<section class="col col-2">
213 213 
 												<label class="label">全日制最高学历</label>
214 
-												<label class="select">
215 
-													<select ng-model="addXwxl[0].education" name="education{{0}}"
216 
-															ng-options="enum.enumid as enum.enumname for enum in dicDataList[5294]"
217 
-															class="form-control" ng-disabled="isNotEdit"></select>
218 
-												</label>
219 
-											</section>
220 
-											<section class="col col-2">
221 
-												<label class="label">毕业院校</label>
222 
-												<label class="input">
223 
-													<input type="text" ng-model="addXwxl[0].college" maxlength="30"
224 
-														   name="college{{0}}" ng-readonly="isNotEdit" />
225 
-												</label>
226 
-											</section>
227 
-											<section class="col col-2">
228 
-												<label class="label">专业</label>
229 214 
 												<label class="input">
230 
-													<input type="text" ng-model="addXwxl[0].department" maxlength="20"
231 
-														   name="department{{0}}" ng-readonly="isNotEdit" />
232 
-												</label>
233 
-											</section>
234 
-											<section class="col col-2">
235 
-												<label class="label">是否为涉粮专业</label>
236 
-												<label class="select">
237 
-													<select ng-model="addXwxl[0].sfwslzy" name="sfwslzy{{0}}" class="form-control" ng-disabled="isNotEdit">
238 
-														<option value="">--请选择--</option>
239 
-														<option value="0">是</option>
240 
-														<option value="1">否</option>
241 
-													</select>
242 
-												</label>
243 
-											</section>
244 
-										</div>
245 
-										<div class="row">
246 
-											<input type="hidden" ng-model="addXwxl[1].datatype" />
247 
-											<section class="col col-2">
248 
-												<label class="label">非全日制最高学历</label>
249 
-												<label class="select">
250 
-													<select ng-model="addXwxl[1].education" name="education{{1}}"
251 
-															ng-options="enum.enumid as enum.enumname for enum in dicDataList[5294]"
252 
-															class="form-control" ng-disabled="isNotEdit"></select>
215 
+													<input type="text" ng-model="dicData[educationVO.quanHighestEducation]" name="quanHighestEducation" ng-readonly="true" />
253 216 
 												</label>
254 217 
 											</section>
255 218 
 											<section class="col col-2">
256 219 
 												<label class="label">毕业院校</label>
257 220 
 												<label class="input">
258 
-													<input type="text" ng-model="addXwxl[1].college" maxlength="30"
259 
-														   name="college{{1}}" ng-readonly="isNotEdit" />
221 
+													<input type="text" ng-model="educationVO.quanInstitutions" name="quanInstitutions" ng-readonly="true" />
260 222 
 												</label>
261 223 
 											</section>
262 224 
 											<section class="col col-2">
263 225 
 												<label class="label">专业</label>
264 226 
 												<label class="input">
265 
-													<input type="text" ng-model="addXwxl[1].department" maxlength="20"
266 
-														   name="department{{1}}" ng-readonly="isNotEdit" />
227 
+													<input type="text" ng-model="educationVO.quanSpeciality" name="quanSpeciality" ng-readonly="true" />
267 228 
 												</label>
268 229 
 											</section>
269 230 
 											<section class="col col-2">
270 231 
 												<label class="label">是否为涉粮专业</label>
271 232 
 												<label class="select">
272 
-													<select ng-model="addXwxl[1].sfwslzy" name="sfwslzy{{1}}" class="form-control" ng-disabled="isNotEdit">
233 
+													<select ng-model="educationVO.quanFoodstuff" name="quanFoodstuff" class="form-control" ng-disabled="true">
273 234 
 														<option value="">--请选择--</option>
274 235 
 														<option value="0">是</option>
275 236 
 														<option value="1">否</option>
 
@@ -277,6 +238,38 @@
277 238 
 												</label>
278 239 
 											</section>
279 240 
 										</div>
241 
+										<div ng-repeat="feiEducationVO in feiEducationVOList">
242 
+											<div class="row">
243 
+												<section class="col col-2">
244 
+													<label class="label">非全日制最高学历</label>
245 
+													<label class="input">
246 
+														<input type="text" ng-model="dicData[feiEducationVO.feiHighestEducation]" name="feiHighestEducation" ng-readonly="true" />
247 
+													</label>
248 
+												</section>
249 
+												<section class="col col-2">
250 
+													<label class="label">毕业院校</label>
251 
+													<label class="input">
252 
+														<input type="text" ng-model="feiEducationVO.feiInstitutions" name="feiInstitutions" ng-readonly="true" />
253 
+													</label>
254 
+												</section>
255 
+												<section class="col col-2">
256 
+													<label class="label">专业</label>
257 
+													<label class="input">
258 
+														<input type="text" ng-model="feiEducationVO.feiSpeciality" name="feiSpeciality" ng-readonly="true" />
259 
+													</label>
260 
+												</section>
261 
+												<section class="col col-2">
262 
+													<label class="label">是否为涉粮专业</label>
263 
+													<label class="select">
264 
+														<select ng-model="feiEducationVO.feiFoodstuff" name="feiFoodstuff" class="form-control" ng-disabled="true">
265 
+															<option value="">--请选择--</option>
266 
+															<option value="0">是</option>
267 
+															<option value="1">否</option>
268 
+														</select>
269 
+													</label>
270 
+												</section>
271 
+											</div>
272 
+										</div>
280 273 
 									</div>
281 274 
 								</fieldset>
282 275 
 								<header>
 
@@ -293,7 +286,7 @@
293 286 
 											<th width='15%'>
294 287 
 												<section>
295 288 
 													<label class="select">
296 
-														<select ng-model="keeper.sfsjjllg" name="sfsjjllg" ng-change="checkJllg()" ng-disabled="isNotEdit" class="form-control" required>
289 
+														<select ng-model="keeper.rotaterotateType" name="rotaterotateType" ng-disabled="true" class="form-control">
297 290 
 															<option value="">--请选择--</option>
298 291 
 															<option value="0">是</option>
299 292 
 															<option value="1">否</option>
 
@@ -301,71 +294,44 @@
301 294 
 													</label>
302 295 
 												</section>
303 296 
 											</th>
304 
-											<th width='15%' ng-hide="jllg_but">
297 
+											<th width='15%'>
305 298 
 												<label class="label" style="margin-top: 9px;text-align: center;">领导班子成员/关键部门负责人</label>
306 299 
 											</th>
307 
-											<th width='15%' ng-hide="jllg_but">
300 
+											<th width='15%'>
308 301 
 												<section>
309 302 
 													<label class="input">
310 
-														<input type="text" ng-model="keeper.cyfzr" maxlength="100" name="cyfzr" ng-readonly="isNotEdit" />
303 
+														<input type="text" ng-model="keeper.head" maxlength="100" name="head" ng-readonly="true" />
311 304 
 													</label>
312 305 
 												</section>
313 306 
 											</th>
314 307 
 										</tr>
315 308 
 									</table>
316 
-									<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" ng-hide="jllg_but">
317 
-										<!--第一个tr开始 -->
309 
+									<table class="table table-striped table-bordered table-hover" width="100%">
310 
+										<thead>
318 311 
 										<tr>
319 
-											<th width='15%'>
320 
-												<label class="label" style="margin-top: 9px;text-align: center;">序号</label>
321 
-											</th>
322 
-											<th width='15%'>
323 
-												<label class="label" style="margin-top: 9px;text-align: center;">负责（分管）业务类型</label>
324 
-											</th>
325 
-											<th>
326 
-												<label class="label" style="margin-top: 9px;text-align: center;">负责（分管）业务时间</label>
327 
-											</th>
328 
-											<th width='15%'>
329 
-												<label class="label" style="margin-top: 9px;text-align: center;">任命文件或者会议纪要等佐证材料</label>
330 
-											</th>
312 
+											<th data-hide="expand">序号</th>
313 
+											<th data-class="expand">负责（分管）业务类型</th>
314 
+											<th data-class="expand">负责（分管）业务时间</th>
315 
+											<th data-class="expand">任命文件或者会议纪要等佐证材料</th>
331 316 
 										</tr>
332 
-										<tr ng-repeat="jllg in addJllg">
333 
-											<th>
334 
-												<section>
335 
-													<label class="input">{{$index+1}}</label>
336 
-												</section>
337 
-											</th>
338 
-											<th>
339 
-												<section>
340 
-													<label class="select">
341 
-														<select ng-model="jllg.fzywlx" name="fzywlx{{$index}}" ng-disabled="isNotEdit" class="form-control" required>
317 
+										</thead>
318 
+										<tbody>
319 
+										<tr ng-repeat="rotaterotateVO in rotaterotateVOList">
320 
+											<td>{{$index+1}}</td>
321 
+											<!--
322 
+											<select ng-model="rotaterotateVO.businessType" name="businessType{{$index}}" ng-disabled="true" class="form-control">
342 323 
 															<option value="01">负责（分管）购销工作</option>
343 324 
 															<option value="02">负责（分管）检斤工作</option>
344 325 
 															<option value="03">负责（分管）检验工作</option>
345 326 
 															<option value="04">负责（分管）保管工作</option>
346 327 
 															<option value="05">负责（分管）财务工作</option>
347 328 
 															<option value="06">负责（分管）基建工作</option>
348 
-														</select>
349 
-													</label>
350 
-												</section>
351 
-											</th>
352 
-											<th>
353 
-												<section>
354 
-													<label class="input">
355 
-														<input class="form-control" type="text" ng-model="jllg.fzywsj" id="jllg_{{$index}}" ng-blur="getVal(5, $index)"
356 
-															   ng-readonly="isNotEdit" name="fzywsj{{$index}}" onClick="WdatePicker({lang:'zh-cn'})" />
357 
-													</label>
358 
-												</section>
359 
-											</th>
360 
-											<th>
361 
-												<section>
362 
-													<label class="input">
363 
-														<input class="form-control" type="text" ng-model="jllg.fzywsj"
364 
-															   ng-readonly="isNotEdit" name="fzywsj{{$index}}" onClick="WdatePicker({lang:'zh-cn'})" />
365 
-													</label>
366 
-												</section>
367 
-											</th>
329 
+											-->
330 
+											<td>{{rotaterotateVO.businessType}}</td>
331 
+											<td>{{rotaterotateVO.businessTime}}</td>
332 
+											<td>{{rotaterotateVO.serialNumber}}</td>
368 333 
 										</tr>
334 
+										</tbody>
369 335 
 									</table>
370 336 
 								</fieldset>
371 337 
 								<header>
 
@@ -374,15 +340,12 @@
374 340 
 									</h3>
375 341 
 								</header>
376 342 
 								<fieldset>
377 
-									<div ng-repeat="zyjszc in addZyjs">
378 
-										<input type="hidden" ng-model="zyjszc.datatype" />
379 
-										<input type="hidden" ng-model="zyjszc.keeperId" />
380 
-										<input type="hidden" ng-model="zyjszc.id" />
343 
+									<div ng-repeat="skillVO in skillVOList">
381 344 
 										<div class="row">
382 345 
 											<section class="col col-2">
383 346 
 												<label class="label">技能等级</label>
384 347 
 												<label class="select">
385 
-													<select ng-model="zyjszc.rank" name="rankes{{$index}}" class="form-control" ng-disabled="isNotEdit">
348 
+													<select ng-model="skillVO.skillLevel" name="skillLevel" class="form-control" ng-disabled="true">
386 349 
 														<option value="1">一级/高级技师</option>
387 350 
 														<option value="2">二级/技师</option>
388 351 
 														<option value="3">三级/高级工</option>
 
@@ -394,7 +357,7 @@
394 357 
 											<section class="col col-2">
395 358 
 												<label class="label">专业</label>
396 359 
 												<label class="select">
397 
-													<select ng-model="zyjszc.department" name="department{{$index}}" ng-disabled="isNotEdit" class="form-control" required>
360 
+													<select ng-model="skillVO.skillName" name="skillName" ng-disabled="true" class="form-control">
398 361 
 														<option value="01">（粮油）仓储管理员/保管员</option>
399 362 
 														<option value="02">农产品食品检验员/化验员</option>
400 363 
 														<option value="03">其他</option>
 
@@ -403,9 +366,7 @@
403 366 
 											</section>
404 367 
 											<section class="col col-2">
405 368 
 												<label class="label">获取时间</label> <label class="input">
406 
-													<input type="text" ng-model="zyjszc.issueTime" id="zyjszc_{{$index}}"
407 
-														   class="form-control" onClick="WdatePicker({lang:'zh-cn'})" ng-blur="getVal(2, $index)"
408 
-														   name="issueTime{{$index}}" ng-disabled="isNotEdit">
369 
+													<input type="text" ng-model="skillVO.skillDate" name="skillDate" ng-disabled="true">
409 370 
 												</label>
410 371 
 											</section>
411 372 
 										</div>
 
@@ -417,74 +378,75 @@
417 378 
 									</h3>
418 379 
 								</header>
419 380 
 								<fieldset>
420 
-									<div class="row">
421 
-										<section class="col col-3">
422 
-											<label class="label">职业资格证书名称</label>
423 
-											<label class="input">
424 
-												<input type="text" ng-model="zyzg.department" maxlength="100"
425 
-													   name="departmente{{$index}}" ng-readonly="isNotEdit" required />
426 
-											</label>
427 
-										</section>
428 
-										<section class="col col-2">
429 
-											<label class="label">职称(等级)</label>
430 
-											<label class="select">
431 
-												<select ng-model="zyzg.rank" name="rank{{$index}}" class="form-control" ng-disabled="isNotEdit">
432 
-													<option value="01">正高</option>
433 
-													<option value="02">副高</option>
434 
-													<option value="03">中级</option>
435 
-													<option value="04">初级</option>
436 
-												</select>
437 
-											</label>
438 
-										</section>
439 
-										<section class="col col-2">
440 
-											<label class="label">证书编号</label>
441 
-											<label class="input">
442 
-												<input type="text" ng-model="zyzg.zsbh" maxlength="35"
443 
-													   name="zsbh{{$index}}" ng-readonly="isNotEdit" />
444 
-											</label>
445 
-										</section>
446 
-										<section class="col col-2">
447 
-											<label class="label">发证机关</label> <label class="input">
448 
-											<input type="text" ng-model="zyzg.issueFacility" maxlength="100"
449 
-												   name="issueFacility{{$index}}" ng-readonly="isNotEdit">
450 
-										</label>
451 
-										</section>
452 
-									</div>
453 
-									<div class="row">
454 
-										<section class="col col-2">
455 
-											<label class="label">颁证时间</label> <label class="input">
456 
-											<input type="text" ng-model="zyzg.issueTime" id="zyzg_{{$index}}"
457 
-												   class="form-control" onClick="WdatePicker({lang:'zh-cn'})" ng-blur="getVal(3, $index)"
458 
-												   name="zyzgissueTime{{$index}}" ng-disabled="isNotEdit">
459 
-										</label>
460 
-										</section>
461 
-										<section class="col col-2">
462 
-											<label class="label">荣誉称号</label>
463 
-											<label class="input">
464 
-												<input type="text" ng-model="zyzg.rych" maxlength="100"
465 
-													   name="rych{{$index}}" ng-readonly="isNotEdit" required />
466 
-											</label>
467 
-										</section>
468 
-										<section class="col col-2">
469 
-											<label class="label">专业</label>
470 
-											<label class="select">
471 
-												<select ng-model="zyzg.sfwslzy" name="sfwslzy{{$index}}" class="form-control" ng-disabled="isNotEdit">
472 
-													<option value="">--请选择--</option>
473 
-													<option value="0">涉粮相关专业</option>
474 
-													<option value="1">非涉粮相关专业</option>
475 
-												</select>
476 
-											</label>
477 
-										</section>
478 
-										<section class="col col-2">
479 
-											<label class="label">&nbsp;</label>
480 
-											<label class="select">
481 
-												<select ng-model="zyzg.occupation" name="occupation{{$index}}"
482 
-														ng-options="enum.enumid as enum.enumname for enum in dicDataList[5307]"
483 
-														class="form-control" ng-disabled="isNotEdit">
484 
-													<option value="">--请选择--</option>
485 
-												</select>
381 
+									<div ng-repeat="reportVO in reportVOList">
382 
+										<div class="row">
383 
+											<section class="col col-3">
384 
+												<label class="label">职业资格证书名称</label>
385 
+												<label class="input">
386 
+													<input type="text" ng-model="reportVO.honoraryName" name="honoraryName" ng-readonly="true" />
387 
+												</label>
388 
+											</section>
389 
+											<section class="col col-2">
390 
+												<label class="label">职称(等级)</label>
391 
+												<label class="select">
392 
+													<select ng-model="reportVO.title" name="title" class="form-control" ng-disabled="true">
393 
+														<option value="01">正高</option>
394 
+														<option value="02">副高</option>
395 
+														<option value="03">中级</option>
396 
+														<option value="04">初级</option>
397 
+													</select>
398 
+												</label>
399 
+											</section>
400 
+											<section class="col col-2">
401 
+												<label class="label">证书编号</label>
402 
+												<label class="input">
403 
+													<input type="text" ng-model="reportVO.reportNumber" name="reportNumber" ng-readonly="true" />
404 
+												</label>
405 
+											</section>
406 
+											<section class="col col-2">
407 
+												<label class="label">发证机关</label>
408 
+												<label class="input">
409 
+													<input type="text" ng-model="reportVO.authoritys" name="authoritys" ng-readonly="true">
410 
+												</label>
411 
+											</section>
412 
+										</div>
413 
+										<div class="row">
414 
+											<section class="col col-2">
415 
+												<label class="label">颁证时间</label> <label class="input">
416 
+												<input type="text" ng-model="reportVO.releaseTime" class="form-control" name="releaseTime" ng-disabled="true">
486 417 
 											</label>
487 
-										</section>
418 
+											</section>
419 
+											<section class="col col-2">
420 
+												<label class="label">荣誉称号</label>
421 
+												<label class="input">
422 
+													<input type="text" ng-model="reportVO.honoraryTitle" name="honoraryTitle" ng-readonly="true" />
423 
+												</label>
424 
+											</section>
425 
+											<section class="col col-2">
426 
+												<label class="label">专业</label>
427 
+												<label class="select">
428 
+													<select ng-model="reportVO.reportName" name="reportName" class="form-control" ng-disabled="true">
429 
+														<option value="">--请选择--</option>
430 
+														<option value="0">涉粮相关专业</option>
431 
+														<option value="1">非涉粮相关专业</option>
432 
+													</select>
433 
+												</label>
434 
+											</section>
435 
+											<section class="col col-2">
436 
+												<label class="label">&nbsp;</label>
437 
+												<label class="input">
438 
+													<input type="text" ng-model="dicData[reportVO.occupation]" name="occupation" ng-readonly="true" />
439 
+												</label>
440 
+											</section>
441 
+										</div>
442 
+										<div class="row">
443 
+											<section class="col col-2">
444 
+												<label class="label">证书附件</label>
445 
+												<label class="input">
446 
+													<input type="text" ng-model="reportVO.fjid" name="fjid" ng-readonly="isNotEdit" />
447 
+												</label>
448 
+											</section>
449 
+										</div>
488 450 
 									</div>
489 451 
 								</fieldset>
490 452 
 								<header>
 
@@ -493,32 +455,30 @@
493 455 
 									</h3>
494 456 
 								</header>
495 457 
 								<fieldset>
496 
-									<div class="row">
497 
-										<section class="col col-3">
498 
-											<label class="label">专业</label> <label class="input">
499 
-											<input type="text" ng-model="sgz.department" maxlength="100"
500 
-												   name="departments{{$index}}" ng-readonly="isNotEdit" required />
501 
-										</label>
502 
-										</section>
503 
-										<section class="col col-3">
504 
-											<label class="label">颁证机构</label> <label class="input">
505 
-											<input type="text" ng-model="sgz.issueFacility" maxlength="100"
506 
-												   name="issueFacility" ng-readonly="isNotEdit">
507 
-										</label>
508 
-										</section>
509 
-										<section class="col col-3">
510 
-											<label class="label">颁证时间</label> <label class="input">
511 
-											<input type="text" ng-model="sgz.issueTime" id="sgz_{{$index}}"
512 
-												   class="form-control" onClick="WdatePicker({lang:'zh-cn'})" ng-blur="getVal(4, $index)"
513 
-												   name="issueTime{{$index}}" ng-disabled="isNotEdit">
514 
-										</label>
515 
-										</section>
516 
-										<section class="col col-2">
517 
-											<label class="label">证书附件</label>
518 
-											<label class="input">
519 
-												<input type="text" ng-model="sgz.issueFacility" maxlength="100" name="issueFacility" ng-readonly="isNotEdit">
458 
+									<div ng-repeat="certificatesVO in certificatesVOList">
459 
+										<div class="row">
460 
+											<section class="col col-3">
461 
+												<label class="label">专业</label> <label class="input">
462 
+												<input type="text" ng-model="certificatesVO.speciality" name="speciality" ng-readonly="true" />
520 463 
 											</label>
521 
-										</section>
464 
+											</section>
465 
+											<section class="col col-3">
466 
+												<label class="label">颁证机构</label> <label class="input">
467 
+												<input type="text" ng-model="certificatesVO.issuefacility" name="issuefacility" ng-readonly="true">
468 
+											</label>
469 
+											</section>
470 
+											<section class="col col-3">
471 
+												<label class="label">颁证时间</label> <label class="input">
472 
+												<input type="text" ng-model="certificatesVO.acquisitionTime" class="form-control" name="acquisitionTime" ng-disabled="true">
473 
+											</label>
474 
+											</section>
475 
+											<section class="col col-2">
476 
+												<label class="label">证书附件</label>
477 
+												<label class="input">
478 
+													<input type="text" ng-model="certificatesVO.fjid" name="fjid" ng-readonly="true">
479 
+												</label>
480 
+											</section>
481 
+										</div>
522 482 
 									</div>
523 483 
 								</fieldset>
524 484 
 								<header>
 
@@ -527,10 +487,12 @@
527 487 
 									</h3>
528 488 
 								</header>
529 489 
 								<fieldset>
530 
-									<label class="label">附件</label>
531 
-									<label class="input">
532 
-										<input type="text" ng-model="sgz.issueFacility" maxlength="100" name="issueFacility" ng-readonly="isNotEdit">
533 
-									</label>
490 
+									<div ng-repeat="otherVo in otherVoList">
491 
+										<label class="label">附件</label>
492 
+										<label class="input">
493 
+											<input type="text" ng-model="otherVo.fjid" maxlength="100" name="fjid" ng-readonly="true">
494 
+										</label>
495 
+									</div>
534 496 
 								</fieldset>
535 497 
 								<header>
536 498 
 									<h3>
 
@@ -551,14 +513,17 @@
551 513 
 											</tr>
552 514 
 										</thead>
553 515 
 										<tbody>
554 
-											<tr ng-repeat="keeper in pageInfo.list">
555 
-												<td>{{$index+1}}</td>
556 
-												<td>{{$index+1}}</td>
557 
-												<td>{{$index+1}}</td>
558 
-												<td>{{$index+1}}</td>
559 
-												<td>{{$index+1}}</td>
560 
-												<td>{{$index+1}}</td>
516 
+											<tr ng-repeat="zwlxbgjlVO in zwlxbgjlVOList" ng-hide="zwlxbgjlVOHide">
561 517 
 												<td>{{$index+1}}</td>
518 
+												<td>{{zwlxbgjlVO.bgqzzdwmc}}</td>
519 
+												<td>{{zwlxbgjlVO.zwlxQ}}</td>
520 
+												<td>{{zwlxbgjlVO.bghzzdwmc}}</td>
521 
+												<td>{{zwlxbgjlVO.zwlxH}}</td>
522 
+												<td>{{zwlxbgjlVO.bgr}}</td>
523 
+												<td>{{zwlxbgjlVO.bgfsrq}}</td>
524 
+											</tr>
525 
+											<tr ng-hide="zwlxbgjlVONotHide">
526 
+												<td colspan="7" style="text-align: center;">暂无数据</td>
562 527 
 											</tr>
563 528 
 										</tbody>
564 529 
 									</table>

+ 1 - 1
src/main/resources/static/app/basic/module.js
Visa fil 

@@ -156,7 +156,7 @@ angular.module('app.basic')
156 156 
     })*/
157 157 
     //点查看跳转页面
158 158 
     .state('app.basic.keeperView', {
159 
-    	url: '/keeperView/:id',
159 
+    	url: '/keeperView/:rybh',
160 160 
         data: {
161 161 
             title: '员工信息详情'
162 162 
         },