Merge remote-tracking branch 'origin/master'

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

@@ -98,17 +98,12 @@ public class SettementUtil {
     public static final String RESON_JGJS8=",小计,<span style='font-weight: bold;'>xxx</span>,";
     //变电站
     public static final String BDZ_TBBJ="《工程项目投标报价汇总表》,投标报价,<span style='font-weight: bold;'>xxx</span>,";
-    /*
-        增补税率差额
-     */
-    public static final String RESON_BZZS="补增值税税率调整差额";
+
     /*
        工程结算
     */
-    public static final String RESON_GCJS="《工程项目竣工结算汇总表》,工程结算价,<span style='font-weight: bold;'>xxx</span>,";
-    public static final String RESON_GCJS1=",竣工结算价合计,<span style='font-weight: bold;'>xxx</span>,";
-    public static final String RESON_GCJS2=",补增值税税率调整差额,<span style='font-weight: bold;'>xxx</span>,";
-    public static final String RESON_GCJS3=",扣减甲供材超供材料费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_GCJS="《工程项目竣工结算汇总表》,结算价,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_GCJS1="《工程项目竣工结算汇总表》,结算价,<span style='font-weight: bold;'>xxx</span>,";
     public static final String[] DLBDZ_FBFX2 = {RESON_FBFX1,BDZ_FBFX1,BDZ_FBFX2,RESON_JGJS8,RESON_JZFBFX3,RESON_AZFBFX3,RESON_JGJS8};
     public static final String[] DLBDZ_FBFX1 = {RESON_FBFX1,RESON_JZFBFX,RESON_AZFBFX,RESON_JGJS8,RESON_JZFBFX3,RESON_AZFBFX3,RESON_JGJS8};
     /*
@@ -318,15 +313,11 @@ public class SettementUtil {
                     settlement.setTheAmount(str);
                     break;
                 case BashInfo.JS_GCJS:
-                    double[] gcComparison =getGcComparison(settlements);
-                    if (gcComparison[0]<=moneyComparison1&&gcComparison[0]>=moneyComparison2){
+                    double gcComparison =getGcComparison(settlements);
+                    if (gcComparison<=moneyComparison1&&gcComparison>=moneyComparison2){
                         settlement.setStatus("0");
                     }
-                    String gc = String.valueOf(nf.format(gcComparison[0])+','+
-                            nf.format(gcComparison[1])+','
-                            +nf.format(gcComparison[2])+','+
-                            nf.format(gcComparison[3]));
-                    settlement.setTheAmount(gc);
+                    settlement.setTheAmount(String.valueOf(nf.format(gcComparison)));
                     break;
                 default:
                     settlement.setStatus("2");
@@ -436,15 +427,11 @@ public class SettementUtil {
                     settlement.setTheAmount(str);
                     break;
                 case BashInfo.JS_GCJS:
-                    double[] gcComparison =getGcComparison(settlements);
-                    if (gcComparison[0]<=moneyComparison1&&gcComparison[0]>=moneyComparison2){
+                    double gcComparison =getGcComparison(settlements);
+                    if (gcComparison<=moneyComparison1&&gcComparison>=moneyComparison2){
                         settlement.setStatus("0");
                     }
-                    String gc = String.valueOf(nf.format(gcComparison[0])+','+
-                            nf.format(gcComparison[1])+','
-                            +nf.format(gcComparison[2])+','+
-                            nf.format(gcComparison[3]));
-                    settlement.setTheAmount(gc);
+                    settlement.setTheAmount(String.valueOf(nf.format(gcComparison)));
                     break;
                 default:
                     settlement.setStatus("2");
@@ -543,19 +530,18 @@ public class SettementUtil {
         }
         return doubles[0];
     }
-
     /**
      * 工程结算价 校验
      * @param settlements 《工程项目结算汇总表》 集合
      * @return double[] 计算匹配数据集合
      */
-    public static double[] getGcComparison(List<Settlement> settlements){
-        double[] doubles=new double[4];
-        double[] doubles1 = new double[8];
-        String name;
-        double money=0;
+    public static double getGcComparison(List<Settlement> settlements){
+        double fbrMoney = 0.0;
+        String name="";
+        double money=0.0;
         double minus = 0.0;
         double addcount = 0.0;
+        double count = 0.0;
         for (Settlement settlement:settlements){
             name = settlement.getEntryName();
             if (name.equals(BDZ_TBNAME)){
@@ -570,10 +556,10 @@ public class SettementUtil {
             if (name.equals(BDZ_TBNAME)){
                 name=BashInfo.JS_JGJS;
             }
-            if (name.contains(RESON_KYJ)&&!name.equals(BashInfo.JS_KJJG)){
+            if (name.contains(RESON_KYJ)){
                 name = RESON_KYJ;
             }
-            if (name.contains(RESON_KYJ1)&&!name.equals(BashInfo.JS_KJJG)){
+            if (name.contains(RESON_KYJ1)){
                 name = RESON_KYJ1;
             }
             if (name.equals(RESON_ZZJS)){
@@ -581,26 +567,8 @@ public class SettementUtil {
             }
             money =settlement.getMoney();
             switch (name) {
-                case BashInfo.JS_FBFX:
-                    doubles1[1]=money;
-                    break;
-                case BashInfo.JS_CBRF:
-                    doubles1[2]=money;
-                    break;
-                case BashInfo.JS_CSXM:
-                    doubles1[3]=money;
-                    break;
-                case BashInfo.JS_QTXM:
-                    doubles1[4]=money;
-                    break;
-                case BashInfo.JS_GF:
-                    doubles1[5]=money;
-                    break;
-                case BashInfo.JS_SJ:
-                    doubles1[6]=money;
-                    break;
                 case BashInfo.JS_FBRF:
-                    doubles1[7]=money;
+                    fbrMoney+=money;
                     break;
                 case RESON_KYJ:
                     minus += money;
@@ -608,12 +576,6 @@ public class SettementUtil {
                 case RESON_KYJ1:
                     minus += money;
                     break;
-                case BashInfo.JS_BZZS://补增值税
-                    doubles[2]=money;
-                    break;
-                case BashInfo.JS_KJJG://扣减
-                    doubles[3]=money;
-                    break;
                 default:
                     if (!name.equals(BashInfo.JS_JGJS)&&!name.equals(BashInfo.JS_GCJS)){
                         addcount+=money;
@@ -622,13 +584,11 @@ public class SettementUtil {
             }
         }
         if (getFlag){
-            doubles1[0]=doubles1[1]+doubles1[2]+doubles1[3]+doubles1[4]+doubles1[5]+doubles1[6]-doubles1[7]-minus+addcount;
+            count =addcount-fbrMoney-minus;
         }else {
-            doubles1[0]=doubles1[1]+doubles1[2]+doubles1[3]+doubles1[4]+doubles1[5]+doubles1[6]-minus+addcount;
+            count=addcount-minus;
         }
-        doubles[1]=doubles1[0];
-        doubles[0]=doubles[1]+doubles[2]-doubles[3];
-        return doubles;
+        return count;
     }
     /**
      * 前台显示提示数据匹配：架空线路
@@ -637,7 +597,6 @@ public class SettementUtil {
      */
     public static List<Settlement> getSelectSettlement(List<Settlement> settlementList){
         boolean flag = false;//定义开关
-        boolean[] booleans =getJgforJoint(settlementList);
         String key="";
         String reason="";
         for(Settlement settlement:settlementList){
@@ -654,6 +613,10 @@ public class SettementUtil {
                 flag=true;
                 key = BashInfo.JS_JGJS;
             }
+            if (key.equals(RESON_ZZJS)){
+                flag = true;
+                key = BashInfo.GCJS;
+            }
             switch (key){
                 case BashInfo.JS_FBFX:
                     reason = getFbfxJoint(settlement);
@@ -705,16 +668,13 @@ public class SettementUtil {
                     }
                     settlement.setReason(reason);
                     break;
-                case BashInfo.JS_BZZS:
-                    reason=RESON_BZZS;
-                    settlement.setReason(reason);
-                    break;
-                case BashInfo.JS_KJJG:
-                    reason=RESON_BZZS;
-                    settlement.setReason(reason);
-                    break;
                 case BashInfo.GCJS:
-                    reason=getJshzJoint(settlement,booleans);
+                    if(flag){
+                        settlement.setEntryName(RESON_ZZJS);
+                        reason=getJshzJoint(RESON_GCJS1,settlement,settlementList);
+                    }else {
+                        reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
+                    }
                     settlement.setReason(reason);
                     break;
             }
@@ -728,7 +688,6 @@ public class SettementUtil {
      */
     public static List<Settlement> getSelectDlSettlement(List<Settlement> settlementList){
         boolean flag = false;//定义开关
-        boolean[] booleans =getJgforJoint(settlementList);
         String key="";
         String reason="";
         for(Settlement settlement:settlementList){
@@ -745,6 +704,10 @@ public class SettementUtil {
                 flag=true;
                 key = BashInfo.JS_JGJS;
             }
+            if (key.equals(RESON_ZZJS)){
+                flag = true;
+                key = BashInfo.GCJS;
+            }
             switch (key){
                 case BashInfo.JS_FBFX:
                     reason = getDJoint(settlement,DLBDZ_FBFX1);
@@ -796,16 +759,13 @@ public class SettementUtil {
                     }
                     settlement.setReason(reason);
                     break;
-                case BashInfo.JS_BZZS:
-                    reason=RESON_BZZS;
-                    settlement.setReason(reason);
-                    break;
-                case BashInfo.JS_KJJG:
-                    reason=RESON_BZZS;
-                    settlement.setReason(reason);
-                    break;
                 case BashInfo.GCJS:
-                    reason=getJshzJoint(settlement,booleans);
+                    if(flag){
+                        settlement.setEntryName(RESON_ZZJS);
+                        reason=getJshzJoint(RESON_GCJS1,settlement,settlementList);
+                    }else {
+                        reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
+                    }
                     settlement.setReason(reason);
                     break;
             }
@@ -820,7 +780,6 @@ public class SettementUtil {
      */
     public static List<Settlement> getSelectBdzSettlement(List<Settlement> settlementList){
         boolean flag = false;//定义开关
-        boolean[] booleans =getJgforJoint(settlementList);//判断读取存在字段
         String key=""; //匹配字段
         String reason=""; //提示 字段
         for(Settlement settlement:settlementList){
@@ -838,6 +797,10 @@ public class SettementUtil {
                 flag=true;
                 key = BDZ_TBNAME;
             }
+            if (key.equals(RESON_ZZJS)){
+                flag = true;
+                key = BashInfo.GCJS;
+            }
             switch (key){
                 case BashInfo.JS_FBFX:
                     reason = getDJoint(settlement,DLBDZ_FBFX2);
@@ -889,16 +852,13 @@ public class SettementUtil {
                     }
                     settlement.setReason(reason);
                     break;
-                case BashInfo.JS_BZZS:
-                    reason=RESON_BZZS;
-                    settlement.setReason(reason);
-                    break;
-                case BashInfo.JS_KJJG:
-                    reason=RESON_BZZS;
-                    settlement.setReason(reason);
-                    break;
                 case BashInfo.GCJS:
-                    reason=getJshzJoint(settlement,booleans);
+                    if(flag){
+                        settlement.setEntryName(RESON_ZZJS);
+                        reason=getJshzJoint(RESON_GCJS1,settlement,settlementList);
+                    }else {
+                        reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
+                    }
                     settlement.setReason(reason);
                     break;
             }
@@ -1078,27 +1038,33 @@ public class SettementUtil {
         }
         return reason;
     }
-
     /**
      * 工程结算
-     * @param settlement bean
-     * @param booleans 判断工程结算 对比 字段 是否存在
-     * @return bean rason
+     * @param tops
+     * @param settlement
+     * @param settlements
+     * @return String
      */
-    public static String getJshzJoint(Settlement settlement,boolean[] booleans){
+    public static String getJshzJoint(String tops,Settlement settlement,List<Settlement> settlements){
         String reason="";
-        String[] amout=settlement.getTheAmount().split(",");
-        reason+=RESON_GCJS.replace("xxx",String.valueOf(nf.format(settlement.getMoney())));
-        if (booleans[8]){
-            reason+=RESON_GCJS1.replace("xxx",amout[1]);
-        }
-        if (booleans[9]){
-            reason+=RESON_GCJS2.replace("xxx",amout[2]);
-        }
-        if (booleans[10]) {
-            reason +=RESON_GCJS3.replace("xxx", amout[3]);
+        reason = tops.replace("xxx",String.valueOf(nf.format(settlement.getMoney())));
+        String amout=settlement.getTheAmount();
+        for (int i = 0; i < settlements.size(); i++) {
+            if (settlements.get(i).getEntryName().equals(BashInfo.JS_JGJS)){
+                continue;
+            }
+            if (settlements.get(i).getEntryName().equals(BashInfo.JS_GCJS)||settlements.get(i).getEntryName().equals(RESON_ZZJS)){
+                reason+=RESON_JGJS8.replace("xxx",amout);
+                if (settlement.getStatus().equals("0")){
+                    reason+=SettementUtil.RESON_TRUE;
+                }else {
+                    reason+=SettementUtil.RESON_FLASE;
+                }
+                return reason;
+            }
+            reason += ","+settlements.get(i).getEntryName()+",<span style='font-weight: bold;'>"+nf.format(settlements.get(i).getMoney())+"</span>,";
         }
-        reason+=RESON_JGJS8.replace("xxx",amout[0]);
+        reason+=RESON_JGJS8.replace("xxx",amout);
         if (settlement.getStatus().equals("0")){
             reason+=SettementUtil.RESON_TRUE;
         }else {
@@ -1106,65 +1072,6 @@ public class SettementUtil {
         }
         return reason;
     }
-
-    /**
-     * 获取 工程竣工、工程投标 是否存在
-     * @param settlements 汇总表 所有数据 list 集合
-     * @return 布尔  数组
-     */
-    public static boolean[] getJgforJoint(List<Settlement> settlements){
-        String key = "";
-        boolean[] booleans = new boolean[11];
-        for (int i = 0; i < booleans.length; i++) {
-            booleans[i]=false;
-        }
-        for (int i = 0; i < settlements.size(); i++) {
-            key =  settlements.get(i).getEntryName();
-            if(key.equals(BDZ_TBRNAME)){
-                key=BashInfo.JS_CBRF;
-            }
-            if (key.equals(BDZ_ZBRNAME)){
-                key=BashInfo.JS_FBRF;
-            }
-            if (key.equals(BDZ_TBNAME)){
-                key=BashInfo.JS_JGJS;
-            }
-            switch (key){
-                case BashInfo.JS_FBFX:
-                    booleans[1]=true;
-                    break;
-                case  BashInfo.JS_CBRF:
-                    booleans[2]=true;
-                    break;
-                case BashInfo.JS_CSXM:
-                    booleans[3]=true;
-                    break;
-                case BashInfo.JS_QTXM:
-                    booleans[4]=true;
-                    break;
-                case BashInfo.JS_GF:
-                    booleans[5]=true;
-                    break;
-                case BashInfo.JS_SJ:
-                    booleans[6]=true;
-                    break;
-                case BashInfo.JS_FBRF:
-                    booleans[7]=true;
-                    break;
-                case BashInfo.JS_JGJS://竣工结算
-                    booleans[8]=true;
-                    break;
-                case BashInfo.JS_BZZS://补增值税
-                    booleans[9]=true;
-                    break;
-                case BashInfo.JS_KJJG://扣减
-                    booleans[10]=true;
-                    break;
-            }
-        }
-        return booleans;
-    }
-
     /**
      *  添加获取数据到settlement 对象
      * @param settlement bean

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

@@ -0,0 +1,166 @@
+<%@ 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,
+    id:'checktable',
+    elem: '#longtable',
+    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":"${data.wbsCode}",
+        "wbsys": "${data.describe}",
+        "wbsCode": "${data.wbsCode}",
+        "bl":'',
+        "fee":'',
+        "pid": "${data.parentNode}"
+    },
+    </c:forEach>
+    </c:if>
+    ],
+    done: function () {
+    $(".layui-icon-triangle-d").closest('tr').find("[data-field='bl']").data('edit', false);
+    $(".layui-icon-triangle-d").closest('tr').find("[data-field='fee']").data('edit', false);
+    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('请输入有效数字',{icon: 5,offset:['40%','40%']});
+    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('请输入有效数字',{icon: 5,offset:['40%','40%']});
+    return false;
+}
+    var bfb2 = (feevalue*100);
+    $(this).closest("tr").find("td").eq("3").find("div").html(bfb2);
+    data.bl=bfb2;
+}
+});
+    $('#btn-search').click(function () {
+    var keyword = $('#edt-search').val();
+    var searchCount = 0;
+    $('#longtable').next('.treeTable').find('.layui-table-body tbody tr td').each(function () {
+    $(this).css('background-color', 'transparent');
+    var text = $(this).text();
+    if (keyword != '' && text.indexOf(keyword) >= 0) {
+    $(this).css('background-color', 'rgba(250,230,160,0.5)');
+    if (searchCount == 0) {
+    treetable.expandAll('#longtable');
+    $('html,body').stop(true);
+    $('html,body').animate({scrollTop: $(this).offset().top - 150}, 500);
+}
+    searchCount++;
+}
+});
+    if (keyword == '') {
+    layer.msg("请输入搜索内容", {icon: 5,offset:['40%','40%']});
+} else if (searchCount == 0) {
+    layer.msg("没有匹配结果", {icon: 5,offset:['40%','40%']});
+}
+});
+
+    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('请选择操作方式',{icon: 5,offset:['40%','40%']});
+    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('比例/金额分配不正确!',{icon: 5,offset:['40%','40%']});
+    return false;
+}
+    var newid2 = parent.$('#newid').val();//获取父类input框的值
+    var xmmc2 = parent.$('#xmmc1').val();
+    var fyje2 = parent.$('#fyje1').val();
+    //加载提示
+    layer.msg('加载中', {
+    icon: 16
+    ,shade: 0.01
+    ,time:false
+    ,offset:['40%','40%']
+});
+    $.ajax({
+    type:"post",
+    url:"${ctx}/jkxl/bddtz",
+    // 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>

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

@@ -7,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="individualForm.js"%>
 </head>
 <style>
     .layui-table-view .layui-table {width:100%}
@@ -43,169 +44,4 @@
 <table class="layui-table" id="longtable" lay-filter="longtable"></table>
 </div>
 </body>
-<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,
-                id:'checktable',
-                elem: '#longtable',
-                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":"${data.wbsCode}",
-                        "wbsys": "${data.describe}",
-                        "wbsCode": "${data.wbsCode}",
-                        "bl":'',
-                        "fee":'',
-                        "pid": "${data.parentNode}"
-                    },
-                    </c:forEach>
-                    </c:if>
-                ],
-                done: function () {
-                    $(".layui-icon-triangle-d").closest('tr').find("[data-field='bl']").data('edit', false);
-                    $(".layui-icon-triangle-d").closest('tr').find("[data-field='fee']").data('edit', false);
-                    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('请输入有效数字',{icon: 5,offset:['40%','40%']});
-                    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('请输入有效数字',{icon: 5,offset:['40%','40%']});
-                    return false;
-                }
-                var bfb2 = (feevalue*100);
-                $(this).closest("tr").find("td").eq("3").find("div").html(bfb2);
-                data.bl=bfb2;
-            }
-        });
-        $('#btn-search').click(function () {
-            var keyword = $('#edt-search').val();
-            var searchCount = 0;
-            $('#longtable').next('.treeTable').find('.layui-table-body tbody tr td').each(function () {
-                $(this).css('background-color', 'transparent');
-                var text = $(this).text();
-                if (keyword != '' && text.indexOf(keyword) >= 0) {
-                    $(this).css('background-color', 'rgba(250,230,160,0.5)');
-                    if (searchCount == 0) {
-                        treetable.expandAll('#longtable');
-                        $('html,body').stop(true);
-                        $('html,body').animate({scrollTop: $(this).offset().top - 150}, 500);
-                    }
-                    searchCount++;
-                }
-            });
-            if (keyword == '') {
-                layer.msg("请输入搜索内容", {icon: 5,offset:['40%','40%']});
-            } else if (searchCount == 0) {
-                layer.msg("没有匹配结果", {icon: 5,offset:['40%','40%']});
-            }
-        });
-
-        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('请选择操作方式',{icon: 5,offset:['40%','40%']});
-                    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('比例/金额分配不正确!',{icon: 5,offset:['40%','40%']});
-                    return false;
-                }
-                var newid2 = parent.$('#newid').val();//获取父类input框的值
-                var xmmc2 = parent.$('#xmmc1').val();
-                var fyje2 = parent.$('#fyje1').val();
-                //加载提示
-                layer.msg('加载中', {
-                    icon: 16
-                    ,shade: 0.01
-                    ,time:false
-                    ,offset:['40%','40%']
-                });
-                $.ajax({
-                    type:"post",
-                    url:"${ctx}/jkxl/bddtz",
-                    // 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/project/addItemForm.jsp

@@ -11,7 +11,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>
     <style>
-        .mydiv{padding: 5px 7px;min-height: 17px;text-align: left}
+        .mydiv{padding: 5px 7px;min-height: 17px;text-align: left;color:#333333}
         .mydiv:empty:before{content: attr(placeholder);color:#999999;text-align: left}
         .mydiv:focus:before{content:none;text-align: left}
         .layui-input{ height: 28px;}
@@ -25,35 +25,18 @@
         <table class="layui-table">
             <tbody>
             <tr>
-                <td><input type="button" class="layui-btn layui-btn-primary layui-btn-sm" value="选择结算文件" id="btnxz"/></td>
+                <td width="30%"><input type="button" class="layui-btn layui-btn-primary layui-btn-sm" value="选择结算文件" id="btnxz"/></td>
                 <td><input type="text" autocomplete="off" readonly="readonly" class="layui-input" placeholder="*结算书文件为博微导出xls/xlsx格式文件" id="view_input" style="background-color: whitesmoke"></td>
             </tr>
-            <%--<tr>--%>
-                <%--<td>*项目划分</td>--%>
-                <%--<td>--%>
-                    <%--<select name="type" lay-verify="required" lay-search="">--%>
-                        <%--<option value="">请选择</option>--%>
-                        <%--<option value="1">架空线路工程</option>--%>
-                        <%--<option value="2">电缆工程</option>--%>
-                        <%--<option value="3">变电站工程</option>--%>
-                    <%--</select>--%>
-                <%--</td>--%>
-            <%--</tr>--%>
             <tr>
-                <td>*结算书名称</td>
+                <td width="30%">*结算书名称</td>
                 <td>
                     <input type="text" name="itemName" style="display: none" hidden="hidden" autocomplete="off" class="layui-input" id="inputwrite">
                     <div contenteditable="true" id="mydiv1" class="mydiv" placeholder="请输入结算书名称"></div>
                 </td>
             </tr>
-            <%--<tr>--%>
-                <%--<td>*结算书编号</td>--%>
-                <%--<td>--%>
-                    <%--<div contenteditable="true" class="mydiv3 mydiv" placeholder="请输入供应商"></div>--%>
-                <%--</td>--%>
-            <%--</tr>--%>
             <tr>
-                <td>*供应商名称</td>
+                <td width="30%">*供应商名称</td>
                 <td>
                     <input type="text" name="unit" style="display: none" autocomplete="off" class="layui-input" id="inputUnit">
                     <div contenteditable="true" id="mydiv2" class=" mydiv" placeholder="请输入供应商名称"></div>

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

@@ -0,0 +1,34 @@
+<%@ 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();
+    });
+    function addPro(){
+        var div1_value =  $("#mydiv1").text();
+        var div2_value =  $("#mydiv2").text();
+        if (div1_value==null||div1_value==""){
+            layer.msg("请输入工程名称",{icon:3});
+            throw SyntaxError;
+        }
+        if(div2_value==null||div2_value==""){
+            layer.msg("请输入工程编号",{icon:3});
+            throw SyntaxError;
+        }
+        $.ajax({
+            type: "post",
+            url: "${ctx}/project/save",
+            data:{projectName:div1_value,projectNo:div2_value},
+            dataType: "json",
+            success: function(data){
+            if(data.success){
+                layer.msg(data.msg, {icon: 6,offset:['38%','38%']},function () {
+                    parent.location.reload();
+                });
+            }else{
+                layer.msg(data.msg, {icon: 5});
+             }
+            }
+        });
+    }
+</script>

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

@@ -11,7 +11,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>
     <style>
-        .mydiv{padding: 5px 7px;min-height: 17px;text-align: left}
+        .mydiv{padding: 5px 7px;min-height: 17px;text-align: left;color:#333333}
         .mydiv:empty:before{content: attr(placeholder);color:#999999;text-align: left}
         .mydiv:focus:before{content:none;text-align: left}
         .layui-input{ height: 28px;}
@@ -26,14 +26,13 @@
         <table class="layui-table">
             <tbody>
             <tr>
-                <td width="35%">*工程名称</td>
+                <td width="30%">*工程名称</td>
                 <td>
-                    <%--<input type="text" name="projectName" style="display: none" hidden="hidden" autocomplete="off" class="layui-input" id="inputwrite">--%>
-                    <div contenteditable="true" id="mydiv1" class="mydiv" placeholder="请输入工程名称"></div>
+                    <div contenteditable="true"  id="mydiv1" class="mydiv" placeholder="请输入工程名称"></div>
                 </td>
             </tr>
             <tr>
-                <td width="35%">*工程编号</td>
+                <td width="30%">*工程编号</td>
                 <td>
                     <div contenteditable="true" id="mydiv2" class="mydiv" placeholder="请输入工程编号"></div>
                 </td>
@@ -44,38 +43,5 @@
 </form>
 </body>
 <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
-<script type="text/javascript">
-    layui.use(['form', 'layedit', 'laydate'], function(){
-        var form = layui.form;
-        form.render();
-    });
-    function addPro(){
-        var div1_value =  $("#mydiv1").text();
-        var div2_value =  $("#mydiv2").text();
-        if (div1_value==null||div1_value==""){
-            layer.msg("请输入工程名称",{icon:3});
-            throw SyntaxError;
-        }
-        if(div2_value==null||div2_value==""){
-            layer.msg("请输入工程编号",{icon:3});
-            throw SyntaxError;
-        }
-        $.ajax({
-            type: "post",
-            url: "${ctx}/project/save",
-            data:{projectName:div1_value,projectNo:div2_value},
-            dataType: "json",
-            success: function(data){
-                if(data.success){
-                    layer.msg(data.msg, {icon: 6,offset:['38%','38%']},function () {
-                        parent.location.reload();
-                    });
-                }else{
-                    layer.msg(data.msg, {icon: 5});
-                }
-            }
-        });
-    }
-
-</script>
+<%@include file="addprojectForm.js"%>
 </html>

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

@@ -21,9 +21,7 @@
     .layui-table-view .layui-table {width:100%}
     .layui-table-tips-main{display:none}
     .layui-table-tips-c{display:none}
-    .layui-table-cell {
-        height: inherit;
-    }
+    .layui-table-cell {height: inherit;}
 </style>
 <body style="height: 100%">
 <input style="display: none;" id="addtext" value=""/>
@@ -39,7 +37,7 @@
                            <input id="pageNo" name="pageNo" type="hidden" value=""/>
                            <input id="pageSize" name="pageSize" type="hidden" value=""/>
                            <div class="layui-form-item">
-                               <div class="layui-inline" style="background-color: #FFE136">
+                               <div class="layui-inline">
                                    <div class="col-xs-12 col-sm-6 col-md-4" style="margin-left: 20px">
                                    <label class="layui-font-style">工程名称:</label>
                                        <input type="text" name="projectName"  autocomplete="off" class="layui-input">

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

@@ -121,7 +121,7 @@
             // data:JSON.stringify({id:newid2,type:xmmc2,fee:fyje2}),
             data:$('#updateForm').serialize(),
             success:function(result){
-                layer.msg(result.msg, {icon: 5,offset:['38%','38%']},function () {
+                layer.msg(result.msg, {icon: 6,offset:['38%','38%']},function () {
                     parent.location.reload();
                 });
             }

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

@@ -7,7 +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>
     <style>
-        .mydiv{padding: 5px 7px;min-height: 17px;text-align: left}
+        .mydiv{padding: 5px 7px;min-height: 17px;text-align: left;color:#333333}
         .mydiv:empty:before{content: attr(placeholder);color:#999999;text-align: left}
         .mydiv:focus:before{content:none;text-align: left}
         .layui-input{ height: 28px;}
@@ -21,19 +21,20 @@
         <table class="layui-table">
             <tbody>
             <tr>
-                <td><input type="button" class="layui-btn layui-btn-primary layui-btn-sm" value="选择结算文件" id="btnxz"/></td>
-                <td> <input type="text" autocomplete="off" readonly="readonly" class="layui-input" placeholder="*结算书文件为博微导出xls/xlsx格式文件" id="view_input" style="background-color: whitesmoke"></td>
+                <td width="30%"><input type="button" class="layui-btn layui-btn-primary layui-btn-sm" value="选择结算文件" id="btnxz"/></td>
+                <td>
+                    <input type="text" autocomplete="off" readonly="readonly" class="layui-input" placeholder="*结算书文件为博微导出xls/xlsx格式文件" id="view_input" style="background-color: whitesmoke">
+                </td>
             </tr>
             <tr>
-                <td>*结算书名称</td>
+                <td width="30%">*结算书名称</td>
                 <td>
                     <input type="text" style="display: none" name="itemName" autocomplete="off" class="layui-input" id="inputwrite">
                     <div contenteditable="true" id="mydiv1" class="mydiv" placeholder="请输入结算书名称"></div>
                 </td>
             </tr>
             <tr>
-
-                <td>*供应商名称</td>
+                <td width="30%">*供应商名称</td>
                 <td>
                     <input type="text" style="display: none" name="unit" autocomplete="off" class="layui-input" id="inputUnit">
                     <div contenteditable="true" id="mydiv2" class="mydiv" placeholder="请输入供应商名称"></div>

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

@@ -116,7 +116,7 @@
             // data:JSON.stringify({id:newid2,type:xmmc2,fee:fyje2}),
             data:$('#updateForm').serialize(),
             success:function(result){
-                layer.msg(result.msg, {icon: 5,offset:['38%','38%']},function () {
+                layer.msg(result.msg, {icon:6,offset:['38%','38%']},function () {
                     parent.location.reload();
                 });
             }