优化组织界面 组织联动

WebService/src/main/java/com/java110/web/components/org/AddOrgComponent.java

@@ -2,6 +2,7 @@ package com.java110.web.components.org;
 
 import com.java110.core.context.IPageData;
 import com.java110.web.smo.org.IAddOrgSMO;
+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.ResponseEntity;
@@ -16,6 +17,9 @@ public class AddOrgComponent {
     @Autowired
     private IAddOrgSMO addOrgSMOImpl;
 
+    @Autowired
+    private IListOrgsSMO listOrgsSMOImpl;
+
     @Autowired
     private IListParentOrgsSMO listParentOrgsSMOImpl;
 
@@ -27,6 +31,15 @@ public class AddOrgComponent {
     public ResponseEntity<String> save(IPageData pd){
         return addOrgSMOImpl.saveOrg(pd);
     }
+    /**
+     * 查询组织管理列表
+     * @param pd 页面数据封装
+     * @return 返回 ResponseEntity 对象
+     */
+    public ResponseEntity<String> list(IPageData pd){
+        return listOrgsSMOImpl.listOrgs(pd);
+    }
+
 
 
     public ResponseEntity<String> getParentOrg(IPageData pd){
@@ -48,4 +61,12 @@ public class AddOrgComponent {
     public void setListParentOrgsSMOImpl(IListParentOrgsSMO listParentOrgsSMOImpl) {
         this.listParentOrgsSMOImpl = listParentOrgsSMOImpl;
     }
+
+    public IListOrgsSMO getListOrgsSMOImpl() {
+        return listOrgsSMOImpl;
+    }
+
+    public void setListOrgsSMOImpl(IListOrgsSMO listOrgsSMOImpl) {
+        this.listOrgsSMOImpl = listOrgsSMOImpl;
+    }
 }

WebService/src/main/java/com/java110/web/components/org/DeleteOrgComponent.java

@@ -2,6 +2,7 @@ package com.java110.web.components.org;
 
 import com.java110.core.context.IPageData;
 import com.java110.web.smo.org.IDeleteOrgSMO;
+import com.java110.web.smo.org.IListOrgsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
         import org.springframework.http.ResponseEntity;
         import org.springframework.stereotype.Component;
@@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 @Component("deleteOrg")
 public class DeleteOrgComponent {
 
+
+
 @Autowired
 private IDeleteOrgSMO deleteOrgSMOImpl;
 

WebService/src/main/java/com/java110/web/components/org/EditOrgComponent.java

@@ -2,6 +2,7 @@ package com.java110.web.components.org;
 
 import com.java110.core.context.IPageData;
 import com.java110.web.smo.org.IEditOrgSMO;
+import com.java110.web.smo.org.IListOrgsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -11,6 +12,8 @@ import org.springframework.stereotype.Component;
  */
 @Component("editOrg")
 public class EditOrgComponent {
+    @Autowired
+    private IListOrgsSMO listOrgsSMOImpl;
 
     @Autowired
     private IEditOrgSMO editOrgSMOImpl;
@@ -24,6 +27,15 @@ public class EditOrgComponent {
         return editOrgSMOImpl.updateOrg(pd);
     }
 
+    /**
+     * 查询组织管理列表
+     * @param pd 页面数据封装
+     * @return 返回 ResponseEntity 对象
+     */
+    public ResponseEntity<String> list(IPageData pd){
+        return listOrgsSMOImpl.listOrgs(pd);
+    }
+
     public IEditOrgSMO getEditOrgSMOImpl() {
         return editOrgSMOImpl;
     }
@@ -31,4 +43,12 @@ public class EditOrgComponent {
     public void setEditOrgSMOImpl(IEditOrgSMO editOrgSMOImpl) {
         this.editOrgSMOImpl = editOrgSMOImpl;
     }
+
+    public IListOrgsSMO getListOrgsSMOImpl() {
+        return listOrgsSMOImpl;
+    }
+
+    public void setListOrgsSMOImpl(IListOrgsSMO listOrgsSMOImpl) {
+        this.listOrgsSMOImpl = listOrgsSMOImpl;
+    }
 }

WebService/src/main/resources/components/orgPackage/add-org/addOrg.html

@@ -29,7 +29,7 @@
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addOrgInfo.parentOrgId">
                                         <option selected disabled value="">必填，请选择上级组织</option>
-                                        <option v-for="parentOrg in addOrgInfo.parentOrg" :value="parentOrg.orgId">{{parentOrg.parentOrgName}}</option>
+                                        <option v-for="parentOrg in addOrgInfo.parentOrg" :value="parentOrg.orgId">{{parentOrg.orgName}}</option>
                                     </select></div>
                             </div>
                             <div class="form-group row">

WebService/src/main/resources/components/orgPackage/add-org/addOrg.js

@@ -56,9 +56,9 @@
                             errInfo:"组织级别不能为空"
                         },
  {
-                            limit:"maxin",
-                            param:"2,50",
-                            errInfo:"报修人名称必须在2至50字符之间"
+                            limit:"num",
+                            param:"",
+                            errInfo:"组织级别错误"
                         },
                     ],
 'addOrgInfo.parentOrgId':[
@@ -74,11 +74,7 @@
                         },
                     ],
 'addOrgInfo.description':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"描述不能为空"
-                        },
+
  {
                             limit:"maxLength",
                             param:"200",
@@ -135,10 +131,11 @@
             },
             clearAddOrgInfo:function(){
                 vc.component.addOrgInfo = {
-                                            orgName:'',
-                                            orgLevel:'',
-                                            parentOrgId:'',
-                                            description:'',
+                    orgName:'',
+                    orgLevel:'',
+                    parentOrgId:'',
+                    description:'',
+                    parentOrg:[]
             };
             },
             _addOrgListParentOrgInfo:function(){
@@ -159,7 +156,7 @@
                  };
 
                //发送get请求
-               vc.http.get('orgManage',
+               vc.http.get('addOrg',
                             'list',
                              param,
                              function(json,res){

WebService/src/main/resources/components/orgPackage/edit-org/editOrg.js

@@ -8,9 +8,18 @@
                 orgLevel:'',
                 parentOrgId:'',
                 description:'',
+                parentOrg:[]
 
             }
         },
+        watch:{
+            "editOrgInfo.orgLevel":{//深度监听，可监听到对象、数组的变化
+                handler(val, oldVal){
+                   vc.component._editOrgListParentOrgInfo();
+                },
+                deep:true
+            }
+         },
          _initMethod:function(){
 
          },
@@ -46,9 +55,9 @@
                             errInfo:"组织级别不能为空"
                         },
                         {
-                            limit:"maxin",
-                            param:"2,50",
-                            errInfo:"报修人名称必须在2至50字符之间"
+                            limit:"num",
+                            param:"",
+                            errInfo:"组织级别错误"
                         },
                     ],
                     'editOrgInfo.parentOrgId':[
@@ -64,11 +73,7 @@
                         },
                     ],
                         'editOrgInfo.description':[
-                        {
-                            limit:"required",
-                            param:"",
-                            errInfo:"描述不能为空"
-                        },
+
                      {
                             limit:"maxLength",
                             param:"200",
@@ -120,8 +125,37 @@
                     orgLevel:'',
                     parentOrgId:'',
                     description:'',
+                    parentOrg:[]
+                }
+            },
+            _editOrgListParentOrgInfo:function(){
 
+
+                var _tmpOrgLevel = vc.component.editOrgInfo.orgLevel;
+
+                if(_tmpOrgLevel > 1){
+                    _tmpOrgLevel = _tmpOrgLevel-1;
                 }
+
+                var param = {
+                    params:{
+                        orgLevel:_tmpOrgLevel,
+                        page: 1,
+                        row: 30,
+                    }
+                 };
+
+               //发送get请求
+               vc.http.get('editOrg',
+                            'list',
+                             param,
+                             function(json,res){
+                                var _orgManageInfo=JSON.parse(json);
+                                vc.component.editOrgInfo.parentOrg = _orgManageInfo.orgs;
+                             },function(errInfo,error){
+                                console.log('请求失败处理');
+                             }
+                           );
             }
         }
     });