Merge remote-tracking branch 'origin/master'

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

@@ -1,120 +1,120 @@
 <%@ 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'}
-    ,{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
-});
+        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
+    });
     //计算比例/金额
     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 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;
-}
+        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);
-}
+        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();
+        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();
-}
-});
-}
-};
+        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);
-});
+        $('.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/wbslist.js

@@ -1,6 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <script type="text/javascript">
-    layui.config({
+layui.config({
     base: '${ctxp}/static/plugin/assets/'
 }).extend({
     treetable: 'treetable-lay/treetable'
@@ -9,7 +9,7 @@
     var table = layui.table;
     var layer = layui.layer;
     var treetable = layui.treetable;
-
+    //本体部分树形表格生成
     var renderTable1 = function () {
     layer.load(2);
     treetable.render({
@@ -21,7 +21,7 @@
     treeLinkage: false,
     elem: '#table1',
     page: false,
-    cols: [[
+    cols: [[ //加载下拉表格二级表头
     {type:'numbers',title: '序号', rowspan: 2, totalRowText: "合计",},
     {field: 'wbsys', title: 'WBS要素',width:200, rowspan:'2'},
 
@@ -56,7 +56,7 @@
     {field:'gf',align:'center',width:120,title:'规费',totalRow: true},
     {field:'sf',align:'center',width:120,title:'税金',totalRow: true},
     ]]
-    ,data: [
+    ,data: [ //数据传入
     <c:if test="${ not empty map.list}">
     <c:forEach items="${map.list}" var="data" varStatus="index">
     <c:if test="${data.feeType eq '1'}">
@@ -101,8 +101,8 @@
 });
 };
 
-    renderTable1();
-    // treetable.foldAll('#table1');
+    renderTable1(); //表格渲染
+    // treetable.foldAll('#table1'); 开启后下拉合并
 });
 layui.use(['table', 'form', 'element', 'treetable'], function () {
     var $ = layui.jquery;
@@ -111,7 +111,7 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
     var element = layui.element;
     var treetable = layui.treetable;
 
-    // 渲染表格
+    // 其他部分 表格渲染
     var renderTable2 = function () {
         layer.load(2);
         treetable.render({
@@ -121,13 +121,13 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
             treePidName: 'd_pid',
             elem: '#table2',
             page: false,
-            cols: [[
+            cols: [[ //其他部分 生产表头
                 {type: 'numbers'},
                 {field: 'wbsys', title: 'WBS要素'},
                 {field: 'wbssbm', title: 'WBS识别码'},
                 {field: 'money', title: '金额'},
              ]]
-            ,data: [
+            ,data: [ //其他部分数据传入
                 <c:if test="${ not empty map.list}">
                     <c:forEach items="${map.list}" var="data" varStatus="index">
                         <c:if test="${data.feeType eq '0'}">
@@ -157,16 +157,16 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
         });
         layui.use('table', function(){
             var table = layui.table;
-
+            //未标识部分 表格渲染
             table.render({
                 elem: '#xmmc'
                 ,title: '未标识'
-                ,cols: [[
+                ,cols: [[ //渲染 表头
                     {field:'xmmc', width:200,title:'项目名称'}
                     ,{field:'fyje', width:178,title:'费用金额'}
                     ,{width:178,  toolbar: '#barDemo',title:'操作'}
                 ]]
-                ,data:[
+                ,data:[ //渲染 数据
                     <c:if test="${ not empty map.list}">
                         <c:forEach items="${map.list2}" var="data" varStatus="index">
                             {
@@ -183,47 +183,48 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
             table.on('tool(freestr)', function(obj){
                 var datacount="";
                 var data = obj.data;
-                if(obj.event === 'fttz'){
+                if(obj.event === 'fttz'){ //分摊调整
                     sureradio(data);
-                } else if(obj.event === 'ddtz'){
+                } else if(obj.event === 'ddtz'){ //单独调整
                     sureradio2(data,'${ctx}/jkxl/getft?id='+data.id);
                 }
                 // alert(datacount);
             });
         });
-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: url
-            , btn: ['确定','关闭']
-                ,yes: function(index, layero){
-                    var bodyparent = layer.getChildFrame('body', index);
-                    bodyparent.find('#freenl').click();
-                }
-                ,btn2: function(index, layero){
-                    layer.close(index);
-                }
+    function sureradio2(data,url){ //分摊调整 弹出层
+        var newid = data.id;   //获取id
+        var xmmc = data.xmmc;  //获取项目名称
+        var fyje = data.fyje;  //获取 费用金额
+        $("#newid").val(newid); //项目 id/名称/金额 写入input当中  子类页面调用
+        $("#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: url  //弹出层路径
+                , btn: ['确定','关闭']
+                    ,yes: function(index, layero){
+                        var bodyparent = layer.getChildFrame('body', index); //当前页面 获取子类（弹出层body）的属性
+                        bodyparent.find('#freenl').click();  //获取子类页面的按钮,点击事件。
+                    }
+                    ,btn2: function(index, layero){
+                        layer.close(index); //管理弹出层
+                    }
+                })
             })
-        })
     }
-    function sureradio(data,target){
-        var newid = data.id;
+    function sureradio(data,target){ //单独调整
+        var newid = data.id; //获取 id/项目名称/项目金额
         var xmmc = data.xmmc;
         var fyje = data.fyje;
-        $("#newid").val(newid);
+        $("#newid").val(newid); //写入当前页面input框中
         $("#xmmc1").val(xmmc);
         $("#fyje1").val(fyje);
         layui.use(['table','layer'],function(){
@@ -235,7 +236,7 @@ function sureradio2(data,url){
                 shade: 0.8,
                 shadeClose: true,
                 content: '${ctxp}/webpage/modules/sg/free/avgpage.jsp'
-    , btn: ['调整','关闭']
+                , btn: ['调整','关闭']
                 ,yes: function(index, layero){
                     var body = layer.getChildFrame('body', index);
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -256,7 +257,7 @@ function sureradio2(data,url){
             })
         })
     }
-    layui.use('table', function(){
+    layui.use('table', function(){ //结算汇总表部分
         var table = layui.table;
         table.render({
             elem: '#settlement'
@@ -311,7 +312,7 @@ table.on('tool(settle)', function(obj){
     }
 });
 });
-function doIt(val){
+function doIt(val){ //科学计数法
     if(val == null){
         return val;
     }

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

@@ -157,7 +157,7 @@ function refresh(){
     $("#fromSumbit").submit();
 }
 function addProject(){
-    layer.prompt({title: '请输入工程名称', formType: 3}, function(text, index){
+    layer.prompt({title: '请输入工程名称', formType: 3,offset:['35%','37%']}, function(text, index){
         layer.close(index);
         $.ajax({
             type: "post",

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

@@ -48,7 +48,7 @@ function okSubmit() {
 
     var inputval = $("#myinput").val();
     if(inputval==null||inputval==""){
-        layer.msg("请输入工程名称",{icon: 3});
+        layer.msg("请输入工程名称",{icon: 3,offset:['40%','40%']});
         return false;
     }
     formdata.append("projectName",inputval);
@@ -62,16 +62,16 @@ function okSubmit() {
         div_val[i]=div1[i].innerHTML;
     }
     if (divvalue.length<=0){
-        layer.msg("请输入项目名称",{icon: 3});
+        layer.msg("请输入项目名称",{icon: 3,offset:['40%','40%']});
         return false;
     }
     for (var i = 0; i < divvalue.length; i++) {
         if (divvalue[i]=="请输入项目名称"){
-            layer.msg("请输入项目名称",{icon: 3});
+            layer.msg("请输入项目名称",{icon: 3,offset:['40%','40%']});
             throw SyntaxError;
         }
         if(div_val[i]==divvalue[i+1]){
-            layer.msg("项目名称不能重复",{icon: 5});
+            layer.msg("项目名称不能重复",{icon: 5,offset:['40%','40%']});
             throw SyntaxError;
         }
     }
@@ -83,12 +83,12 @@ function okSubmit() {
         selectval[i]=select1[i].value;
     }
     if (selectval.length<=0){
-        layer.msg("请输入项目名称",{icon: 3});
+        layer.msg("请输入项目名称",{icon: 3,offset:['40%','40%']});
         return false;
     }
     for (var i = 0; i < selectval.length; i++) {
         if (selectval[i]==""||selectval[i]==null){
-            layer.msg("请选择项目类型",{icon: 3});
+            layer.msg("请选择项目类型",{icon: 3,offset:['40%','40%']});
             throw SyntaxError;
         }
     }

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

@@ -21,7 +21,7 @@
         .layui-table-tips-c{display:none}
     </style>
 </head>
-<body>
+<body style="height: 100%;">
 <div style="padding: 10px; background-color: #F2F2F2;">
     <div class="layui-main-bgc">
         <%--<sys:message content="${message}"/>--%>