Просмотр исходного кода

加入 员工 部门组织查询

wuxw лет назад: 6
Родитель
Сommit
37cb6ba53d

+ 23 - 0
WebService/src/main/java/com/java110/web/components/StaffComponent.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
 import com.java110.web.smo.IStaffServiceSMO;
+import com.java110.web.smo.org.IListOrgsSMO;
+import com.java110.web.smo.org.IListParentOrgsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -20,6 +22,19 @@ public class StaffComponent {
     @Autowired
     IStaffServiceSMO staffServiceSMOImpl;
 
+    @Autowired
+    private IListOrgsSMO listOrgsSMOImpl;
+
+
+    /**
+     * 查询组织管理列表
+     * @param pd 页面数据封装
+     * @return 返回 ResponseEntity 对象
+     */
+    public ResponseEntity<String> list(IPageData pd){
+        return listOrgsSMOImpl.listOrgs(pd);
+    }
+
     public ResponseEntity<String> loadData(IPageData pd){
         ResponseEntity<String> responseEntity = null;
         try{
@@ -39,4 +54,12 @@ public class StaffComponent {
     public void setStaffServiceSMOImpl(IStaffServiceSMO staffServiceSMOImpl) {
         this.staffServiceSMOImpl = staffServiceSMOImpl;
     }
+
+    public IListOrgsSMO getListOrgsSMOImpl() {
+        return listOrgsSMOImpl;
+    }
+
+    public void setListOrgsSMOImpl(IListOrgsSMO listOrgsSMOImpl) {
+        this.listOrgsSMOImpl = listOrgsSMOImpl;
+    }
 }

+ 1 - 1
WebService/src/main/resources/components/staffPackage/staff-manage/staff.html

@@ -24,7 +24,7 @@
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <select class="custom-select" v-model="orgManageInfo.conditions.branchOrgId">
+                                <select class="custom-select" v-model="staffInfo.conditions.branchOrgId">
                                     <option selected value="">必填,请选择部门</option>
                                     <option v-for="departmentOrg in staffInfo.departmentOrgs" :value="departmentOrg.orgId">
                                         {{departmentOrg.orgName}}

+ 5 - 5
WebService/src/main/resources/components/staffPackage/staff-manage/staff.js

@@ -116,15 +116,15 @@
                  };
 
                //发送get请求
-               vc.http.get('orgManage',
+               vc.http.get('staff',
                             'list',
                              param,
                              function(json,res){
-                                var _orgManageInfo=JSON.parse(json);
-                                if(_orgLevel == 1){
-                                     vc.component.orgManageInfo.headOrg = _orgManageInfo.orgs;
+                                var _orgInfo=JSON.parse(json);
+                                if(_orgLevel == 2){
+                                     vc.component.staffInfo.branchOrgs = _orgInfo.orgs;
                                 }else{
-                                     vc.component.orgManageInfo.branchOrg = _orgManageInfo.orgs;
+                                     vc.component.staffInfo.departmentOrgs = _orgInfo.orgs;
                                 }
                              },function(errInfo,error){
                                 console.log('请求失败处理');