Browse Source

添加工作经历所在部门字段

jack 8 years ago
parent
commit
c2a846b416
2 changed files with 22 additions and 5 deletions
  1. 6 1
      src/main/webapp/js/information.brow.js
  2. 16 4
      src/main/webapp/js/information.js

+ 6 - 1
src/main/webapp/js/information.brow.js

110
					for (var i = 0; i < data.length; i++) {
110
					for (var i = 0; i < data.length; i++) {
111
						var sDate="";
111
						var sDate="";
112
						var eDate="";
112
						var eDate="";
113
						if(data[i].department){
114
							var dep="-"+data[i].department;					
115
						}else{
116
							var dep=""
117
						}
113
						if(data[i].startMonth){								
118
						if(data[i].startMonth){								
114
							sDate =data[i].startMonth.substr(0,4)+"-"+data[i].startMonth.substr(4,6)+"-";
119
							sDate =data[i].startMonth.substr(0,4)+"-"+data[i].startMonth.substr(4,6)+"-";
115
							if(data[i].stopMonth){
120
							if(data[i].stopMonth){
119
							}
124
							}
120
						}
125
						}
121
						var JobHtml='<li>';
126
						var JobHtml='<li>';
122
						JobHtml +='<div class="h4Font h4tit">'+ data[i].company+'-'+data[i].title +'<small class="h6Font">'+ sDate +''+ eDate +'</small></div>';
127
						JobHtml +='<div class="h4Font h4tit">'+ data[i].company+'-'+data[i].title +''+dep +'<small class="h6Font">'+ sDate +''+ eDate +'</small></div>';
123
						JobHtml +='</li>';
128
						JobHtml +='</li>';
124
						
129
						
125
						$("#timeJobShow").append(JobHtml);
130
						$("#timeJobShow").append(JobHtml);

+ 16 - 4
src/main/webapp/js/information.js

157
					for (var i = 0; i < data.length; i++) {	
157
					for (var i = 0; i < data.length; i++) {	
158
						var sDate = "";
158
						var sDate = "";
159
						var eDate = "";
159
						var eDate = "";
160
						var string = '<li class="paddingSpace listnone">'
161
							string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+data[i].company+'-'+data[i].title+'<small class="h6Font">';
160
						if(data[i].department){
161
							var dep="-"+data[i].department;
162
							var depart=data[i].department;
163
						}else{
164
							var dep=""
165
						}
162
						if(data[i].startMonth){
166
						if(data[i].startMonth){
163
							
167
							
164
							sDate =data[i].startMonth.substr(0,4)+"-"+data[i].startMonth.substr(4,6);
168
							sDate =data[i].startMonth.substr(0,4)+"-"+data[i].startMonth.substr(4,6);
169
							}
173
							}
170
						}
174
						}
171
						var string = '<li class="paddingSpace listnone">'
175
						var string = '<li class="paddingSpace listnone">'
172
							string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+data[i].company+'-'+data[i].title+'<small class="h6Font">';
176
							string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+data[i].company+'-'+data[i].title+''+dep+'<small class="h6Font">';
173
						    string +=sDate;
177
						    string +=sDate;
174
						    if(eDate) string+=("-"+eDate);
178
						    if(eDate) string+=("-"+eDate);
175
						    string +='</small><em class="exitlist inforedu"></em></div>';
179
						    string +='</small><em class="exitlist inforedu"></em></div>';
209
							string += '<div class="txtType floatL"><b class="required_star"></b><em class="emspace">职</em>位</div>'
213
							string += '<div class="txtType floatL"><b class="required_star"></b><em class="emspace">职</em>位</div>'
210
							string += '<div class="txtExp floatL"><input type="text" class="input-txt edu-txt jobTitle" value="'+data[i].title+'"/></div>'
214
							string += '<div class="txtExp floatL"><input type="text" class="input-txt edu-txt jobTitle" value="'+data[i].title+'"/></div>'
211
							string += '</div>'
215
							string += '</div>'
216
							string += '<div class="infor edu btn-marL">'
217
							string += '<div class="txtType floatL">所在部门</div>'
218
							string += '<div class="txtExp floatL"><input type="text" class="input-txt edu-txt jobdepartment"  value="'+depart+'"/></div>'
219
							string += '</div>'
212
							string += '<div class="btnbox">'
220
							string += '<div class="btnbox">'
213
							string += '<input type="button" value="保存" class="infor-save btn btn-marL">'
221
							string += '<input type="button" value="保存" class="infor-save btn btn-marL">'
214
							string += '<input type="button" value="取消" class="close btn btn-marB">'
222
							string += '<input type="button" value="取消" class="close btn btn-marB">'
1226
					string += '<div class="txtType floatL"><b class="required_star"></b><em class="emspace">职</em>位</div>'
1234
					string += '<div class="txtType floatL"><b class="required_star"></b><em class="emspace">职</em>位</div>'
1227
					string += '<div class="txtExp floatL"><input type="text" class="input-txt edu-txt jobTitle" /></div>'
1235
					string += '<div class="txtExp floatL"><input type="text" class="input-txt edu-txt jobTitle" /></div>'
1228
					string += '</div>'
1236
					string += '</div>'
1237
					string += '<div class="infor edu btn-marL">'
1238
					string += '<div class="txtType floatL">所在部门</div>'
1239
					string += '<div class="txtExp floatL"><input type="text" class="input-txt edu-txt jobdepartment" /></div>'
1240
					string += '</div>'
1229
					string += '<div class="btnbox">'
1241
					string += '<div class="btnbox">'
1230
					string += '<input type="button" value="添加" class="infor-save btn btn-marL">'
1242
					string += '<input type="button" value="添加" class="infor-save btn btn-marL">'
1231
					string += '<input type="button" value="取消" class="close1 close2 btn btn-marB">'
1243
					string += '<input type="button" value="取消" class="close1 close2 btn btn-marB">'
1305
			}	
1317
			}	
1306
			$data.professorId = userid;
1318
			$data.professorId = userid;
1307
			$data.company = $(this).parents(".txtExpForm").find(".jobCompany").val();
1319
			$data.company = $(this).parents(".txtExpForm").find(".jobCompany").val();
1308
			
1320
			$data.department=$(this).parents(".txtExpForm").find(".jobdepartment").val();
1309
			var s=$(this).parents(".txtExpForm").find(".startMonth").val();
1321
			var s=$(this).parents(".txtExpForm").find(".startMonth").val();
1310
			var st=$(this).parents(".txtExpForm").find(".stopMonth").val();	
1322
			var st=$(this).parents(".txtExpForm").find(".stopMonth").val();	
1311
			if(s){
1323
			if(s){