导入优化

src/main/webapp/yw/hr/salary/salary_import/import_list.jsp

@@ -116,15 +116,15 @@
 	}
 	
 	function openImportDialog() {
-		var obj = window.top;
-		if (obj != undefined && obj != null) {
-			obj.$.ligerDialog.open({
+		//var obj = window.top;
+		//if (obj != undefined && obj != null) {
+			$.ligerDialog.open({
 				url: 'salaryImportAction.do?task=excelUpload&time=' + new Date().getTime(),
 				width: 700,
 				height: 400,
 				title: '工资条导入'
 			});
-		}
+		//}
 	}
 </script>
 </head>

src/main/webapp/yw/hr/salary/salary_import/import_salary.jsp

@@ -108,6 +108,7 @@
 						<td class="form-content">
 							<input type="file" name="files" id="files" />
 							<span style="color: red;">*</span>
+							<a href="${pageContext.request.contextPath }/yw/hr/salary/salary_import/salaryImport.xlsx" style="margin-left: 10px;">下载模版</a>
 						</td>
 					</tr>
 					<tr>

src/main/webapp/yw/hr/salary/salary_import/upload_salary.jsp

@@ -38,13 +38,14 @@
                 buttons : [ {
                     text : '确定',
                     onclick : function(item, dialog) {
+                    	window.parent.searchByKword();
                         dialog.close();
                         // 检查是否有成功导入的数据
-                        var succList = '${succList}';
+                       /*  var succList = '${succList}';
                         if (succList && succList.length > 0) {
                             // 有部分数据导入成功，提示刷新
                             top.$.ligerDialog.success('部分数据导入成功！请刷新页面查看。');
-                        }
+                        } */
                     }
                 } ]
             });
@@ -60,9 +61,10 @@
                 buttons : [ {
                     text : '确定',
                     onclick : function(item, dialog) {
+                    	window.parent.searchByKword();
                         dialog.close();
                         // 提示用户刷新
-                        top.$.ligerDialog.success('导入成功！请刷新页面查看最新数据。');
+                        //top.$.ligerDialog.success('导入成功！请刷新页面查看最新数据。');
                     }
                 } ]
             });
@@ -119,7 +121,7 @@
                             <FONT COLOR="red">*</FONT>
                             	：
                         </td>
-                        <td class="l-table-edit-td">
+                        <td class="l-table-edit-td" colspan="2">
                             <input type="text" class="Wdate" id="salary_month" name="salary_month" 
                                 onclick="WdatePicker({dateFmt:'yyyy-MM'})" style="width: 150px;" />
                         </td>
@@ -133,10 +135,13 @@
                         <td class="l-table-edit-td">
                             <input type="file" name="files" id="files" />
                         </td>
+                        <td class="l-table-edit-td">
+                            <a href="${pageContext.request.contextPath }/yw/hr/salary/salary_import/salaryImport.xlsx">下载模版</a>
+                        </td>
                     </tr>
                     <tr>
                         <td class="l-table-edit-text">导入说明：</td>
-                        <td class="l-table-edit-td">
+                        <td class="l-table-edit-td" colspan="2">
                             <div style="color: #666; line-height: 2;">
                                 1. Excel文件第一行、第二行为表头<br/>
                                 2. 必须包含"姓名"和"身份证号"列<br/>