Browse Source

js文件提取

xs 5 years ago
parent
commit
7d03e1450f

+ 119 - 0
src/main/webapp/webpage/modules/sg/free/alongst.js

@@ -0,0 +1,119 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<script type="text/javascript">
+    layui.use(['table','form','layedit', 'laydate'], function(){
+    var table = layui.table
+    ,form = layui.form;
+    form.render();
+    table.render({
+    elem: '#longtable'
+    ,title: '单独调整页'
+    ,id:'checktable'
+    ,cols: [[
+{type: 'checkbox',width:30}
+    ,{field:'wbsys',width:100,title:'分部分项'}
+    ,{field:'wbsCode',width:120,title:'WBS识别码'}
+    ,{field:'bl',width:100,title:'比例(%)',edit: 'text'}
+    ,{field:'fee',width:100,title:'分摊金额',edit: 'text'}
+    ]]
+    ,data:[
+    <c:if test="${ not empty list}">
+    <c:forEach items="${list}" var="data" varStatus="index">
+    {
+        "id":"1",
+        "wbsys": "${data.describe}",
+        "wbsCode": "${data.wbsCode}",
+        "bl":'',
+        "fee":''
+    },
+    </c:forEach>
+    </c:if>
+    ]
+    ,page: false
+});
+    table.on('edit(longtable)', function(obj){
+
+    var field = obj.field;
+    var moneycount = $("#readid2").text();
+    if(field == 'bl'){
+    var value = obj.value;
+    var data = obj.data;
+    var blvalue = value/100;
+    if(value==''){
+    var w = $(this).closest("tr").find("td").eq("4").find("div").html("");
+    data.fee="";
+    return false;
+}
+    if(isNaN(blvalue)){
+    layer.msg('请输入有效数字');
+    return false;
+}
+    var bfb = (blvalue*moneycount).toFixed(2);
+    var w = $(this).closest("tr").find("td").eq("4").find("div").html(bfb);
+    data.fee=bfb;
+}else{
+    var value = obj.value;
+    var data = obj.data;
+    var feevalue = value/moneycount;
+    if(value==''){
+    $(this).closest("tr").find("td").eq("3").find("div").html("");
+    data.bl="";
+    return false;
+}
+    if(isNaN(value)){
+    layer.msg('请输入有效数字');
+    return false;
+}
+    var bfb2 = (feevalue*100).toFixed(2);
+    $(this).closest("tr").find("td").eq("3").find("div").html(bfb2);
+    data.bl=bfb2;
+}
+});
+    var $ = layui.$, active = {
+    getCheckData: function(){ //获取选中数据
+    var checkStatus = table.checkStatus('checktable'),
+    data = checkStatus.data;
+    var moneycount2 = $("#readid2").text();
+    var val = $('input[name="mydiv"]:checked').val();
+    if(val==null){
+    layer.msg('请选择操作方式');
+    return false;
+}
+    var jsondata=JSON.stringify(data);
+    var objdata = JSON.parse(jsondata);
+    var blcount = 0;
+    var feecount = 0;
+    for (var i = 0;i<objdata.length;i++) {
+    blcount=Number(blcount)+Number(objdata[i].bl) ;
+    feecount=Number(feecount)+Number(objdata[i].fee);
+}
+    if(blcount!=100||feecount!=moneycount2){
+    layer.msg('比例/金额分配不正确!');
+    return false;
+}
+    var newid2 = parent.$('#newid').val();
+    var xmmc2 = parent.$('#xmmc1').val();
+    var fyje2 = parent.$('#fyje1').val();
+
+    $.ajax({
+    type:"post",
+    url:"${ctx}/jkxl/ddtz",
+    // data:JSON.stringify({id:newid2,type:xmmc2,fee:fyje2}),
+    data:{id:newid2,type:xmmc2,fee:fyje2,tableData:jsondata,state:val },
+    success:function(result){
+    parent.location.reload();
+}
+});
+}
+};
+
+    $('.suretable .layui-btn').on('click', function(){
+    var type = $(this).data('type');
+    active[type] ? active[type].call(this) : '';
+});
+    var newid2 = parent.$('#newid').val();
+    var xmmc2 = parent.$('#xmmc1').val();
+    var fyje2 = parent.$('#fyje1').val();
+    $("#mylable2").text(xmmc2);
+    $("#readid2").text(fyje2);
+});
+</script>

+ 2 - 139
src/main/webapp/webpage/modules/sg/free/alongst.jsp

@@ -1,10 +1,3 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: user
-  Date: 2019/8/11
-  Time: 9:30
-  To change this template use File | Settings | File Templates.
---%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -14,16 +7,11 @@
     <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>
     <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
+    <%@include file="alongst.js"%>
 </head>
 <style>
     .layui-table-view .layui-table {width:100%}
-    .layui-table-cell .layui-form-checkbox[lay-skin="primary"]{
-
-        top: 50%;
-
-        transform: translateY(-50%);
-
-    }
+    .layui-table-cell .layui-form-checkbox[lay-skin="primary"]{top: 50%;transform: translateY(-50%);}
 </style>
 <body>
 <div class="layui-btn-group suretable" style="display: none;">
@@ -45,130 +33,5 @@
 <!--<div>-->
 <table class="layui-hide" id="longtable" lay-filter="longtable"></table>
 <!--</div>-->
-
-
-
-<script>
-    layui.use(['table','form','layedit', 'laydate'], function(){
-        var table = layui.table
-            ,form = layui.form;
-        form.render();
-        table.render({
-            elem: '#longtable'
-            ,title: '单独调整页'
-            ,id:'checktable'
-            ,cols: [[
-                {type: 'checkbox',width:30}
-                ,{field:'wbsys',width:100,title:'分部分项'}
-                ,{field:'wbsCode',width:120,title:'WBS识别码'}
-                ,{field:'bl',width:100,title:'比例(%)',edit: 'text'}
-                ,{field:'fee',width:100,title:'分摊金额',edit: 'text'}
-            ]]
-            ,data:[
-            <c:if test="${ not empty list}">
-             <c:forEach items="${list}" var="data" varStatus="index">
-                {
-                    "id":"1",
-                    "wbsys": "${data.describe}",
-                    "wbsCode": "${data.wbsCode}",
-                    "bl":'',
-                    "fee":''
-                },
-             </c:forEach>
-                </c:if>
-            ]
-            ,page: false
-        });
-        table.on('edit(longtable)', function(obj){
-
-            var field = obj.field;
-            var moneycount = $("#readid2").text();
-            if(field == 'bl'){
-                var value = obj.value;
-                var data = obj.data;
-                var blvalue = value/100;
-                if(value==''){
-                    var w = $(this).closest("tr").find("td").eq("4").find("div").html("");
-                    data.fee="";
-                    return false;
-                }
-                if(isNaN(blvalue)){
-                    layer.msg('请输入有效数字');
-                    return false;
-                }
-                var bfb = (blvalue*moneycount).toFixed(2);
-                var w = $(this).closest("tr").find("td").eq("4").find("div").html(bfb);
-                data.fee=bfb;
-            }else{
-                var value = obj.value;
-                var data = obj.data;
-                var feevalue = value/moneycount;
-                if(value==''){
-                    $(this).closest("tr").find("td").eq("3").find("div").html("");
-                    data.bl="";
-                    return false;
-                }
-                if(isNaN(value)){
-                    layer.msg('请输入有效数字');
-                    return false;
-                }
-                var bfb2 = (feevalue*100).toFixed(2);
-                $(this).closest("tr").find("td").eq("3").find("div").html(bfb2);
-                data.bl=bfb2;
-            }
-        });
-        var $ = layui.$, active = {
-            getCheckData: function(){ //获取选中数据
-                var checkStatus = table.checkStatus('checktable'),
-                    data = checkStatus.data;
-                var moneycount2 = $("#readid2").text();
-                var val = $('input[name="mydiv"]:checked').val();
-                if(val==null){
-                    layer.msg('请选择操作方式');
-                    return false;
-                }
-                var jsondata=JSON.stringify(data);
-		     // var e= jsondata.stringify(jsondata);
-                var objdata = JSON.parse(jsondata);
-             //    var objdata = JSON.stringify(jsondata);
-
-                var blcount = 0;
-                var feecount = 0;
-                for (var i = 0;i<objdata.length;i++) {
-                    blcount=Number(blcount)+Number(objdata[i].bl) ;
-                    feecount=Number(feecount)+Number(objdata[i].fee);
-                }
-                if(blcount!=100||feecount!=moneycount2){
-                    layer.msg('比例/金额分配不正确!');
-                    return false;
-                }
-                var newid2 = parent.$('#newid').val();
-                var xmmc2 = parent.$('#xmmc1').val();
-                var fyje2 = parent.$('#fyje1').val();
-
-                $.ajax({
-                    type:"post",
-                    url:"${ctx}/jkxl/ddtz",
-                    // data:JSON.stringify({id:newid2,type:xmmc2,fee:fyje2}),
-                    data:{id:newid2,type:xmmc2,fee:fyje2,tableData:jsondata,state:val },
-                    success:function(result){
-                        parent.location.reload();
-                    }
-                });
-            }
-        };
-
-        $('.suretable .layui-btn').on('click', function(){
-            var type = $(this).data('type');
-            active[type] ? active[type].call(this) : '';
-        });
-//		  -----
-        var newid2 = parent.$('#newid').val();
-        var xmmc2 = parent.$('#xmmc1').val();
-        var fyje2 = parent.$('#fyje1').val();
-        $("#mylable2").text(xmmc2);
-        $("#readid2").text(fyje2);
-    });
-</script>
 </body>
 </html>

+ 25 - 0
src/main/webapp/webpage/modules/sg/free/avgpage.js

