qweqweqweqqeqwe1

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

@@ -601,7 +601,7 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_FBRF:
                     double divisionFbr =divisiontotal[1]+divisiontotal[3];
-                    if(money==divisiontotal[1]){
+                    if(money==divisionFbr){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(divisionFbr+","+divisiontotal[1]+","+divisiontotal[3]));

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

@@ -36,8 +36,7 @@
             width: 70px;
         }
         .mydiv1:empty:before{
-            content: attr(placeholder);   /* element attribute*/
-            /*content: 'this is content';*/
+            content: attr(placeholder);
             color:#999999;
         }
         .mydiv1:focus:before{content:none}
@@ -82,7 +81,9 @@
                                         </tbody>
                                     </table>
                                 </div>
-                                    <button type="button" class="layui-btn layui-btn-mysele" onclick="okSubmit()">确定</button>
+                                    <div>
+                                    <button id="mybtn" type="button" class="layui-btn layui-btn-mysele" onclick="okSubmit()">确定</button>
+                                    <div>
                             </div>
                 </div>
             </div>
@@ -141,7 +142,7 @@
     function okSubmit() {
         var inputval = $("#myinput").val();
         if(inputval==null||inputval==""){
-            layer.msg("请输入工程名称");
+            layer.msg("请输入工程名称",{icon: 3});
             return false;
         }
         formdata.append("projectName",inputval);
@@ -152,12 +153,12 @@
             divvalue[i]=div1[i].innerHTML;
         }
         if (divvalue.length<=0){
-            layer.msg("请输入项目名称");
+            layer.msg("请输入项目名称",{icon: 3});
             return false;
         }
         for (var i = 0; i < divvalue.length; i++) {
             if (divvalue[i]=="请输入项目名称"){
-                layer.msg("请输入项目名称");
+                layer.msg("请输入项目名称",{icon: 3});
                 throw SyntaxError;
             }
         }
@@ -169,34 +170,37 @@
             selectval[i]=select1[i].value;
         }
         if (selectval.length<=0){
-            layer.msg("请输入项目名称");
+            layer.msg("请输入项目名称",{icon: 3});
             return false;
         }
         for (var i = 0; i < selectval.length; i++) {
             if (selectval[i]==""||selectval[i]==null){
-                layer.msg("请选择项目类型");
+                layer.msg("请选择项目类型",{icon: 3});
                 throw SyntaxError;
             }
         }
         formdata.append("itemTypes",selectval);
-
-        $.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);
-                    window.location.href="${ctx}/project/tem/list?projectId="+data.id;
-                }else {
-                    layer.msg(data.msg);
+        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});
+                        window.location.href="${ctx}/project/tem/list?projectId="+data.id;
+                    }else {
+                        layer.msg(data.msg,{icon: 5});
+                    }
                 }
-        }
-    });
+            });
     }
 </script>
 </html>