优化 员工权限bug 和 派单定位员工

Api/src/main/java/com/java110/api/listener/users/QueryStaffServiceListener.java

@@ -141,7 +141,7 @@ public class QueryStaffServiceListener extends AbstractServiceApiListener {
         ApiStaffVo apiStaffVo = new ApiStaffVo();
 
         apiStaffVo.setTotal(count);
-        apiStaffVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
+        apiStaffVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("rows")));
         apiStaffVo.setStaffs(staffs);
 
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiStaffVo), HttpStatus.OK);

WebService/src/main/resources/components/ownerRepairPackage/ownerRepair-manage/ownerRepairManage.js

@@ -125,6 +125,7 @@
 
             },
             _openDispatchRepair:function(_ownerRepair){
+                 vc.jumpToPage('/flow/repairDispatchStepFlow?repairId=' + _ownerRepair.repairId);
 
             },
             _moreCondition:function(){

WebService/src/main/resources/components/ownerRepairPackage/repairDispatchStep/repairDispatchStep.js

@@ -7,6 +7,7 @@
             repairDispatchStepInfo:{
                 $step:{},
                 index:0,
+                repairId:'',
                 infos:[],
                 branchOrgInfo:{
                         orgId:'',
@@ -28,16 +29,22 @@
                 },
                 repairDispatchInfo:{
                     orgId:'',
-                    username:'',
-                    sex:'',
+                    userId:'',
+                    name:'',
                     email:'',
                     tel:'',
-                    address:'',
-                    relCd:'',
+                    sex:''
                 }
             }
         },
         _initMethod:function(){
+            vc.component.repairDispatchStepInfo.repairId = vc.getParam('repairId');
+
+            if(!vc.notNull(vc.component.repairDispatchStepInfo.repairId)){
+                vc.message("非法数据，未找到派单信息");
+                vc.jumpToPage("/flow/ownerFlow");
+                return ;
+            }
             vc.component._initStep();
         },
         _initEvent:function(){

WebService/src/main/resources/components/staffPackage/search-staff/searchStaff.js

@@ -1,9 +1,14 @@
 (function(vc){
     vc.extends({
+        propTypes: {
+           callBackListener:vc.propTypes.string='privilegeStaffInfo', //父组件名称
+           callBackFunction:vc.propTypes.string='chooseStaff' //父组件监听方法
+        },
         data:{
             searchStaffInfo:{
                 staffs:[],
                 _currentStaffName:'',
+                orgId:'',
             }
         },
         _initMethod:function(){
@@ -14,6 +19,9 @@
                 console.log("打开定位员工界面")
                 $('#searchStaffModel').modal('show');
                 vc.component._refreshSearchStaffData();
+                if(_param.hasOwnProperty('orgId')){
+                    vc.component.searchStaffInfo.orgId = _param.orgId;
+                }
                 vc.component._loadAllStaffInfo(1,10);
             });
         },
@@ -23,7 +31,8 @@
                     params:{
                         page:_page,
                         rows:_rows,
-                        staffName:_staffName
+                        staffName:_staffName,
+                        orgId:vc.component.searchStaffInfo.orgId
                     }
                 };
 
@@ -33,14 +42,16 @@
                              param,
                              function(json){
                                 var _staffInfo = JSON.parse(json);
-                                vc.component.searchStaffInfo.staffs = _staffInfo.datas;
+                                vc.component.searchStaffInfo.staffs = _staffInfo.staffs;
                              },function(){
                                 console.log('请求失败处理');
                              }
                            );
             },
             chooseStaff:function(_staff){
-                vc.emit('privilegeStaffInfo','chooseStaff',_staff);
+                //vc.emit('privilegeStaffInfo','chooseStaff',_staff);
+                vc.emit($props.callBackListener,$props.callBackFunction,_staff);
+
                 vc.emit('staffPrivilege','_loadStaffPrivileges',{
                     staffId:_staff.userId
                 });

WebService/src/main/resources/components/staffPackage/view-staff-info/viewStaffInfo.html

@@ -0,0 +1,57 @@
+<div class="row">
+    <div class="col-lg-12">
+        <div class="ibox ">
+            <div class="ibox-title">
+                <h5>员工信息</h5>
+                <div class="ibox-tools" style="top:10px;">
+                    <button type="button" class="btn btn-primary btn-sm"
+                            style="margin-right:10px;" v-on:click="_openSelectStaffInfoModel()">
+                        <i class="glyphicon glyphicon-search"></i> 选择
+                    </button>
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">员工ID：</label>
+                            <label class="">{{viewStaffInfo.userId}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">员工名称：</label>
+                            <label class="">{{viewStaffInfo.name}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">员工邮箱：</label>
+                            <label class="">{{viewStaffInfo.email}}</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">手机号：</label>
+                            <label class="">{{viewStaffInfo.tel}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">员工性别：</label>
+                            <label class="">{{viewStaffInfo.sex=='0' ? '男' : '女'}}</label>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <vc:create name="searchStaff"
+               emitChooseOrg="viewStaffInfo"
+               emitLoadData="viewStaffInfo"
+    ></vc:create>
+</div>

WebService/src/main/resources/components/staffPackage/view-staff-info/viewStaffInfo.js

@@ -0,0 +1,57 @@
+/**
+    组织管理 组件
+**/
+(function(vc){
+
+    vc.extends({
+        propTypes: {
+           callBackListener:vc.propTypes.string, //父组件名称
+           callBackFunction:vc.propTypes.string //父组件监听方法
+        },
+        data:{
+            viewStaffInfo:{
+                index:0,
+                flowComponent:'viewStaffInfo',
+                userId:'',
+                name:'',
+                email:'',
+                tel:'',
+                sex:'',
+                orgId:''
+            }
+        },
+        _initMethod:function(){
+            //根据请求参数查询 查询 业主信息
+            vc.component._loadStaffInfoData();
+        },
+        _initEvent:function(){
+            vc.on('viewStaffInfo','chooseStaff',function(_app){
+                vc.copyObject(_app, vc.component.viewStaffInfo);
+                vc.emit($props.callBackListener,$props.callBackFunction,vc.component.viewStaffInfo);
+            });
+
+            vc.on('viewStaffInfo', 'onIndex', function(_index){
+                vc.component.viewStaffInfo.index = _index;
+            });
+
+            vc.on('viewStaffInfo', '_initInfo', function(_info){
+                //vc.component.viewStaffInfo.index = _index;
+                vc.copyObject(_info,vc.component.viewStaffInfo);
+                console.log(_info);
+            });
+
+        },
+        methods:{
+
+            _openSelectStaffInfoModel(){
+                vc.emit('searchStaff','openSearchStaffModel',{
+                    orgId:vc.component.viewStaffInfo.orgId
+                });
+            },
+            _loadStaffInfoData:function(){
+
+            }
+        }
+    });
+
+})(window.vc);