修改一版 访客登记工鞥呢

WebService/src/main/resources/components/visitPackage/add-visit/addVisit.html

@@ -1,4 +1,5 @@
-<div id = "addVisitModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addVisitModel" 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">
@@ -20,50 +21,58 @@
                             </div>-->
 
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">访客姓名</label>
-         <div class="col-sm-10">
-           <input v-model="addVisitInfo.name"                   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">
-           <input v-model="addVisitInfo.visitGender"                   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">
-           <input v-model="addVisitInfo.visitGender"                   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">
-           <input v-model="addVisitInfo.phoneNumber"                   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">
-           <input v-model="addVisitInfo.visitTime"                   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">
-           <input v-model="addVisitInfo.departureTime"                   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">
-<textarea  placeholder="选填，请填写描述" class="form-control" v-model="addVisitInfo.visitCase"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">访客姓名</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addVisitInfo.name" 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="form-control-sm form-control input-s-sm inline"
+                                            v-model="addVisitInfo.visitGender">
+                                        <option selected value="">请选择访客性别</option>
+                                        <option value="1">男</option>
+                                        <option value="0">女</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">访客联系方式</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addVisitInfo.phoneNumber" type="tel" 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">
+                                    <input v-model="addVisitInfo.visitTime" type="date" 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">
+                                    <input v-model="addVisitInfo.departureTime" type="date" 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">
+                                    <textarea placeholder="选填，请填写描述" class="form-control"
+                                              v-model="addVisitInfo.visitCase"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveVisitInfo()" ><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="saveVisitInfo()">
+                                    <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/visitPackage/add-visit/addVisit.js

@@ -15,7 +15,6 @@
                 visitTime: '',
                 departureTime: '',
                 visitCase: '',
-
             }
         },
         _initMethod: function () {
@@ -50,21 +49,9 @@
                             errInfo: "访客性别不能为空"
                         },
                         {
-                            limit: "maxin",
-                            param: "2,10",
-                            errInfo: "访客姓名必须在2至10字符之间"
-                        },
-                    ],
-                    'addVisitInfo.visitGender': [
-                        {
-                            limit: "required",
+                            limit: "num",
                             param: "",
-                            errInfo: "访客性别不能为空"
-                        },
-                        {
-                            limit: "maxin",
-                            param: "2,10",
-                            errInfo: "访客姓名必须在2至10字符之间"
+                            errInfo: "性别错误"
                         },
                     ],
                     'addVisitInfo.phoneNumber': [
@@ -74,9 +61,9 @@
                             errInfo: "访客联系方式不能为空"
                         },
                         {
-                            limit: "maxin",
-                            param: "11",
-                            errInfo: "访客联系方式必须在11个字符之间"
+                            limit: "phone",
+                            param: "",
+                            errInfo: "不是有效的手机号"
                         },
                     ],
                     'addVisitInfo.visitTime': [
@@ -86,17 +73,17 @@
                             errInfo: "访客拜访时间不能为空"
                         },
                         {
-                            limit: "maxin",
-                            param: "2,10",
-                            errInfo: "访客拜访时间必须在2至10字符之间"
+                            limit: "date",
+                            param: "",
+                            errInfo: "访客拜访时间格式错误，如：2019-09-11"
                         },
                     ],
                     'addVisitInfo.departureTime': [
-                        {
-                            limit: "maxin",
-                            param: "2,10",
-                            errInfo: "访客拜访时间必须在2至10字符之间"
-                        },
+                       {
+                           limit: "date",
+                           param: "",
+                           errInfo: "访客离开时间格式错误，如：2019-09-11"
+                       },
                     ],
                     'addVisitInfo.visitCase': [
                         {

WebService/src/main/resources/components/visitPackage/visit-manage/visitManage.html

@@ -5,15 +5,58 @@
                 <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()">{{visitManageInfo.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="请输入访客姓名" v-model="visitManageInfo.conditions.name" class=" form-control">
-                            </div>                        </div></div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入访客ID" v-model="visitManageInfo.conditions.vId"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入访客姓名" v-model="visitManageInfo.conditions.name"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <select class="form-control-sm form-control input-s-sm inline"
+                                        v-model="visitManageInfo.conditions.visitGender">
+                                    <option selected value="">请选择访客性别</option>
+                                    <option value="1">男</option>
+                                    <option value="0">女</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryVisitMethod()"><i
+                                    class="glyphicon glyphicon-search"></i> 查询
+                            </button>
+                        </div>
+
+                    </div>
+
+                    <div class="row"  v-if="visitManageInfo.moreCondition == true">
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请选择访客拜访时间" v-model="visitManageInfo.conditions.visitTime"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请选择访客离开时间" v-model="visitManageInfo.conditions.departureTime"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                    </div>
 
 
                 </div>
@@ -39,10 +82,9 @@
                     >
                         <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">访客性别</th>
                             <th class="text-center">访客联系方式</th>
                             <th class="text-center">访客拜访时间</th>
                             <th class="text-center">访客离开时间</th>
@@ -53,19 +95,22 @@
                         </thead>
                         <tbody>
                         <tr v-for="visit in visitManageInfo.visits">
-                                                        <td class="text-center">{{visit.vId}}</td>
+                            <td class="text-center">{{visit.vId}}</td>
                             <td class="text-center">{{visit.name}}</td>
                             <td class="text-center">{{visit.visitGender}}</td>
-                            <td class="text-center">{{visit.visitGender}}</td>
                             <td class="text-center">{{visit.phoneNumber}}</td>
                             <td class="text-center">{{visit.visitTime}}</td>
                             <td class="text-center">{{visit.departureTime}}</td>
-                            <td class="text-center"><div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditVisitModel(visit)">修改</button>
+                            <td class="text-center">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openEditVisitModel(visit)">修改
+                                    </button>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteVisitModel(visit)">删除</button>
-                                </div></td>
+                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteVisitModel(visit)">删除
+                                    </button>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>
@@ -84,7 +129,6 @@
         </div>
     </div>
 
-    
 
     <vc:create name="addVisit"
                callBackListener=""

WebService/src/main/resources/components/visitPackage/visit-manage/visitManage.js

@@ -13,8 +13,11 @@
                 moreCondition:false,
                 name:'',
                 conditions:{
+                    vId:'',
                     name:'',
-
+                    visitGender:'',
+                    visitTime:'',
+                    departureTime:''
                 }
             }
         },