@@ -0,0 +1,25 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<script type="text/javascript">
+    layui.use(['form', 'layedit', 'laydate'], function(){
+    var form = layui.form
+    ,layer = layui.layer
+    ,layedit = layui.layedit
+    ,laydate = layui.laydate;
+    form.render();
+    var index = parent.layer.getFrameIndex(window.name);
+    var newid2 = parent.$('#newid').val();
+    var xmmc2 = parent.$('#xmmc1').val();
+    var fyje2 = parent.$('#fyje1').val();
+    var type = parent.$("#type").val();
+    $("#newid2").val(newid2);
+    $("#xmmc2").val(xmmc2);
+    $("#fyje2").val(fyje2);
+    $("#mylable").text(xmmc2);
+    $("#readid2").text(fyje2);
+    $("#type").val(type);
+});
+
+    function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
+    $("#inputForm").submit();
+}
+</script>

+ 1 - 45
src/main/webapp/webpage/modules/sg/free/avgpage.jsp

@@ -1,10 +1,3 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: user
-  Date: 2019/8/9
-  Time: 20:39
-  To change this template use File | Settings | File Templates.
---%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -14,6 +7,7 @@
     <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>
     <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
+    <%@include file="avgpage.js"%>
     <style>
         .layui-table-view .layui-table {width:100%}
         .layui-input-block{margin-left: 20px;}
@@ -75,44 +69,6 @@
             <input type="radio" name="code" value="税费" title="税费">
         </div>
     </div>
-    <%--<div class="layui-form-item">--%>
-        <%--<div class="layui-input-block">--%>
-            <%--<button class="layui-btn" lay-submit="" lay-filter="demo1">确定</button>--%>
-            <!--<button type="reset" class="layui-btn layui-btn-primary">重置</button>-->
-        <%--</div>--%>
-    <%--</div>--%>
 </form:form>
 </body>
-<script>
-    layui.use(['form', 'layedit', 'laydate'], function(){
-        var form = layui.form
-            ,layer = layui.layer
-            ,layedit = layui.layedit
-            ,laydate = layui.laydate;
-        form.render();
-        var index = parent.layer.getFrameIndex(window.name);
-        var newid2 = parent.$('#newid').val();
-        var xmmc2 = parent.$('#xmmc1').val();
-        var fyje2 = parent.$('#fyje1').val();
-        var type = parent.$("#type").val();
-        $("#newid2").val(newid2);
-        $("#xmmc2").val(xmmc2);
-        $("#fyje2").val(fyje2);
-        $("#mylable").text(xmmc2);
-        $("#readid2").text(fyje2);
-        $("#type").val(type);
-    });
-
-    function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
-            $("#inputForm").submit();
-        <%--$.ajax({--%>
-            <%--type:"post",--%>
-            <%--url:"${ctx}/jkxl/fttz",--%>
-            <%--data:$("#inputForm").serialize(),--%>
-            <%--success:function(result){--%>
-                <%--// parent.location.reload();--%>
-            <%--}--%>
-        <%--});--%>
-    }
-</script>
 </html>

+ 328 - 0
src/main/webapp/webpage/modules/sg/free/wbslist.js

@@ -0,0 +1,328 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<script type="text/javascript">
+    layui.config({
+    base: '${ctxp}/static/plugin/assets/'
+}).extend({
+    treetable: 'treetable-lay/treetable'
+}).use(['layer', 'table', 'treetable'], function () {
+    var $ = layui.jquery;
+    var table = layui.table;
+    var layer = layui.layer;
+    var treetable = layui.treetable;
+
+    var renderTable1 = function () {
+    layer.load(2);
+    treetable.render({
+    treeColIndex: 1,
+    treeSpid: -1,
+    treeIdName: 'id',
+    treePidName: 'pid',
+    treeDefaultClose: false,
+    treeLinkage: false,
+    elem: '#table1',
+    <%--url: '${ctxp}/webpage/modules/sys/free/selfwbs.json',--%>
+    page: false,
+    cols: [[
+    {type:'numbers',title: '序号', rowspan: 2, totalRowText: "合计",},
+    {field: 'wbsys', title: 'WBS要素',width:200, rowspan:'2'},
+
+    {field:'wbssbm',width:100, align:'center',rowspan:'2',title:"wbs识别码",rowspan:'2'},
+    {field:'fbfxysj', align:'center', title: '分部分项(原数据)',colspan:'6'},
+    {field:'fbfxtch',align:'center',title:'分部分项(调差后)',colspan:'4'},
+    {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'10'},
+
+    {field:'hj',align:'center',width:120,title:'合计',rowspan:'2',totalRow: true}
+//                  {templet: '#oper-col', title: 'oper'}
+    ],[
+    {field:'hjje', width:120,align:'center',title:'合计金额',totalRow: true},
+    {field:'zjgcf', width:120,align:'center',title:'直接工程费',totalRow: true},
+    {field:'rgf1', width:120,align:'center',title:'人工费',totalRow: true},
+    {field:'cbrcg1', width:120,align:'center',title:'承包人采购',totalRow: true},
+    {field:'fbrcg1', width:120,align:'center',title:'发包人采购',totalRow: true},
+    {field:'jxf1', width:120,align:'center',title:'机械费',totalRow: true},
+
+    {field:'rgf2', width:120,align:'center',title:'人工费',totalRow: true},
+    {field:'cbrcg2', width:120,align:'center',title:'承包人采购',totalRow: true},
+    {field:'fbrcg2', width:120,align:'center',title:'发包人采购',totalRow: true},
+    {field:'jxf2', width:120,align:'center',title:'机械费',totalRow: true},
+
+    {field:'rgf3', width:120,align:'center',title:'人工费',totalRow: true},
+    {field:'cbrcg3', width:120,align:'center',title:'承包人采购',totalRow: true},
+    {field:'fbrcg3', width:120,align:'center',title:'发包人采购',totalRow: true},
+    {field:'jxf3', width:120,align:'center',title:'机械费',totalRow: true},
+
+    {field:'csf_1',width:120,title:'措施费-1',align:'center',totalRow: true},
+    {field:'csf_2',width:120,title:'措施费-2',align:'center',totalRow: true},
+    {field:'csf2',align:'center',width:120,title:'措施费二',totalRow: true},
+    {field:'qtf',align:'center',width:120,title:'其他费',totalRow: true},
+    {field:'gf',align:'center',width:120,title:'规费',totalRow: true},
+    {field:'sf',align:'center',width:120,title:'税金',totalRow: true},
+    // {field:'gxfy',align:'center',width:120,title: '共性费用',rowspan:'2',totalRow: true},
+    ]]
+    ,data: [
+    <c:if test="${ not empty map.list}">
+    <c:forEach items="${map.list}" var="data" varStatus="index">
+    <c:if test="${data.feeType eq '1'}">
+    {
+        "id": "${data.wbsCode}",
+        "wbsys":"${data.describe}",
+        "wbssbm": "${data.wbsCode}",
+
+        "hjje": "${data.originalTotalCost}",
+        "zjgcf":"${data.zjgcFee}",
+        "rgf1": "${data.originalRgCost}",
+        "cbrcg1": "${data.originalCbrCost}",
+        "fbrcg1": "${data.originalFbrCost}",
+        "jxf1": "${data.originalJxCost}",
+
+        "rgf2": "${data.rgCost}",
+        "cbrcg2": "${data.cbrCost}",
+        "fbrcg2":"${data.fbrCost}",
+        "jxf2": "${data.jxCost}",
+
+        <%--"rgf3": "${data.rgFtFee}",--%>
+                    "rgf3": "<c:if test="${ empty data.rgFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.rgFtFee}">${data.rgFtFee}</c:if> ",
+        "cbrcg3": "<c:if test="${ empty data.cbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.cbrFtFee}">${data.cbrFtFee}</c:if>",
+        "fbrcg3": "<c:if test="${ empty data.fbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.fbrFtFee}">${data.fbrFtFee}</c:if>",
+        "jxf3": "<c:if test="${ empty data.jxFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.jxFtFee}">${data.jxFtFee}</c:if>",
+
+        "csf_1": "${data.measuresFee1}",
+        "csf_2": "${data.measuresFee2}",
+        "csf2": "<c:if test="${ empty data.measuresFee3 and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.measuresFee3}">${data.measuresFee3}</c:if>",
+        "qtf":"${data.otherCost}",
+        "gf":"${data.fees}",
+        "sf":"${data.tex}",
+        "hj": "${data.totalFee}",
+        "gxfy": "${data.gxFee}",
+        "pid": "${data.parentNode}"
+    },
+    </c:if>
+    </c:forEach>
+    </c:if>
+    ],
+    done: function () {
+    layer.closeAll('loading');
+}
+});
+};
+
+    renderTable1();
+});
+</script>
+<script>
+layui.use(['table', 'form', 'element', 'treetable'], function () {
+    var $ = layui.jquery;
+    var table = layui.table;
+    var form = layui.form;
+    var element = layui.element;
+    var treetable = layui.treetable;
+
+    // 渲染表格
+    var renderTable2 = function () {
+        layer.load(2);
+        treetable.render({
+            treeColIndex: 1,
+            treeSpid: -1,
+            treeIdName: 'd_id',
+            treePidName: 'd_pid',
+            elem: '#table2',
+        <%--url: '${ctxp}/webpage/modules/sys/free/other.json',--%>
+    page: false,
+    cols: [[
+    {type: 'numbers'},
+    {field: 'wbsys', title: 'WBS要素'},
+    {field: 'wbssbm', title: 'WBS识别码'},
+    {field: 'money', title: '金额'},
+    ]]
+    ,data: [
+                <c:if test="${ not empty map.list}">
+                    <c:forEach items="${map.list}" var="data" varStatus="index">
+                        <c:if test="${data.feeType eq '0'}">
+                            {
+                                "d_id": "${data.wbsCode}",
+                                "wbsys": "${data.describe}",
+                                "wbssbm": "${data.wbsCode}",
+                                "money": "${data.totalFee}",
+                                "d_pid": "${data.parentNode}"
+
+                            },
+                        </c:if>
+                    </c:forEach>
+                </c:if>
+    ],
+        done: function () {
+            layer.closeAll('loading');
+        }
+    });
+    };
+
+    renderTable2();
+});
+</script>
+<script>
+layui.use('table', function(){
+    var table = layui.table;
+});
+</script>
+<script>
+layui.use('table', function(){
+    var table = layui.table;
+
+    table.render({
+        elem: '#xmmc'
+        ,title: '未标识'
+        ,cols: [[
+            {field:'xmmc', width:200,title:'项目名称'}
+            ,{field:'fyje', width:178,title:'费用金额'}
+            ,{width:178,  toolbar: '#barDemo',title:'操作'}
+        ]]
+        ,data:[
+            <c:if test="${ not empty map.list}">
+                <c:forEach items="${map.list2}" var="data" varStatus="index">
+                    {
+                        "id":"${data.id}",
+                        "xmmc": "${data.type}",
+                        "fyje": "${data.fee}"
+                    },
+                </c:forEach>
+            </c:if>
+        ]
+        ,page: false
+    });
+    //监听工具条
+    table.on('tool(freestr)', function(obj){
+        var datacount="";
+        var data = obj.data;
+        if(obj.event === 'fttz'){
+            sureradio(data);
+        } else if(obj.event === 'ddtz'){
+            sureradio2(data,'${ctx}/jkxl/getft?id='+data.id);
+        }
+        // alert(datacount);
+    });
+});
+</script>
+<script>
+function sureradio2(data,url){
+    var newid = data.id;
+    var xmmc = data.xmmc;
+    var fyje = data.fyje;
+    $("#newid").val(newid);
+    $("#xmmc1").val(xmmc);
+    $("#fyje1").val(fyje);
+    layui.use(['table','layer'],function(){
+
+        layer.open({
+            type: 2,
+            title: '单独调整',
+            area: ['70%', '90%'],
+            shade: 0.8,
+            maxmin: true,
+            shadeClose: true,
+        <%--content: '${ctxp}/webpage/modules/sg/free/alongst.jsp'--%>
+    content: url
+    , btn: ['确定','关闭']
+                ,yes: function(index, layero){
+                    var bodyparent = layer.getChildFrame('body', index);
+                    bodyparent.find('#freenl').click();
+                }
+                ,btn2: function(index, layero){
+//		  		alert(layero);
+                    layer.close(index);
+                }
+            })
+        })
+    }
+</script>
+<script>
+    function sureradio(data,target){
+        var newid = data.id;
+        var xmmc = data.xmmc;
+        var fyje = data.fyje;
+        $("#newid").val(newid);
+        $("#xmmc1").val(xmmc);
+        $("#fyje1").val(fyje);
+        layui.use(['table','layer'],function(){
+
+           layer.open({
+                type: 2,
+                title: xmmc,
+                area: ['40%', '90%'],
+    shade: 0.8,
+    shadeClose: true,
+    content: '${ctxp}/webpage/modules/sg/free/avgpage.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();
+
+                    layer.close(index);//关闭对话框。
+
+                }
+
+            })
+        })
+    }
+</script>
+<script>
+    layui.use('table', function(){
+        var table = layui.table;
+        table.render({
+            elem: '#settlement'
+            ,limit:Number.MAX_VALUE
+            ,title: '结算汇总表'
+            ,cols: [[
+                {width:50, title: '序号',type:'numbers'}
+                ,{field:'setname',title:'项目或费用名称'}
+                ,{field:'setmoney',title:'金额'}
+                ,{field:'settext', title:'备注'}
+                ,{field:'op',align:'center',title:"数据核验", templet:function(d){
+                        ////对操作进行初始化
+                        var xml = "";
+                        if(d.status=="1")
+                            xml += "<a style='margin-top: 3px;' class='layui-btn layui-btn-danger layui-btn-xs' lay-event='byz'>不一致</a>";
+        if(d.status == "0")
+            xml+="<a style='margin-top: 3px;' class='layui-btn layui-btn-xs' lay-event='byz'>一致</a>";
+        return xml;
+    }}
+]]
+,data:[
+        <c:if test="${not empty map.list3}">
+            <c:forEach items="${map.list3}" var="data">
+                {
+                    "id":"${data.id}",
+                    "setname": "${data.entryName}",
+                    "setmoney":"${data.money}",
+                    "settext":"${data.remarks}",
+                    "status":"${data.status}",
+                    "reason":"${data.reason}"
+                },
+            </c:forEach>
+        </c:if>
+    ]
+    // ,page: false
+});
+//监听行工具事件
+table.on('tool(settle)', function(obj){
+    var data = obj.data;
+    if(obj.event === 'byz'){
+        layer.open({
+            type: 1,
+            title:data.setname,
+            // skin: 'layui-layer-rim',
+            area: ['50%', '70%'],
+            content: "<div style='padding: 16px'>"+data.reason+"</div>"
+        });
+    }
+});
+});
+</script>

