删除用户列表+企业编辑页面部分内容

happy-job-base-system/src/main/webapp/webpage/modules/wscompany/wsCompanyForm.jsp

@@ -246,32 +246,32 @@
 						<form:input path="companyName" htmlEscape="false"    class="form-control input-sm required"/>
 					</div>
 				</div>
-				<div class="form-group col-sm-6">
-					<label class="col-sm-4 control-label"><font color="red">*</font>工资结算周期：</label>
-					<div class="form-group col-sm-4">
-						<div class="col-sm-10">
-							<form:input path="salaryPeriodStartDay" htmlEscape="false"    class="form-control input-sm required digits"/>
-						</div>
-						<div class="col-sm-2">
-							至
-						</div>
-					</div>
+				<%--<div class="form-group col-sm-6">--%>
+					<%--<label class="col-sm-4 control-label"><font color="red">*</font>工资结算周期：</label>--%>
+					<%--<div class="form-group col-sm-4">--%>
+						<%--<div class="col-sm-10">--%>
+							<%--<form:input path="salaryPeriodStartDay" htmlEscape="false"    class="form-control input-sm required digits"/>--%>
+						<%--</div>--%>
+						<%--<div class="col-sm-2">--%>
+							<%--至--%>
+						<%--</div>--%>
+					<%--</div>--%>
 
-					<div class="form-group col-sm-4">
-						<div class="col-sm-12">
-							<form:input path="salaryPeriodEndDay" htmlEscape="false"    class="form-control input-sm required digits"/>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="form-group col-sm-12">
-				<div class="form-group col-sm-6">
-					<label class="col-sm-4 control-label"><font color="red">*</font>发薪日：</label>
-					<div class="col-sm-7">
-						<form:input path="salaryDay" htmlEscape="false"    class="form-control input-sm required digits"/>
-					</div>
-				</div>
+					<%--<div class="form-group col-sm-4">--%>
+						<%--<div class="col-sm-12">--%>
+							<%--<form:input path="salaryPeriodEndDay" htmlEscape="false"    class="form-control input-sm required digits"/>--%>
+						<%--</div>--%>
+					<%--</div>--%>
+				<%--</div>--%>
 			</div>
+			<%--<div class="form-group col-sm-12">--%>
+				<%--<div class="form-group col-sm-6">--%>
+					<%--<label class="col-sm-4 control-label"><font color="red">*</font>发薪日：</label>--%>
+					<%--<div class="col-sm-7">--%>
+						<%--<form:input path="salaryDay" htmlEscape="false"    class="form-control input-sm required digits"/>--%>
+					<%--</div>--%>
+				<%--</div>--%>
+			<%--</div>--%>
 			<div class="form-group col-sm-12 headBottom">
 				<div class="form-group col-sm-4">
 				围栏信息
@@ -288,7 +288,7 @@
 				<div id="remove0">
 					<div class="form-group col-sm-12">
 						<div class="form-group col-sm-6">
-							<label class="col-sm-4 control-label"><font color="red">*</font>围栏名称：</label>
+							<label class="col-sm-4 control-label"><font color="red">*</font>厂区名称：</label>
 							<div class="col-sm-7">
 								<input id="fenceName0"  class="form-control input-sm required">
 							</div>

happy-job-base-system/src/main/webapp/webpage/modules/wsstaff/wsStaffList.js

@@ -108,20 +108,10 @@ $(document).ready(function() {
 			   sortName: 'mobile'
 
 		   }
-			   ,{
-				   field: 'status',
-				   title: '状态',
-				   sortable: false,
-				   sortName: 'status'
-			   ,formatter:function(value, row , index){
-				   	var time=value==1?row.onaboardingDate:row.outgoingDate
-				   	return jp.getDictLabel(${fns:toJson(fns:getDictList('out_status'))}, value, "-")+"  "+time;
-			   }
 
-			   }
 		   ,{
 			   field: 'wsCompany.companyName',
-			   title: '所属企业',
+			   title: '最近打卡企业',
 			   sortable: false,
 			   sortName: 'wsCompany.companyName'