组织管理 代码优化

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

@@ -1,8 +1,9 @@
-<div id = "addOrgModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addOrgModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">添加组织管理</h3>
+                <h3 class="m-t-none m-b ">添加组织</h3>
                 <div class="ibox-content">
                     <div>
                         <div>
@@ -20,40 +21,46 @@
                             </div>-->
 
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">组织名称</label>
-         <div class="col-sm-10">
-           <input v-model="addOrgInfo.orgName"                   type="text" placeholder="必填，请填写组织名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">组织级别</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="addOrgInfo.orgLevel">
-         <option selected  disabled value="">必填，请选择组织级别</option>
-         <option  value="1">公司级</option>
-<option  value="2">分公司级</option>
-<option  value="3">部门级</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">上级ID</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="addOrgInfo.parentOrgId">
-         <option selected  disabled value="">必填，请选择上级ID</option>
-         <option  value="1">公司级</option>
-<option  value="2">分公司级</option>
-<option  value="3">部门级</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">描述</label>
-         <div class="col-sm-10">
-<textarea  placeholder="必填，请填写描述" class="form-control" v-model="addOrgInfo.description"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">组织名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addOrgInfo.orgName" type="text" placeholder="必填，请填写组织名称"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">组织级别</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addOrgInfo.orgLevel">
+                                        <option selected disabled value="">必填，请选择组织级别</option>
+                                        <option value="1">公司级</option>
+                                        <option value="2">分公司级</option>
+                                        <option value="3">部门级</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">上级组织</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addOrgInfo.parentOrgId">
+                                        <option selected disabled value="">必填，请选择上级ID</option>
+                                        <option value="1">公司级</option>
+                                        <option value="2">分公司级</option>
+                                        <option value="3">部门级</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">描述</label>
+                                <div class="col-sm-10">
+                                    <textarea placeholder="必填，请填写描述" class="form-control"
+                                              v-model="addOrgInfo.description"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveOrgInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveOrgInfo()"><i
+                                        class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

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

@@ -9,9 +9,9 @@
             addOrgInfo:{
                 orgId:'',
                 orgName:'',
-orgLevel:'',
-parentOrgId:'',
-description:'',
+                orgLevel:'',
+                parentOrgId:'',
+                description:'',
 
             }
         },

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

@@ -1,46 +1,53 @@
-<div id = "editOrgModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editOrgModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">修改组织管理</h3>
+                <h3 class="m-t-none m-b ">修改组织</h3>
                 <div class="ibox-content">
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">组织名称</label>
-         <div class="col-sm-10">
-           <input v-model="editOrgInfo.orgName"                   type="text" placeholder="必填，请填写组织名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">组织级别</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editOrgInfo.orgLevel">
-         <option selected  disabled value="">必填，请选择组织级别</option>
-         <option  value="1">公司级</option>
-<option  value="2">分公司级</option>
-<option  value="3">部门级</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">上级ID</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editOrgInfo.parentOrgId">
-         <option selected  disabled value="">必填，请选择上级ID</option>
-         <option  value="1">公司级</option>
-<option  value="2">分公司级</option>
-<option  value="3">部门级</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">描述</label>
-         <div class="col-sm-10">
-<textarea  placeholder="必填，请填写描述" class="form-control" v-model="editOrgInfo.description"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">组织名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editOrgInfo.orgName" type="text" placeholder="必填，请填写组织名称"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">组织级别</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editOrgInfo.orgLevel">
+                                        <option selected disabled value="">必填，请选择组织级别</option>
+                                        <option value="1">公司级</option>
+                                        <option value="2">分公司级</option>
+                                        <option value="3">部门级</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">上级组织</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editOrgInfo.parentOrgId">
+                                        <option selected disabled value="">必填，请选择上级ID</option>
+                                        <option value="1">公司级</option>
+                                        <option value="2">分公司级</option>
+                                        <option value="3">部门级</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">描述</label>
+                                <div class="col-sm-10">
+                                    <textarea placeholder="必填，请填写描述" class="form-control"
+                                              v-model="editOrgInfo.description"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editOrg()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="editOrg()"><i
+                                        class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

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

@@ -4,10 +4,10 @@
         data:{
             editOrgInfo:{
                 orgId:'',
-orgName:'',
-orgLevel:'',
-parentOrgId:'',
-description:'',
+                orgName:'',
+                orgLevel:'',
+                parentOrgId:'',
+                description:'',
 
             }
         },
@@ -39,44 +39,44 @@ description:'',
                             errInfo:"组织名称长度为2至50"
                         },
                     ],
