Merge remote-tracking branch 'origin/master'

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

@@ -132,6 +132,7 @@ public class SettementUtil {
         List<Settlement> settlementList = new ArrayList<Settlement>();
         int lastDataRowNum =  importExcel.getLastDataRowNum();
         String key = "";//获取结算名称
+        Integer count = 0; //计数器
         for (int i = 0; i < lastDataRowNum; i++) {
             settlement=new Settlement();
             key =  importExcel.getValue(i+1,1);
@@ -171,7 +172,19 @@ public class SettementUtil {
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
                     break;
                 case BashInfo.JS_SJ:
-                    settlementList.add(getSettlement(settlement,key,importExcel,i));
+                    count+=1;
+                    if (count>1){
+                        for (Settlement st:settlementList){
+                            if (st.getEntryName().equals(BashInfo.JS_SJ)){
+                                double s = importExcel.getDouble(i+1,2);
+                                double total = st.getMoney()+s;
+                                st.setMoney(total);
+                            }
+                        }
+                    }
+                    if (count==1){
+                        settlementList.add(getSettlement(settlement,key,importExcel,i));
+                    }
                     break;
                 case BashInfo.JS_FBRF:
                     if (flag){

src/main/java/com/jeeplus/modules/sg/project/service/ItemService.java

@@ -73,10 +73,10 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
             itemMapper.updateItem(wbsItem);
             projectService.updateProjectNumber(wbsProject);
             j.setSuccess(true);
-            j.setMsg("删除成功");
+            j.setMsg("删除项目成功!");
         }catch (Exception e){
             j.setSuccess(false);
-            j.setMsg("删除失败");
+            j.setMsg("删除项目失败!");
         }
         return j;
     }

src/main/java/com/jeeplus/modules/sg/project/service/ProjectService.java

@@ -116,7 +116,7 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
     public AjaxJson deleteProject(WbsProject wbsProject){
         AjaxJson j = new AjaxJson();
         j.setSuccess(true);
-        j.setMsg("操作成功");
+        j.setMsg("删除工程成功!");
         try {
 //          List<WbsItem> wbsItems = itemService.findItem(wbsProject.getId());
 //            for (int i = 0; i < wbsItems.size(); i++) {
@@ -129,7 +129,7 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
             projectMapper.deleteProject(wbsProject);
         }catch (Exception e){
             j.setSuccess(false);
-            j.setMsg("删除失败");
+            j.setMsg("删除工程失败!");
         }
         return j;
     }

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

@@ -39,7 +39,10 @@
     </div>
     <div class="layui-form-item">
         <div class="layui-input-block">
-            <input type="radio" name="code" value="人工费" title="人工费" checked="checked">
+            <input type="radio" name="code" value="直接工程费" title="直接工程费" checked="checked">
+        </div>
+        <div class="layui-input-block">
+            <input type="radio" name="code" value="人工费" title="人工费" >
         </div>
         <div class="layui-input-block">
             <input type="radio" name="code" value="承包分采购" title="承包分采购">

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

@@ -6,9 +6,9 @@
         //自定义验证规则
         form.verify({
         context: function(value){
-        if(value.length <=0){
-        return '请选择导入的文件';
-        }
+            if(value.length <=0){
+                return '请选择导入的文件';
+            }
         }
     });
     var newText1 = parent.$('#addtext').val();
@@ -16,20 +16,24 @@
     })
     function doSubmit(obj){
         if ($("#myfile").val()==null||$("#myfile").val()==""){
-        layer.msg("请选择文件",{icon: 3});
-        throw SyntaxError;
-    }
-    if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
-        layer.msg("请输入项目名称",{icon:3});
-        throw SyntaxError;
+            layer.msg("请选择文件",{icon: 3});
+            throw SyntaxError;
+        }
+        if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
+            layer.msg("请输入项目名称",{icon:3});
+            throw SyntaxError;
+        }
+        $("#inputForm").submit();
     }
-    $("#inputForm").submit();
-}
-    $("#btnxz").click(function(){
-        $("#myfile").trigger("click");
+    $(document).ready(function() {
+    // 选择文件触发事件
+        $("#btnxz").click(function(){
+            $("#myfile").trigger("click");
+        })
+
+        $("#myfile").bind("change",function(){
+            var solr_file= $("#myfile").val();
+            $("#view_input").val(solr_file);
         })
-    $("#myfile").bind("change",function(){
-        var solr_file= $("#myfile").val();
-        $("#view_input").val(solr_file);
     })
 </script>

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

@@ -123,6 +123,8 @@
                         </div>
                         <table id="table1" class="layui-table" lay-filter="table1"></table>
                         <div id="page"><div>
+                    </div>
+                </div>
                 </div>
             </div>
         </div>

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

@@ -30,10 +30,11 @@ function doSubmit(obj){ // 添加项目提交方法
              $("#inputForm").submit();
           }else{
               alert(data.msg);
-              throw SyntaxError;
+             layer.alert(data.msg, {icon: 6});
           }
       }
    });
+   return false;
 }
 $(document).ready(function() {
     //点击触发选择文件input框

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

@@ -174,13 +174,13 @@ function okSubmit() {
             if(data.code == 1){
                 // this.formdata=new FormData();
                 layer.msg(data.msg,{icon: 6,offset:['40%','40%']},function(){
-                     window.location.href="${ctx}/project/tem/list?projectId="+data.id;
+                    window.location.href="${ctx}/project/tem/list?projectId="+data.id;
                 });
             }else {
-                // this.formdata=new FormData();
-                layer.msg(data.msg,{icon: 5});
+                layer.alert(data.msg, {icon: 6})
             }
         }
     });
+    return false;
 }
 </script>

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

@@ -23,7 +23,7 @@
 <body style="height:100%">
 <input style="display: none;" id="addtext" value=""/>
 <div class="layui-main-bgc">
-    <%--<sys:message content="${message}"/>--%>
+    <sys:message content="${message}"/>
     <div class="layui-row layui-col-space15">
         <div class="layui-col-md12">
             <div class="layui-card">