+ 9 - 361
src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -1,46 +1,22 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: user
-  Date: 2019/8/7
-  Time: 18:39
-  To change this template use File | Settings | File Templates.
---%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
+
 <html>
 <head>
     <title>wbs</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>
+    <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
+    <%@include file="wbslist.js"%>
 </head>
 <style>
-    .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;
-    }
-    .layui-meself-img1{
-        width: 15px;height:15px;
-        /*padding: 2px;*/
-        margin-bottom: 3px;
-    }
-    .layui-btn-meself{
-        width: 70px;
-        padding: 4px 7px;
-    }
+    .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;}
+    .layui-meself-img1{width: 15px;height:15px;/*padding: 2px;*/margin-bottom: 3px;}
+    .layui-btn-meself{ width: 70px;padding: 4px 7px;}
      .layui-table-view .layui-table {width:100%}
 </style>
 <body style="background-color: white ;height: 100%">
@@ -95,332 +71,4 @@
         <a class="layui-btn layui-btn-xs" lay-event="ddtz">单独调整</a>
     </script>
 </body>
-<script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
-<script>
-    layui.config({
-        base: '${ctxp}/static/plugin/assets/'
-    }).extend({
-        treetable: 'treetable-lay/treetable'
-    }).use(['layer', 'table', 'treetable'], function () {
-        var $ = layui.jquery;
-        var table = layui.table;
-        var layer = layui.layer;
-        var treetable = layui.treetable;
-
-        var renderTable1 = function () {
-            layer.load(2);
-            treetable.render({
-                treeColIndex: 1,
-                treeSpid: -1,
-                treeIdName: 'id',
-                treePidName: 'pid',
-                treeDefaultClose: false,
-                treeLinkage: false,
-                elem: '#table1',
-                <%--url: '${ctxp}/webpage/modules/sys/free/selfwbs.json',--%>
-                page: false,
-                cols: [[
-                    {type:'numbers',title: '序号', rowspan: 2, totalRowText: "合计",},
-                    {field: 'wbsys', title: 'WBS要素',width:200, rowspan:'2'},
-
-                    {field:'wbssbm',width:100, align:'center',rowspan:'2',title:"wbs识别码",rowspan:'2'},
-                    {field:'fbfxysj', align:'center', title: '分部分项(原数据)',colspan:'6'},
-                    {field:'fbfxtch',align:'center',title:'分部分项(调差后)',colspan:'4'},
-                    {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'10'},
-
-                    {field:'hj',align:'center',width:120,title:'合计',rowspan:'2',totalRow: true}
-//                  {templet: '#oper-col', title: 'oper'}
-                ],[
-                    {field:'hjje', width:120,align:'center',title:'合计金额',totalRow: true},
-                    {field:'zjgcf', width:120,align:'center',title:'直接工程费',totalRow: true},
-                    {field:'rgf1', width:120,align:'center',title:'人工费',totalRow: true},
-                    {field:'cbrcg1', width:120,align:'center',title:'承包人采购',totalRow: true},
-                    {field:'fbrcg1', width:120,align:'center',title:'发包人采购',totalRow: true},
-                    {field:'jxf1', width:120,align:'center',title:'机械费',totalRow: true},
-
-                    {field:'rgf2', width:120,align:'center',title:'人工费',totalRow: true},
-                    {field:'cbrcg2', width:120,align:'center',title:'承包人采购',totalRow: true},
-                    {field:'fbrcg2', width:120,align:'center',title:'发包人采购',totalRow: true},
-                    {field:'jxf2', width:120,align:'center',title:'机械费',totalRow: true},
-
-                    {field:'rgf3', width:120,align:'center',title:'人工费',totalRow: true},
-                    {field:'cbrcg3', width:120,align:'center',title:'承包人采购',totalRow: true},
-                    {field:'fbrcg3', width:120,align:'center',title:'发包人采购',totalRow: true},
-                    {field:'jxf3', width:120,align:'center',title:'机械费',totalRow: true},
-
-                    {field:'csf_1',width:120,title:'措施费-1',align:'center',totalRow: true},
-                    {field:'csf_2',width:120,title:'措施费-2',align:'center',totalRow: true},
-                    {field:'csf2',align:'center',width:120,title:'措施费二',totalRow: true},
-                    {field:'qtf',align:'center',width:120,title:'其他费',totalRow: true},
-                    {field:'gf',align:'center',width:120,title:'规费',totalRow: true},
-                    {field:'sf',align:'center',width:120,title:'税金',totalRow: true},
-                    // {field:'gxfy',align:'center',width:120,title: '共性费用',rowspan:'2',totalRow: true},
-                ]]
-                ,data: [
-                <c:if test="${ not empty map.list}">
-                <c:forEach items="${map.list}" var="data" varStatus="index">
-                    <c:if test="${data.feeType eq '1'}">
-                {
-                    "id": "${data.wbsCode}",
-                    "wbsys":"${data.describe}",
-                    "wbssbm": "${data.wbsCode}",
-
-                    "hjje": "${data.originalTotalCost}",
-                    "zjgcf":"${data.zjgcFee}",
-                    "rgf1": "${data.originalRgCost}",
-                    "cbrcg1": "${data.originalCbrCost}",
-                    "fbrcg1": "${data.originalFbrCost}",
-                    "jxf1": "${data.originalJxCost}",
-
-                    "rgf2": "${data.rgCost}",
-                    "cbrcg2": "${data.cbrCost}",
-                    "fbrcg2":"${data.fbrCost}",
-                    "jxf2": "${data.jxCost}",
-
-                    <%--"rgf3": "${data.rgFtFee}",--%>
-                    "rgf3": "<c:if test="${ empty data.rgFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.rgFtFee}">${data.rgFtFee}</c:if> ",
-                    "cbrcg3": "<c:if test="${ empty data.cbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.cbrFtFee}">${data.cbrFtFee}</c:if>",
-                    "fbrcg3": "<c:if test="${ empty data.fbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.fbrFtFee}">${data.fbrFtFee}</c:if>",
-                    "jxf3": "<c:if test="${ empty data.jxFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.jxFtFee}">${data.jxFtFee}</c:if>",
-
-                    "csf_1": "${data.measuresFee1}",
-                    "csf_2": "${data.measuresFee2}",
-                    "csf2": "<c:if test="${ empty data.measuresFee3 and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.measuresFee3}">${data.measuresFee3}</c:if>",
-                    "qtf":"${data.otherCost}",
-                    "gf":"${data.fees}",
-                    "sf":"${data.tex}",
-                    "hj": "${data.totalFee}",
-                    "gxfy": "${data.gxFee}",
-                    "pid": "${data.parentNode}"
-                },
-                    </c:if>
-                </c:forEach>
-                </c:if>
-            ],
-                done: function () {
-                    layer.closeAll('loading');
-                }
-            });
-        };
-
-        renderTable1();
-    });
-</script>
-<script>
-    layui.use(['table', 'form', 'element', 'treetable'], function () {
-        var $ = layui.jquery;
-        var table = layui.table;
-        var form = layui.form;
-        var element = layui.element;
-        var treetable = layui.treetable;
-
-        // 渲染表格
-        var renderTable2 = function () {
-            layer.load(2);
-            treetable.render({
-                treeColIndex: 1,
-                treeSpid: -1,
-                treeIdName: 'd_id',
-                treePidName: 'd_pid',
-                elem: '#table2',
-                <%--url: '${ctxp}/webpage/modules/sys/free/other.json',--%>
-                page: false,
-                cols: [[
-                    {type: 'numbers'},
-                    {field: 'wbsys', title: 'WBS要素'},
-                    {field: 'wbssbm', title: 'WBS识别码'},
-                    {field: 'money', title: '金额'},
-                ]]
-                ,data: [
-                <c:if test="${ not empty map.list}">
-                <c:forEach items="${map.list}" var="data" varStatus="index">
-                <c:if test="${data.feeType eq '0'}">
-                {
-                    "d_id": "${data.wbsCode}",
-                    "wbsys": "${data.describe}",
-                    "wbssbm": "${data.wbsCode}",
-                    "money": "${data.totalFee}",
-                    "d_pid": "${data.parentNode}"
-
-                },
-                    </c:if>
-                </c:forEach>
-                </c:if>
-            ],
-                done: function () {
-                    layer.closeAll('loading');
-                }
-            });
-        };
-
-        renderTable2();
-    });
-</script>
-<script>
-    layui.use('table', function(){
-        var table = layui.table;
-    });
-</script>
-<script>
-    layui.use('table', function(){
-        var table = layui.table;
-
-        table.render({
-            elem: '#xmmc'
-            ,title: '未标识'
-            ,cols: [[
-                {field:'xmmc', width:200,title:'项目名称'}
-                ,{field:'fyje', width:178,title:'费用金额'}
-                ,{width:178,  toolbar: '#barDemo',title:'操作'}
-            ]]
-            ,data:[
-            <c:if test="${ not empty map.list}">
-               <c:forEach items="${map.list2}" var="data" varStatus="index">
-                {
-                    "id":"${data.id}",
-                    "xmmc": "${data.type}",
-                    "fyje": "${data.fee}"
-                },
-                </c:forEach>
-                </c:if>
-            ]
-            ,page: false
-        });
-        //监听工具条
-        table.on('tool(freestr)', function(obj){
-            var datacount="";
-            var data = obj.data;
-            if(obj.event === 'fttz'){
-                sureradio(data);
-            } else if(obj.event === 'ddtz'){
-                sureradio2(data,'${ctx}/jkxl/getft?id='+data.id);
-            }
-            // alert(datacount);
-        });
-    });
-</script>
-<script>
-    function sureradio2(data,url){
-        var newid = data.id;
-        var xmmc = data.xmmc;
-        var fyje = data.fyje;
-        $("#newid").val(newid);
-        $("#xmmc1").val(xmmc);
-        $("#fyje1").val(fyje);
-        layui.use(['table','layer'],function(){
-
-            layer.open({
-                type: 2,
-                title: '单独调整',
-                area: ['70%', '90%'],
-                shade: 0.8,
-                maxmin: true,
-                shadeClose: true,
-                <%--content: '${ctxp}/webpage/modules/sg/free/alongst.jsp'--%>
-                content: url
-                , btn: ['确定','关闭']
-                ,yes: function(index, layero){
-                    var bodyparent = layer.getChildFrame('body', index);
-                    bodyparent.find('#freenl').click();
-                }
-                ,btn2: function(index, layero){
-//		  		alert(layero);
-                    layer.close(index);
-                }
-            })
-        })
-    }
-</script>
-<script>
-    function sureradio(data,target){
-        var newid = data.id;
-        var xmmc = data.xmmc;
-        var fyje = data.fyje;
-        $("#newid").val(newid);
-        $("#xmmc1").val(xmmc);
-        $("#fyje1").val(fyje);
-        layui.use(['table','layer'],function(){
-
-           layer.open({
-                type: 2,
-                title: xmmc,
-                area: ['40%', '90%'],
-                shade: 0.8,
-                shadeClose: true,
-                content: '${ctxp}/webpage/modules/sg/free/avgpage.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();
-
-                    layer.close(index);//关闭对话框。
-
-                }
-
-            })
-        })
-    }
-</script>
-<script>
-    layui.use('table', function(){
-        var table = layui.table;
-        table.render({
-            elem: '#settlement'
-            ,limit:Number.MAX_VALUE
-            ,title: '结算汇总表'
-            ,cols: [[
-                {width:50, title: '序号',type:'numbers'}
-                ,{field:'setname',title:'项目或费用名称'}
-                ,{field:'setmoney',title:'金额'}
-                ,{field:'settext', title:'备注'}
-                ,{field:'op',align:'center',title:"数据核验", templet:function(d){
-                        ////对操作进行初始化
-                        var xml = "";
-                        if(d.status=="1")
-                            xml += "<a style='margin-top: 3px;' class='layui-btn layui-btn-danger layui-btn-xs' lay-event='byz'>不一致</a>";
-                        if(d.status == "0")
-                            xml+="<a style='margin-top: 3px;' class='layui-btn layui-btn-xs' lay-event='byz'>一致</a>";
-                        return xml;
-                    }}
-            ]]
-            ,data:[
-                <c:if test="${not empty map.list3}">
-                <c:forEach items="${map.list3}" var="data">
-                {
-                    "id":"${data.id}",
-                    "setname": "${data.entryName}",
-                    "setmoney":"${data.money}",
-                    "settext":"${data.remarks}",
-                    "status":"${data.status}",
-                    "reason":"${data.reason}"
-                },
-                </c:forEach>
-                </c:if>
-            ]
-            // ,page: false
-        });
-        //监听行工具事件
-        table.on('tool(settle)', function(obj){
-            var data = obj.data;
-            if(obj.event === 'byz'){
-                layer.open({
-                    type: 1,
-                    title:data.setname,
-                    // skin: 'layui-layer-rim',
-                    area: ['50%', '70%'],
-                    content: "<div style='padding: 16px'>"+data.reason+"</div>"
-                });
-            }
-        });
-    });
-</script>
 </html>

