Переглянути джерело

Merge remote-tracking branch 'origin/master'

蔡德晨 5 роки тому
батько
коміт
ec46582879

+ 1 - 0
src/main/java/com/jeeplus/modules/sg/web/JkxlController.java

@@ -86,6 +86,7 @@ public class JkxlController extends BaseController {
     }catch (Exception e){
       addMessage(redirectAttributes, "导出失败");
     }
+     addMessage(redirectAttributes, "导出成功");
     return "redirect:/a/jkxl/list?id="+id;
   }
 

+ 1 - 0
src/main/webapp/webpage/modules/sg/free/indexProject.jsp

@@ -16,6 +16,7 @@
 </style>
 <body style="text-align: center;">
 <form class="layui-form" action="${ctx}/jkxl/import" method="post" style="margin-top: 60px;" enctype="multipart/form-data">
+    <sys:message content="${message}"/>
     <div class="" style="margin-left: 30px;">
         <input type="button" class="layui-btn layui-btn-radiu" value="选择结算文件" id="btnxz"/>
         <input type="text" style="border-style:none;border:0;" readonly="readonly"/>

+ 39 - 2
src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -20,8 +20,13 @@
         float: right;
         margin-right:2%;
     }
+    .div_main_form{
+        width: 50%;
+        margin-left: 10px;
+    }
 </style>
 <body>
+    <sys:message content="${message}"/>
     <!-----------本体部分--------->
     <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
         <legend>本体部分</legend>
@@ -29,7 +34,7 @@
     <div class="" style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
         <%--<button type="button" class="layui-btn layui-btn-fluid btn_out" onclick="export()">导出</button>--%>
        <c:forEach items="${map.list1}" var="data1" varStatus="index">
-         <a class="layui-btn" href="${ctx}/jkxl/export?id=${data1.id}">导</a>
+         <a class="layui-btn" href="${ctx}/jkxl/export?id=${data1.id}">导</a>
        </c:forEach>
             <%--<table:importExcel url="${ctx}/propertycostreminder/propertyCostReminder/import"></table:importExcel>--%>
         <table id="table1" class="layui-table" lay-filter="table1"></table>
@@ -45,7 +50,39 @@
     <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
         <legend>未识别部分</legend>
     </fieldset>
-    <div style="height: 200px;width: 100%;">
+    <div class="layui-form div_main_form" >
+        <table class="layui-table">
+            <colgroup>
+                <col width="200">
+                <col width="150">
+                <col width="200">
+            </colgroup>
+            <thead>
+            <tr>
+                <th>项目名称</th>
+                <th>费用金额</th>
+                <th>操作</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td id="">补增值税税率调整差额</td>
+                <td>500</td>
+                <td>
+                    <input type="button" class="layui-btn layui-btn-primary layui-btn-xs" value="调整" onclick="wbsup();"/>
+                </td>
+            </tr>
+            <tr>
+                <td>扣减甲供材超供材料费</td>
+                <td>500</td>
+                <td>
+                    <input type="button" class="layui-btn layui-btn-primary layui-btn-xs" value="调整" onclick="wbsup();"/>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <div style="height: 100px;width: 100%;">
     </div>
 </body>
 <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>