Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
chengqiang
/
sg_finalAcountAuto
1
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

Merge remote-tracking branch 'origin/master'

蔡德晨 5 vuotta sitten
vanhempi
869c3ceaa2 750b43eec0
commit
72b8790702
7 muutettua tiedostoa jossa 119 lisäystä ja 132 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 6 4
      src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java
  2. 27 42
      src/main/webapp/webpage/modules/sg/project/addItemForm.js
  3. 44 43
      src/main/webapp/webpage/modules/sg/project/addItemForm.jsp
  4. 2 3
      src/main/webapp/webpage/modules/sg/project/management.js
  5. 10 10
      src/main/webapp/webpage/modules/sg/projecttem/addItem.js
  6. 29 29
      src/main/webapp/webpage/modules/sg/projecttem/manageList.js
  7. 1 1
      src/main/webapp/webpage/modules/sg/projecttem/updateItem.jsp

+ 6 - 4
src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java
Näytä tiedosto 

@@ -189,10 +189,12 @@ public class SubstationService {
 
             ImportExcel azhz = new ImportExcel(file, 1, SubstationInfo.SHEET_HZHZB);   //安装工程费用汇总表
 
             //变电站结算汇总
 
             int[] comlumn2 = {12,15};//定义所要数组
 
-            double built1Total = ExcelUtil.getDouble(jzqd,SubstationInfo.JZMX_BJZ,2,0);//建筑分部分项工程量清单计价表合计
 
-            double[] builtTotal={built1Total,0.0};
 
-            double[] division1total=ExcelUtil.getDoubleArray(azqd,SubstationInfo.AZMX_BDZAZ,1,comlumn2);//安装分部分项比对数据清单合计
 
-            double[] division = {division1total[0],division1total[1],0.00,0.00};
 
+            double built1Total = ExcelUtil.getDouble(jzhz,BashInfo.QT_HJ,0,2);//变电站建筑
 
+            double built2Total = ExcelUtil.getDouble(azhz,BashInfo.QT_HJ,0,2);//变电站安装
 
+            double[] builtTotal={built1Total,built2Total};
 
+            double[] division1total=ExcelUtil.getDoubleArray(jzqd,SubstationInfo.JZMX_BJZ,2,comlumn2);//建筑分部分项比对数据清单合计
 
+            double[] division2total=ExcelUtil.getDoubleArray(azqd,SubstationInfo.AZMX_BDZAZ,2,comlumn2);//安装分部分项比对数据清单合计
 
+            double[] division = {division1total[0],division1total[1],division2total[0],division2total[1]};
 
             List<Settlement> settlementBdzs = SettementUtil.getDLComparison(settlementsBdz,builtTotal,division,word1total,word2total,otherBdzTotal,feesBdzCount,cbperson);
 
             settlementService.save(settlementBdzs,id);
 
             double zjgcJzTotal = ExcelUtil.getDouble(jzhz,SubstationInfo.QT_HJ,0,3);//建筑直接工程费合计

+ 27 - 42
src/main/webapp/webpage/modules/sg/project/addItemForm.js
Näytä tiedosto 

@@ -1,50 +1,35 @@
 
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 
 <script type="text/javascript">
 
     layui.use(['form', 'layedit', 'laydate'], function(){
 
-    var form = layui.form;
 
-    form.render();
 
-    //自定义验证规则
 
-    form.verify({
 
-    context: function(value){
 
-    if(value.length <=0){
 
-    return '请选择导入的文件';
 
-}
 
-}
 
-});
 
+        var form = layui.form;
 
+        form.render();
 
+        //自定义验证规则
 
+        form.verify({
 
+        context: function(value){
 
+        if(value.length <=0){
 
+        return '请选择导入的文件';
 
+        }
 
+        }
 
+    });
 
     var newText1 = parent.$('#addtext').val();
 
-    $("#newText1").val(newText1);
 
-})
 
+        $("#newText1").val(newText1);
 
+    })
 
     function doSubmit(obj){
 
-    if ($("#myfile").val()==null||$("#myfile").val()==""){
 
-    layer.msg("请选择文件",{icon: 3});
 
-    throw SyntaxError;
 
-}
 
+        if ($("#myfile").val()==null||$("#myfile").val()==""){
 
+        layer.msg("请选择文件",{icon: 3});
 
+        throw SyntaxError;
 
+    }
 
     if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
 
-    layer.msg("请输入项目名称",{icon:3});
 
-    throw SyntaxError;
 
-}
 
