Home Explore Help
Register Sign In
zhangyi
/
ceshi
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

1122

xs 5 years ago
parent
34320720e0
commit
0673e5b40a
3 changed files with 108 additions and 106 deletions
Unified View Show Diff Stats
  1. 1 1
      src/main/java/com/jeeplus/modules/sg/overheadline/entity/Settlement.java
  2. 1 1
      src/main/webapp/webpage/modules/sg/free/wbslist.jsp
  3. 106 104
      src/main/webapp/webpage/modules/sg/project/management.jsp

+ 1 - 1
src/main/java/com/jeeplus/modules/sg/overheadline/entity/Settlement.java
View File 

@@ -6,7 +6,7 @@ public class Settlement {
 
     private Double money;//金额
 
     private Double money;//金额
 
     private String remarks;//备注
 
     private String remarks;//备注
 
     private String status;//数据核对 0-核对一致 1-核对不一致
 
     private String status;//数据核对 0-核对一致 1-核对不一致
 
-    private String reason;//数据核对不一致原因
 
+    private String reason;//原因
 
 
 
     public String getId() {
 
     public String getId() {
 
         return id;
 
         return id;

+ 1 - 1
src/main/webapp/webpage/modules/sg/free/wbslist.jsp
View File 

@@ -385,7 +385,7 @@
 
                         if(d.status=="1")
 
                         if(d.status=="1")
 
                             xml += "<a class='layui-btn layui-btn-danger layui-btn-xs' lay-event='byz'>不一致</a>";
 
                             xml += "<a class='layui-btn layui-btn-danger layui-btn-xs' lay-event='byz'>不一致</a>";
 
                         if(d.status == "0")
 
                         if(d.status == "0")
 
-                            xml+="<span>一致</span>";
 
+                            xml+="<a class='layui-btn layui-btn-xs' lay-event='byz'>一致</a>";
 
                         return xml;
 
                         return xml;
 
                     }}
 
                     }}
 
             ]]
 
             ]]

+ 106 - 104
src/main/webapp/webpage/modules/sg/project/management.jsp
View File 

@@ -12,124 +12,119 @@
 
     <title>工程管理</title>
 
     <title>工程管理</title>
 
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/layui/css/layui.css">
 
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/layui/css/layui.css">
 
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/common.css"/>
 
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/common.css"/>
 
+    <link rel="stylesheet" href="${ctxp}/static/plugin/assets/vermeit.css">
 
     <script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
 
     <script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
 
     <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
 
     <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
 
 </head>
 
 </head>
 
 <style>
 
 <style>
 
     .layui-input{
 
     .layui-input{
 
-        height: 30px;
 
+        height: 28px;
 
         margin-top: 5px;
 
         margin-top: 5px;
 
+        width: 260px;
 
     }
 
     }
 
-    .layui-form-label {
 
-        float: left;
 
-        display: block;
 
-        padding: 9px 15px;
 
-        width: 100px;
 
-        font-weight: 400;
 
-        line-height: 20px;
 
-        text-align: right;
 
-    }
 
-    .btn_out{
 
-        width: 100px;
 
-        margin: 0;
 
-        float: right;
 
-        margin-right:2%;
 
-    }
 
-    .div_main_form{
 
-        width: 50%;
 
-        margin-left: 10px;
 
-    }
 
-    .layui-icon-layer{
 
-        display: none;
 
-    }
 
-    .layui-icon-file{
 
-        display: none;
 
-    }
 
-    .btn-update{
 
-        width: 90px;
 
+    .input-meself-time{
 
+        font-size: 13px;
 
+        width: 140px;
 
     }
 
     }
 
+    .layui-table-view .layui-table {width:100%}
 
 </style>
 
 </style>
 
 <body style="height:100%">
 
 <body style="height:100%">
 
 <input style="display: none;" id="addtext" value=""/>
 
 <input style="display: none;" id="addtext" value=""/>
 
-<div style="padding: 20px; background-color: #F2F2F2;">
 
+<div class="layui-main-bgc">
 
     <sys:message content="${message}"/>
 
     <sys:message content="${message}"/>
 
     <div class="layui-row layui-col-space15">
 
     <div class="layui-row layui-col-space15">
 
         <div class="layui-col-md12">
 
         <div class="layui-col-md12">
 
             <div class="layui-card">
 
             <div class="layui-card">
 
-                <div class="layui-card-header">工程管理</div>
 
-                <div class="layui-card-body">
 
-                    <form class="layui-form" action="${ctx}/project/list" style="margin-top: 10px;" method="post">
 
-                        <div class="layui-form-item">
 
-                            <div class="layui-inline">
 
-                                <label class="layui-form-label">工程名称</label>
 
-                                <div class="layui-input-inline">
 
-                                    <input type="text" name="projectName"  autocomplete="off" class="layui-input">
 
-                                </div>
 
-                            </div>
 
-                            <div class="layui-inline">
 
-                                <label class="layui-form-label">登记人</label>
 
-                                <div class="layui-input-inline">
 