+ 27 - 0
src/main/webapp/webpage/modules/sg/project/addItemForm.js

@@ -0,0 +1,27 @@
+<%@ 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 newText1 = parent.$('#addtext').val();
+    $("#newText1").val(newText1);
+})
+    function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
+    $("#inputForm").submit();
+}
+$("#btnxz").click(function(){
+    $("#myfile").trigger("click");
+})
+$("#myfile").bind("change",function(){
+    var w= $("#myfile").val();
+    $("#myspan").html('&nbsp;'+w);
+});
+</script>

+ 2 - 51
src/main/webapp/webpage/modules/sg/project/addItemForm.jsp

@@ -1,24 +1,15 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: user
-  Date: 2019/8/19
-  Time: 13:06
-  To change this template use File | Settings | File Templates.
---%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <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>
 <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
+<%@include file="addItemForm.js"%>
 <html>
 <head>
     <title>添加工程</title>
     <style>
-        .layui-input{
-            height: 28px;
-            margin-top: 6px;
-        }
+        .layui-input{height: 28px;margin-top: 6px;}
     </style>
 </head>
 <body>
@@ -44,18 +35,6 @@
             </div>
         </div>
     </div>
-    <%--<div class="layui-form-item">--%>
-        <%--<div class="layui-inline">--%>
-            <%--<label class="layui-form-label">*调整文件</label>--%>
-            <%--<div class="layui-input-inline">--%>
-                <%--<select name="tzwj" lay-verify="required" lay-search="">--%>
-                    <%--<option value="">请选择</option>--%>
-                    <%--<option value="1">2016年调差价系数文件(50号文件)</option>--%>
-                    <%--<option value="2">-空-</option>--%>
-                <%--</select>--%>
-            <%--</div>--%>
-        <%--</div>--%>
-    <%--</div>--%>
     <div class="layui-form-item">
         <div class="layui-inline">
             <label class="layui-form-label">项目名称</label>
