LiFei 4 лет назад
Родитель
Сommit
068def531b

+ 20 - 20
happy-job-base-system/src/main/webapp/webpage/modules/wsstaff/wsPunchClocForWsStaffForm.js

@@ -101,26 +101,26 @@ $(document).ready(function() {
 				   sortName: 'companyName'
 
 			   }
-                   ,
-                   {
-                       field: 'wsSetting.hourlySalary',
-                       title: '有效打卡金额(元)',
-                       sortable: false,
-                       sortName: 'wsSetting.hourlySalary'
-                       , formatter: function (value, row, index) {
-                               if(row.duration){
-                                 if(row.duration<=row.wsSetting.dailyAvailableMaxHour){
-                                     return accMul(value,row.duration)
-								 }else{
-                                     return accMul(value,row.wsSetting.dailyAvailableMaxHour)
-								 }
-							   }else{
-                               	return "0.00"
-							   }
-
-                       }
-
-                   }
+                   // ,
+                   // {
+                   //     field: 'wsSetting.hourlySalary',
+                   //     title: '有效打卡金额(元)',
+                   //     sortable: false,
+                   //     sortName: 'wsSetting.hourlySalary'
+                   //     , formatter: function (value, row, index) {
+                   //             if(row.duration){
+                   //               if(row.duration<=row.wsSetting.dailyAvailableMaxHour){
+                   //                   return accMul(value,row.duration)
+					// 			 }else{
+                   //                   return accMul(value,row.wsSetting.dailyAvailableMaxHour)
+					// 			 }
+					// 		   }else{
+                   //             	return "0.00"
+					// 		   }
+                   //
+                   //     }
+                   //
+                   // }
 
 		     ]
 		

+ 37 - 37
happy-job-base-system/src/main/webapp/webpage/modules/wsstaff/wsStaffForm.jsp

@@ -75,43 +75,43 @@
 </div>
 </div>
 
-<div class="wrapper wrapper-content">
-	<div class="panel panel-primary">
-		<div class="panel-heading">
-			<h3 class="panel-title">入离职信息</h3>
-		</div>
-		<div class="panel-body">
-
-			<!-- 搜索 -->
-			<div id="search-collapse" class="collapse">
-				<div class="accordion-inner">
-				</div>
-			</div>
-
-			<!-- 工具栏 -->
-			<div id="toolbar">
-
-			</div>
-
-			<!-- 表格 -->
-			<table id="wsStaffTableForm"   data-toolbar="#toolbar"></table>
-
-			<!-- context menu -->
-			<ul id="context-menu" class="dropdown-menu">
-				<shiro:hasPermission name="wsstaff:wsStaff:view">
-					<li data-item="view"><a>查看</a></li>
-				</shiro:hasPermission>
-				<shiro:hasPermission name="wsstaff:wsStaff:edit">
-					<li data-item="edit"><a>编辑</a></li>
-				</shiro:hasPermission>
-				<shiro:hasPermission name="wsstaff:wsStaff:del">
-					<li data-item="delete"><a>删除</a></li>
-				</shiro:hasPermission>
-				<li data-item="action1"><a>取消</a></li>
-			</ul>
-		</div>
-	</div>
-</div>
+<%--<div class="wrapper wrapper-content">--%>
+	<%--<div class="panel panel-primary">--%>
+		<%--<div class="panel-heading">--%>
+			<%--<h3 class="panel-title">入离职信息</h3>--%>
+		<%--</div>--%>
+		<%--<div class="panel-body">--%>
+
+			<%--<!-- 搜索 -->--%>
+			<%--<div id="search-collapse" class="collapse">--%>
+				<%--<div class="accordion-inner">--%>
+				<%--</div>--%>
+			<%--</div>--%>
+
+			<%--<!-- 工具栏 -->--%>
+			<%--<div id="toolbar">--%>
+
+			<%--</div>--%>
+
+			<%--<!-- 表格 -->--%>
+			<%--<table id="wsStaffTableForm"   data-toolbar="#toolbar"></table>--%>
+
+			<%--<!-- context menu -->--%>
+			<%--<ul id="context-menu" class="dropdown-menu">--%>
+				<%--<shiro:hasPermission name="wsstaff:wsStaff:view">--%>
+					<%--<li data-item="view"><a>查看</a></li>--%>
+				<%--</shiro:hasPermission>--%>
+				<%--<shiro:hasPermission name="wsstaff:wsStaff:edit">--%>
+					<%--<li data-item="edit"><a>编辑</a></li>--%>
+				<%--</shiro:hasPermission>--%>
+				<%--<shiro:hasPermission name="wsstaff:wsStaff:del">--%>
+					<%--<li data-item="delete"><a>删除</a></li>--%>
+				<%--</shiro:hasPermission>--%>
+				<%--<li data-item="action1"><a>取消</a></li>--%>
+			<%--</ul>--%>
+		<%--</div>--%>
+	<%--</div>--%>
+<%--</div>--%>