Merge remote-tracking branch 'origin/master'

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

@@ -145,7 +145,6 @@ public class SettementUtil {
                 }else {
                     key=BashInfo.JS_SJ;
                 }
-
             }
             if(key.contains(SE)){
                 if (key.contains(SE1)){
@@ -529,7 +528,9 @@ public class SettementUtil {
                 name=BashInfo.JS_JGJS;
             }
             if (name.contains(RESON_KYJ)||name.contains(RESON_XF)||name.contains(RESON_KYJ1)){
-                name = RESON_KYJ;
+                if (!name.equals(RESON_XFHZJ)){
+                    name = RESON_KYJ;
+                }
             }
 //            if (){
 //                name = RESON_KYJ1;
@@ -627,7 +628,9 @@ public class SettementUtil {
                 name=BashInfo.JS_JGJS;
             }
             if (name.contains(RESON_KYJ)||name.contains(RESON_XF)||name.contains(RESON_KYJ1)){
-                name = RESON_KYJ;
+                if (!name.equals(RESON_XFHZJ)){
+                    name = RESON_KYJ;
+                }
             }
 //            if (name.contains(RESON_KYJ1)){
 //                name = RESON_KYJ1;
@@ -1117,8 +1120,11 @@ public class SettementUtil {
         String reason="";
         reason+=tops.replace("xxx",String.valueOf(nf.format(settlement.getMoney())));
         String amout=settlement.getTheAmount();
+        String name = "";
         for (int i = 0; i < settlements.size(); i++) {
-            if (settlements.get(i).getEntryName().equals(BashInfo.JS_JGJS)){
+            name = settlements.get(i).getEntryName();
+            if (name.equals(BashInfo.JS_JGJS)||
+                    name.equals(BDZ_TBNAME)){
                 reason+=RESON_JGJS8.replace("xxx",amout);
                 if (settlement.getStatus().equals("0")){
                     reason+=SettementUtil.RESON_TRUE;
@@ -1146,17 +1152,16 @@ public class SettementUtil {
      */
     public static String getJshzJoint(String tops,Settlement settlement,List<Settlement> settlements){
         String reason="";
+        String name="";
         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)){
+            name = settlements.get(i).getEntryName();
+            if (name.equals(BashInfo.JS_JGJS)|| name.equals(BDZ_TBNAME)){
                 continue;
             }
-            if (settlements.get(i).getEntryName().equals(BashInfo.JS_GCJS)||
-                    settlements.get(i).getEntryName().equals(RESON_ZZJS)||
-                    settlements.get(i).getEntryName().equals(RESON_ZZFC)||
-                    settlements.get(i).getEntryName().equals(RESON_ZGTB)||
-                    settlements.get(i).getEntryName().equals(RESON_XFHZJ)){
+            if (name.equals(BashInfo.JS_GCJS)|| name.equals(RESON_ZZJS)|| name.equals(RESON_ZZFC)|| name.equals(RESON_ZGTB)||
+                    name.equals(RESON_XFHZJ)){
                 reason+=RESON_JGJS8.replace("xxx",amout);
                 if (settlement.getStatus().equals("0")){
                     reason+=SettementUtil.RESON_TRUE;

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

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

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

@@ -29,6 +29,15 @@
         <label>当前工程：${data1.projectName}</label>&nbsp;&nbsp;
         <label>工程编号：${data1.projectNo}</label>
         <div style="height: 5px"></div>
+        <c:if test="${data1.type eq '1'}">
+            <label>结算书类型：架空线路</label>&nbsp;&nbsp;
+        </c:if>
+        <c:if test="${data1.type eq '2'}">
+            <label>结算书类型：电缆线路</label>&nbsp;&nbsp;
+        </c:if>
+        <c:if test="${data1.type eq '3'}">
+            <label>结算书类型：变电站工程</label>&nbsp;&nbsp;
+        </c:if>
         <label>当前结算书：${data1.itemName}</label>
         <div style="height: 7px"></div>
     </div>

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

@@ -59,10 +59,10 @@ layui.config({
 
                         }
                         if(d.status==2){ //项目表头操作
-                            xml +="<span class='myspan'>操作</span>";
+                            xml +="<span class='myspan' self-id ="+d.pid+">操作</span>";
                         }
                         if(d.status==3){ //项目类型
-                            xml +="<a style='margin-top: 3px;' class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"\">编辑</a>"
+                            xml +="<a style='margin-top: 3px;' self-id="+d.pid+" class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"\">编辑</a>"
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs layui-btn-danger' id=del"+d.id+" onclick=\"deleteItem('" + d.id + "')\">删除</a>";
                         }
 
@@ -219,7 +219,7 @@ function deleteItem(id) { //逻辑删除项目
     layer.msg('您确定要删除吗？', {
          icon: 3
         , time: 0 //不自动关闭
-        ,offset:['40%','40%']
+        ,offset:['38%','38%']
         , btn: ['确定', '取消']
         , yes: function (index) {
             $.ajax({
@@ -229,11 +229,14 @@ function deleteItem(id) { //逻辑删除项目
                 dataType: "json",
                 success: function (data) {
                     if (data.success) {
-                        layer.msg("删除结算书成功", {icon: 6,offset:['40%','40%']},function () {
-                            var text = $("#delPro"+data.msg).closest('tr').find("td").eq("1").find("div").html();
-                            $("#del"+id).closest('tr').remove();
+                        layer.close(index);
+                        var text = $("#delPro"+data.msg).closest('tr').find("td").eq("1").find("div").html();
+                        $("#del"+id).closest('tr').remove();
+                        if (text-1 >= 0){
                             $("#delPro"+data.msg).closest('tr').find("td").eq("1").find("div").html(text-1);
-                        });
+                        }else {
+                            $("#delPro"+data.msg).closest('tr').find("td").eq("1").find("div").html(0);
+                        }
                     } else {
                         layer.msg(data.msg, {icon: 5,offset:['40%','40%']});
                     }
@@ -247,7 +250,7 @@ function deleteProject(id) {//删除工程
         icon: 3
         , time: 0 //不自动关闭
         , btn: ['确定', '取消']
-        ,offset:['40%','40%']
+        ,offset:['38%','38%']
         , yes: function (index) {
             $.ajax({
                 type: "post",
@@ -256,11 +259,11 @@ function deleteProject(id) {//删除工程
                 dataType: "json",
                 success: function (data) {
                     if (data.success) {
-                        layer.msg(data.msg, {icon: 6,offset:['40%','40%']},function () {
-                            window.location.reload();
-                        })
+                        layer.close(index);
+                        $("[self-id="+id+"]").closest('tr').remove();
+                        $("#delPro"+id).closest('tr').remove();
                     } else {
-                        layer.msg(data.msg, {icon: 5,offset:['40%','40%']});
+                        layer.msg(data.msg, {icon: 5,offset:['37%','37%']});
                     }
                 }
             })