@@ -80,32 +59,4 @@
     </div>
 </form>
 </body>
-<script>
-    layui.use(['form', 'layedit', 'laydate'], function(){
-        var form = layui.form;
-        form.render();
-        //自定义验证规则
-        form.verify({
-            context: function(value){
-                if(value.length <=0){
-                    return '请选择导入的文件';
-                }
-            }
-        });
-        var newText1 = parent.$('#addtext').val();
-        $("#newText1").val(newText1);
-    })
-    function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
-        $("#inputForm").submit();
-    }
-</script>
-<script>
-    $("#btnxz").click(function(){
-        $("#myfile").trigger("click");
-    })
-    $("#myfile").bind("change",function(){
-        var w= $("#myfile").val();
-        $("#myspan").html('&nbsp;'+w);
-    });
-</script>
 </html>

+ 2 - 28
src/main/webapp/webpage/modules/sg/project/lookItemForm.jsp

@@ -1,10 +1,3 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: user
-  Date: 2019/8/19
-  Time: 15:23
-  To change this template use File | Settings | File Templates.
---%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -16,20 +9,8 @@
     <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
 </head>
 <style>
-    .layui-input{
-        height: 28px;
-        margin-top: 6px;
-        background: whitesmoke;
-    }
-    .layui-form-label {
-        float: left;
-        display: block;
-        padding: 9px 15px;
-        width: 100px;
-        font-weight: 400;
-        line-height: 20px;
-        text-align: right;
-    }
+    .layui-input{ height: 28px; margin-top: 6px; background: whitesmoke;}
+    .layui-form-label { float: left; display: block;padding: 9px 15px;width: 100px;font-weight: 400;line-height: 20px;text-align: right;}
     .layui-table-view .layui-table {width:100%}
 </style>
 <body style="height: 100%">
@@ -88,13 +69,6 @@
             ]
             ,page: true
         });
-//         table.on('tool(looktable)', function(obj){
-//             var data = obj.data;
-//             //console.log(obj)
-//             if(obj.event == 'update'){
-// //		     alert(data.id);
-//             }
-//         });
     });
 </script>
     </c:forEach>

+ 218 - 0
src/main/webapp/webpage/modules/sg/project/management.js

@@ -0,0 +1,218 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<script type="text/javascript">
+    layui.use(['form', 'layedit', 'laydate'], function(){
+    var form = layui.form
+    ,layer = layui.layer
+    ,layedit = layui.layedit
+    ,laydate = layui.laydate;
+
+    //日期
+    laydate.render({
+    elem: '#beginDate1'
+});
+    laydate.render({
+    elem: '#endDate1'
+});
+    laydate.render({
+    elem: '#beginDate2'
+});
+    laydate.render({
+    elem: '#endDate2'
+});
+});
+layui.config({
+    base: '${ctxp}/static/plugin/assets/'
+}).extend({
+    treetable: 'treetable-lay/treetable'
+}).use(['layer', 'table', 'treetable'], function () {
+    var $ = layui.jquery;
+    var table = layui.table;
+    var layer = layui.layer;
+    var treetable = layui.treetable;
+
+    var renderTable1 = function () {
+        layer.load(2);
+        treetable.render({
+            treeColIndex: 0,
+            treeSpid: -1,
+            treeIdName: 'id',
+            treePidName: 'pid',
+            treeDefaultClose: false,
+            treeLinkage: false,
+            elem: '#table1',
+            cols: [[
+                {field: 'gcmc',width:200,title: '工程名称'},
+                {field:'xmsl',width:180,title:"项目数量"},
+                {field:'cjsq',width:200,title: '创建时期'},
+                {field:'djr',width:200,title:'登记人'},
+                {field:'op',align:'center',title:"操作",minWidth:200,templet:function(d){
+                        ////对操作进行初始化
+                        var xml = "";
+                        if(d.status==1){
+                            xml += "<a class='layui-btn layui-btn-primary layui-btn-xs' onclick=\"look( '${ctx}/project/form?id=" + d.id + "&tabId=1')\">查看</a>"
+                                +"<a class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/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-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a>";
+                        }
+                        if(d.status==2){
+                            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+"\">编辑</a>";
+                        }
+
+                        return xml;
+                    }}
+            ]],
+            "data": [
+                <c:if test="${ not empty list}">
+                    <c:forEach items="${list}" var="data" varStatus="index">
+                        {
+                            "id": "${data.id}",
+                            "gcmc":"${data.projectName}",
+                            "xmsl": "${data.number}",
+                            "cjsq": "<fmt:formatDate value="${data.createDate}" pattern="yyyy/MM/dd"/>",
+                            "djr":"${data.userName}",
+                            "status":"1",
+                            "pid": -1
+                        },
+                        {
+                            "id": "2",
+                            "gcmc":"项目名称",
+                            "xmsl": "施工单位",
+                            "cjsq": "项目划分",
+                            "djr":"创建时间",
+                            "status":"2",
+                            "pid": "${data.id}"
+                        },
+                    </c:forEach>
+                </c:if>
+                <c:forEach items="${list}" var="item" varStatus="index">
+            <c:forEach items="${item.wbsItems}" var="items" varStatus="index">
+            {
+                "id": "${items.id}",
+                "type":"${items.type}",
+                "gcmc":"${items.itemName}",
+                "xmsl": "某施工单位一",
+        <%--"cjsq": <c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,--%>
+                        "cjsq":<c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,
+                        "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
+        "status":"3",
+            "pid": "${items.projectId}"
+    },
+    </c:forEach>
+    </c:forEach>
+    ],
+
+        done: function () {
+            $(".myspan").closest("tr").css('background-color','#f2f2f2');
+            layer.closeAll('loading');
+        }
+    });
+    };
+    renderTable1();
+    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%'],
+                    shade: 0.8,
+                    shadeClose: true,
+                    content: '${ctxp}/webpage/modules/sg/project/addItemForm.jsp'
+                    , btn: ['确定','关闭']
+                    ,yes: function(index, layero){
+                        // var bodyparent = layer.getChildFrame('body', index);
+                        // bodyparent.find('#newProject').click();
+                        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();
+
+                        layer.close(index);//关闭对话框。
+
+                    }
+                    ,btn2: function(index, layero){
+                        layer.close(index);
+                    }
+                })
+            })
+        }
+    });
+});
+function refresh(){
+    window.location.reload();
+}
+function addProject(){
+    layer.prompt({title: '请输入工程名称', formType: 3}, function(text, index){
+        layer.close(index);
+        $.ajax({
+            type: "post",
+            url: "${ctx}/project/save",
+            data:{projectName:text},
+            dataType: "json",
+            success: function(data){
+                if(data.success){
+                    layer.msg(data.msg, {icon: 1});
+                    window.location.reload();
+                }else{
+                    layer.msg('添加失败', {icon: 1});
+                }
+            }
+        });
+
+    });
+}
+function look(url) {
+    layer.open({
+        type: 2,
+        title: '查看',
+        area: ['70%', '90%'],
+        shade: 0.8,
+
+        shadeClose: true,
+        fixed: true, //不固定
+        maxmin: true,
+        content: url
+        , btn: ['关闭']
+    })
+}
+function update(url) {
+    layer.open({
+        type: 2,
+        title: '修改工程',
+        area: ['70%', '90%'],
+        shade: 0.8,
+        shadeClose: true,
+        fixed: false, //不固定
+        maxmin: true,
+        content: url
+        , btn: ['确定','关闭']
+        ,yes: function(index, layero){
+            var bodyparent = layer.getChildFrame('body', index);
+            bodyparent.find('#updatebtn').click();
+        }
+        ,btn2: function(index, layero){
+            layer.close(index);
+        }
+    })
+}
+$(document).ready(function(e) {
+
+    $("#noneBtn").click(function(e) {
+        $("#noneDiv").toggle(400);
+    });
+});
+</script>

+ 7 - 257
src/main/webapp/webpage/modules/sg/project/management.jsp

@@ -1,10 +1,3 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: user
-  Date: 2019/8/16
-  Time: 14:49
-  To change this template use File | Settings | File Templates.
---%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <!DOCTYPE html>
@@ -16,33 +9,15 @@
     <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 src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
+    <%@include file="management.js"%>
 </head>
 <style>
-    .layui-input{
-        height: 28px;
-        margin-top: 5px;
-        width: 260px;
-    }
-    .input-meself-time{
-        font-size: 13px;
-        width: 140px;
-    }
-    .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;
-    }
+    .layui-input{height: 28px;margin-top: 5px;width: 260px;}
+    .input-meself-time{font-size: 13px;width: 140px;}
+    .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;}
     .layui-table-view .layui-table {width:100%}
 </style>
 <body style="height:100%">
@@ -152,230 +127,5 @@
         </div>
     </div>
 </div>
