2019-09-05 20：04

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

@@ -614,6 +614,15 @@ public class SettementUtil {
         String reason="";
         for(Settlement settlement:settlementList){
             key = settlement.getEntryName();
+            if (key.equals(BashInfo.JS_CBRF)){
+                key = BDZ_TBRNAME;
+            }
+            if (key.equals(BashInfo.JS_FBRF)){
+                key=BDZ_ZBRNAME;
+            }
+            if (key.equals(BashInfo.JS_JGJS)){
+                key = BDZ_TBNAME;
+            }
             switch (key){
                 case BashInfo.JS_FBFX:
                     reason = getDJoint(settlement);

src/main/java/com/jeeplus/modules/sg/project/entity/WbsItem.java

@@ -13,7 +13,17 @@ public class WbsItem extends DataEntity<WbsItem> {
     private String parentNode; //父节点
     private String type; //项目类型
     private Date createDate;  //创建时间
-
+//    private String delFlag;//是否删除
+
+//    @Override
+//    public String getDelFlag() {
+//        return delFlag;
+//    }
+//
+//    @Override
+//    public void setDelFlag(String delFlag) {
+//        this.delFlag = delFlag;
+//    }
 
     @Override
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

src/main/java/com/jeeplus/modules/sg/project/mapper/ItemMapper.java

@@ -16,4 +16,7 @@ public interface ItemMapper extends BaseMapper<WbsItem> {
 
     //根据名称获取项目
     List<WbsItem> findItemByName(@Param("itemName")String itemName,@Param("projectId") String projectId);
+
+    //删除项目
+//    Integer  updateItem(WbsItem wbsItem);
 }

src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ItemMapper.xml

@@ -143,4 +143,12 @@
 		FROM sg_wbs_item
 		WHERE item_name = #{itemName} and project_id =#{projectId}
 	</select>
+
+	<delete id="deleteItem" parameterType="String">
+		DELETE FROM sg_wbs_item where id = #{id}
+	</delete>
+
+	<!--<update id="updateItem" parameterType="WbsItem">-->
+		<!--update sg_wbs_item set del_flag = #{delFlag} where id=#{id}-->
+	<!--</update>-->
 </mapper>

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

@@ -49,4 +49,7 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
     public List<WbsItem> findItemByName(String itemName,String projectId){
         return itemMapper.findItemByName(itemName,projectId);
     }
+    //删除
+//    @Transactional(readOnly = false)
+//    public void updateItem(WbsItem wbsItem){ itemMapper.updateItem(wbsItem); }
 }

src/main/java/com/jeeplus/modules/sg/project/web/ProjectTemController.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.sg.project.web;
 
+import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.overheadline.service.OverheadLineService;
 import com.jeeplus.modules.sg.project.entity.WbsItem;
@@ -186,19 +187,29 @@ public class ProjectTemController extends BaseController {
         }
         return newDate+result;
     }
-
-//    @RequestMapping("/verfiy")
+    //校验项目名称是否存在
+    @RequestMapping("/verfiy")
+    @ResponseBody
+    public HashMap getVerfiy(String projectName,String projectId){
+        HashMap map = new HashMap();
+        List<WbsItem> wbsItemList = itemService.findItemByName(projectName,projectId);
+        if (wbsItemList!=null&&!wbsItemList.isEmpty()){
+            map.put("msg","导入失败! 项目名称:"+projectName+" 已存在");
+            return map;
+        }
+        map.put("code",1);
+        map.put("msg","导入成功");
+        return map;
+    }
+//    //删除项目
+//    @RequestMapping("/deleteItem")
 //    @ResponseBody
-//    public HashMap getVerfiy(String projectName,String projectId){
-//        HashMap map = new HashMap();
-//        List<WbsItem> wbsItemList = itemService.findItemByName(projectName,projectId);
-//        if (wbsItemList!=null&&!wbsItemList.isEmpty()){
-//            map.put("code",1);
-//            map.put("msg","导入失败! 项目名称:"+projectName+" 已存在");
-//            return map;
-//        }
-//        map.put("msg","导入成功");
-//        return map;
+//    public AjaxJson deleteItem(WbsItem wbsItem){
+//        wbsItem.setDelFlag("1");
+//        AjaxJson j = new AjaxJson();
+//            itemService.updateItem(wbsItem);
+//            j.setSuccess(true);
+//            j.setMsg("删除成功");
+//        return j;
 //    }
-
 }

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

@@ -1,7 +1,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <script type="text/javascript">
     layui.use(['table','form','layedit', 'laydate'], function(){
-    var table = layui.table
+    var table = layui.table //生产数据表格
     ,form = layui.form;
     form.render();
     table.render({
@@ -30,6 +30,7 @@
     ]
     ,page: false
 });
+    //计算比例/金额
     table.on('edit(longtable)', function(obj){
 
     var field = obj.field;

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

@@ -25,7 +25,7 @@
     {type:'numbers',title: '序号', rowspan: 2, totalRowText: "合计",},
     {field: 'wbsys', title: 'WBS要素',width:200, rowspan:'2'},
 
-    {field:'wbssbm',width:100, align:'center',rowspan:'2',title:"wbs识别码",rowspan:'2'},
+    {field:'wbssbm',width:100, align:'center',rowspan:'2',title:"wbs识别码"},
     {field:'fbfxysj', align:'center', title: '分部分项(原数据)',colspan:'6'},
     {field:'fbfxtch',align:'center',title:'分部分项(调差后)',colspan:'4'},
     {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'10'},

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

@@ -52,13 +52,15 @@ layui.config({
                             xml += "<a class='layui-btn layui-btn-primary layui-btn-xs' onclick=\"look( '${ctx}/project/form?id=" + d.id + "&tabId=1')\">查看</a>"
                                 +"<a class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/form?id=" + d.id + "&tabId=2')\">修改</a>"
                                 +"<a class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加项目</a>"
-                                +"<a class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a>";
+                                +"<a class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a>"
+                                +"<a class='layui-btn layui-btn-xs layui-btn-danger' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"\">删除</a>";
                         }
                         if(d.status==2){
                             xml +="<span class='myspan'>操作</span>";
                         }
                         if(d.status==3){
-                            xml +="<a class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"\">编辑</a>";
+                            xml +="<a class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"\">编辑</a>"
+                                +"<button class='layui-btn layui-btn-xs layui-btn-danger' onclick='deleteItem("+d.id+")'>删除</button>";
                         }
 
                         return xml;
@@ -206,10 +208,27 @@ function update(url) {
         }
     })
 }
+function deleteItem(id) {
+    $.ajax({
+        type: "post",
+        url: "${ctx}/project/tem/deleteItem",
+        data:{'id':id},
+        dataType: "json",
+        success: function(data){
+            if(data.success){
+                alert(data.msg);
+                layer.msg(data.msg, {icon: 6});
+                window.location.reload();
+            }else{
+                layer.msg(data.msg, {icon: 5});
+            }
+        }
+    })
+}
 $(document).ready(function(e) {
 
     $("#noneBtn").click(function(e) {
         $("#noneDiv").toggle();
-    });
+    })
 });
 </script>

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

@@ -6,16 +6,30 @@
         var newText1 = parent.$('#addtext').val();
         $("#newText1").val(newText1);
     })
-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;
-    }
-    $("#inputForm").submit();
+    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;
+        }
+        $.ajax({
+            type: "post",
+            url: "${ctx}/project/tem/verfiy",
+            // contentType: 'application/x-www-form-urlencoded;charset=utf-8',
+            data: {projectName:$("#inputwrite").val(),projectId:$("#newText1").val()},
+            dataType: "json",
+            success: function(data){
+                if(data.code=="1"){
+                    $("#inputForm").submit();
+                }else{
+                    alert(data.msg);
+                    throw SyntaxError;
+                }
+            }
+        });
     }
     $("#btnxz").click(function(){
         $("#myfile").trigger("click");