Página inicial Explorar Ajuda
Registrar Entrar
depot-tianjin
/
depot-web-tianjin
Observar 6
Favorito 0
Fork 0
Arquivos Issues 0 Pull Requests 1 Wiki
Ver código fonte

出库结算管理

hanqingsong 1 ano atrás
pai
05b214f769
commit
39de4fb2ec
4 arquivos alterados com 630 adições e 35 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 24 20
      src/main/resources/static/app/basic/keeper/controller/keeperCtrl.js
  2. 5 5
      src/main/resources/static/app/basic/keeper/views/keeper-list.html
  3. 597 6
      src/main/resources/static/app/basic/keeper/views/keeper-view.html
  4. 4 4
      src/main/resources/static/app/basic/module.js

+ 24 - 20
src/main/resources/static/app/basic/keeper/controller/keeperCtrl.js
Ver arquivo 

@@ -1,5 +1,4 @@
1 
-angular.module('app.basic')
2 
-	.controller("keeperCtrl", function($scope, $rootScope, $http, $uibModal, $location, $state, keeperService,$stateParams) {
1 
+angular.module('app.basic').controller("keeperCtrl", function($scope, $rootScope, $http, $uibModal, $location, $state, keeperService,$stateParams) {
3 2
4 3 
      // 获取货位列表数据
5 4 
 	 $scope.pageInfo = {pageNum : 1, pageSize : 10};
 
@@ -10,21 +9,34 @@ angular.module('app.basic')
10 9 
          },function(data){
11 10 
              console.log(data);
12 11 
          });
13 
-     }
12 
+     };
14 13 
      $scope.loadData();
14 
+
15 
+    // 查看
16 
+    $scope.view = function(id) {
17 
+        $state.go('app.basic.keeperView',{id:id});
18 
+    };
19 
+
20 
+    // 翻页
21 
+    $scope.goPage = function(pageNum) {
22 
+        if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
23 
+            $scope.pageInfo.pageNum = pageNum;
24 
+            $scope.loadData();
25 
+        }
26 
+    }
15 27
16 28 
      // 新增或修改跳转到录入页面