-<script>
-    layui.use(['form', 'layedit', 'laydate'], function(){
-        var form = layui.form
-            ,layer = layui.layer
-            ,layedit = layui.layedit
-            ,laydate = layui.laydate;
-
-        //日期
-        laydate.render({
-            elem: '#beginDate1'
-        });
-        laydate.render({
-            elem: '#endDate1'
-        });
-        laydate.render({
-            elem: '#beginDate2'
-        });
-        laydate.render({
-            elem: '#endDate2'
-        });
-    });
-</script>
-<script>
-    layui.config({
-        base: '${ctxp}/static/plugin/assets/'
-    }).extend({
-        treetable: 'treetable-lay/treetable'
-    }).use(['layer', 'table', 'treetable'], function () {
-        var $ = layui.jquery;
-        var table = layui.table;
-        var layer = layui.layer;
-        var treetable = layui.treetable;
-
-        var renderTable1 = function () {
-            layer.load(2);
-            treetable.render({
-                treeColIndex: 0,
-                treeSpid: -1,
-                treeIdName: 'id',
-                treePidName: 'pid',
-                treeDefaultClose: false,
-                treeLinkage: false,
-                elem: '#table1',
-                cols: [[
-                    {field: 'gcmc',width:200,title: '工程名称'},
-                    {field:'xmsl',width:180,title:"项目数量"},
-                    {field:'cjsq',width:200,title: '创建时期'},
-                    {field:'djr',width:200,title:'登记人'},
-                    {field:'op',align:'center',title:"操作",minWidth:200,templet:function(d){
-                            ////对操作进行初始化
-                            var xml = "";
-                            if(d.status==1){
-                                xml += "<a class='layui-btn layui-btn-primary layui-btn-xs' onclick=\"look( '${ctx}/project/form?id=" + d.id + "&tabId=1')\">查看</a>"
-                                    +"<a class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/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-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a>";
-                            }
-                            if(d.status==2){
-                                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+"\">编辑</a>";
-                            }
-
-                            return xml;
-                        }}
-                ]],
-                "data": [
-                    <c:if test="${ not empty list}">
-                    <c:forEach items="${list}" var="data" varStatus="index">
-                    {
-                        "id": "${data.id}",
-                        "gcmc":"${data.projectName}",
-                        "xmsl": "${data.number}",
-                        "cjsq": "<fmt:formatDate value="${data.createDate}" pattern="yyyy/MM/dd"/>",
-                        "djr":"${data.userName}",
-                        "status":"1",
-                        "pid": -1
-                    },
-                    {
-                        "id": "2",
-                        "gcmc":"项目名称",
-                        "xmsl": "施工单位",
-                        "cjsq": "项目划分",
-                        "djr":"创建时间",
-                        "status":"2",
-                        "pid": "${data.id}"
-                    },
-                    </c:forEach>
-                    </c:if>
-                    <c:forEach items="${list}" var="item" varStatus="index">
-                      <c:forEach items="${item.wbsItems}" var="items" varStatus="index">
-                    {
-                        "id": "${items.id}",
-                        "type":"${items.type}",
-                        "gcmc":"${items.itemName}",
-                        "xmsl": "某施工单位一",
-                        <%--"cjsq": <c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,--%>
-                        "cjsq":<c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,
-                        "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
-                        "status":"3",
-                        "pid": "${items.projectId}"
-                    },
-                    </c:forEach>
-                    </c:forEach>
-                ],
-
-                done: function () {
-                    $(".myspan").closest("tr").css('background-color','#f2f2f2');
-                    layer.closeAll('loading');
-                }
-            });
-        };
-        renderTable1();
-        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%'],
-                        shade: 0.8,
-                        shadeClose: true,
-                        content: '${ctxp}/webpage/modules/sg/project/addItemForm.jsp'
-                        , btn: ['确定','关闭']
-                        ,yes: function(index, layero){
-                            // var bodyparent = layer.getChildFrame('body', index);
-                            // bodyparent.find('#newProject').click();
-                            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();
-
-                            layer.close(index);//关闭对话框。
-
-                        }
-                        ,btn2: function(index, layero){
-                            layer.close(index);
-                        }
-                    })
-                })
-            }
-        });
-    });
-</script>
-<script>
-    function refresh(){
-        window.location.reload();
-    }
-    function addProject(){
-        layer.prompt({title: '请输入工程名称', formType: 3}, function(text, index){
-            layer.close(index);
-            $.ajax({
-                type: "post",
-                url: "${ctx}/project/save",
-                data:{projectName:text},
-                dataType: "json",
-                success: function(data){
-                    if(data.success){
-                        layer.msg(data.msg, {icon: 1});
-                        window.location.reload();
-                    }else{
-                        layer.msg('添加失败', {icon: 1});
-                    }
-                }
-            });
-
-        });
-    }
-</script>
-<script>
-    function look(url) {
-        layer.open({
-            type: 2,
-            title: '查看',
-            area: ['70%', '90%'],
-            shade: 0.8,
-
-            shadeClose: true,
-            fixed: true, //不固定
-            maxmin: true,
-            content: url
-            , btn: ['关闭']
-        })
-    }
-    function update(url) {
-        layer.open({
-            type: 2,
-            title: '修改工程',
-            area: ['70%', '90%'],
-            shade: 0.8,
-            shadeClose: true,
-            fixed: false, //不固定
-            maxmin: true,
-            content: url
-            , btn: ['确定','关闭']
-            ,yes: function(index, layero){
-                var bodyparent = layer.getChildFrame('body', index);
-                bodyparent.find('#updatebtn').click();
-            }
-            ,btn2: function(index, layero){
-                layer.close(index);
-            }
-        })
-    }
-</script>
-<script>
-    $(document).ready(function(e) {
-
-        $("#noneBtn").click(function(e) {
-            $("#noneDiv").toggle(400);
-        });
-    });
-</script>
 </body>
 </html>

+ 2 - 14
src/main/webapp/webpage/modules/sg/project/updateItemForm.jsp

@@ -16,20 +16,8 @@
     <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
 </head>
 <style>
-    .layui-input{
-        height: 28px;
-        margin-top: 6px;
-        /*background: whitesmoke;*/
-    }
-    .layui-form-label {
-        float: left;
-        display: block;
-        padding: 9px 15px;
-        width: 100px;
-        font-weight: 400;
-        line-height: 20px;
-        text-align: right;
-    }
+    .layui-input{height: 28px;margin-top: 6px;/*background: whitesmoke;*/}
+    .layui-form-label { float: left;display: block;padding: 9px 15px;width: 100px;font-weight: 400;line-height: 20px;text-align: right;}
     .layui-table-view .layui-table {width:100%}
 </style>
 <body>

+ 27 - 0
src/main/webapp/webpage/modules/sg/projecttem/addItem.js

@@ -0,0 +1,27 @@
+<%@ 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 newText1 = parent.$('#addtext').val();
+    $("#newText1").val(newText1);
+})
+function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
+    $("#inputForm").submit();
+}
+$("#btnxz").click(function(){
+    $("#myfile").trigger("click");
+})
+$("#myfile").bind("change",function(){
+    var w= $("#myfile").val();
+    $("#myspan").html('&nbsp;'+w);
+});
+</script>

+ 2 - 30
src/main/webapp/webpage/modules/sg/projecttem/addItem.jsp

@@ -4,7 +4,6 @@
 <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>
 <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
-<%--<script src="${ctxp}/webpage/modules/sg/projecttem/addItem.js"></script>--%>
 <html>
 <head>
     <title>添加工程</title>
@@ -42,7 +41,7 @@
         <div class="layui-inline">
             <label class="layui-form-label">项目名称</label>
             <div class="layui-input-inline">
-                <input type="text" name="name"  class="layui-input" id="inputwrite">
+                <input type="text" name="name" autocomplete="off" class="layui-input" id="inputwrite">
             </div>
         </div>
     </div>
@@ -60,33 +59,6 @@
         </div>
     </div>
 </form>
+<%@ include file="addItem.js"%>
 </body>
-<script>
-    layui.use(['form', 'layedit', 'laydate'], function(){
-        var form = layui.form;
-        form.render();
-        //自定义验证规则
-        form.verify({
-            context: function(value){
-                if(value.length <=0){
-                    return '请选择导入的文件';
-                }
-            }
-        });
-        var newText1 = parent.$('#addtext').val();
-        $("#newText1").val(newText1);
-    })
-    function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
-        $("#inputForm").submit();
-    }
-</script>
-<script>
-    $("#btnxz").click(function(){
-        $("#myfile").trigger("click");
-    })
-    $("#myfile").bind("change",function(){
-        var w= $("#myfile").val();
-        $("#myspan").html('&nbsp;'+w);
-    });
-</script>
 </html>

+ 129 - 0
src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.js

