Quellcode durchsuchen

访客登记页面完成待测试

duckweed vor 6 Jahren
Ursprung
Commit
84d0543026
15 geänderte Dateien mit 431 neuen und 151 gelöschten Zeilen
  1. 3 2
      WebService/src/main/java/com/java110/web/smo/visit/impl/AddVisitSMOImpl.java
  2. 21 0
      WebService/src/main/resources/components/visitInfoPackage/add-visit-case/addVisitCase.html
  3. 44 0
      WebService/src/main/resources/components/visitInfoPackage/add-visit-case/addVisitCase.js
  4. 5 5
      WebService/src/main/resources/components/visitInfoPackage/add-visit-space/addVisitSpace.html
  5. 29 17
      WebService/src/main/resources/components/visitInfoPackage/add-visit-space/addVisitSpace.js
  6. 3 1
      WebService/src/main/resources/components/visitInfoPackage/add-visit/addVisit.js
  7. 89 0
      WebService/src/main/resources/components/visitInfoPackage/choose-owner/chooseOwner.html
  8. 63 0
      WebService/src/main/resources/components/visitInfoPackage/choose-owner/chooseOwner.js
  9. 0 54
      WebService/src/main/resources/components/visitInfoPackage/choose-visit/chooseApp.html
  10. 0 63
      WebService/src/main/resources/components/visitInfoPackage/choose-visit/chooseApp.js
  11. 70 0
      WebService/src/main/resources/components/visitInfoPackage/visit-for-owner/visitForOwner.html
  12. 84 0
      WebService/src/main/resources/components/visitInfoPackage/visit-for-owner/visitForOwner.js
  13. 8 8
      WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.html
  14. 3 1
      WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.js
  15. 9 0
      java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java

+ 3 - 2
WebService/src/main/java/com/java110/web/smo/visit/impl/AddVisitSMOImpl.java