17 
-     $scope.edit = function(id, showType) {
29 
+     /*$scope.edit = function(id, showType) {
18 30 
     	 $state.go('app.basic.keeperEdit',{id:id, showType:showType});
19 
-     }
31 
+     }*/
20 32
21 33 
      // 查看
22 
-     $scope.view = function(id) {
34 
+     /*$scope.view = function(id) {
23 35 
     	 $state.go('app.basic.keeperView',{id:id, types : $stateParams.functionType});
24 
-     }
36 
+     }*/
25 37
26 38 
     // 删除一条记录
27 
-    $scope.remove = function(id) {
39 
+    /*$scope.remove = function(id) {
28 40 
          if (!confirm("确定要删除吗？")) {
29 41 
              return;
30 42 
          }
 
@@ -39,17 +51,9 @@ angular.module('app.basic')
39 51 
          },function(data){
40 52 
              console.log(data);
41 53 
          });
42 
-    }
43 
-
44 
-    // 翻页
45 
- 	$scope.goPage = function(pageNum) {
46 
- 		if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
47 
-      		$scope.pageInfo.pageNum = pageNum;
48 
-      		$scope.loadData();
49 
-      	}
50 
- 	}
51 
-
52 
-    $scope.selected = []; //仓房数组
54 
+    }*/
55 
+
56 
+    /*$scope.selected = []; //仓房数组
53 57 
     //$scope.orgId = ""; //当前保管员的单位
54 58 
     $scope.bgyId = ""; //当前保管员的ID
55 59 
     // 获取当前保管员所在粮库的所有仓房和当前保管员的权限
 
@@ -70,7 +74,7 @@ angular.module('app.basic')
70 74 
 	    }, function (reason) {
71 75 
 	        console.log(reason);
72 76 
 	    });
73 
-    }
77 
+    }*/
74 78
75 79 
 })
76 80 
 .controller("keeperCtrlEdit", function(FileUploader, $rootScope, $filter, $scope, $http, $state, $location,

+ 5 - 5
src/main/resources/static/app/basic/keeper/views/keeper-list.html
Ver arquivo 

@@ -18,9 +18,9 @@
18 18 
 								<div class="dt-toolbar">
19 19 
 									<div class="col-xs-12 col-sm-9">
20 20 
 										<div class="form-group">
21 
-											<a class="btn btn-primary btn-sm" ng-click="edit(0, 'add')">
21 
+											<!--<a class="btn btn-primary btn-sm" ng-click="edit(0, 'add')">
22 22 
 												<span class="fa fa-plus"></span>&nbsp;新&nbsp;增
23 
-											</a>&emsp;
23 
+											</a>&emsp;-->
24 24 
 											<label>员工姓名:&emsp;<input class="form-control input-sm" ng-model="keper.name" placeholder=""> &emsp;
25 25 
 											</label>
26 26 
 											<a class="btn btn-default btn-sm" ng-click="loadData()">
 
@@ -46,7 +46,7 @@
46 46 
 											<th data-class="expand">性别</th>
47 47 
 											<th data-class="expand">联系电话</th>
48 48 
 											<th data-class="expand">岗位角色</th>
49 
-											<th data-hide="expand">职务(岗位)</th>
49 
+											<th data-hide="expand">职务类型</th>
50 50 
 											<th data-hide="expand">所属单位</th>
51 51 
 											<th data-hide="expand">操作</th>
52 52 
 										</tr>
 
@@ -61,7 +61,7 @@
61 61 
 											<td>{{keeper.zw}}</td>
62 62 
 											<td>{{orgInfo.orgName}}</td>
63 63 
 											<td>
64 
-												<span ng-if="roleObj[keeper.postType]=='保管员'||roleObj[keeper.postType]=='仓储人员'">
64 
+												<!--<span ng-if="roleObj[keeper.postType]=='保管员'||roleObj[keeper.postType]=='仓储人员'">
65 65 
 													<a href-void ng-click="getUnitStoreList(keeper.id,keeper.orgId)">
66 66 
 														<i class="fa fa-cogs"></i>分配仓房
67 67 
 													</a>
 
@@ -71,7 +71,7 @@
71 71 
 												</a>
72 72 
 												<a href-void ng-click="remove(keeper.id)">
73 73 
 													<i class="fa fa-trash-o"></i>删除
74 
-												</a>
74 
+												</a>-->
75 75 
 												<a href-void ng-click="view(keeper.id)">
76 76 
 													<i class="fa fa-info-circle"></i>查看
77 77 
 												</a>

+ 597 - 6
src/main/resources/static/app/basic/keeper/views/keeper-view.html
Ver arquivo 

@@ -1,4 +1,595 @@
1 
-<div id="content" class="hb-vie">
1 
+<!-- MAIN CONTENT -->
2 
+<div id="content">
3 
+	<!-- widget grid -->
4 
+	<section id="widget-grid" widget-grid>
5 
+		<!-- START ROW -->
6 
+		<div class="row">
7 
+			<!-- NEW COL START -->
8 
+			<article class="col-sm-12 col-md-12 col-lg-12">
9 
+				<!-- Widget ID (each widget will need unique ID)-->
10 
+				<div jarvis-widget id="form-grid-widget"
11 
+					 data-widget-colorbutton="false" data-widget-editbutton="false"
12 
+					 data-widget-custombutton="false">
13 
+					<!-- widget div-->
14 
+					<div>
15 
+						<!-- widget content -->
16 
+						<div class="widget-body no-padding">
17 
+							<form id="keeper-form" name='keeper-form'
18 
+								  class="smart-form ng-pristine ng-valid"
19 
+								  data-validator-option="validateOptions" novalidate="novalidate">
20 
+								<header>
21 
+									<a href-void class="btn btn-default btn-xs" ng-click="returnTop()">
22 
+										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
23 
+									</a>
24 
+									&nbsp;<strong>员工信息详情</strong>
25 
+									<span class="pull-right font-xs">带*的部分必须填写</span>
26 
+								</header>
27 
+								<fieldset>
28 
+									<div class="container">
29 
+										<span class="right-side-image">职员头像<span style="color: red;margin-left: 5px;text-align: center;">*</span>
30 
+											<img class="right-side-image" alt="职员头像" src="{{keeper.avatorUrl}}">
31 
+										</span>
32 
+									</div>
33 
+									<div class="row">
34 
+										<section class="col col-3">
35 
+											<label class="label">身份证号<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
36 
+											<label class="input">
37 
+												<input type="text" ng-model="keeper.idCard" name="idCard" placeholder="" ng-readonly="true" maxlength="18">
38 
+											</label>
39 
+										</section>
40 
+										<section class="col col-3">
41 
+											<label class="label">员工姓名<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
42 
+											<label class="input">
43 
+												<input type="text" ng-model="keeper.idCard" name="idCard" placeholder="" ng-readonly="true" maxlength="18">
44 
+											</label>
45 
+										</section>
46 
+										<section class="col col-3">
47 
+											<label class="label">职务类型<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
48 
+											<label class="input">
49 
+												<input type="text" ng-model="keeper.idCard" name="idCard" placeholder="" ng-readonly="true" maxlength="18">
50 
+											</label>
51 
+										</section>
52 
+										<!--<section class="col col-3">
53 
+											<span>职员头像<span style="color: red;margin-left: 5px;text-align: center;">*</span></span>
54 
+										</section>-->
55 
+									</div>
56 
+									<div class="row">
57 
+										<section class="col col-3">
58 
+											<label class="label">性别</label>
59 
+											<label class="select">
60 
+												<select ng-model="keeper.sex" ng-disabled="true" name="sex"
61 
+														ng-options="enum.enumid as enum.enumname for enum in dicDataList[5287]"
62 
+														class="form-control">
63 
+													<option value="">--请选择--</option>
64 
+												</select>
65 
+											</label>
66 
+										</section>
67 
+										<section class="col col-3">
68 
+											<label class="label">名族</label>
69 
+											<label class="select">
70 
+												<select ng-model="keeper.mz" ng-disabled="true" name="mz"
71 
+														ng-options="enum.enumid as enum.enumname for enum in dicDataList[7176]"
72 
+														class="form-control">
73 
+													<option value="">--请选择--</option>
74 
+												</select>
75 
+											</label>
76 
+										</section>
77 
+										<section class="col col-3">
78 
+											<label class="label">政治面貌</label>
79 
+											<label class="select">
80 
+												<select ng-model="keeper.political" ng-disabled="true"
81 
+														ng-options="enum.enumid as enum.enumname for enum in dicDataList[1043]"
82 
+														class="form-control">
83 
+													<option value="">--请选择--</option>
84 
+												</select>
85 
+											</label>
86 
+										</section>
87 
+									</div>
88 
+									<div class="row">
89 
+										<section class="col col-3">
90 
+											<label class="label">移动电话</label>
91 
+											<label class="input">
92 
+												<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">
95 
+											</label>
96 
+										</section>
97 
+										<section class="col col-3">
98 
+											<label class="label">部门名称</label>
99 
+											<label class="input">
100 
+												<i class="icon-prepend fa fa-mobile-phone"></i>
101 
+												<input type="text" ng-model="keeper.phone" name="phone"
102 
+													   placeholder="" ng-readonly="true">
103 
+											</label>
104 
+										</section>
105 
+										<section class="col col-3">
106 
+											<label class="label">职务(岗位)</label>
107 
+											<label class="input">
108 
+												<input type="text" ng-model="keeper.zw" name="zw" maxlength="30" ng-readonly="true" />
109 
+												<i></i>
110 
+											</label>
111 
+										</section>
112 
+									</div>
113 
+									<div class="row">
114 
+										<section class="col col-3">
115 
+											<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>
122 
+												<i></i>
123 
+											</label>
124 
+										</section>
125 
+										<section class="col col-3">
126 
+											<label class="label">人员类别</label>
127 
+											<label class="select">
128 
+												<select ng-model="keeper.employeeNature" ng-disabled="true" name="employeeNature"
129 
+														ng-options="enum.enumid as enum.enumname for enum in dicDataList[6888]"
130 
+														class="form-control">
131 
+													<option value="">--请选择--</option>
132 
+												</select>
133 
+											</label>
134 
+										</section>
135 
+										<section class="col col-3">
136 
+											<label class="label">岗位性质<span style="color: red;">*</span></label>
137 
+											<label class="select">
138 
+												<select ng-model="keeper.gwxz" name="gwxz" class="form-control" ng-disabled="true">
139 
+													<option value="">--请选择--</option>
140 
+													<option value="11">在岗职工(长期)</option>
141 
+													<option value="12">在岗职工(临时)</option>
142 
+													<option value="20">其它从业人员</option>
143 
+												</select>
144 
+												<i></i>
145 
+											</label>
146 
+										</section>
147 
+									</div>
148 
+									<div class="row">
149 
+										<section class="col col-3">
150 
+											<label class="label">岗位类型</label>
151 
+											<label class="select">
152 
+												<select ng-model="keeper.gwlb" name="gwlb" class="form-control"  ng-disabled="true">
153 
+													<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>
161 
+												</select>
162 
+											</label>
163 
+										</section>
164 
+										<section class="col col-3">
165 
+											<label class="label">入职日期</label>
166 
+											<label class="input">
167 
+												<input type="text" ng-model="keeper.entryTime" name="entryTime" id="entryTime" ng-disabled="true"
168 
+													   class="form-control" onClick="WdatePicker({lang:'zh-cn'})" />
169 
+											</label>
170 
+										</section>
171 
+										<section class="col col-3">
172 
+											<label class="label">参加涉粮企业工作时间<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
173 
+											<label class="input">
174 
+												<input type="text" ng-model="keeper.cjslqygzsj" class="form-control" onClick="WdatePicker({lang:'zh-cn'})"
175 
+													   name="cjslqygzsj" ng-disabled="isNotEdit" required >
176 
+											</label>
177 
+										</section>
178 
+									</div>
179 
+									<div class="row">
180 
+										<section class="col col-3">
181 
+											<label class="label">参加工作时间<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
182 
+											<label class="input">
183 
+												<input type="text" ng-model="keeper.cjgzsj" name="cjgzsj"
184 
+													   class="form-control" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isNotEdit" />
185 
+											</label>
186 
+										</section>
187 
+										<section class="col col-3">
188 
+											<label class="label">最高职称</label>
189 
+											<label class="input">
190 
+												<input type="text" ng-model="keeper.zw" name="zw" maxlength="30" ng-readonly="true" />
191 
+												<i></i>
192 
+											</label>
193 
+										</section>
194 
+										<section class="col col-3">
195 
+											<label class="label">取得最高职称或职业资格时间</label>
196 
+											<label class="input">
197 
+												<input type="text" ng-model="keeper.zw" name="zw" maxlength="30" ng-readonly="true" />
198 
+												<i></i>
199 
+											</label>
200 
+										</section>
201 
+									</div>
202 
+								</fieldset>
203 
+								<header>
204 
+									<h3>
205 
+										<strong>学历学位情况</strong>&nbsp;&nbsp;
206 
+									</h3>
207 
+								</header>
208 
+								<fieldset>
209 
+									<div>
210 
+										<div class="row">
211 
+											<input type="hidden" ng-model="keeperedu[0].datatype" />
212 
+											<section class="col col-2">
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 
+												<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>
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="addXwxl[1].college" maxlength="30"
259 
+														   name="college{{1}}" ng-readonly="isNotEdit" />
260 
+												</label>
261 
+											</section>
262 
+											<section class="col col-2">
263 
+												<label class="label">专业</label>
264 
+												<label class="input">
265 
+													<input type="text" ng-model="addXwxl[1].department" maxlength="20"
266 
+														   name="department{{1}}" ng-readonly="isNotEdit" />
267 
+												</label>
268 
+											</section>
269 
+											<section class="col col-2">
270 
+												<label class="label">是否为涉粮专业</label>
271 
+												<label class="select">
272 
+													<select ng-model="addXwxl[1].sfwslzy" name="sfwslzy{{1}}" class="form-control" ng-disabled="isNotEdit">
273 
+														<option value="">--请选择--</option>
274 
+														<option value="0">是</option>
275 
+														<option value="1">否</option>
276 
+													</select>
277 
+												</label>
278 
+											</section>
279 
+										</div>
280 
+									</div>
281 
+								</fieldset>
282 
+								<header>
283 
+									<h3>
284 
+										<strong>是否涉及交流轮岗</strong>
285 
+									</h3>
286 
+								</header>
287 
+								<fieldset>
288 
+									<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
289 
+										<tr>
290 
+											<th width='15%'>
291 
+												<label class="label" style="margin-top: 9px;text-align: center;">是否涉及交流轮岗</label>
292 
+											</th>
293 
+											<th width='15%'>
294 
+												<section>
295 
+													<label class="select">
296 
+														<select ng-model="keeper.sfsjjllg" name="sfsjjllg" ng-change="checkJllg()" ng-disabled="isNotEdit" class="form-control" required>
297 
+															<option value="">--请选择--</option>
298 
+															<option value="0">是</option>
299 
+															<option value="1">否</option>
300 
+														</select>
301 
+													</label>
302 
+												</section>
303 
+											</th>
304 
+											<th width='15%' ng-hide="jllg_but">
305 
+												<label class="label" style="margin-top: 9px;text-align: center;">领导班子成员/关键部门负责人</label>
306 
+											</th>
307 
+											<th width='15%' ng-hide="jllg_but">
308 
+												<section>
309 
+													<label class="input">
310 
+														<input type="text" ng-model="keeper.cyfzr" maxlength="100" name="cyfzr" ng-readonly="isNotEdit" />
311 
+													</label>
312 
+												</section>
313 
+											</th>
314 
+										</tr>
315 
+									</table>
316 
+									<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" ng-hide="jllg_but">
317 
+										<!--第一个tr开始 -->
318 
+										<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>
331 
+										</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>
342 
+															<option value="01">负责（分管）购销工作</option>
343 
+															<option value="02">负责（分管）检斤工作</option>
344 
+															<option value="03">负责（分管）检验工作</option>
345 
+															<option value="04">负责（分管）保管工作</option>
346 
+															<option value="05">负责（分管）财务工作</option>
347 
+															<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>
368 
+										</tr>
369 
+									</table>
370 
+								</fieldset>
371 
+								<header>
372 
+									<h3>
373 
+										<strong>技能等级</strong>
374 
+									</h3>
375 
+								</header>
376 
+								<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" />
381 
+										<div class="row">
382 
+											<section class="col col-2">
383 
+												<label class="label">技能等级</label>
384 
+												<label class="select">
385 
+													<select ng-model="zyjszc.rank" name="rankes{{$index}}" class="form-control" ng-disabled="isNotEdit">
386 
+														<option value="1">一级/高级技师</option>
387 
+														<option value="2">二级/技师</option>
388 
+														<option value="3">三级/高级工</option>
389 
+														<option value="4">四级中级工</option>
390 
+														<option value="5">五级/初级工</option>
391 
+													</select>
392 
+												</label>
393 
+											</section>
394 
+											<section class="col col-2">
395 
+												<label class="label">专业</label>
396 
+												<label class="select">
397 
+													<select ng-model="zyjszc.department" name="department{{$index}}" ng-disabled="isNotEdit" class="form-control" required>
398 
+														<option value="01">（粮油）仓储管理员/保管员</option>
399 
+														<option value="02">农产品食品检验员/化验员</option>
400 
+														<option value="03">其他</option>
401 
+													</select>
402 
+												</label>
403 
+											</section>
404 
+											<section class="col col-2">
405 
+												<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">
409 
+												</label>
410 
+											</section>
411 
+										</div>
412 
+									</div>
413 
+								</fieldset>
414 
+								<header>
415 
+									<h3>
416 
+										<strong>职称和荣誉称号</strong>
417 
+									</h3>
418 
+								</header>
419 
+								<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>
486 
+											</label>
487 
+										</section>
488 
+									</div>
489 
+								</fieldset>
490 
+								<header>
491 
+									<h3>
492 
+										<strong>上岗及其他证书</strong>
493 
+									</h3>
494 
+								</header>
495 
+								<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">
520 
+											</label>
521 
+										</section>
522 
+									</div>
523 
+								</fieldset>
524 
+								<header>
525 
+									<h3>
526 
+										<strong>其它附件</strong>
527 
+									</h3>
528 
+								</header>
529 
+								<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>
534 
+								</fieldset>
535 
+								<header>
536 
+									<h3>
537 
+										<strong>职务类型变更记录</strong>
538 
+									</h3>
539 
+								</header>
540 
+								<fieldset>
541 
+									<table class="table table-striped table-bordered table-hover" width="100%">
542 
+										<thead>
543 
+											<tr>
544 
+												<th data-hide="expand">序号</th>
545 
+												<th data-class="expand">变更前单位名称</th>
546 
+												<th data-class="expand">职务类型变更前</th>
547 
+												<th data-class="expand">变更后单位名称</th>
548 
+												<th data-hide="expand">职务类型变更后</th>
549 
+												<th data-hide="expand">变更人</th>
550 
+												<th data-hide="expand">变更时间</th>
551 
+											</tr>
552 
+										</thead>
553 
+										<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>
561 
+												<td>{{$index+1}}</td>
562 
+											</tr>
563 
+										</tbody>
564 
+									</table>
565 
+								</fieldset>
566 
+								<footer class="modal-footer text-align-center">
567 
+									<button ng-click="returnTop()" class="btn btn-default btn-lg" data-dismiss="modal">返回</button>
568 
+								</footer>
569 
+							</form>
570 
+						</div>
571 
+					</div>
572 
+				</div>
573 
+			</article>
574 
+		</div>
575 
+	</section>
576 
+</div>
577 
+<style>
578 
+	.container {
579 
+		position: relative;
580 
+		width: 100%;
581 
+		max-width: 1525px; /* 或者其他你需要的最大宽度 */
582 
+		margin: 0 auto;
583 
+	}
584 
+	.right-side-image {
585 
+		position: absolute;
586 
+		top: 27px;
587 
+		right: 0;
588 
+		width: 200px; /* 或者你想要的其他宽度 */
589 
+		height: auto;
590 
+	}
591 
+</style>
592 
+<!--<div id="content" class="hb-vie">
2 593 
 	<section id="widget-grid" widget-grid>
3 594 
 		<div class="row">
4 595 
 			<article class="col-sm-12 col-md-12 col-lg-12">
 
@@ -10,7 +601,7 @@
10 601 
 							<a href-void class="btn btn-default btn-xs" ng-click="returnTop()">
11 602 
 								<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
12 603 
 							</a>
13 
-							&nbsp;<strong>员工信息展示</strong>
604 
+							&nbsp;<strong>员工信息详情</strong>
14 605 
 						</header>
15 606 
 						<div class="col-sm-5" style="width:30%;padding-top:10px;height:305px">
16 607 
 							<img style="width: 100%;height:100%" class="img-responsive"
 
@@ -63,9 +654,9 @@
63 654 
 										<li class="list-group-item add-listclass col-sm-12">
64 655 
 											<span class="font-lg text-right col-sm-4">联系方式：</span>
65 656 
 											<span class="font-lg col col-sm-8">{{keeper.phone}}</span></li>
66 
-<!--										<li class="list-group-item add-listclass col-sm-12">-->
67 
-<!--											<span class="font-lg text-right col-sm-4">保管工作年限：</span>-->
68 
-<!--											<span class="font-lg col col-sm-8">{{keeper.workYear}}</span></li>-->
657 
+&lt;!&ndash;										<li class="list-group-item add-listclass col-sm-12">&ndash;&gt;
658 
+&lt;!&ndash;											<span class="font-lg text-right col-sm-4">保管工作年限：</span>&ndash;&gt;
659 
+&lt;!&ndash;											<span class="font-lg col col-sm-8">{{keeper.workYear}}</span></li>&ndash;&gt;
69 660 
 										<li class="list-group-item add-listclass col-sm-12">
70 661 
 											<span class="font-lg text-right col-sm-4">岗位性质：</span>
71 662 
 											<span class="font-lg col col-sm-8">
 
@@ -95,4 +686,4 @@
95 686 
 			</article>
96 687 
 		</div>
97 688 
 	</section>
98 
-</div>
689 
+</div>-->

+ 4 - 4
src/main/resources/static/app/basic/module.js
Ver arquivo 

@@ -142,7 +142,7 @@ angular.module('app.basic')
142 142 
         }
143 143 
     })
144 144 
     //点新增或修改保管员信息调用
145 
-    .state('app.basic.keeperEdit', {
145 
+    /*.state('app.basic.keeperEdit', {
146 146 
     	url: '/keeperEdit/:id/:showType',
147 147 
         data: {
148 148 
             title: '员工信息详情'
 
@@ -153,12 +153,12 @@ angular.module('app.basic')
153 153 
                 templateUrl: 'app/basic/keeper/views/keeper-edit.html'
154 154 
             }
155 155 
         }
156 
-    })
156 
+    })*/
157 157 
     //点查看跳转页面
158 158 
     .state('app.basic.keeperView', {
159 
-    	url: '/keeperView/:id/:types',
159 
+    	url: '/keeperView/:id',
160 160 
         data: {
161 
-            title: '员工信息展示'
161 
+            title: '员工信息详情'
162 162 
         },
163 163 
         views: {
164 164 
             "content@app": {