@@ -0,0 +1,129 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<script type="text/javascript">
+var arrayFile=[];
+layui.use('upload', function(){
+    var $ = layui.jquery
+        ,upload = layui.upload;
+    //多文件列表示例
+    var demoListView = $('#demoList')
+        ,uploadListIns = upload.render({
+        elem: '#testList'
+        // ,url: '/upload/'
+        ,accept: 'file'
+        ,exts:'xls|xlsx'
+        ,multiple: true
+        ,auto: false
+        // ,bindAction: '#testListAction'
+        ,choose: function(obj){
+            var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
+            //读取本地文件
+            obj.preview(function(index, file, result){
+                arrayFile.push(index);
+                arrayFile.push(file);
+                var tr = $(['<tr id='+index+'>'
+                    ,'<td hidden><div class="td_id">'+index+'</div></td>'
+                    ,'<td>'+ file.name +'</td>'
+                    ,'<td><div contenteditable="true" class="mydiv1" placeholder="请输入项目名称"></div></td>'
+                    ,'<td>'
+                    ,' <select name="type" class="myselect"><option value="">请选择项目类型</option><option value="1">架空线路工程</option><option value="2">电缆工程</option></select>'
+                    ,'<td style="text-align: center">'
+                    ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
+                    ,'</td>'
+                    ,'</tr>'].join(''));
+                //删除
+                tr.find('.demo-delete').on('click', function(){
+                    delete files[index]; //删除对应的文件
+                    tr.remove();
+                    uploadListIns.config.elem.next()[0].value = '';
+                });
+
+                demoListView.append(tr);
+            });
+        }
+    });
+});
+function okSubmit() {
+    //获取表单对象
+    var formdata = new FormData();
+
+    var inputval = $("#myinput").val();
+    if(inputval==null||inputval==""){
+        layer.msg("请输入工程名称",{icon: 3});
+        return false;
+    }
+    formdata.append("projectName",inputval);
+
+    //获取输入的项目名称
+    var div1 =  document.getElementsByClassName("mydiv1");
+    var divvalue=[];
+    for (var i = 0; i < div1.length; i++) {
+        divvalue[i]=div1[i].innerHTML;
+    }
+    if (divvalue.length<=0){
+        layer.msg("请输入项目名称",{icon: 3});
+        return false;
+    }
+    for (var i = 0; i < divvalue.length; i++) {
+        if (divvalue[i]=="请输入项目名称"){
+            layer.msg("请输入项目名称",{icon: 3});
+            throw SyntaxError;
+        }
+    }
+    formdata.append("itemNames",divvalue);
+    // 获取表格项目类型
+    var select1=document.getElementsByClassName("myselect");
+    var selectval=[];
+    for (var i = 0; i < select1.length; i++) {
+        selectval[i]=select1[i].value;
+    }
+    if (selectval.length<=0){
+        layer.msg("请输入项目名称",{icon: 3});
+        return false;
+    }
+    for (var i = 0; i < selectval.length; i++) {
+        if (selectval[i]==""||selectval[i]==null){
+            layer.msg("请选择项目类型",{icon: 3});
+            throw SyntaxError;
+        }
+    }
+    formdata.append("itemTypes",selectval);
+
+    // 获取表格id的值
+    var td_id=document.getElementsByClassName("td_id");
+    var array_id = [];
+    for (var i = 0; i < td_id.length; i++) {
+        array_id[i]=td_id[i].innerHTML;
+    }
+    for (var i = 0; i < array_id.length; i++) {
+        for (var j = 0; j < arrayFile.length; j++) {
+            if (array_id[i]==arrayFile[j]){
+                formdata.append("file",arrayFile[j+1]);
+            }
+        }
+    }
+    //加载提示
+    layer.msg('加载中', {
+        icon: 16
+        ,shade: 0.01
+    });
+    $.ajax({
+        url: "${ctx}/project/tem/import",
+        type: "POST",
+        data: formdata,
+        traditional: true,
+        cache: false,        // 不缓存数据
+        processData: false,  // 不处理数据
+        contentType: false,   // 不设置内容类型
+        success:function (data) {
+            if(data.code == 1){
+                layer.msg(data.msg,{icon: 6});
+                this.formdata=new FormData();
+                window.location.href="${ctx}/project/tem/list?projectId="+data.id;
+            }else {
+                this.formdata=new FormData();
+                layer.msg(data.msg,{icon: 5});
+            }
+        }
+    });
+}
+</script>

+ 1 - 129
src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.jsp

@@ -5,6 +5,7 @@
 <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 src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
+<%@ include file="addItem2Form.js"%>
 <html>
 <head>
     <title>添加工程</title>
@@ -82,134 +83,5 @@
             </div>
         </div>
     </div>
-
 </body>
-<script>
-    var arrayFile=[];
-    layui.use('upload', function(){
-        var $ = layui.jquery
-            ,upload = layui.upload;
-        //多文件列表示例
-        var demoListView = $('#demoList')
-            ,uploadListIns = upload.render({
-            elem: '#testList'
-            // ,url: '/upload/'
-            ,accept: 'file'
-            ,exts:'xls|xlsx'
-            ,multiple: true
-            ,auto: false
-            // ,bindAction: '#testListAction'
-            ,choose: function(obj){
-               var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
-                //读取本地文件
-                obj.preview(function(index, file, result){
-                    arrayFile.push(index);
-                    arrayFile.push(file);
-                    var tr = $(['<tr id='+index+'>'
-                        ,'<td hidden><div class="td_id">'+index+'</div></td>'
-                        ,'<td>'+ file.name +'</td>'
-                        ,'<td><div contenteditable="true" class="mydiv1" placeholder="请输入项目名称"></div></td>'
-                        ,'<td>'
-                        ,' <select name="type" class="myselect"><option value="">请选择项目类型</option><option value="1">架空线路工程</option><option value="2">电缆工程</option></select>'
-                        ,'<td style="text-align: center">'
-                        ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
-                        ,'</td>'
-                        ,'</tr>'].join(''));
-                    //删除
-                    tr.find('.demo-delete').on('click', function(){
-                        delete files[index]; //删除对应的文件
-                        tr.remove();
-                        uploadListIns.config.elem.next()[0].value = '';
-                    });
-
-                    demoListView.append(tr);
-                });
-            }
-        });
-    });
-    function okSubmit() {
-        //获取表单对象
-        var formdata = new FormData();
-
-        var inputval = $("#myinput").val();
-        if(inputval==null||inputval==""){
-            layer.msg("请输入工程名称",{icon: 3});
-            return false;
-        }
-        formdata.append("projectName",inputval);
-
-        //获取输入的项目名称
-        var div1 =  document.getElementsByClassName("mydiv1");
-        var divvalue=[];
-        for (var i = 0; i < div1.length; i++) {
-            divvalue[i]=div1[i].innerHTML;
-        }
-        if (divvalue.length<=0){
-            layer.msg("请输入项目名称",{icon: 3});
-            return false;
-        }
-        for (var i = 0; i < divvalue.length; i++) {
-            if (divvalue[i]=="请输入项目名称"){
-                layer.msg("请输入项目名称",{icon: 3});
-                throw SyntaxError;
-            }
-        }
-        formdata.append("itemNames",divvalue);
-        // 获取表格项目类型
-        var select1=document.getElementsByClassName("myselect");
-        var selectval=[];
-        for (var i = 0; i < select1.length; i++) {
-            selectval[i]=select1[i].value;
-        }
-        if (selectval.length<=0){
-            layer.msg("请输入项目名称",{icon: 3});
-            return false;
-        }
-        for (var i = 0; i < selectval.length; i++) {
-            if (selectval[i]==""||selectval[i]==null){
-                layer.msg("请选择项目类型",{icon: 3});
-                throw SyntaxError;
-            }
-        }
-        formdata.append("itemTypes",selectval);
-
-        // 获取表格id的值
-        var td_id=document.getElementsByClassName("td_id");
-        var array_id = [];
-        for (var i = 0; i < td_id.length; i++) {
-            array_id[i]=td_id[i].innerHTML;
-        }
-        for (var i = 0; i < array_id.length; i++) {
-            for (var j = 0; j < arrayFile.length; j++) {
-                if (array_id[i]==arrayFile[j]){
-                    formdata.append("file",arrayFile[j+1]);
-                }
-            }
-        }
-        //加载提示
-        layer.msg('加载中', {
-            icon: 16
-            ,shade: 0.01
-        });
-            $.ajax({
-                url: "${ctx}/project/tem/import",
-                type: "POST",
-                data: formdata,
-                traditional: true,
-                cache: false,        // 不缓存数据
-                processData: false,  // 不处理数据
-                contentType: false,   // 不设置内容类型
-                success:function (data) {
-                    if(data.code == 1){
-                        layer.msg(data.msg,{icon: 6});
-                        this.formdata=new FormData();
-                        window.location.href="${ctx}/project/tem/list?projectId="+data.id;
-                    }else {
-                        this.formdata=new FormData();
-                        layer.msg(data.msg,{icon: 5});
-                    }
-                }
-            });
-    }
-</script>
 </html>

+ 0 - 14
src/main/webapp/webpage/modules/sg/projecttem/lookItem.jsp

@@ -1,10 +1,3 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: user
-  Date: 2019/8/19
-  Time: 15:23
-  To change this template use File | Settings | File Templates.
---%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -89,13 +82,6 @@
             ]
             ,page: true
         });
-//         table.on('tool(looktable)', function(obj){
-//             var data = obj.data;
-//             //console.log(obj)
-//             if(obj.event == 'update'){
-// //		     alert(data.id);
-//             }
-//         });
     });
 </script>
     </c:forEach>

+ 210 - 0
src/main/webapp/webpage/modules/sg/projecttem/manageList.js

