修复访客登记编辑功能

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

@@ -62,7 +62,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">描述</label>
                                 <div class="col-sm-10">
-                                    <textarea placeholder="选填，请填写描述" class="form-control"
+                                    <textarea cols="5" placeholder="选填，请填写描述" class="form-control"
                                               v-model="addVisitInfo.visitCase"></textarea></div>
                             </div>
 

WebService/src/main/resources/components/visitPackage/edit-visit/editVisit.html

@@ -1,56 +1,64 @@
-<div id = "editVisitModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editVisitModel" 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="editVisitInfo.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="editVisitInfo.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="editVisitInfo.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="editVisitInfo.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="editVisitInfo.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="editVisitInfo.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="editVisitInfo.visitCase"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">访客姓名</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editVisitInfo.name" type="text" placeholder="必填，请填写访客姓名"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">访客性别</label>
+
+                                <select class="form-control-sm form-control input-s-sm inline"
+                                        v-model="editVisitInfo.visitGender">
+                                    <option selected value="">请选择访客性别</option>
+                                    <option value="1">男</option>
+                                    <option value="0">女</option>
+                                </select>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">访客联系方式</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editVisitInfo.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="editVisitInfo.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="editVisitInfo.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 cols="5" placeholder="选填，请填写描述" class="form-control"
+                                              v-model="editVisitInfo.visitCase"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editVisit()" ><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="editVisit()"><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/edit-visit/editVisit.js

@@ -4,14 +4,12 @@
         data:{
             editVisitInfo:{
                 vId:'',
-name:'',
-visitGender:'',
-visitGender:'',
-phoneNumber:'',
-visitTime:'',
-departureTime:'',
-visitCase:'',
-
+                name:'',
+                visitGender:'',
+                phoneNumber:'',
+                visitTime:'',
+                departureTime:'',
+                visitCase:'',
             }
         },
          _initMethod:function(){
@@ -49,22 +47,10 @@ visitCase:'',
                             errInfo:"访客性别不能为空"
                         },
  {
-                            limit:"maxin",
-                            param:"2,10",
-                            errInfo:"访客姓名必须在2至10字符之间"
-                        },
-                    ],
-'editVisitInfo.visitGender':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"访客性别不能为空"
-                        },
- {
-                            limit:"maxin",
-                            param:"2,10",
-                            errInfo:"访客姓名必须在2至10字符之间"
-                        },
+                             limit: "num",
+                             param: "",
+                             errInfo: "性别错误"
+                         },
                     ],
 'editVisitInfo.phoneNumber':[
 {
@@ -73,10 +59,10 @@ visitCase:'',
                             errInfo:"访客联系方式不能为空"
                         },
  {
-                            limit:"maxin",
-                            param:"11",
-                            errInfo:"访客联系方式必须在11个字符之间"
-                        },
+                             limit: "phone",
+                             param: "",
+                             errInfo: "不是有效的手机号"
+                         },
                     ],
 'editVisitInfo.visitTime':[
 {
@@ -84,17 +70,17 @@ visitCase:'',
                             param:"",
                             errInfo:"访客拜访时间不能为空"
                         },
- {
-                            limit:"maxin",
-                            param:"2,10",
-                            errInfo:"访客拜访时间必须在2至10字符之间"
-                        },
+   {
+                             limit: "date",
+                             param: "",
+                             errInfo: "访客拜访时间格式错误，如：2019-09-11"
+                         },
                     ],
 'editVisitInfo.departureTime':[
  {
-                            limit:"maxin",
-                            param:"2,10",
-                            errInfo:"访客拜访时间必须在2至10字符之间"
+                            limit: "date",
+                            param: "",
+                            errInfo: "访客离开时间格式错误，如：2019-09-11"
                         },
                     ],
 'editVisitInfo.visitCase':[

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

@@ -97,7 +97,7 @@
                         <tr v-for="visit in visitManageInfo.visits">
                             <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.visitGenderName}}</td>
                             <td class="text-center">{{visit.phoneNumber}}</td>
                             <td class="text-center">{{visit.visitTime}}</td>
                             <td class="text-center">{{visit.departureTime}}</td>

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

@@ -22,6 +22,7 @@ public class VisitDto extends PageDto implements Serializable {
     private String name;
     private String visitCase;
     private String visitGender;
+    private String visitGenderName;
     private String ownerId;
     private String userId;
 
@@ -127,4 +128,12 @@ public class VisitDto extends PageDto implements Serializable {
     public void setvId(String vId) {
         this.vId = vId;
     }
+
+    public String getVisitGenderName() {
+        return visitGenderName;
+    }
+
+    public void setVisitGenderName(String visitGenderName) {
+        this.visitGenderName = visitGenderName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/visit/ApiVisitDataVo.java

@@ -8,6 +8,7 @@ public class ApiVisitDataVo implements Serializable {
     private String vId;
     private String name;
     private String visitGender;
+    private String visitGenderName;
     private String phoneNumber;
     private String visitTime;
     private String departureTime;
@@ -69,5 +70,19 @@ public class ApiVisitDataVo implements Serializable {
         this.visitCase = visitCase;
     }
 
+    public String getvId() {
+        return vId;
+    }
+
+    public void setvId(String vId) {
+        this.vId = vId;
+    }
+
+    public String getVisitGenderName() {
+        return visitGenderName;
+    }
 
+    public void setVisitGenderName(String visitGenderName) {
+        this.visitGenderName = visitGenderName;
+    }
 }

java110-db/src/main/resources/mapper/visit/VisitServiceDaoImplMapper.xml

@@ -104,7 +104,16 @@
     <select id="getVisitInfo" parameterType="Map" resultType="Map">
         select t.v_id,t.v_id vId,t.departure_time,t.departure_time departureTime,t.visit_time,t.visit_time
         visitTime,t.phone_number phoneNumber,t.name,t.visit_case,t.visit_case visitCase,t.status_cd,t.status_cd
-        statusCd,t.visit_gender,t.visit_gender visitGender,t.owner_id,t.owner_id ownerId,t.user_id userId,t.b_id,
+        statusCd,t.visit_gender,t.visit_gender visitGender,
+        (CASE
+        WHEN t.`visit_gender` = '1'
+        THEN '男'
+        WHEN t.visit_gender = '0'
+        THEN '女'
+        ELSE
+        '未知'
+        END) visitGenderName ,
+        t.owner_id,t.owner_id ownerId,t.user_id userId,t.b_id,
         t.b_id bId
         from visit_info t
         where 1 =1