Merge branch '1.0.0_online' of http://192.168.1.41:3000/SmartCost/ConstructionOperation into 1.0.0_online

web/users/views/user/index.html

@@ -97,7 +97,7 @@
                     <th>姓名</th>
                     <th>企业名称</th>
                     <th>企业地区</th>
-                    <th>最近使用版本 </th>
+                    <th>最近使用费用定额 </th>
                     <th>在线时长(<%= filter.loginMsg === undefined ? '所有' : filter.loginMsg %>)</th>
                     <th width="180">注册时间 / 最近登录</th>
                     <% if (manager.superAdmin == 1) { %>
@@ -116,11 +116,13 @@
                     <td><%= compilationMap[user.latest_used]?compilationMap[user.latest_used].name:""%></td>
                     <td><a onclick="getOnlineInfo('<%= user._doc.filter%>')" href="#time-detail" data-toggle="modal" data-target="#time-detail"><%= user._doc.online_times %></a></td>
                     <td><%= moment(user.create_time).format('YYYY-MM-DD HH:mm:ss') %><br><%= user.latest_login?moment(user.latest_login).format('YYYY-MM-DD HH:mm:ss'):"" %></td>
+                    <!--<td><a role="button" data-toggle="modal" data-target="#view" onclick='getUserInfo("<%= user._id.toString()%>")'>详细</a></td>-->
                     <% if (manager.superAdmin == 1) { %>
-                    <td><a onclick='deleteUser("<%= user._id.toString()%>")' data-toggle="modal" data-target="#delUser" class="btn btn-link btn-sm" style="padding: 0px">删除</a></td>
+                    <td>
+                        <a onclick='deleteUser("<%= user._id.toString()%>")' data-toggle="modal" data-target="#delUser" class="btn text-danger" style="padding: 0px">删除</a>
+                        <a href="#update" data-toggle="modal" data-target="#update" class="btn" onclick='getUserUpgradeInfo("<%= user._id.toString()%>")'>升级</a>
+                    </td>
                     <% }%>
-                    <!--<td><a role="button" data-toggle="modal" data-target="#view" onclick='getUserInfo("<%= user._id.toString()%>")'>详细</a></td>-->
-                    <!--<td><a href="#update" data-toggle="modal" data-target="#update" onclick='getUserUpgradeInfo("<%= user._id.toString()%>")'>升级</a></td>-->
                 </tr>
                 <% }) %>
                 </tbody>
@@ -175,6 +177,28 @@
     </div>
 </div>
 
+<!-- 弹窗显示已升级专业版-->
+<div class="modal fade" id="pdu" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" >已升级专业版</h4>
+            </div>
+            <div class="modal-body">
+                <table class="table table-bordered">
+                    <tr><th>定额</th><th>升级时间</th></tr>
+                    <tr><td>重庆定额(2018)</td><td>2019-09-11</td></tr>
+                    <tr><td>甘肃定额(2013)</td><td>2019-09-09</td></tr>
+                </table>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <!--弹出删除-->
 <div class="modal fade" id="delUser" data-backdrop="static" style="display: none;" aria-hidden="true">
     <div class="modal-dialog" role="document">