Merge remote-tracking branch 'origin/master'

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

@@ -45,7 +45,7 @@
                 return false;
             }
             if(isNaN(blvalue)){
-                layer.msg('请输入有效数字');
+                layer.msg('请输入有效数字',{icon: 5,offset:['40%','40%']});
                 return false;
             }
             var bfb = (blvalue*moneycount);
@@ -61,7 +61,7 @@
             return false;
         }
         if(isNaN(value)){ //判断输入是否是数字
-            layer.msg('请输入有效数字');
+            layer.msg('请输入有效数字',{icon: 5,offset:['40%','40%']});
             return false;
         }
         var bfb2 = (feevalue*100);
@@ -70,40 +70,45 @@
         }
     });
     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();
+            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/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();
+            }
+        });
     }
     };
 

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

@@ -39,7 +39,7 @@
     <input id="edt-search" type="text" placeholder="输入关键字" class="solr" style=""/>&nbsp;&nbsp;
     <button class="layui-btn" id="btn-search">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
 </div>
-<div style="margin-left: 7px;margin-right: 7px">
+<div style="margin-left: 10px;margin-right: 10px">
 <table class="layui-table" id="longtable" lay-filter="longtable"></table>
 </div>
 </body>
@@ -68,8 +68,8 @@
                     {type: 'checkbox'},
                     {field:'wbsys',title:'分部分项'},
                     {field:'wbsCode',title:'WBS识别码'},
-                    {field:'bl',title:'比例(%)',edit: 'text'},
-                    {field:'fee',title:'分摊金额',edit: 'text'},
+                    {field:'bl',title:'比例(%)',edit:'text'},
+                    {field:'fee',title:'分摊金额',edit:'text'},
                 ]],
                 data: [
                     <c:if test="${ not empty list}">
@@ -85,7 +85,9 @@
                     </c:forEach>
                     </c:if>
                 ],
-                done: function (res, curr, count) {
+                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');
                 }
             });
@@ -105,7 +107,7 @@
                     return false;
                 }
                 if(isNaN(blvalue)){
-                    layer.msg('请输入有效数字');
+                    layer.msg('请输入有效数字',{icon: 5,offset:['40%','40%']});
                     return false;
                 }
                 var bfb = (blvalue*moneycount);
@@ -121,7 +123,7 @@
                     return false;
                 }
                 if(isNaN(value)){ //判断输入是否是数字
-                    layer.msg('请输入有效数字');
+                    layer.msg('请输入有效数字',{icon: 5,offset:['40%','40%']});
                     return false;
                 }
                 var bfb2 = (feevalue*100);
@@ -129,7 +131,6 @@
                 data.bl=bfb2;
             }
         });
-        //搜索--
         $('#btn-search').click(function () {
             var keyword = $('#edt-search').val();
             var searchCount = 0;
@@ -147,9 +148,9 @@
                 }
             });
             if (keyword == '') {
-                layer.msg("请输入搜索内容", {icon: 5});
+                layer.msg("请输入搜索内容", {icon: 5,offset:['40%','40%']});
             } else if (searchCount == 0) {
-                layer.msg("没有匹配结果", {icon: 5});
+                layer.msg("没有匹配结果", {icon: 5,offset:['40%','40%']});
             }
         });
 
@@ -160,7 +161,7 @@
                 var moneycount2 = $("#readid2").text();
                 var val = $('input[name="mydiv"]:checked').val();
                 if(val==null){
-                    layer.msg('请选择操作方式');
+                    layer.msg('请选择操作方式',{icon: 5,offset:['40%','40%']});
                     return false;
                 }
                 var jsondata=JSON.stringify(data);
@@ -172,18 +173,24 @@
                     feecount=Number(feecount)+Number(objdata[i].fee);
                 }
                 if(blcount!=100||feecount!=moneycount2){
-                    layer.msg('比例/金额分配不正确!');
+                    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 },
+                    data:{id:newid2,type:xmmc2,fee:fyje2,tableData:jsondata,state:val},
                     success:function(result){
                         parent.location.reload();
                     }
@@ -193,7 +200,7 @@
         $('.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();