@@ -25,13 +25,14 @@ public class AddVisitSMOImpl extends AbstractComponentSMO implements IAddVisitSM
 
     @Override
     protected void validate(IPageData pd, JSONObject paramIn) {
+        System.out.println(paramIn);
 
         //super.validatePageInfo(pd);
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
         Assert.hasKeyAndValue(paramIn, "name", "必填,请填写访客姓名");
-        Assert.hasKeyAndValue(paramIn, "visitGender", "必填,请填写访客姓名");
-        Assert.hasKeyAndValue(paramIn, "visitGender", "必填,请填写访客姓名");
+        Assert.hasKeyAndValue(paramIn, "communityId", "必填,请填写小区ID");
+        Assert.hasKeyAndValue(paramIn, "ownerId", "必填,请填写目标业主ID");
         Assert.hasKeyAndValue(paramIn, "phoneNumber", "必填,请填写访客联系方式");
         Assert.hasKeyAndValue(paramIn, "visitTime", "必填,请填写访客拜访时间");
 

+ 21 - 0
WebService/src/main/resources/components/visitInfoPackage/add-visit-case/addVisitCase.html

@@ -0,0 +1,21 @@
+<div class="row">
+    <div class="col-lg-12">
+        <div class="ibox ">
+            <div class="ibox-title">
+                <h5>添加访客拜访事由</h5>
+            </div>
+            <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">
+                                <textarea v-model="addVisitCase.visitCase" type="text" placeholder="请填写访客拜访事由" rows="3" class="form-control"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

+ 44 - 0
WebService/src/main/resources/components/visitInfoPackage/add-visit-case/addVisitCase.js

@@ -0,0 +1,44 @@
+/**
+    权限组
+**/
+(function(vc){
+
+    vc.extends({
+        data:{
+            addVisitCase:{
+
+                visitCase:""
+            }
+        },
+        watch:{
+            addVisitCase(val){
+                vc.emit('addVisitSpace', 'visitCase', this.addVisitCase.visitCase);
+            }
+        },
+        _initMethod:function(){
+
+        },
+        _initEvent:function(){
+            vc.on('addVisitCase', 'onIndex', function(_index){
+                console.log("侦听到addVisitCase的index为  "+_index);
+                // vc.component.addCarInfo.index = _index;
+                vc.emit('addVisitSpace', 'notify', _index);
+            });
+
+        },
+        methods:{
+            addCarValidate:function(){
+
+            },
+            saveAddCarInfo:function(){
+                if(vc.component.addCarValidate()){
+                    //侦听回传
+                    vc.emit($props.callBackComponent,$props.callBackFunction, vc.component.addCarInfo);
+                    return ;
+                }
+            }
+
+        }
+    });
+
+})(window.vc);

+ 5 - 5
WebService/src/main/resources/components/visitInfoPackage/add-visit-space/addVisitSpace.html

@@ -14,13 +14,13 @@
         ></vc:create>
     </div>
     <div v-if="newVisitInfo.index == 1">
-        <vc:create name="viewOwnerInfo"
+        <vc:create name="visitForOwner"
                    callBackListener="addVisitSpace"
                    callBackFunction="notify"
         ></vc:create>
     </div>
     <div v-if="newVisitInfo.index == 2">
-        <vc:create name="addCar"
+        <vc:create name="addVisitCase"
                    callBackComponent="addVisitSpace"
                    callBackFunction="notify"
         ></vc:create>
@@ -32,13 +32,13 @@
         <div class="col-md-10"></div>
         <div class="col-md-2 " style="margin-bottom:10px; text-align:right">
             <button type="button" class="btn btn-secondary" v-on:click="_prevStep()">上一步</button>
-            <button v-if="newVisitInfo.index != 3" type="button" class="btn btn-primary"
+            <button v-if="newVisitInfo.index != 2" type="button" class="btn btn-primary"
                     style="margin-left:10px;"
                     v-on:click="_nextStep()">下一步
             </button>
-            <button v-if="newVisitInfo.index == 3" type="button" class="btn btn-primary"
+            <button v-if="newVisitInfo.index == 2" type="button" class="btn btn-primary"
                     style="margin-left:10px;"
-                    v-on:click="_addVisitFinish()">出租
+                    v-on:click="_addVisitFinish()">添加
             </button>
         </div>
     </div>

+ 29 - 17
WebService/src/main/resources/components/visitInfoPackage/add-visit-space/addVisitSpace.js

@@ -17,8 +17,15 @@
         _initEvent:function(){
 
            vc.on("addVisitSpace", "notify", function(_info){
+               console.log("侦听到index为 "+_info);
                 vc.component.newVisitInfo.infos[vc.component.newVisitInfo.index] = _info;
             });
+            vc.on("addVisitSpace", "ownerId", function(_ownerId){
+                vc.component.newVisitInfo.infos[0]["ownerId"] = _ownerId;
+            });
+            vc.on("addVisitSpace", "visitCase", function(_visitCase){
+                vc.component.newVisitInfo.infos[0]["visitCase"] = _visitCase;
+            });
 
         },
         methods:{
@@ -36,12 +43,12 @@
                 vc.component.newVisitInfo.index = vc.component.newVisitInfo.$step.getIndex();
 
                 vc.emit('addVisit', 'onIndex', vc.component.newVisitInfo.index);
-                vc.emit('viewVisitInfo', 'onIndex', vc.component.newVisitInfo.index);
-                vc.emit('addCar', 'onIndex', vc.component.newVisitInfo.index);
+                vc.emit('visitForOwner', 'onIndex', vc.component.newVisitInfo.index);
+                vc.emit('addVisitCase', 'onIndex', vc.component.newVisitInfo.index);
 
-                if(vc.component.newVisitInfo.index == 1){
-                    vc.emit('viewOwnerInfo','callBackOwnerInfo',{});
-                }
+                // if(vc.component.newVisitInfo.index == 1){
+                //     vc.emit('viewOwnerInfo','callBackOwnerInfo',{});
+                // }
 
             },
             _nextStep:function(){
@@ -52,13 +59,13 @@
                 }
                 vc.component.newVisitInfo.$step.nextStep();
                 vc.component.newVisitInfo.index = vc.component.newVisitInfo.$step.getIndex();
+                vc.emit('addVisit', 'onIndex', vc.component.newVisitInfo.index);
+                vc.emit('visitForOwner', 'onIndex', vc.component.newVisitInfo.index);
+                vc.emit('addVisitCase', 'onIndex', vc.component.newVisitInfo.index);
 
-                vc.emit('viewSelectParkingSpace', 'onIndex', vc.component.newVisitInfo.index);
-                vc.emit('viewOwnerInfo', 'onIndex', vc.component.newVisitInfo.index);
-                vc.emit('addCar', 'onIndex', vc.component.newVisitInfo.index);
-                if(vc.component.newVisitInfo.index == 1){
-                    vc.emit('viewOwnerInfo','callBackOwnerInfo',{});
-                }
+                // if(vc.component.newVisitInfo.index == 1){
+                //     vc.emit('viewOwnerInfo','callBackOwnerInfo',{});
+                // }
 
             },
             _addVisitFinish:function(){
@@ -69,15 +76,20 @@
                     vc.message("请选择或填写必选信息");
                     return ;
                 }
