Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

蔡德晨 5 лет назад
Родитель
Сommit
aa3d74e901
1 измененных файлов с 10 добавлено и 3 удалено
  1. 10 3
      src/main/webapp/webpage/modules/sg/free/wbslist.jsp

+ 10 - 3
src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -23,9 +23,15 @@
 </style>
 <body style="background-color: white ;height: 100%">
     <sys:message content="${message}"/>
-    <div class="" style="margin-right: 30px;float: right;margin-top: 20px">
+    <div style="margin-top: 20px">
+     <c:forEach items="${map.list1}" var="data1" varStatus="index">
+    <div style="margin-left: 30px;float: left;font-size: 15px">
+        <%--<label>当前工程:111111111111111</label>--%>
+        <label>项目编号:${data1.itemNo}</label>&nbsp;&nbsp;
+        <label>当前项目:${data1.itemName}</label>
+    </div>
+    <div class="" style="margin-right: 30px;float: right;">
         <div class="layui-btn-group">
-           <c:forEach items="${map.list1}" var="data1" varStatus="index">
                <input id="type" hidden value="${data1.type}">
                <c:if test="${empty data1.projectId}">
             <a class="layui-btn layui-btn-meself" href="${ctx}/project/tolist"><img class="layui-meself-img1" src="${ctxp}/icon/back.png" alt="">&nbsp;返回</a>
@@ -34,9 +40,10 @@
                    <a class="layui-btn layui-btn-meself" href="${ctx}/project/tem/tolist?projectId=${data1.projectId}"><img class="layui-meself-img1" src="${ctxp}/icon/back.png" alt="">&nbsp;返回</a>
                </c:if>
                 <a class="layui-btn layui-btn-warm layui-btn-meself" href="${ctx}/jkxl/export?id=${data1.id}&type=${data1.type}"><img class="layui-meself-img1" src="${ctxp}/icon/daochu.png" alt="">&nbsp;导出</a>
-            </c:forEach>
         </div>
     </div>
+     </c:forEach>
+    </div>
     <fieldset class="layui-elem-field layui-field-title" style="width: 100%">
         <legend>结算汇总表</legend>
     </fieldset>