Merge branch 'master' of https://github.com/java110/MicroCommunity

wuxw

2019-10-09 6e76a733d6c343a890c008dd5e875ae2bb9e2fc2

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

@@ -7,7 +7,7 @@
                    <div class="ibox-tools" style="top:10px;">
                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddVisitModal()">
                            <i class="glyphicon glyphicon-plus"></i>
                            添加访客
                            登记
                        </button>
                    </div>
                </div>
@@ -22,7 +22,7 @@
                            <th>访客性别</th>
                            <th>来访事由</th>
                            <th>来访时间</th>
                            <th>离开时间</th>
                            <!--<th>离开时间</th>-->
<!--                            <th class="text-right">操作</th>-->


@@ -31,12 +31,12 @@
                        <tbody>
                        <tr v-for="visit in appManageInfo.visits">
                            <td>{{visit.vId}}</td>
                            <td>{{visit.name}}</td>
                            <td>{{visit.vName}}</td>
                            <td>{{visit.phoneNumber}}</td>
                            <td>{{visit.visitGenderName}}</td>
                            <td>{{visit.visitGender=='0'?'男':'女'}}</td>
                            <td>{{visit.visitCase}}</td>
                            <td>{{visit.visitTime}}</td>
                            <td>{{visit.departureTime}}</td>
                            <!--<td>{{visit.departureTime}}</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;-->
@@ -65,6 +65,5 @@
    </div>

    <vc:create name="editVisit"></vc:create>
    <vc:create name="deleteApp"></vc:create>

</div>