-
+                vc.component.newVisitInfo.infos[0]['communityId']=vc.getCurrentCommunity().communityId;
                 var param = {
-                    communityId:vc.getCurrentCommunity().communityId,
-                    data:vc.component.newVisitInfo.infos
+                    name:vc.component.newVisitInfo.infos[0]['name'],
+                    visitGender:vc.component.newVisitInfo.infos[0]['visitGender'],
+                    phoneNumber:vc.component.newVisitInfo.infos[0]['phoneNumber'],
+                    communityId:vc.component.newVisitInfo.infos[0]['communityId'],
+                    ownerId:vc.component.newVisitInfo.infos[0]['ownerId'],
+                    visitCase:vc.component.newVisitInfo.infos[0]['visitCase'],
+                    visitTime:new Date()
                 }
-
+                console.log(param);
                vc.http.post(
-                   'hireParkingSpace',
-                   'sell',
+                   'addVisit',
+                   'save',
                    JSON.stringify(param),
                    {
                        emulateJSON:true

+ 3 - 1
WebService/src/main/resources/components/visitInfoPackage/add-visit/addVisit.js

@@ -24,7 +24,9 @@
             });
 
             vc.on('addVisit', 'onIndex', function(_index){
-                vc.component.viewVisitInfo.index = _index;
+                console.log("侦听到addVisit的index为  "+_index);
+                // vc.component.newVisitInfo.index = _index;
+                vc.emit('addVisitSpace', 'notify', _index);
             });
 
         },

+ 89 - 0
WebService/src/main/resources/components/visitInfoPackage/choose-owner/chooseOwner.html

@@ -0,0 +1,89 @@
+<div id="searchOwnerModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="searchOwnerModelLabel"
+     aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3 class="modal-title" id="searchOwnerModelLabel">选择业主</h3>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class=" row">
+                    <div class="col-lg-12">
+                        <div class="ibox ">
+                            <div class="row">
+
+                                <div class="col-sm-7 m-b-xs">
+                                    <div class="input-group">
+                                        <input placeholder="输入业主ID" type="text"
+                                               v-model="searchOwnerInfo._currentOwnerId"
+                                               class="form-control form-control-sm">
+                                    </div>
+                                </div>
+                                <div class="col-sm-5">
+                                    <div class="input-group">
+                                        <input placeholder="输入业主名称" type="text"
+                                               v-model="searchOwnerInfo._currentOwnerName"
+                                               class="form-control form-control-sm">
+                                        <span class="input-group-append">
+                                                <button type="button" class="btn btn-sm btn-primary"
+                                                        v-on:click="searchOwners()">查询</button>
+                                            </span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="table-responsive" style="margin-top:15px">
+                                <table class="table table-striped">
+                                    <thead>
+                                    <tr>
+                                        <th>业主ID</th>
+                                        <th>名称</th>
+                                        <th>性别</th>
+                                        <th>年龄</th>
+                                        <th>联系方式</th>
+                                        <th>创建员工</th>
+                                        <th>备注</th>
+                                        <th>操作</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr v-for="owner in searchOwnerInfo.owners">
+                                        <td>
+                                            {{owner.memberId}}
+                                        </td>
+
+                                        <td>
+                                            {{owner.name}}
+                                        </td>
+                                        <td>
+                                            {{owner.sex == 0 ? '男' : '女'}}
+                                        </td>
+                                        <td>
+                                            {{owner.age}}
+                                        </td>
+                                        <td>
+                                            {{owner.link}}
+                                        </td>
+                                        <td>
+                                            {{owner.userName}}
+                                        </td>
+                                        <td>
+                                            {{owner.remark}}
+                                        </td>
+                                        <td>
+                                            <button class="btn btn-primary btn-xs" v-on:click="chooseOwner(owner)">选择
+                                            </button>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

