修改字段

src/main/resources/static/app/basic/keeper/controller/keeperCtrl.js

@@ -209,7 +209,7 @@ angular.module('app.basic')
     	var i;
     	if (typeId === 1) {
     		i = $scope.addXwxl.length;
-    		if (null == $scope.addXwxl[i-1].type) {
+    		if (null == $scope.addXwxl[i-1].typeS) {
     			alert("请先录入空行！");
     			return;
     		}

src/main/resources/static/app/basic/keeper/views/keeper-edit.html

@@ -172,7 +172,7 @@
 												<label class="label">教育形式</label>
 												<label class="select">
 													<select ng-options="enum.enumid as enum.enumname for enum in dicDataList[5291]" 
-													ng-model="keeperedu.type" name="type{{$index}}" 
+													ng-model="keeperedu.typeS" name="type{{$index}}"
 													class="form-control" ng-disabled="isNotEdit">
 														<option value="">--请选择--</option>
 													</select>
@@ -249,7 +249,7 @@
 												<label class="label">级别</label> 
 												<label class="select">
 													<select ng-options="enum.enumid as enum.enumname for enum in dicDataList[5303]" 
-													ng-model="zyjszc.rank" name="rankes{{$index}}" 
+													ng-model="zyjszc.rankS" name="rankes{{$index}}"
 													class="form-control" ng-disabled="isNotEdit">
 														<option value="">--请选择--</option>
 													</select>
@@ -302,7 +302,7 @@
 											<section class="col col-2">
 												<label class="label">等级</label>
 												<label class="select">
-													<select ng-model="zyzg.rank" name="rank{{$index}}" 
+													<select ng-model="zyzg.rankS" name="rank{{$index}}"
 														ng-options="enum.enumid as enum.enumname for enum in dicDataList[5310]"
 														class="form-control" ng-disabled="isNotEdit">
 														<option value="">--请选择--</option>

src/main/resources/static/app/storage/views/keeper/keeper-edit.html

@@ -164,7 +164,7 @@
 											<section class="col col-2">
 												<label class="label">教育形式<span style="color: red;margin-left: 5px;text-align: center;">*</span></label> <label class="select">
 												<select ng-options="enum.enumid as enum.enumname for enum in dicDataList[5291]"
-														ng-model="keeperedu.type" name="type{{$index}}"
+														ng-model="keeperedu.typeS" name="type{{$index}}"
 														class="form-control" ng-disabled="isNotEdit" required>
 													<option value="">--请选择--</option>
 												</select>
@@ -226,7 +226,7 @@
 												<label class="label">级别<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 												<label class="select">
 													<select ng-options="enum.enumid as enum.enumname for enum in dicDataList[5303]"
-															ng-model="zyjszc.rank" name="rankes{{$index}}"
+															ng-model="zyjszc.rankS" name="rankes{{$index}}"
 															class="form-control" ng-disabled="isNotEdit" required>
 														<option value="">--请选择--</option>
 													</select>
@@ -278,7 +278,7 @@
 											<section class="col col-2">
 												<label class="label">等级<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 												<label class="select">
-													<select ng-model="zyzg.rank" name="rank{{$index}}"
+													<select ng-model="zyzg.rankS" name="rank{{$index}}"
 															ng-options="enum.enumid as enum.enumname for enum in dicDataList[5310]"
 															class="form-control" ng-disabled="isNotEdit" required>
 														<option value="">--请选择--</option>

src/main/resources/static/app/synth/person/views/person-view.html

@@ -36,7 +36,7 @@
 										<td class="label-td">所属粮库：</td>
 										<td>{{depotInfo.orgName}}</td>
 										<td class="label-td">职业资格：</td>
-										<td>{{dicData[data.zyzgList[0].rank]}}</td>
+										<td>{{dicData[data.zyzgList[0].rankS]}}</td>
 										<td class="label-td">政治面貌：</td>
 										<td>{{dicData[data.keeper.political]}}</td>
 										<td class="label-td">入职时间：</td>
@@ -84,7 +84,7 @@
 									<tbody>
 										<tr ng-repeat="edu in data.xlxwList">
 											<td>{{$index+1}}</td>
-											<td>{{dicData[edu.type]}}</td>
+											<td>{{dicData[edu.typeS]}}</td>
 											<td>{{edu.college}}</td>
 											<td>{{edu.department}}</td>
 											<td>{{dicData[edu.education]}}</td>
@@ -106,14 +106,14 @@
 										<tr ng-repeat="occupation in data.zyjsList">
 											<td>{{$index+1}}</td>
 											<td>{{occupation.department}}</td>
-											<td>{{dicData[occupation.rank]}}</td>
+											<td>{{dicData[occupation.rankS]}}</td>
 											<td>{{occupation.issueFacility}}</td>
 											<td>{{occupation.issueTime | date:'yyyy-MM-dd'}}</td>
 										</tr>
 										<tr ng-repeat="occupation in data.zyzgList">
 											<td>{{data.zyjsList.length + $index + 1}}</td>
 											<td>{{dicData[occupation.occupation]}}</td>
-											<td>{{dicData[occupation.rank]}}</td>
+											<td>{{dicData[occupation.rankS]}}</td>
 											<td>{{occupation.issueFacility}}</td>
 											<td>{{occupation.issueTime | date:'yyyy-MM-dd'}}</td>
 										</tr>