-    //获取项目名称
 
-    var project_name=$("#inputwrite").val();
 
-    //获取工程id
 
-    var project_id=$("#newText1").val();
 
-    $.ajax({
 
-        url: "${ctx}/project/tem/verfiy",
 
-        type: "post",
 
-        data: {"projectName":project_name,"projectId":project_id},
 
-        success:function (result) {
 
-            if (result.code == 1){
 
-                layer.msg(result.msg,{icon:5});
 
-            }else {
 
-                $("#inputForm").submit();
 
-            }
 
-        }
 
-    });
 
+        layer.msg("请输入项目名称",{icon:3});
 
+        throw SyntaxError;
 
+    }
 
+    $("#inputForm").submit();
 
 }
 
-$("#btnxz").click(function(){
 
-    $("#myfile").trigger("click");
 
-})
 
-$("#myfile").bind("change",function(){
 
-    var w= $("#myfile").val();
 
-    $("#myspan").html('&nbsp;'+w);
 
-});
 
+    $("#btnxz").click(function(){
 
+        $("#myfile").trigger("click");
 
+        })
 
+    $("#myfile").bind("change",function(){
 
+        var solr_file= $("#myfile").val();
 
+        $("#view_input").val(solr_file);
 
+    })
 
 </script>

+ 44 - 43
src/main/webapp/webpage/modules/sg/project/addItemForm.jsp
Näytä tiedosto 

@@ -6,58 +6,59 @@
 
 <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
 
 <html>
 
 <head>
 
-    <title>添加工程</title>
 
+    <title>添加项目</title>
 
+    <link rel="stylesheet" href="${ctxp}/static/plugin/assets/layui/css/layui.css">
 
+    <link rel="stylesheet" href="${ctxp}/static/plugin/assets/common.css"/>
 
+    <script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
 
+    <link rel="stylesheet" href="${ctxp}/static/plugin/assets/bootstrap.min.css">
 
     <style>
 
-        .layui-input{height: 28px;margin-top: 6px;}
 
+
 
+        .layui-input{ height: 28px;}
 