@@ -0,0 +1,210 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<script type="text/javascript">
+    layui.config({
+    base: '${ctxp}/static/plugin/assets/'
+}).extend({
+    treetable: 'treetable-lay/treetable'
+}).use(['layer', 'table', 'treetable'], function () {
+    var $ = layui.jquery;
+    var table = layui.table;
+    var layer = layui.layer;
+    var treetable = layui.treetable;
+
+    var renderTable1 = function () {
+    layer.load(2);
+    treetable.render({
+    treeColIndex: 0,
+    treeSpid: -1,
+    treeIdName: 'id',
+    treePidName: 'pid',
+    treeDefaultClose: false,
+    treeLinkage: false,
+    elem: '#table1',
+    cols: [[
+{field: 'gcmc',width:200,title: '工程名称'},
+{field:'xmsl',width:180,title:"项目数量"},
+{field:'cjsq',width:200,title: '创建时期'},
+{field:'djr',width:200,title:'登记人'},
+{field:'op',align:'center',title:"操作",minWidth:200,templet:function(d){
+    ////对操作进行初始化
+    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>";
+}
+    if(d.status==2){
+    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>";
+}
+
+    return xml;
+}}
+    ]],
+    "data": [
+    <c:if test="${ not empty list}">
+    <c:forEach items="${list}" var="data" varStatus="index">
+    {
+        "id": "${data.id}",
+        "gcmc":"${data.projectName}",
+        "xmsl": "${data.number}",
+        "cjsq": "<fmt:formatDate value="${data.createDate}" pattern="yyyy/MM/dd"/>",
+        "djr":"${data.userName}",
+        "status":"1",
+        "pid": -1
+    },
+    {
+        "id": "2",
+        "gcmc":"项目名称",
+        "xmsl": "施工单位",
+        "cjsq": "项目划分",
+        "djr":"创建时间",
+        "status":"2",
+        "pid": "${data.id}"
+    },
+    </c:forEach>
+    </c:if>
+    <c:forEach items="${list}" var="item" varStatus="index">
+    <c:forEach items="${item.wbsItems}" var="items" varStatus="index">
+{
+    "id": "${items.id}",
+    "type":"${items.type}",
+    "gcmc":"${items.itemName}",
+    "xmsl": "某施工单位一",
+    <%--"cjsq": <c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,--%>
+                        "cjsq":<c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,
+                        "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
+    "status":"3",
+    "pid": "${items.projectId}"
+},
+    </c:forEach>
+    </c:forEach>
+    ],
+
+    done: function () {
+    $(".myspan").closest("tr").css('background-color','#f2f2f2');
+    layer.closeAll('loading');
+}
+});
+};
+    renderTable1();
+    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%'],
+    shade: 0.8,
+    shadeClose: true,
+    content: '${ctxp}/webpage/modules/sg/projecttem/addItem.jsp'
+    , btn: ['确定','关闭']
+    ,yes: function(index, layero){
+    // var bodyparent = layer.getChildFrame('body', index);
+    // bodyparent.find('#newProject').click();
+    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();
+
+    layer.close(index);//关闭对话框。
+
+}
+    ,btn2: function(index, layero){
+    layer.close(index);
+}
+})
+})
+}
+});
+});
+function refresh(){
+    window.location.reload()
+}
+function addProject(target){
+    layer.open({
+        type: 2,
+        title: '添加项目',
+        area: ['43%', '90%'],
+        shade: 0.8,
+        shadeClose: true,
+        content: '${ctxp}/webpage/modules/sg/project/addItem2Form.jsp'
+        , btn: ['确定','关闭']
+        ,yes: function(index, layero){
+            // var bodyparent = layer.getChildFrame('body', index);
+            // bodyparent.find('#newProject').click();
+            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();
+
+            layer.close(index);//关闭对话框。
+
+        }
+        ,btn2: function(index, layero){
+            layer.close(index);
+        }
+    })
+}
+function look(url) {
+    layer.open({
+        type: 2,
+        title: '查看',
+        area: ['70%', '90%'],
+        shade: 0.8,
+
+        shadeClose: true,
+        fixed: true, //不固定
+        maxmin: true,
+        content: url
+        , btn: ['关闭']
+    })
+}
+function update(url) {
+    layer.open({
+        type: 2,
+        title: '修改工程',
+        area: ['70%', '90%'],
+        shade: 0.8,
+        shadeClose: true,
+        fixed: false, //不固定
+        maxmin: true,
+        content: url
+        , btn: ['确定','关闭']
+        ,yes: function(index, layero){
+            var bodyparent = layer.getChildFrame('body', index);
+            bodyparent.find('#updatebtn').click();
+        }
+        ,btn2: function(index, layero){
+            layer.close(index);
+        }
+    })
+}
+$(document).ready(function(e) {
+
+    $("#noneBtn").click(function(e) {
+        $("#noneDiv").toggle(400);
+    })
+});
+</script>
+

+ 1 - 221
src/main/webapp/webpage/modules/sg/projecttem/manageList.jsp

@@ -1,10 +1,3 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: user
-  Date: 2019/8/16
-  Time: 14:49
-  To change this template use File | Settings | File Templates.
---%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <!DOCTYPE html>
@@ -16,6 +9,7 @@
     <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 src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
+    <%@ include file="manageList.js"%>
 </head>
 <style>
     .layui-input{
@@ -69,219 +63,5 @@
         </div>
     </div>
 </div>
-<script>
-    layui.config({
-        base: '${ctxp}/static/plugin/assets/'
-    }).extend({
-        treetable: 'treetable-lay/treetable'
-    }).use(['layer', 'table', 'treetable'], function () {
-        var $ = layui.jquery;
-        var table = layui.table;
-        var layer = layui.layer;
-        var treetable = layui.treetable;
-
-        var renderTable1 = function () {
-            layer.load(2);
-            treetable.render({
-                treeColIndex: 0,
-                treeSpid: -1,
-                treeIdName: 'id',
-                treePidName: 'pid',
-                treeDefaultClose: false,
-                treeLinkage: false,
-                elem: '#table1',
-                cols: [[
-                    {field: 'gcmc',width:200,title: '工程名称'},
-                    {field:'xmsl',width:180,title:"项目数量"},
-                    {field:'cjsq',width:200,title: '创建时期'},
-                    {field:'djr',width:200,title:'登记人'},
-                    {field:'op',align:'center',title:"操作",minWidth:200,templet:function(d){
-                            ////对操作进行初始化
-                            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>";
-                            }
-                            if(d.status==2){
-                                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>";
-                            }
-
-                            return xml;
-                        }}
-                ]],
-                "data": [
-                    <c:if test="${ not empty list}">
-                    <c:forEach items="${list}" var="data" varStatus="index">
-                    {
-                        "id": "${data.id}",
-                        "gcmc":"${data.projectName}",
-                        "xmsl": "${data.number}",
-                        "cjsq": "<fmt:formatDate value="${data.createDate}" pattern="yyyy/MM/dd"/>",
-                        "djr":"${data.userName}",
-                        "status":"1",
-                        "pid": -1
-                    },
-                    {
-                        "id": "2",
-                        "gcmc":"项目名称",
-                        "xmsl": "施工单位",
-                        "cjsq": "项目划分",
-                        "djr":"创建时间",
-                        "status":"2",
-                        "pid": "${data.id}"
-                    },
-                    </c:forEach>
-                    </c:if>
-                    <c:forEach items="${list}" var="item" varStatus="index">
-                      <c:forEach items="${item.wbsItems}" var="items" varStatus="index">
-                    {
-                        "id": "${items.id}",
-                        "type":"${items.type}",
-                        "gcmc":"${items.itemName}",
-                        "xmsl": "某施工单位一",
-                        <%--"cjsq": <c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,--%>
-                        "cjsq":<c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,
-                        "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
-                        "status":"3",
-                        "pid": "${items.projectId}"
-                    },
-                    </c:forEach>
-                    </c:forEach>
-                ],
-
-                done: function () {
-                    $(".myspan").closest("tr").css('background-color','#f2f2f2');
-                    layer.closeAll('loading');
-                }
-            });
-        };
-        renderTable1();
-        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%'],
-                        shade: 0.8,
-                        shadeClose: true,
-                        content: '${ctxp}/webpage/modules/sg/projecttem/addItem.jsp'
-                        , btn: ['确定','关闭']
-                        ,yes: function(index, layero){
-                            // var bodyparent = layer.getChildFrame('body', index);
-                            // bodyparent.find('#newProject').click();
-                            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();
-
-                            layer.close(index);//关闭对话框。
-
-                        }
-                        ,btn2: function(index, layero){
-                            layer.close(index);
-                        }
-                    })
-                })
-            }
-        });
-    });
-</script>
-<script>
-    function refresh(){
-        window.location.reload();
-    }
-    function addProject(target){
-        layer.open({
-            type: 2,
-            title: '添加项目',
-            area: ['43%', '90%'],
-            shade: 0.8,
-            shadeClose: true,
-            content: '${ctxp}/webpage/modules/sg/project/addItem2Form.jsp'
-            , btn: ['确定','关闭']
-            ,yes: function(index, layero){
-                // var bodyparent = layer.getChildFrame('body', index);
-                // bodyparent.find('#newProject').click();
-                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();
-
-                layer.close(index);//关闭对话框。
-
-            }
-            ,btn2: function(index, layero){
-                layer.close(index);
-            }
-        })
-    }
-</script>
-<script>
-    function look(url) {
-        layer.open({
-            type: 2,
-            title: '查看',
-            area: ['70%', '90%'],
-            shade: 0.8,
-
-            shadeClose: true,
-            fixed: true, //不固定
-            maxmin: true,
-            content: url
-            , btn: ['关闭']
-        })
-    }
-    function update(url) {
-        layer.open({
-            type: 2,
-            title: '修改工程',
-            area: ['70%', '90%'],
-            shade: 0.8,
-            shadeClose: true,
-            fixed: false, //不固定
-            maxmin: true,
-            content: url
-            , btn: ['确定','关闭']
-            ,yes: function(index, layero){
-                var bodyparent = layer.getChildFrame('body', index);
-                bodyparent.find('#updatebtn').click();
-            }
-            ,btn2: function(index, layero){
-                layer.close(index);
-            }
-        })
-    }
-</script>
-<script>
-    $(document).ready(function(e) {
-
-        $("#noneBtn").click(function(e) {
-            $("#noneDiv").toggle(400);
-        });
-    });
-</script>
 </body>
 </html>

+ 1 - 9
src/main/webapp/webpage/modules/sg/projecttem/updateItem.jsp

@@ -1,12 +1,6 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: user
-  Date: 2019/8/19
-  Time: 15:30
-  To change this template use File | Settings | File Templates.
---%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
+<%@ include file="addItem2Form.js"%>
 <html>
 <head>
     <title>修改</title>
@@ -103,9 +97,7 @@
         });
         table.on('tool(updatetable)', function(obj){
             var data = obj.data;
-            //console.log(obj)
             if(obj.event == 'update'){
-//		     alert(data.id);
             }
         });
     });