-'editOrgInfo.orgLevel':[
-{
+                        'editOrgInfo.orgLevel':[
+                        {
                             limit:"required",
                             param:"",
                             errInfo:"组织级别不能为空"
                         },
- {
+                        {
                             limit:"maxin",
                             param:"2,50",
                             errInfo:"报修人名称必须在2至50字符之间"
                         },
                     ],
-'editOrgInfo.parentOrgId':[
-{
+                    'editOrgInfo.parentOrgId':[
+                    {
                             limit:"required",
                             param:"",
                             errInfo:"上级ID不能为空"
                         },
- {
+                        {
                             limit:"num",
                             param:"",
                             errInfo:"上级ID不正确"
                         },
                     ],
-'editOrgInfo.description':[
-{
+                        'editOrgInfo.description':[
+                        {
                             limit:"required",
                             param:"",
                             errInfo:"描述不能为空"
                         },
- {
+                     {
                             limit:"maxLength",
                             param:"200",
                             errInfo:"描述不能为空"
                         },
                     ],
-'editOrgInfo.orgId':[
-{
+                    'editOrgInfo.orgId':[
+                    {
                             limit:"required",
                             param:"",
                             errInfo:"组织ID不能为空"
@@ -115,11 +115,11 @@ description:'',
             },
             refreshEditOrgInfo:function(){
                 vc.component.editOrgInfo= {
-                  orgId:'',
-orgName:'',
-orgLevel:'',
-parentOrgId:'',
-description:'',
+                    orgId:'',
+                    orgName:'',
+                    orgLevel:'',
+                    parentOrgId:'',
+                    description:'',
 
                 }
             }

WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html

@@ -5,30 +5,45 @@
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button"  class="btn btn-link btn-sm" style="margin-right:10px;"  v-on:click="_moreCondition()">{{orgManageInfo.moreCondition == true?'隐藏':'更多'}}</button>
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
+                                v-on:click="_moreCondition()">{{orgManageInfo.moreCondition == true?'隐藏':'更多'}}
+                        </button>
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-<div class="col-sm-4" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入组织ID" v-model="orgManageInfo.conditions.orgId" class=" form-control">
-                            </div>                        </div><div class="col-sm-4" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入组织名称" v-model="orgManageInfo.conditions.orgName" class=" form-control">
-                            </div>                        </div><div class="col-sm-3" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入组织级别" v-model="orgManageInfo.conditions.orgLevel" class=" form-control">
-                            </div>                        </div><div class="col-sm-1">
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入组织ID" v-model="orgManageInfo.conditions.orgId"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入组织名称" v-model="orgManageInfo.conditions.orgName"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入组织级别" v-model="orgManageInfo.conditions.orgLevel"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOrgMethod()">
-                                    <i class="glyphicon glyphicon-search"></i> 查询
+                                <i class="glyphicon glyphicon-search"></i> 查询
                             </button>
-                        </div></div>
-<div class="row">
-<div class="col-sm-4" v-if="orgManageInfo.moreCondition == true">
-<div class="form-group">
-                                <input type="text" placeholder="请输入上级组织" v-model="orgManageInfo.conditions.parentOrgId" class=" form-control">
-                            </div>                        </div></div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-4" v-if="orgManageInfo.moreCondition == true">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入上级组织" v-model="orgManageInfo.conditions.parentOrgId"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                    </div>
 
 
                 </div>
@@ -39,11 +54,11 @@
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
-                    <h5>组织管理信息</h5>
+                    <h5>组织信息</h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddOrgModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            添加组织管理
+                            添加组织
                         </button>
                     </div>
                 </div>
@@ -54,10 +69,10 @@
                     >
                         <thead>
                         <tr>
-                                                        <th class="text-center">组织ID</th>
+                            <th class="text-center">组织ID</th>
                             <th class="text-center">组织名称</th>
                             <th class="text-center">组织级别</th>
-                            <th class="text-center">上级ID</th>
+                            <th class="text-center">上级组织</th>
                             <th class="text-center">操作</th>
 
 
@@ -65,16 +80,19 @@
                         </thead>
                         <tbody>
                         <tr v-for="org in orgManageInfo.orgs">
-                                                        <td class="text-center">{{org.orgId}}</td>
+                            <td class="text-center">{{org.orgId}}</td>
                             <td class="text-center">{{org.orgName}}</td>
                             <td class="text-center">{{org.orgLevel}}</td>
                             <td class="text-center">{{org.parentOrgId}}</td>
-                            <td class="text-center"><div class="btn-group">
+                            <td class="text-center">
+                                <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditOrgModel(org)">修改</button>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteOrgModel(org)">删除</button>
-                                </div></td>
+                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteOrgModel(org)">删除
+                                    </button>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>
@@ -93,7 +111,6 @@
         </div>
     </div>
 
-    
 
     <vc:create name="addOrg"
                callBackListener=""

WebService/src/main/resources/components/orgPackage/org-manage/orgManage.js

@@ -14,9 +14,9 @@
                 orgName:'',
                 conditions:{
                     orgId:'',
-orgName:'',
-orgLevel:'',
-parentOrgId:'',
+                    orgName:'',
+                    orgLevel:'',
+                    parentOrgId:'',
 
                 }
             }

java110-utils/src/main/java/com/java110/utils/constant/PrivilegeCodeConstant.java

@@ -100,7 +100,7 @@ public final class PrivilegeCodeConstant {
 
     public static final String LIST_OWNERREPAIR = "502019100524950005";
 
-    public static final String LIST_ORG = "502019100524950005";
+    public static final String LIST_ORG = "502019100721900005";