+ 63 - 0
WebService/src/main/resources/components/visitInfoPackage/choose-owner/chooseOwner.js

@@ -0,0 +1,63 @@
+(function(vc){
+    vc.extends({
+
+        data:{
+            searchOwnerInfo:{
+                owners:[],
+                _currentOwnerName:'',
+                _currentOwnerId:''
+            }
+        },
+        _initMethod:function(){
+
+        },
+        _initEvent:function(){
+            vc.on('searchOwner','openSearchOwnerModel',function(_param){
+                console.log("打开业主成员界面")
+                $('#searchOwnerModel').modal('show');
+                vc.component._refreshSearchOwnerData();
+                vc.component._loadAllOwnerInfo(1,10);
+            });
+        },
+        methods:{
+            _loadAllOwnerInfo:function(_page,_row,_name){
+                var param = {
+                    params:{
+                        page:_page,
+                        row:_row,
+                        communityId:vc.getCurrentCommunity().communityId,
+                        name:_name,
+                        ownerId:vc.component.searchOwnerInfo._currentOwnerId,
+                        ownerTypeCd:'1001'
+                    }
+                };
+
+                //发送get请求
+                vc.http.get('searchOwner',
+                    'listOwner',
+                    param,
+                    function(json){
+                        var _ownerInfo = JSON.parse(json);
+                        vc.component.searchOwnerInfo.owners = _ownerInfo.owners;
+                    },function(){
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            chooseOwner:function(_owner){
+                vc.emit('visitForOwner','ownerInfo',_owner);
+                // vc.emit($props.emitLoadData,'listOwnerData',{
+                //     ownerId:_owner.ownerId
+                // });
+                $('#searchOwnerModel').modal('hide');
+            },
+            searchOwners:function(){
+                vc.component._loadAllOwnerInfo(1,10,vc.component.searchOwnerInfo._currentOwnerName);
+            },
+            _refreshSearchOwnerData:function(){
+                vc.component.searchOwnerInfo._currentOwnerName = "";
+            }
+        }
+
+    });
+})(window.vc);

+ 0 - 54
WebService/src/main/resources/components/visitInfoPackage/choose-visit/chooseApp.html

@@ -1,54 +0,0 @@
-<div id = "chooseAppModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="chooseAppModelLabel" aria-hidden="true" >
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h3 class="modal-title" id="chooseAppModelLabel">选择应用</h3>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class=" row">
-                    <div class="col-lg-12">
-                        <div class="ibox ">
-                            <div class="row">
-
-                                <div class="col-sm-7 m-b-xs">
-                                </div>
-                                <div class="col-sm-5">
-                                    <div class="input-group">
-                                        <input placeholder="输入应用名称" type="text" v-model="chooseAppInfo._currentAppName" class="form-control form-control-sm">
-                                        <span class="input-group-append">
-                                                <button type="button" class="btn btn-sm btn-primary" v-on:click="queryApps()">查询</button>
-                                            </span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="table-responsive" style="margin-top:15px">
-                                <table class="table table-striped">
-                                    <thead>
-                                        <tr>
-                                            <th>应用Id</th>
-                                            <th>应用名称</th>
-                                            <th>操作</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr v-for="app in chooseAppInfo.apps">
-                                            <td>{{app.appId}}</td>
-                                            <td>{{app.name}}</td>
-                                            <td>
-                                                <button class="btn btn-primary btn-xs" v-on:click="chooseApp(app)">选择</button>
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

+ 0 - 63
WebService/src/main/resources/components/visitInfoPackage/choose-visit/chooseApp.js

@@ -1,63 +0,0 @@
-(function(vc){
-    vc.extends({
-        propTypes: {
-           emitChooseApp:vc.propTypes.string,
-           emitLoadData:vc.propTypes.string
-        },
-        data:{
-            chooseAppInfo:{
-                apps:[],
-                _currentAppName:'',
-            }
-        },
-        _initMethod:function(){
-        },
-        _initEvent:function(){
-            vc.on('chooseApp','openChooseAppModel',function(_param){
-                console.log("打开业主成员界面")
-                $('#chooseAppModel').modal('show');
-                vc.component._refreshChooseAppInfo();
-                vc.component._loadAllAppInfo(1,10,'');
-            });
-        },
-        methods:{
-            _loadAllAppInfo:function(_page,_row,_name){
-                var param = {
-                    params:{
-                        page:_page,
-                        row:_row,
-                        communityId:vc.getCurrentCommunity().communityId,
-                        name:_name
-                    }
-                };
-
-                //发送get请求
-               vc.http.get('chooseApp',
-                            'list',
-                             param,
-                             function(json){
-                                var _appInfo = JSON.parse(json);
-                                vc.component.chooseAppInfo.apps = _appInfo.apps;
-                             },function(){
-                                console.log('请求失败处理');
-                             }
-                           );
-            },
-            chooseApp:function(_app){
-                _app.appName = _app.name;
-                vc.emit($props.emitChooseApp,'chooseApp',_app);
-                vc.emit($props.emitLoadData,'listAppData',{
-                    appId:_app.appId
-                });
-                $('#chooseAppModel').modal('hide');
-            },
-            queryApps:function(){
-                vc.component._loadAllAppInfo(1,10,vc.component.chooseAppInfo._currentAppName);
-            },
-            _refreshChooseAppInfo:function(){
-                vc.component.chooseAppInfo._currentAppName = "";
-            }
-        }
-
-    });
-})(window.vc);

+ 70 - 0
WebService/src/main/resources/components/visitInfoPackage/visit-for-owner/visitForOwner.html

@@ -0,0 +1,70 @@
+<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" v-if="showCallBackButton=='true'"
+                            v-on:click="_openSearchOwnerModel(viewOwnerInfo.ownerId)">
+                        选择业主
+                    </button>
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label">业主ID:</label>
+                            <label class="">{{viewOwnerInfo.ownerId}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label">名称:</label>
+                            <label class="">{{viewOwnerInfo.name}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label">性别:</label>
+                            <label class="">{{viewOwnerInfo.sex == 0 ? '男' : '女'}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label">年龄:</label>
+                            <label class="">{{viewOwnerInfo.age}}</label>
+                        </div>
+                    </div>
+
+                </div>
+
+                <div class="row">
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label">联系方式:</label>
+                            <label class="">{{viewOwnerInfo.link}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label">创建员工:</label>
+                            <label class="">{{viewOwnerInfo.userName}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-form-label">备注:</label>
+                            <label class="">{{viewOwnerInfo.remark}}</label>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <vc:create name="chooseOwner"
+               callBackListener="visitForOwner"
+               callBackFunction="ownerInfo"
+    ></vc:create>
+</div>

+ 84 - 0
WebService/src/main/resources/components/visitInfoPackage/visit-for-owner/visitForOwner.js

@@ -0,0 +1,84 @@
+/**
+ 权限组
+ **/
+(function(vc){
+
+    vc.extends({
+        propTypes: {
+            callBackListener:vc.propTypes.string,
+            callBackFunction:vc.propTypes.string,
+            showCallBackButton:vc.propTypes.string='false'
+        },
+        data:{
+            viewOwnerInfo:{
+                flowComponent:'viewOwnerInfo',
+                ownerId:"",
+                name:"",
+                age:"",
+                sex:"",
+                userName:"",
+                remark:"",
+                link:""
+            },
+            showCallBackButton:'true'
+        },
+        _initMethod:function(){
+            vc.component._loadOwnerInfo();
+        },
+        _initEvent:function(){
+            vc.on('visitForOwner','onIndex',function(_index){
+                console.log("侦听到visitForOwner的index为  "+_index);
+                vc.emit('addVisitSpace', 'notify', _index);
+                /*if(_index == 2){
+                   vc.emit($props.callBackListener,$props.callBackFunction,vc.component.viewOwnerInfo);
+                }*/
+            });
+
+            vc.on('visitForOwner','ownerInfo',function(_info){
+                vc.component.viewOwnerInfo=_info;
+                console.log(_info);
+                vc.emit('addVisitSpace','ownerId',vc.component.viewOwnerInfo.ownerId);
+            });
+
+        },
+        methods:{
+
+            _loadOwnerInfo:function(){
+                //加载 业主信息
+                var _ownerId = vc.getParam('ownerId')
+
+                if(!vc.notNull(_ownerId)){
+                    return ;
+                }
+
+                var param = {
+                    params:{
+                        ownerId:_ownerId,
+                        page:1,
+                        row:1,
+                        communityId:vc.getCurrentCommunity().communityId,
+                        ownerTypeCd:'1001'
+                    }
+                }
+
+                //发送get请求
+                vc.http.get('viewOwner',
+                    'getOwner',
+                    param,
+                    function(json,res){
+                        var listOwnerData =JSON.parse(json);
+                        vc.copyObject(listOwnerData.owners[0],vc.component.viewOwnerInfo);
+                    },function(errInfo,error){
+                        console.log('请求失败处理');
+                    }
+                );
+
+            },
+            _openSearchOwnerModel:function(_ownerId){
+                vc.emit('searchOwner','openSearchOwnerModel',{});
+            }
+
+        }
+    });
+
+})(window.vc);

+ 8 - 8
WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.html

@@ -23,7 +23,7 @@
                             <th>来访事由</th>
                             <th>来访时间</th>
                             <th>离开时间</th>
-                            <th class="text-right">操作</th>
+<!--                            <th class="text-right">操作</th>-->
 
 
                         </tr>
@@ -37,15 +37,15 @@
                             <td>{{visit.visitCase}}</td>
                             <td>{{visit.visitTime}}</td>
                             <td>{{visit.departureTime}}</td>
-                            <td>
+<!--                            <td>-->
+<!--&lt;!&ndash;                                <div class="btn-group">&ndash;&gt;-->
+<!--&lt;!&ndash;                                    <button class="btn-white btn btn-xs" v-on:click="_openEditVisitModel(visit)">修改</button>&ndash;&gt;-->
+<!--&lt;!&ndash;                                </div>&ndash;&gt;-->
 <!--                                <div class="btn-group">-->
-<!--                                    <button class="btn-white btn btn-xs" v-on:click="_openEditVisitModel(visit)">修改</button>-->
+<!--                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteAppModel(visit)">删除-->
+<!--                                    </button>-->
 <!--                                </div>-->
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteAppModel(visit)">删除
-                                    </button>
-                                </div>
-                            </td>
+<!--                            </td>-->
 
                         </tr>
                         </tbody>

+ 3 - 1
WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.js

@@ -28,7 +28,8 @@
                 var param = {
                         params: {
                             page: _page,
-                            row: _rows
+                            row: _rows,
+                            communityId:vc.getCurrentCommunity().communityId
                         }
 
                     }
@@ -39,6 +40,7 @@
                     param,
                     function (json, res) {
                         var _visitManageInfo = JSON.parse(json);
+                        console.log(_visitManageInfo);
                         for (var k in _visitManageInfo.visits){
                             _visitManageInfo.visits[k].visitTime=new Date(_visitManageInfo.visits[k].visitTime).format('yyyy-MM-dd');
                             _visitManageInfo.visits[k].departureTime=new Date(_visitManageInfo.visits[k].departureTime).format('yyyy-MM-dd');

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java

@@ -26,8 +26,17 @@ public class VisitDto extends PageDto implements Serializable {
     private Date visitTime;
     private Date departureTime;
     private Date createTime;
+    private String bId;
     private String statusCd = "0";
 
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
+
     public String getvId() {
         return vId;
     }