-                                    <input type="text" name="createBy"  autocomplete="off" class="layui-input">
 
-                                </div>
 
-                            </div>
 
-                            <div class="layui-inline">
 
-                                <label class="layui-form-label">工程登记时间</label>
 
-                                <div class="layui-input-inline">
 
-                                    <input type="text" name="projectStartDate" id="beginDate1"  placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
 
-                                </div>
 
-                                <div class="layui-form-mid">-</div>
 
-                                <div class="layui-input-inline">
 
-                                    <input type="text" name="projectEndDate" id="endDate1"  placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                        <div class="layui-form-item">
 
-                            <div class="layui-inline">
 
-                                <label class="layui-form-label">项目名称</label>
 
-                                <div class="layui-input-inline">
 
-                                    <input type="text" name="itemName"  autocomplete="off" class="layui-input">
 
-                                </div>
 
-                            </div>
 
-                            <div class="layui-inline">
 
-                                <label class="layui-form-label">项目划分</label>
 
-                                <div class="layui-input-inline">
 
-                                    <input type="text" name="type"  autocomplete="off" class="layui-input">
 
-                                </div>
 
-                            </div>
 
-                            <div class="layui-inline">
 
-                                <label class="layui-form-label">施工单位</label>
 
-                                <div class="layui-input-inline">
 
-                                    <input type="text" name="unit"  autocomplete="off" class="layui-input">
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                        <div class="layui-form-item">
 
-                            <div class="layui-inline">
 
-                                <label class="layui-form-label">项目登记时间</label>
 
-                                <div class="layui-input-inline">
 
-                                    <input type="text" name="itemStartDate" id="beginDate2"  placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
 
-                                </div>
 
-                                <div class="layui-form-mid">-</div>
 
-                                <div class="layui-input-inline">
 
-                                    <input type="text" name="itemEndDate" id="endDate2"  placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
 
-                                </div>
 
-                            </div>
 
-                            <div class="layui-inline" style="margin-left: 300px;">
 
-                                <button class="layui-btn layui-btn-normal btn-update" lay-submit="" lay-filter="mybtnsubmit">查询</button>
 
-                            </div>
 
-                        </div>
 
-                    </form>
 
+                <div class="layui-card-header layui-card-header-add">工程管理</div>
 
+                <div class="layui-card-body" id="noneDiv" style="display: none">
 
+                   <div class="layui-meself-bgc">
 
+                       <form class="layui-form" action="${ctx}/project/list" style="margin-top: 10px;" method="post">
 
+                           <div class="layui-form-item">
 
+                               <div class="layui-inline">
 
+                                   <div class="col-xs-12 col-sm-6 col-md-4" style="margin-left: 20px">
 
+                                   <label class="layui-font-style">工程名称:</label>
 
+                                       <input type="text" name="projectName"  autocomplete="off" class="layui-input">
 
+                                   </div>
 
+
 
+                               </div>
 
+                               <div class="layui-inline">
 
+                                   <div class="col-xs-12 col-sm-6 col-md-4" style="margin-left: 20px">
 
+                                   <label class="layui-font-style">登记人:</label>
 
+                                       <input type="text" name="createBy"  autocomplete="off" class="layui-input">
 
+                                   </div>
 
+                               </div>
 
+                               <div class="layui-inline">
 
+                                   <div class="col-xs-12 col-sm-6 col-md-4" style="margin-left: 20px">
 
+                                       <label class="layui-font-style">工程登记时间:</label>
 
+                                       <table>
 
+                                           <tbody>
 
+                                           <tr>
 
+                                               <td> <input type="text" name="projectStartDate" id="beginDate1"  placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input input-meself-time"></td>
 
+                                               <td>~</td>
 
+                                               <td> <input type="text" name="projectEndDate" id="endDate1"  placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input input-meself-time"></td>
 
+                                           </tr>
 
+                                           </tbody>
 
+                                       </table>
 
+                                   </div>
 
+                               </div>
 
+                           </div>
 
+                           <div class="layui-form-item">
 
+                               <div class="layui-inline">
 
+                                   <div class="col-xs-12 col-sm-6 col-md-4" style="margin-left: 20px">
 
+                                   <label class="layui-font-style">项目名称:</label>
 
+                                       <input type="text" name="itemName"  autocomplete="off" class="layui-input">
 
+                                   </div>
 
+                               </div>
 
+                               <div class="layui-inline">
 
+                                   <div class="col-xs-12 col-sm-6 col-md-4" style="margin-left: 20px">
 
+                                   <label class="layui-font-style">项目划分:</label>
 
+                                       <input type="text" name="type"  autocomplete="off" class="layui-input">
 
+                                   </div>
 
+                               </div>
 
+                               <div class="layui-inline">
 
+                                   <div class="col-xs-12 col-sm-6 col-md-4" style="margin-left: 20px">
 
+                                   <label class="layui-font-style">施工单位:</label>
 
+                                       <input type="text" name="unit"  autocomplete="off" class="layui-input">
 
+                                   </div>
 