+        td{text-align: center;font-size: 14px;margin-top: 20px;color: #555}
 
+        .layui_td_1{text-align: center;font-size: 14px;}
 
+        .modal-body{padding: 10px}
 
     </style>
 
 </head>
 
 <body>
 
 <form id="inputForm"class="layui-form" action="${ctx}/project/import" method="post" enctype="multipart/form-data">
 
-    <input id="newText1" hidden name="projectId" value=""/>
 
-    <div class="layui-form-item">
 
-        <div class="layui-inline" style="margin-left:30px;margin-top: 10px;display: flex">
 
-            <input type="button" class="layui-btn-primary layui-btn-sm layui-btn-radius" onclick="uploadwj()" value="选择结算文件" id="btnxz"/>
 
-            <span id="myspan" style="flex: 1;margin-top: 4px">&nbsp;*结算书文件为博微导出xls/xlsx格式文件</span>
 
-            <input type="file" style="display: none;" accept=".xls,.xlsx"  name="file" id="myfile"/>
 
-        </div>
 
-    </div>
 
-    <!---------列表---------->
 
-    <div class="layui-form-item">
 
-        <div class="layui-inline">
 
-            <label class="layui-form-label">*项目划分</label>
 
-            <div class="layui-input-inline">
 
-                <select name="type" lay-verify="required" lay-search="">
 
+    <div class="modal-body">
 
+        <%--<fieldset class="layui-elem-field layui-field-title">--%>
 
+        <%--<legend>222</legend>--%>
 
+        <%--</fieldset>--%>
 
+        <table class="table table-bordered table-striped"  width="800px">
 
+            <tr>
 
+                <td class="layui_td_1"><input type="button" class="layui-btn layui-btn-primary layui-btn-sm" value="选择结算文件" id="btnxz"/></td>
 
+                <td>
 
+                    <input type="text" autocomplete="off" readonly="readonly" class="layui-input" placeholder="*结算书文件为博微导出xls/xlsx格式文件" id="view_input" style="background-color: whitesmoke">
 
+                </td>
 
+            </tr>
 
+            <tr>
 
+                <td class="layui_td_1">*项目划分</td>
 
+                <td ><select name="type" lay-verify="required" lay-search="">
 
                     <option value="">请选择</option>
 
                     <option value="1">架空线路工程</option>
 
-                    <option value="2">电缆工程</option
 
+                    <option value="2">电缆工程</option>
 
                     <option value="3">变电站工程</option>
 
-                </select>
 
-            </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="name" autocomplete="off" class="layui-input" id="inputwrite">
 
-            </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="" autocomplete="off" class="layui-input">
 
-            </div>
 
-        </div>
 
-    </div>
 
-    <div class="layui-form-item">
 
-        <div class="layui-input-block">
 
-            <button class="layui-btn" lay-submit="" lay-filter="mysubmit" type="submit" id="newProject" style="display: none;">创建</button>
 
-            <!--<button type="reset" class="layui-btn layui-btn-primary">取消</button>-->
 
-        </div>
 
+                </select></td>
 
+            </tr>
 
+            <tr>
 
+                <td class="layui_td_1">*项目名称</td>
 
+                <td>
 
+                    <input type="text" name="name" autocomplete="off" class="layui-input" id="inputwrite">
 
+                </td>
 
+            </tr>
 
+            <tr>
 
+                <td class="layui_td_1">项目编号</td>
 
+                <td>
 
+                    <input type="text" name="" autocomplete="off" class="layui-input">
 
+                </td>
 
+            </tr>
 
+        </table>
 
     </div>
 
+    <input type="file" style="display: none;" accept=".xls,.xlsx"  name="file" id="myfile"/>
 
+    <input id="newText1" hidden name="projectId" value=""/>
 
 </form>
 
-<%@include file="addItemForm.js"%>
 
 </body>
 
+<script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
 
+<%@include file="addItemForm.js"%>
 
 </html>

+ 2 - 3
src/main/webapp/webpage/modules/sg/project/management.js
Näytä tiedosto 

@@ -113,14 +113,13 @@ layui.config({
 
     treetable.foldAll('#table1');
 
     table.on('tool(table1)', function(obj,target){
 
         var data = obj.data;
 
-        //console.log(obj)
 
         if(obj.event == 'add'){
 
             $("#addtext").val(data.id);
 
             layui.use(['table','layer'],function(){
 
                 layer.open({
 
                     type: 2,
 
-                    title: '添加工程',
 
-                    area: ['40%', '80%'],
 
+                    title: '添加项目',
 
+                    area: ['60%', '80%'],
 
                     shade: 0.8,
 
                     shadeClose: true,
 
                     content: '${ctxp}/webpage/modules/sg/project/addItemForm.jsp'

+ 10 - 10
src/main/webapp/webpage/modules/sg/projecttem/addItem.js
Näytä tiedosto 

@@ -6,17 +6,17 @@
 
         var newText1 = parent.$('#addtext').val();
 
         $("#newText1").val(newText1);
 
     })
 
-    function doSubmit(obj){
 
-        if ($("#myfile").val()==null||$("#myfile").val()==""){
 
-            layer.msg("请选择文件",{icon: 3});
 
-            throw SyntaxError;
 
-        }
 
-        if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
 
-            layer.msg("请输入项目名称",{icon:3});
 
-            throw SyntaxError;
 
-        }
 
-        $("#inputForm").submit();
 
+function doSubmit(obj){
 
+    if ($("#myfile").val()==null||$("#myfile").val()==""){
 
+        layer.msg("请选择文件",{icon: 3});
 
+        throw SyntaxError;
 
     }
 
+    if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
 
+        layer.msg("请输入项目名称",{icon:3});
 
+        throw SyntaxError;
 
+    }
 
+    $("#inputForm").submit();
 
+}
 
     $("#btnxz").click(function(){
 
         $("#myfile").trigger("click");
 
     })

+ 29 - 29
src/main/webapp/webpage/modules/sg/projecttem/manageList.js
Näytä tiedosto 

@@ -30,18 +30,18 @@
 
     var xml = "";
 
     if(d.status==1){
 
     xml += "<a class='layui-btn layui-btn-primary layui-btn-xs' onclick=\"look( '${ctx}/project/tem/form?id=" + d.id + "&tabId=1')\">查看</a>"
 
-    +"<a class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/tem/form?id=" + d.id + "&tabId=2')\">修改</a>"
 
-    +"<a class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加项目</a>";
 
-}
 
+        +"<a class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/tem/form?id=" + d.id + "&tabId=2')\">修改</a>"
 
+        +"<a class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加项目</a>";
 
+    }
 
     if(d.status==2){
 
-    xml +="<span class='myspan'>操作</span>";
 
-}
 
+        xml +="<span class='myspan'>操作</span>";
 
+    }
 
     if(d.status==3){
 
-    xml +="<a class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"&projectId="+d.pid+"\">编辑</a>";
 
-}
 
+        xml +="<a class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"&projectId="+d.pid+"\">编辑</a>";
 
+    }
 
 
-    return xml;
 
-}}
 
+        return xml;
 
+        }}
 
     ]],
 
     "data": [
 
     <c:if test="${ not empty list}">
 
@@ -95,26 +95,26 @@
 
     var data = obj.data;
 
     //console.log(obj)
 
     if(obj.event == 'add'){
 
-    $("#addtext").val(data.id);
 
-    layui.use(['table','layer'],function(){
 
-    layer.open({
 
-    type: 2,
 
-    title: '添加项目',
 
-    area: ['60%', '80%'],
 
-    shade: 0.8,
 
-    shadeClose: true,
 
-    content: '${ctxp}/webpage/modules/sg/projecttem/addItem.jsp'
 
-    , btn: ['确定','关闭']
 
-    ,yes: function(index, layero){
 
-    var body = layer.getChildFrame('body', index);
 
-    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
-    var inputForm = body.find('#inputForm');
 
-    var top_iframe;
 
-    if(target){
 
-    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
-}else{
 
-    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
-}
 
+        $("#addtext").val(data.id);
 
+        layui.use(['table','layer'],function(){
 
+        layer.open({
 
+        type: 2,
 
+        title: '添加项目',
 
+        area: ['60%', '80%'],
 
+        shade: 0.8,
 
+        shadeClose: true,
 
+        content: '${ctxp}/webpage/modules/sg/projecttem/addItem.jsp'
 
+        , btn: ['确定','关闭']
 
+        ,yes: function(index, layero){
 
+        var body = layer.getChildFrame('body', index);
 
+        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+        var inputForm = body.find('#inputForm');
 
+        var top_iframe;
 
+        if(target){
 
+        top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+    }else{
 
+        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+    }
 
     inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
     iframeWin.contentWindow.doSubmit();

+ 1 - 1
src/main/webapp/webpage/modules/sg/projecttem/updateItem.jsp
Näytä tiedosto 

@@ -42,7 +42,7 @@
 
             <label class="layui-form-label">创建时间</label>
 
             <div class="layui-input-inline">
 
                 <input type="text" name="beginUpdate"  readonly="readonly"  placeholder="yyyy-MM-dd" autocomplete="off"
 
-                       class="layui-input" value="<fmt:formatDate value="${data.createDate}" pattern="yyyy/MM/dd "/>">
 
+                       class="layui-input" value="<fmt:formatDate value="${data.createDate}" pattern="yyyy/MM/dd "/>" style="background-color: whitesmoke">
 
             </div>
 
         </div>
 
     </div>