11

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffBasicInfo.java

@@ -89,6 +89,7 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
     private String maxPercent;		// 基本工资
     private String home;		// 基本工资
 	private String roleId;
+	private String roleName;
 
     private String nowDate;
     private String userName;
@@ -697,4 +698,12 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
     public void setErrInfo(String errInfo) {
         this.errInfo = errInfo;
     }
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
 }

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -48,6 +48,8 @@
 		a.achive_id AS "achiveId",
 		nativePlace.name AS "nativePlace.name",
 		a.try_end_time AS "tryEndTime"
+-- 		ur.role_id AS "roleId",
+-- 		r.name AS "roleName"
 	</sql>
 	
 	<sql id="workStaffBasicInfoJoins">
@@ -57,6 +59,8 @@
 		LEFT JOIN sys_user u ON u.id = a.create_by
 		LEFT JOIN sys_area nativePlace ON nativePlace.id = a.native_place
 		LEFT JOIN work_job_grade jg ON jg.id = a.job_grade
+-- 		LEFT JOIN sys_user_role ur ON  a.user_id = ur.user_id
+-- 		LEFT JOIN sys_role r ON ur.role_id = r.id
 	</sql>
 
 	<select id="get" resultType="WorkStaffBasicInfo" >

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -79,6 +79,24 @@
 
             changeTryEndTime('${workStaffBasicInfo.status}');
 
+            var off = $("#officeId").val();
+            if(off != ''){
+                $.ajax({
+                    type: 'POST',
+                    url: '${ctx}/sys/role/getByOfficeId',
+                    data: {'id':off},
+                    success: function(result){
+                        var data1 = result.data
+                        var html = "";
+                        for (var e in data1) {
+                            html += '<option value=' + data1[e].id+ '>' + data1[e].name + '</option>'
+                        }
+                        $("#roleId").append(html);
+                    }
+                });
+            }
+
+
 
             $('#officeId').on("change",function(){
                 // $("#roleId").find("option:selected").remove();

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -210,9 +210,21 @@
                 ,{field:'idCard',align:'center', title: '身份证号码',minWidth:150}
                 ,{field:'mobile',align:'center', title: '移动电话', minWidth:100}
                 ,{field:'office',align:'center', title: '部门', minWidth:100}
+                // ,{field:'role',align:'center', title: '岗位', minWidth:100}
                 ,{field:'jobGrade',align:'center', title: '职级', minWidth:100}
                 ,{field:'status',align:'center', title: '员工状态', minWidth:80}
                 ,{field:'entryDate', align:'center',sort:true,title: '入职日期',width:100}
+                <%--,{field:'op',align:'center',title:"操作",width:130,templet:function(d){--%>
+                        <%--////对操作进行初始化--%>
+                        <%--var xml = "";--%>
+
+                        <%--if(d.canedit != undefined && d.canedit == "1")--%>
+                            <%--xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改', '${ctx}/workstaff/workStaffBasicInfo/form?id="+ d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";--%>
+
+                        <%--&lt;%&ndash;if(d.candelete != undefined && d.candelete == "1")&ndash;%&gt;--%>
+                            <%--&lt;%&ndash;xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除信息吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";&ndash;%&gt;--%>
+                        <%--return xml;--%>
+                    <%--}}--%>
             ]]
             ,data: [
                 <c:if test="${ not empty page.list}">
@@ -221,6 +233,7 @@
                 {
                     "index":"${index.index+1}"
                     ,"id":"${workStaffBasicInfo.id}"
+                    <%--,"role":"${workStaffBasicInfo.roleName}"--%>
                     ,"no":"<c:out value="${workStaffBasicInfo.no}" escapeXml="true"/>"
                     ,"name":"<c:out value="${workStaffBasicInfo.name}" escapeXml="false"/>"
                     ,"idCard":"<c:out value="${workStaffBasicInfo.idCard}" escapeXml="true"/>"
@@ -229,6 +242,8 @@
                     ,'jobGrade':"<c:out value="${workStaffBasicInfo.jobGrade.name}" escapeXml="true"/>"
                     ,'status':"<c:out value="${workStaffBasicInfo.status}" escapeXml="true"/>"
                     ,"entryDate":"<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>"
+                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:edit">,"canedit":"1"</shiro:hasPermission>
+                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:del">,"candelete":"1"</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>