+                               </div>
 
+                           </div>
 
+                           <div class="layui-form-item">
 
+                               <div class="layui-inline">
 
+                                   <div class="col-xs-12 col-sm-6 col-md-4" style="margin-left: 20px">
 
+                                   <label class="layui-font-style">项目登记时间:</label>
 
+                                       <table>
 
+                                           <tbody>
 
+                                           <tr>
 
+                                               <td><input type="text" name="itemStartDate" id="beginDate2"  placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input input-meself-time"></td>
 
+                                               <td>~</td>
 
+                                               <td> <input type="text" name="itemEndDate" id="endDate2"  placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input input-meself-time"></td>
 
+                                           </tr>
 
+                                           </tbody>
 
+                                       </table>
 
+                                   </div>
 
+                               </div>
 
+
 
+                               <div class="layui-inline">
 
+                                   <div class="col-xs-12 col-sm-6 col-md-4 layui-mesl-mit">
 
+                                   <button class="layui-btn layui-btn-primary layui-btn-radius formbtn" lay-submit="" lay-filter="mybtnsubmit">查询</button>
 
+                                    <button type="reset" class="layui-btn layui-btn-primary layui-btn-radius formbtn">重置</button>
 
+                               </div>
 
+                               </div>
 
+                           </div>
 
+                       </form>
 
+                   </div>
 
                 </div>
 
                 </div>
 
-            </div>
 
-        </div>
 
-        <div class="layui-col-md12">
 
-            <div class="layui-card">
 
                 <div class="layui-card-body">
 
                 <div class="layui-card-body">
 
                     <div class="" style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
 
                     <div class="" style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
 
                         <div class="layui-btn-group">
 
                         <div class="layui-btn-group">
 
-                            <button type="button" class="layui-btn layui-btn-normal btn-update" onclick="addProject()">新建工程</button>
 
-                            <!--<button type="button" class="layui-btn ">编辑</button>-->
 
-                            <button type="button" class="layui-btn layui-btn-normal btn-update" onclick="refresh()">刷新</button>
 
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-meself" onclick="addProject()"><i class="layui-icon"></i>新建</button>
 
+                            <button type="button" class="layui-btn layui-btn-primary layui-btn-meself"  onclick="refresh()"><img class="layui-meself-img1" src="${ctxp}/icon/refush.png" alt="">&nbsp;刷新</button>
 
+                        </div>
 
+                        <div class="layui-btn-group" style="float: right;margin-right: 10px;border: 1px solid rgb(204,204,204)">
 
+                            <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="noneBtn"><img class="layui-meself-img" src="${ctxp}/icon/solr.png" alt=""></button>
 
+                            <button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>
 
+                            <button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>
 
+                            <button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>
 
                         </div>
 
                         </div>
 
                         <table id="table1" class="layui-table" lay-filter="table1"></table>
 
                         <table id="table1" class="layui-table" lay-filter="table1"></table>
 
                     </div>
 
                     </div>
 
@@ -259,7 +254,7 @@
 
                     layer.open({
 
                     layer.open({
 
                         type: 2,
 
                         type: 2,
 
                         title: '添加工程',
 
                         title: '添加工程',
 
-                        area: ['60%', '80%'],
 
+                        area: ['70%', '90%'],
 
                         shade: 0.8,
 
                         shade: 0.8,
 
                         shadeClose: true,
 
                         shadeClose: true,
 
                         content: '${ctxp}/webpage/modules/sg/project/addItemForm.jsp'
 
                         content: '${ctxp}/webpage/modules/sg/project/addItemForm.jsp'
 
@@ -318,10 +313,10 @@
 
 </script>
 
 </script>
 
 <script>
 
 <script>
 
     function look(url) {
 
     function look(url) {
 
-        layer.open({
 
+        top.layer.open({
 
             type: 2,
 
             type: 2,
 
             title: '查看',
 
             title: '查看',
 
-            area: ['80%', '90%'],
 
+            area: ['70%', '90%'],
 
             shade: 0.8,
 
             shade: 0.8,
 
 
 
             shadeClose: true,
 
             shadeClose: true,
 
@@ -332,10 +327,10 @@
 
         })
 
         })
 
     }
 
     }
 
     function update(url) {
 
     function update(url) {
 
-        layer.open({
 
+        top.layer.open({
 
             type: 2,
 
             type: 2,
 
             title: '修改工程',
 
             title: '修改工程',
 
-            area: ['80%', '80%'],
 
+            area: ['70%', '90%'],
 
             shade: 0.8,
 
             shade: 0.8,
 
             shadeClose: true,
 
             shadeClose: true,
 
             fixed: false, //不固定
 
             fixed: false, //不固定
 
@@ -352,5 +347,12 @@
 
         })
 
         })
 
     }
 
     }
 
 </script>
 
 </script>
 
+<script>
 
+    $(document).ready(function(e) {
 
+        $("#noneBtn").click(function(e) {
 
+            $("#noneDiv").toggle(400);
 
+        });
 
+    });
 
+</script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>