Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -19,6 +19,7 @@ public class SettementUtil {
     public static final String BDZ_TBRNAME="投标人采购设备费";
     public static final String BDZ_ZBRNAME="招标人采购材料费";
     public static final String BDZ_TBNAME="投标报价";
+    public static final String SJ = "税";
 
     /*
         分布分项比对
@@ -120,6 +121,8 @@ public class SettementUtil {
     public static final  String[] TOP2 = {BDZ_TBBJ,RESON_JGJS1,BDZ_TBBJ1,RESON_JGJS3, RESON_JGJS4,RESON_JGJS5,RESON_JGJS6,BDZ_TBBJ2,RESON_JGJS8};
     //工程竣工 拼接数组
     public static final String[] TOP1 = {RESON_JGJS,RESON_JGJS1,RESON_JGJS2,RESON_JGJS3,RESON_JGJS4,RESON_JGJS5,RESON_JGJS6,RESON_JGJS7,RESON_JGJS8};
+    public static final String[] DLBDZ_FBFX2 = {BDZ_FXFX,BDZ_FBFX1,BDZ_FBFX2,RESON_GCJS4,RESON_JZFBFX3,RESON_AZFBFX3,RESON_GCJS4};
+    public static final String[] DLBDZ_FBFX1 = {RESON_FBFX1,RESON_JZFBFX,RESON_AZFBFX,RESON_GCJS4,RESON_JZFBFX3,RESON_AZFBFX3,RESON_GCJS4};
     /*
         设置转换参数
      */
@@ -141,7 +144,7 @@ public class SettementUtil {
         for (int i = 0; i < lastDataRowNum; i++) {
             settlement=new Settlement();
             key =  importExcel.getValue(i+1,1);
-            if(key.contains(BashInfo.JS_SJ)){
+            if(key.contains(SJ)){
                 key=BashInfo.JS_SJ;
             }
             if(key.equals(BDZ_TBRNAME)){
@@ -320,7 +323,7 @@ public class SettementUtil {
 //                    if (money==doubles[0]){
 //                        settlement.setStatus("0");
 //                    }
-                    if (doubles[0]<=moneyComparison1&&doubles[1]>=moneyComparison2){
+                    if (doubles[0]<=moneyComparison1&&doubles[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     String str = String.valueOf(nf.format(doubles[0])+','+nf.format(doubles[1])+','+nf.format(doubles[2])+','+nf.format(doubles[3])
@@ -417,15 +420,18 @@ public class SettementUtil {
                     settlement.setTheAmount(String.valueOf(nf.format(cbperson)));
                     break;
                 case BashInfo.JS_CSXM:
-                    if (money==wordtotal){
+//                    if (money==wordtotal){
+//                        settlement.setStatus("0");
+//                    }
+                    if (wordtotal<=moneyComparison1&&wordtotal>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(wordtotal1)+","+nf.format(wordtotal2)+","+nf.format(wordtotal)));
                     break;
                 case BashInfo.JS_QTXM:
-                    if(money==otherTotal){
-                        settlement.setStatus("0");
-                    }
+//                    if(money==otherTotal){
+//                        settlement.setStatus("0");
+//                    }
                     if(otherTotal<=moneyComparison1&&otherTotal>=moneyComparison2){
                         settlement.setStatus("0");
                     }
@@ -449,7 +455,7 @@ public class SettementUtil {
 //                    if(money==divisionFbr){
 //                        settlement.setStatus("0");
 //                    }
-                    if(divisionFbr<=moneyComparison1&&divisionFbr>=money){
+                    if(divisionFbr<=moneyComparison1&&divisionFbr>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(divisionFbr)+","+nf.format(divisiontotal[1])+","+nf.format(divisiontotal[3])));
@@ -507,6 +513,9 @@ public class SettementUtil {
         for (Settlement settlement:settlements){
             name = settlement.getEntryName();
             //读取字段区分
+//            if(name.contains(SJ)){
+//                name=BashInfo.JS_SJ;
+//            }
             if(name.equals(BDZ_TBRNAME)){
                 name=BashInfo.JS_CBRF;
             }
@@ -691,7 +700,7 @@ public class SettementUtil {
             }
             switch (key){
                 case BashInfo.JS_FBFX:
-                    reason = getDJoint(settlement);
+                    reason = getDJoint(settlement,DLBDZ_FBFX1);
                     settlement.setReason(reason);
                     break;
                 case  BashInfo.JS_CBRF:
@@ -784,7 +793,7 @@ public class SettementUtil {
             }
             switch (key){
                 case BashInfo.JS_FBFX:
-                    reason = getDJoint(settlement);
+                    reason = getDJoint(settlement,DLBDZ_FBFX1);
                     settlement.setReason(reason);
                     break;
                 case  BDZ_TBRNAME:
@@ -865,17 +874,28 @@ public class SettementUtil {
         }
         if(status.equals("1")){
             double money = settlement.getMoney();
+            double moneyComparison1=money+5.0;//范围金额+5.0元
+            double moneyComparison2=money-5.0;//范围金额-5.0元
             double amout1 = Double.valueOf(amout[0]);
             double amout2 = Double.valueOf(amout[1]);
-            if(money!=amout1&&amout1!=amout2){
+            if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout2>moneyComparison1&&amout2<moneyComparison2){
                 reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
             }
-            if(amout1!=amout2&&money==amout1){
+            if(amout1!=amout2&&amout1<=moneyComparison1&&amout1>=moneyComparison2){
                 reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
             }
-            if (money!=amout1&&amout1==amout2){
+            if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout1==amout2){
                 reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
             }
+//            if(money!=amout1&&amout1!=amout2){
+//                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
+//            }
+//            if(amout1!=amout2&&money==amout1){
+//                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
+//            }
+//            if (money!=amout1&&amout1==amout2){
+//                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
+//            }
         }
         return reason;
     }
@@ -884,53 +904,17 @@ public class SettementUtil {
      * @param settlement bean
      * @return reason
      */
-    public static String getDJoint(Settlement settlement){
-        String reason="";
-        String[] amout=settlement.getTheAmount().split(",");
-        String reason1=SettementUtil.RESON_FBFX1.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
-                +"<br>"+SettementUtil.RESON_JZFBFX.replace("xxx",amout[2])
-                +"<br>"+SettementUtil.RESON_AZFBFX.replace("xxx",amout[3])
-                +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[0]);
-        String reason2=SettementUtil.RESON_FBFX1.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
-                +"<br>"+SettementUtil.RESON_JZFBFX3.replace("xxx",amout[4])
-                +"<br>"+SettementUtil.RESON_AZFBFX3.replace("xxx",amout[5])
-                +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[1]);
-        String status =settlement.getStatus();
-        if(status.equals("0")){
-            reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
-        }
-        if(status.equals("1")){
-            double money = settlement.getMoney();
-            double amout1 = Double.valueOf(amout[0]);
-            double amout2 = Double.valueOf(amout[1]);
-            if(money!=amout1&&money!=amout2){
-                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
-            }
-            if(money!=amout2&&money==amout1){
-                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
-            }
-            if (money!=amout1&&money==amout2){
-                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
-            }
-        }
-        return reason;
-    }
-    /**
-     * 获取 变电站 分部分项 reason值
-     * @param settlement bean
-     * @return reason
-     */
-    public static String getBdzJoint(Settlement settlement){
+    public static String getDJoint(Settlement settlement,String[] tips){
         String reason="";
         String[] amout=settlement.getTheAmount().split(",");
-        String reason1=SettementUtil.BDZ_FXFX.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
-                +"<br>"+SettementUtil.BDZ_FBFX1.replace("xxx",amout[2])
-                +"<br>"+SettementUtil.BDZ_FBFX2.replace("xxx",amout[3])
-                +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[0]);
-        String reason2=SettementUtil.BDZ_FXFX.replace("xxx",String.valueOf(settlement.getMoney()))
-                +"<br>"+SettementUtil.RESON_JZFBFX3.replace("xxx",amout[4])
-                +"<br>"+SettementUtil.RESON_AZFBFX3.replace("xxx",amout[5])
-                +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[1]);
+        String reason1=tips[0].replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
+                +"<br>"+tips[1].replace("xxx",amout[2])
+                +"<br>"+tips[2].replace("xxx",amout[3])
+                +"<br>"+tips[3].replace("xxx",amout[0]);
+        String reason2=tips[0].replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
+                +"<br>"+tips[4].replace("xxx",amout[4])
+                +"<br>"+tips[5].replace("xxx",amout[5])
+                +"<br>"+tips[6].replace("xxx",amout[1]);
         String status =settlement.getStatus();
         if(status.equals("0")){
             reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
@@ -939,18 +923,67 @@ public class SettementUtil {
             double money = settlement.getMoney();
             double amout1 = Double.valueOf(amout[0]);
             double amout2 = Double.valueOf(amout[1]);
-            if(money!=amout1&&money!=amout2){
+            double moneyComparison1=money+5.0;//范围金额+5.0元
+            double moneyComparison2=money-5.0;//范围金额-5.0元
+            if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout2>moneyComparison1&&amout2<moneyComparison2){
                 reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
             }
-            if(money!=amout2&&money==amout1){
+            if(money!=amout2&&amout1<=moneyComparison1&&amout1>=moneyComparison2){
                 reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
             }
-            if (money!=amout1&&money==amout2){
+            if (money!=amout1&&amout2<=moneyComparison1&&amout2>=moneyComparison2){
                 reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
             }
+//            if(money!=amout1&&money!=amout2){
+//                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
+//            }
+//            if(money!=amout2&&money==amout1){
+//                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
+//            }
+//            if (money!=amout1&&money==amout2){
+//                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
+//            }
         }
         return reason;
     }
+//    /**
+//     * 获取 变电站 分部分项 reason值
+//     * @param settlement bean
+//     * @return reason
+//     */
+//    public static String getBdzJoint(Settlement settlement){
+//        String reason="";
+//        String[] amout=settlement.getTheAmount().split(",");
+//        String reason1=SettementUtil.BDZ_FXFX.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
+//                +"<br>"+SettementUtil.BDZ_FBFX1.replace("xxx",amout[2])
+//                +"<br>"+SettementUtil.BDZ_FBFX2.replace("xxx",amout[3])
+//                +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[0]);
+//        String reason2=SettementUtil.BDZ_FXFX.replace("xxx",String.valueOf(settlement.getMoney()))
+//                +"<br>"+SettementUtil.RESON_JZFBFX3.replace("xxx",amout[4])
+//                +"<br>"+SettementUtil.RESON_AZFBFX3.replace("xxx",amout[5])
+//                +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[1]);
+//        String status =settlement.getStatus();
+//        if(status.equals("0")){
+//            reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
+//        }
+//        if(status.equals("1")){
+//            double money = settlement.getMoney();
+//            double amout1 = Double.valueOf(amout[0]);
+//            double amout2 = Double.valueOf(amout[1]);
+//            double moneyComparison1=money+5.0;//范围金额+5.0元
+//            double moneyComparison2=money-5.0;//范围金额-5.0元
+//            if(money!=amout1&&money!=amout2){
+//                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
+//            }
+//            if(money!=amout2&&money==amout1){
+//                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
+//            }
+//            if (money!=amout1&&money==amout2){
+//                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
+//            }
+//        }
+//        return reason;
+//    }
     /**
      *  规费/其他费 等 计算 数据 常量匹配
      * @param constant1   匹配的常量one

src/main/webapp/webpage/modules/sg/free/individualForm.jsp

@@ -0,0 +1,204 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>单独调整</title>
+    <link rel="stylesheet" href="${ctxp}/static/plugin/assets/layui/css/layui.css">
+    <link rel="stylesheet" href="${ctxp}/static/plugin/assets/common.css"/>
+    <script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
+    <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%);}
+</style>
+<body>
+<div class="layui-btn-group suretable" style="display: none;">
+    <button class="layui-btn"  data-type="getCheckData" id="freenl">确定</button>
+</div>
+<form class="layui-form" action="">
+    <div class="layui-form-item">
+        <div class="" style="margin-left: 10px;margin-top: 10px;">
+            <span id="mylable2">项目调整</span>
+            <span>:</span>
+            <span id="readid2">200</span>
+        </div>
+        <div class="" style="margin-left: 10px;">
+            <input type="radio" name="mydiv" value="1" title="增加" checked="">
+            <input type="radio" name="mydiv" value="2" title="减少">
+        </div>
+    </div>
+</form>
+<div style="margin-left: 7px;margin-right: 7px">
+<%--<table class="layui-hide" id="longtable" lay-filter="longtable"></table>--%>
+    <table id="longtable" class="layui-table" lay-filter="longtable"></table>
+</div>
+</body>
+<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'--%>
+            <%--,limit:Number.MAX_VALUE--%>
+            <%--,cols: [[ //生产表头--%>
+                <%--{type: 'checkbox'}--%>
+                <%--,{field:'wbsys',title:'分部分项'}--%>
+                <%--,{field:'wbsCode',title:'WBS识别码'}--%>
+                <%--,{field:'bl',title:'比例(%)',edit: 'text'}--%>
+                <%--,{field:'fee',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--%>
+        <%--});--%>
+    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',
+                cols: [[
+                    {type: 'checkbox'},
+                    {field:'wbsys',title:'分部分项'},
+                    {field:'wbsCode',title:'WBS识别码'},
+                    {field:'bl',title:'比例(%)',edit: 'text'},
+                    {field:'fee',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":'',
+                        "pid": -1
+                    },
+                    </c:forEach>
+                    </c:if>
+                ],
+                done: function (res, curr, count) {
+                    layer.closeAll('loading');
+                }
+            });
+        };
+        renderTable1();
+        //计算比例/金额
+        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);
+                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);
+                $(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();//获取父类input框的值
+                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>
+</html>

src/main/webapp/webpage/modules/sg/free/wbslist.js

@@ -253,7 +253,6 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
                     iframeWin.contentWindow.doSubmit();
 
                     layer.close(index);//关闭对话框。
-
                 }
 
             })

src/main/webapp/webpage/modules/sg/project/lookItemForm.jsp

@@ -64,7 +64,7 @@
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
                     "sgdw": "${data1.unit}",
-                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站线路"</c:if>,
+                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站工程"</c:if>,
                     "xmbh":"${data1.itemNo}"
                 },
                 </c:forEach>

src/main/webapp/webpage/modules/sg/project/management.js

@@ -37,8 +37,8 @@ layui.config({
             treeSpid: -1,
             treeIdName: 'id',
             treePidName: 'pid',
-            treeDefaultClose: false,
-            treeLinkage: false,
+            treeDefaultClose: true,//默认折叠
+            treeLinkage: true,
             elem: '#table1',
             cols: [[
                 {field: 'gcmc',width:200,title: '工程名称'},
@@ -96,7 +96,7 @@ layui.config({
                 "type":"${items.type}",
                 "gcmc":"${items.itemName}",
                 "xmsl": "${items.unit}",
-                "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if><c:if test="${items.type eq '3'}">变电站线路</c:if>",
+                "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if><c:if test="${items.type eq '3'}">变电站工程</c:if>",
                 "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
                 "status":"3",
                 "pid": "${items.projectId}"
@@ -112,7 +112,7 @@ layui.config({
     });
     };
     renderTable1();
-    treetable.foldAll('#table1');
+    // treetable.foldAll('#table1');
     table.on('tool(table1)', function(obj,target){
         var data = obj.data;
         if(obj.event == 'add'){ //添加项目

src/main/webapp/webpage/modules/sg/project/updateItemForm.jsp

@@ -82,7 +82,7 @@
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
                     "sgdw": "${data1.unit}",
-                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站线路"</c:if>,
+                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站工程"</c:if>,
                     "xmbh":"${data1.itemNo}"
                 },
                 </c:forEach>

src/main/webapp/webpage/modules/sg/projecttem/lookItem.jsp

@@ -65,7 +65,7 @@
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
                     "sgdw": "${data1.unit}",
-                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站线路"</c:if>,
+                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站工程"</c:if>,
                     "xmbh":"${data1.itemNo}"
                 },
                 </c:forEach>

src/main/webapp/webpage/modules/sg/projecttem/manageList.js

@@ -73,7 +73,7 @@
     "type":"${items.type}",
     "gcmc":"${items.itemName}",
     "xmsl": "${items.unit}",
-    "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if><c:if test="${items.type eq '3'}">变电站线路</c:if>",
+    "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if><c:if test="${items.type eq '3'}">变电站工程</c:if>",
     "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
     "status":"3",
     "pid": "${items.projectId}"

src/main/webapp/webpage/modules/sg/projecttem/updateItem.jsp

@@ -78,7 +78,7 @@
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
                     "sgdw": "${data1.unit}",
-                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站线路"</c:if>,
+                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站工程s"</c:if>,
                     "xmbh":"${data1.itemNo}"
                 },
                 </c:forEach>