解决材价bug

src/main/java/com/jeeplus/modules/workmaterialcollect/entity/WorkMaterialCollectEngineer.java

@@ -29,6 +29,26 @@ public class WorkMaterialCollectEngineer extends DataEntity<WorkMaterialCollectE
     private String modelStartDate;
     private String modelEndDate;
 
+    private String areaId;//地址id
+
+    private String areaCity;//城市 适用于手机端
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getAreaCity() {
+        return areaCity;
+    }
+
+    public void setAreaCity(String areaCity) {
+        this.areaCity = areaCity;
+    }
+
     public String getModelStartDate() {
         return modelStartDate;
     }

src/main/java/com/jeeplus/modules/workmaterialcollect/entity/WorkMaterialCollectTotal.java

@@ -23,6 +23,34 @@ public class WorkMaterialCollectTotal extends DataEntity<WorkMaterialCollectTota
     private String projectName;  //工程名称
     private String projectTypeId;//工程id
 
+    private String engineerId;//项目id
+    private String areaId;//工程id
+    private String areaCity;//匹配城市
+
+    public String getEngineerId() {
+        return engineerId;
+    }
+
+    public void setEngineerId(String engineerId) {
+        this.engineerId = engineerId;
+    }
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getAreaCity() {
+        return areaCity;
+    }
+
+    public void setAreaCity(String areaCity) {
+        this.areaCity = areaCity;
+    }
+
     private String modelStartDate;//开始时间
     private String modelEndDate;//结束时间
 

src/main/java/com/jeeplus/modules/workmaterialcollect/service/WorkMaterialCollectEngineerService.java

@@ -2,6 +2,7 @@ package com.jeeplus.modules.workmaterialcollect.service;
 
 import com.jeeplus.common.service.CrudService;
 import com.jeeplus.modules.sys.dao.WorkattachmentDao;
+import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.AreaService;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -33,6 +34,8 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
     private WorkMaterialCollectTotalDao workMaterialCollectTotalDao;
     @Autowired
     private WorkattachmentDao workattachmentDao;
+    @Autowired
+    private AreaService areaService;
     //查找方法
     public WorkMaterialCollectEngineer get(String id){ return super.get(id);}
     //单独保存
@@ -49,16 +52,17 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
 
     @Transactional
     public void saveCollectEngineer(WorkMaterialCollectEngineer workMaterialCollectEngineer){
-        String area = workMaterialCollectEngineer.getProjectSite();
-        String[] split;
-        if (null!=area&&!area.equals("")){
-            split = area.split(",");
-            area = split[1];
-        }
+        getAreaCity(workMaterialCollectEngineer.getProjectSite(),workMaterialCollectEngineer);
+//        String area = workMaterialCollectEngineer.getProjectSite();
+//        String[] split;
+//        if (null!=area&&!area.equals("")){
+//            split = area.split(",");
+//            area = split[1];
+//        }
 //        area = area.substring(area.indexOf(",")+1);
         String uploadType = "";
         //获取基本保存信息
-        workMaterialCollectEngineer.setProjectSite(area);
+//        workMaterialCollectEngineer.setProjectSite(area);
         workMaterialCollectEngineer.setProjectStatus("0");
         workMaterialCollectEngineer.setLeader(UserUtils.getUser().getId());
         workMaterialCollectEngineer.setOfficeId(UserUtils.getUser().getOffice().getId());
@@ -144,15 +148,7 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
 
     @Transactional(readOnly = false)
     public void saveAddWorkEng(WorkMaterialCollectEngineer workMaterialCollectEngineer){
-        String area = workMaterialCollectEngineer.getProjectSite();
-        String[] split;
-        if (null!=area&&!area.equals("")){
-            split = area.split(",");
-            area = split[1];
-        }
-//        area = area.substring(area.indexOf(",")+1);
-        //获取基本保存信息
-        workMaterialCollectEngineer.setProjectSite(area);
+        getAreaCity(workMaterialCollectEngineer.getProjectSite(),workMaterialCollectEngineer);
         //获取修改状态
         workMaterialCollectEngineer.preUpdate();
         //修改项目
@@ -249,4 +245,29 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
     public void deleteWorkInformationCollectType(String id){
         workMaterialCollectTypeDao.deleteWorkInformationCollectType(id);
     }
+
+
+    //匹配使用手机端的地址:手机端会根据项目名称进行查找
+    public void getAreaCity(String area,WorkMaterialCollectEngineer workMaterialCollectEngineer){
+        String[] split = null;
+        String areaId = "";
+        if (null!=area&&!area.equals("")){
+            split = area.split(",");
+            area = split[1];
+            areaId = split[0];
+            //查找当前area
+            workMaterialCollectEngineer.setProjectSite(area);
+            Area thisArea = areaService.get(areaId);
+            workMaterialCollectEngineer.setAreaId(areaId);
+            //根据area的类型进行判断
+            if (null!=thisArea){
+                if (thisArea.getType().equals("4")){
+                    //保存地区信息到市
+                    workMaterialCollectEngineer.setAreaCity(thisArea.getParent().getName());
+                }else {
+                    workMaterialCollectEngineer.setAreaCity(area);
+                }
+            }
+        }
+    }
 }

src/main/java/com/jeeplus/modules/workmaterialcollect/service/WorkMaterialCollectTotalService.java

@@ -181,6 +181,12 @@ public class WorkMaterialCollectTotalService extends CrudService<WorkMaterialCol
                 workMaterialCollectTotal.setProjectTypeId(workMaterialCollectType.getId());
                 //工程地点
                 workMaterialCollectTotal.setProjectSite(workMaterialCollectEngineer.getProjectSite());
+                //地点id
+                workMaterialCollectTotal.setAreaId(workMaterialCollectEngineer.getAreaId());
+                //项目id
+                workMaterialCollectTotal.setEngineerId(workMaterialCollectEngineer.getId());
+                //市级地址
+                workMaterialCollectTotal.setAreaCity(workMaterialCollectEngineer.getAreaCity());
                 //增加备注
                 if (null!=remarks && !"".equals(remarks)){
                     workMaterialCollectTotal.setRemarks(remarks);

src/main/java/com/jeeplus/modules/workmaterialcollect/web/WorkMaterialCollectEngineerController.java

@@ -61,10 +61,23 @@ public class WorkMaterialCollectEngineerController extends BaseController {
     @RequiresPermissions("workMaterialCollect:engineer:list")
     @RequestMapping(value = {"list", ""})
     public String list(WorkMaterialCollectEngineer workMaterialCollectEngineer, HttpServletRequest request, HttpServletResponse response, Model model) {
-//        workMaterialCollectEngineer.setProjectStatus("0");
-//        workMaterialCollectEngineer.setCopyStatus("0");//0-为不存在
-//        workMaterialCollectEngineer.setCopyStatusAdd("0");
+        int selectRoleMax = UserUtils.getSelectRoleMax();
+        if(UserUtils.isManager()){
+            model.addAttribute("flag","1");
+        }
+        String id = "";
+        if (selectRoleMax == 1){
+            id = UserUtils.getUser().getId();
+            workMaterialCollectEngineer.setCreateBy(UserUtils.getUser());
+        }else if (selectRoleMax == 2){
+            id = UserUtils.getUser().getOffice().getId();
+            workMaterialCollectEngineer.setOfficeId(id);
+        }else if (selectRoleMax == 3 || selectRoleMax == 4){
+            id = UserUtils.getUser().getCompany().getId();
+            workMaterialCollectEngineer.setCompanyId(id);
+        }
         Page<WorkMaterialCollectEngineer> page = workMaterialCollectEngineerService.findPage(new Page<WorkMaterialCollectEngineer>(request, response), workMaterialCollectEngineer);
+        List<WorkMaterialCollectEngineer> list = page.getList();
         model.addAttribute("page", page);
         return "modules/workmaterialcollect/workMaterialCollectEngineerList";
     }
@@ -135,7 +148,7 @@ public class WorkMaterialCollectEngineerController extends BaseController {
     @RequestMapping(value = "save")
     public String save(WorkMaterialCollectEngineer workMaterialCollectEngineer,Model model, RedirectAttributes redirectAttributes){
         //判断修改还是删除
-//        try{
+        try{
             if (!"".equals(workMaterialCollectEngineer.getId())){
                 //修改
                 workMaterialCollectEngineerService.updateCollectEngineer(workMaterialCollectEngineer);
@@ -143,9 +156,9 @@ public class WorkMaterialCollectEngineerController extends BaseController {
                 //保存
                 workMaterialCollectEngineerService.saveCollectEngineer(workMaterialCollectEngineer);
             }
-//        }catch (Exception e){
-//            e.printStackTrace();
-//        }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         //获取工程类型集合
         return "redirect:"+ Global.getAdminPath()+"/workMaterialCollect/engineer/?repage";
     }

src/main/java/com/jeeplus/modules/workmaterialcollect/web/WorkMaterialCollectTotalController.java

@@ -67,20 +67,23 @@ public class WorkMaterialCollectTotalController extends BaseController {
      * 导入Excel数据
 
      */
+    @ResponseBody
     @RequiresPermissions("workitemcollar:total:import")
     @RequestMapping(value = "import",method= RequestMethod.POST)
-    public String importFile(@RequestParam(value = "file")MultipartFile file, String itemHideId, String projectTypeId,String remarks,RedirectAttributes redirectAttributes){
+    public AjaxJson importFile(@RequestParam(value = "file")MultipartFile file, String itemHideId, String projectTypeId,String remarks,RedirectAttributes redirectAttributes){
+        AjaxJson ajaxJson = new AjaxJson();
         try {
             StringBuilder failureMsg = new StringBuilder();
             ImportExcel ei = new ImportExcel(file, 1, 0);
             List<WorkMaterialCollectTotal> materialCollects = ei.getDataList(WorkMaterialCollectTotal.class);
             String check = workMaterialCollectTotalService.getCheck(materialCollects);
-//            if (!"".equals(check)){
-//                addMessage(redirectAttributes, "导入客户信息失败！失败信息："+check);
-//                return "redirect:"+ Global.getAdminPath()+"/workMaterialCollect/engineerSure/?repage";
-//            }
+            if (!"".equals(check)){
+                ajaxJson.setSuccess(false);
+                ajaxJson.setMsg(check);
+                return ajaxJson;
+            }
+            //去重
             List<WorkMaterialCollectTotal> duplicateRemoval = workMaterialCollectTotalService.getDuplicateRemoval(materialCollects);
-//            List<WorkMaterialCollectTotal> materialCollects = workMaterialCollectTotalService.getMaterialCollectImportExcel(ei);
             workMaterialCollectTotalService.getAdditionalInformation(duplicateRemoval,itemHideId,projectTypeId,remarks);
 
             //根据项目id查找工程类型，判断是否全部上传
@@ -94,51 +97,15 @@ public class WorkMaterialCollectTotalController extends BaseController {
                 workMaterialCollectEngineer.setProjectStatus("1");
                 workMaterialCollectEngineerService.updateProjectStatus(workMaterialCollectEngineer);
             }
-//            ajaxJson.setSuccess(true);
-//            ajaxJson.setMsg("已经成功上传"+materialCollects.size()+"确认单记录");
-//            return ajaxJson;
+            ajaxJson.setSuccess(true);
+            ajaxJson.setMsg("上传成功");
         } catch (Exception e) {
+            ajaxJson.setSuccess(false);
+            ajaxJson.setMsg("上传确认单采集记录失败！失败信息："+e.getMessage());
             addMessage(redirectAttributes, "上传确认单采集记录失败！失败信息："+e.getMessage());
         }
-//        ajaxJson.setSuccess(false);
-//        ajaxJson.setMsg("上传失败");
-//        addMessage(redirectAttributes, "上传成功!");
-        return "redirect:"+ Global.getAdminPath()+"/workMaterialCollect/engineerSure/?repage";
+        return ajaxJson;
     }
-//    @ResponseBody
-//    @RequestMapping("/import1")
-//    public AjaxJson importFileAjs(@RequestParam("file")MultipartFile file, String itemHideId, String projectTypeId, String remarks) throws Exception{
-//        AjaxJson ajaxJson = new AjaxJson();
-////        try {
-//            StringBuilder failureMsg = new StringBuilder();
-//            ImportExcel ei = new ImportExcel(file, 1, 0);
-//            List<WorkMaterialCollectTotal> materialCollects = ei.getDataList(WorkMaterialCollectTotal.class);
-//            List<WorkMaterialCollectTotal> duplicateRemoval = workMaterialCollectTotalService.getDuplicateRemoval(materialCollects);
-////            List<WorkMaterialCollectTotal> materialCollects = workMaterialCollectTotalService.getMaterialCollectImportExcel(ei);
-//            workMaterialCollectTotalService.getAdditionalInformation(duplicateRemoval,itemHideId,projectTypeId,remarks);
-//
-//            //根据项目id查找工程类型，判断是否全部上传
-//            WorkMaterialCollectType workMaterialCollectType = new WorkMaterialCollectType();
-//            workMaterialCollectType.setStatus("0");
-//            workMaterialCollectType.setEngineerId(itemHideId);
-//            List<WorkMaterialCollectType> list = workMaterialCollectTypeService.findList(workMaterialCollectType);
-//            WorkMaterialCollectEngineer workMaterialCollectEngineer = new WorkMaterialCollectEngineer();
-//            workMaterialCollectEngineer.setId(itemHideId);
-//            if (list.size()<1){
-//                workMaterialCollectEngineer.setProjectStatus("1");
-//                workMaterialCollectEngineerService.updateProjectStatus(workMaterialCollectEngineer);
-//            }
-//            ajaxJson.setSuccess(true);
-//            ajaxJson.setMsg("已经成功上传"+materialCollects.size()+"确认单记录");
-//            return ajaxJson;
-////        } catch (Exception e) {
-////            addMessage(redirectAttributes, "上传确认单采集记录失败！失败信息："+e.getMessage());
-////        }
-////        ajaxJson.setSuccess(false);
-////        ajaxJson.setMsg("上传失败");
-////        return ajaxJson;
-//    }
-
     /**
      * 下载导入领用申请数据模板
      */

src/main/resources/mappings/modules/workmaterialcollect/WorkMaterialCollectEngineerDao.xml

@@ -17,6 +17,8 @@
 		a.projectStatus AS "projectStatus",
 		a.office_id AS "officeId",
 		a.company_id AS "companyId",
+		a.area_id AS "areaId",
+		a.areaCity AS "areaCity",
 		a.leader AS "leader"
 	</sql>
 	
@@ -53,6 +55,19 @@
 			<if test="projectStatus !=null and projectStatus !='' ">
 				AND a.projectStatus = #{projectStatus}
 			</if>
+			<if test="areaCity != null and areaCity != ''">
+				AND a.areaCity = #{areaCity}
+			</if>
+			<if test="officeId != null and officeId != ''">
+				AND a.office_id = #{officeId}
+			</if>
+			<if test="companyId != null and companyId != ''">
+				AND a.company_id = #{companyId}
+			</if>
+			<if test="createBy != null and createBy != ''">
+				AND a.create_by = #{createBy.id}
+			</if>
+			${sqlMap.dsf}
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -79,6 +94,9 @@
 			<if test="projectStartDate != null and projectStartDate != ''">
 				AND a.projectStatusDate = #{projectStatusDate}
 			</if>
+			<if test="areaCity != null and areaCity != ''">
+				AND a.areaCity = #{areaCity}
+			</if>
 			<if test="projectEndDate != null and projectEndDate != ''">
 				AND YEAR(a.projectEndDate) = #{projectEndDate}
 			</if>
@@ -126,6 +144,8 @@
 			projectStatus,
 			office_id,
 			company_id,
+			area_id,
+			areaCity,
 			leader
 		) VALUES (
 			#{id},
@@ -142,6 +162,8 @@
 			#{projectStatus},
 			#{officeId},
 			#{companyId},
+			#{areaId},
+			#{areaCity},
 			#{leader}
 		)
 	</insert>
@@ -163,7 +185,9 @@
 			projectSite = #{projectSite},
 			projectStartDate = #{projectStartDate},
 			projectEndDate = #{projectEndDate},
-			projectStatus = #{projectStatus}
+			projectStatus = #{projectStatus},
+			area_id = #{areaId},
+			areaCity = #{areaCity}
 		WHERE id = #{id}
 	</update>
 	

src/main/resources/mappings/modules/workmaterialcollect/WorkMaterialCollectTotalDao.xml

@@ -24,7 +24,10 @@
 		a.projectPart AS "projectPart",
 		a.auditOpinion AS "auditOpinion",
 		a.projectName AS "projectName",
-		a.projectTypeId AS "projectTypeId"
+		a.projectTypeId AS "projectTypeId",
+		a.area_id AS "areaId",
+		a.areaCity AS "areaCity",
+		a.engineer_id AS "engineerId"
 	</sql>
     
 	<select id="get" resultType="com.jeeplus.modules.workmaterialcollect.entity.WorkMaterialCollectTotal" >
@@ -71,6 +74,9 @@
 			<if test="endDate != null and endDate != ''">
 				AND a.endDate LIKE concat('%',#{endDate},'%')
 			</if>
+			<if test="areaCity !=null and areaCity !='' ">
+				AND a.areaCity = #{areaCity}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -109,6 +115,9 @@
 			<if test="endDate != null and endDate != ''">
 				AND YEAR(a.endDate) = #{endDate}
 			</if>
+			<if test="areaCity !=null and areaCity !='' ">
+				AND a.areaCity = #{areaCity}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -141,6 +150,9 @@
 			<if test="projectSite != null and projectSite != ''">
 				AND a.projectSite = #{projectSite}
 			</if>
+			<if test="areaCity !=null and areaCity !='' ">
+				AND a.areaCity = #{areaCity}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -193,6 +205,9 @@
 			auditOpinion,
 			projectName,
 			projectTypeId,
+			area_id,
+			areaCity,
+			engineer_id
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -215,7 +230,10 @@
 			#{projectPart},
 			#{auditOpinion},
 			#{projectName},
-			#{projectTypeId}
+			#{projectTypeId},
+			#{areaId},
+			#{areaCity},
+			#{engineerId}
 		)
 	</insert>
 
@@ -242,7 +260,10 @@
 			projectPart,
 			auditOpinion,
 			projectName,
-			projectTypeId
+			projectTypeId,
+			area_id,
+			areaCity,
+			engineer_id
 		) VALUES
 		<foreach collection="list" item="item" index="index" separator="," >
 			(
@@ -267,7 +288,10 @@
 			#{item.projectPart},
 			#{item.auditOpinion},
 			#{item.projectName},
-			#{item.projectTypeId}
+			#{item.projectTypeId},
+			#{item.areaId},
+			#{item.areaCity},
+			#{item.engineerId}
 			)
 		</foreach>
 	</insert>

src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelList.jsp

@@ -216,7 +216,7 @@
         $.ajax({
             type: "POST",
             url: url,
-            data: {'materialName':materialName,'projectType':projectType,'time':time,'projectSite':projectSize},
+            data: {'materialName':materialName,'projectType':projectType,'time':time,'areaCity':projectSize},
             dataType: "json",
             success: function (data) {
                 $("#loadDiv").hide();
@@ -290,7 +290,7 @@
         $.ajax({
             type: "POST",
             url: url,
-            data: {'projectName': projectName,'projectSite':projectSize,'time':time},
+            data: {'projectName': projectName,'areaCity':projectSize,'time':time},
             dataType: "json",
             success: function (data) {
                 $("#loadDiv").hide();

src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerForm.jsp

@@ -7,43 +7,6 @@
 	<script type="text/javascript">
 
         var validateForm;
-        validateForm = $("#inputForm").validate({
-            rules:{
-                // leader:{
-                //     leader:true
-                // },
-                // officeName:{
-                //     officeName:true
-                // },
-                // projectName:{
-                //     projectName:true
-                // },
-                // beginDate:{
-                //     beginDate:true
-                // },
-                // endDate:{
-                //     endDate:true
-                // },
-                // projectSite:{
-                //     projectSite:true
-                // }
-            },
-            messages:{
-            },
-            submitHandler: function(form){
-                loading('正在提交，请稍等...');
-                form.submit();
-            },
-            errorContainer: "#messageBox",
-            errorPlacement: function(error, element) {
-                $("#messageBox").text("输入有误，请先更正。");
-                if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-                    error.appendTo(element.parent().parent());
-                } else {
-                    error.insertAfter(element);
-                }
-            }
-        });
         var count = 0;
         $(document).ready(function() {
             laydate.render({
@@ -57,31 +20,39 @@
                 format: 'yyyy-MM-dd',
                 type : 'date'
             });
-
-            /*checkContentKeyUp('collarFor',255);
-            if($("#collarDate").val()==null || $("#collarDate").val()==''){
-                $("#collarDate").val(getNowFormatDate());
-            }*/
+            validateForm = $("#inputForm").validate({
+                submitHandler: function(form){
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
         });
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
-            // var idArr = $("#workItemCollarCatalogList tr:visible");
-            // if(idArr.length<1){
-            //     parent.layer.msg("请上传材料价格采集文件!", {icon: 5});
-            //     return false;
-            // }
-            // if(validateForm.form()){
-            //     alert(1);
-            //     return true;
-            // }else {
-            //      parent.layer.msg("信息未填写完整!", {icon: 5});
-            // }
-            if(obj == 2){
-                $("#inputForm").attr("action","${ctx}/workMaterialCollect/engineer/store");
-            }else{
-                $("#inputForm").attr("action","${ctx}/workMaterialCollect/engineer/save");
+            if(validateForm.form()){
+                if($("#workMaterialCollectEngineer tr").length==0){
+                    top.layer.alert('请添加材料价格类型文件!', {icon: 5});
+                    return false;
+                }
+                if(obj == 2){
+                    $("#inputForm").attr("action","${ctx}/workMaterialCollect/engineer/store");
+                }else{
+                    $("#inputForm").attr("action","${ctx}/workMaterialCollect/engineer/save");
+                }
+                $("#inputForm").submit();
+                return true;
+            }else {
+                 parent.layer.msg("信息未填写完整!", {icon: 5});
             }
-            $("#inputForm").submit();
-            return true;
+            return false;
         }
 
         function deleteRow(obj,index){
@@ -230,7 +201,8 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workMaterialCollectEngineer" action="${ctx}/workMaterialCollect/engineer/save" method="post" class="form-horizontal" >
+		<%--action="${ctx}/workMaterialCollect/engineer/save"--%>
+		<form:form id="inputForm" modelAttribute="workMaterialCollectEngineer"  method="post" class="form-horizontal" >
 			<form:hidden path="id"/>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>基础信息</h2></div>

src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerSureForm.jsp

@@ -18,6 +18,9 @@
                 type : 'date'
             });
         });
+        function fileForm() {
+			alert("!");
+        }
         function deleteForm(typeId,id) {
             var itemId = $("#itemId").val();
             top.layer.confirm("确认要取消上传后的确认单？", {icon: 3, title:'系统提示'}, function(index){
@@ -32,11 +35,11 @@
 							data : {"id":typeId,"itemId":itemId},
 							success : function(data) {
 							    $("#"+id).val("未上传");
-                                $("#"+id).attr("style","color:red");
+                                // $("#"+id).attr("style","color:red");
 								parent.layer.msg(data.msg, {icon: 1});
 							},
 							error : function(arg1, arg2, arg3) {
-                                parent.layer.msg(data.msg, {icon: 1});
+                                parent.layer.msg(data.msg, {icon: 0});
 							}
                     });
                 }
@@ -54,8 +57,7 @@
                         parent.layer.msg(data.msg, {icon: 1});
                         layer.close(index);
                     }else{
-                        // jp.error(data.msg);
-                        parent.layer.msg(data.msg, {icon: 5});
+                        parent.layer.msg(data.msg, {icon:0});
                         layer.close(index);
                     }
                 })
@@ -79,43 +81,24 @@
                     window.location.href='${ctx}/workMaterialCollect/total/import/template';
                 },
                 btn2: function(index, layero){
-                    // var oFiles = document.getElementById("uploadFile").files;
-                    // var element = $("#importForm").files[0];
-                    // var element = $("#uploadFile")[0].files[0];
-                    // var element = document.getElementById("uploadFile").files[0];
-					// var file = document.getElementById("file").files[0];
-					// var formData = new FormData($("#importForm")[0]);
-                    // console.log(formData);
-                    // console.log(file);
-                    // console.log(element);
-                    // formData.append("file", element);
-					// var formData = new FormData();
-					// formData.append("file",oFiles);
-					// formData.append("itemHideId",$("#itemHideId").val());
-					// formData.append("projectTypeId",$("#projectTypeId").val());
-					// formData.append("remarks",$("#remarks").val());
-                    <%--$.ajax({--%>
-                        <%--url : '${ctx}/workMaterialCollect/total/import1',--%>
-                        <%--type : "post",--%>
-                        <%--data : formData,--%>
-						<%--async:false,--%>
-                        <%--cache: false,        // 不缓存数据--%>
-                        <%--processData: false,  // 不处理数据--%>
-                        <%--contentType: false,   // 不设置内容类型--%>
-                        <%--success : function() {--%>
-                            <%--parent.layer.msg("上传成功", {icon: 1});--%>
-                        <%--},--%>
-                        <%--error : function(arg1, arg2, arg3) {--%>
-                            <%--alert("1");--%>
-                        <%--}--%>
-                    <%--});--%>
-                    var inputForm =top.$("#importForm");
-                    var top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-					$("#"+status).val("已上传");
-                    // $("#"+status).attr("style","background-color: white");
-                    top.$("#importForm").submit();
-                    parent.layer.msg("上传成功", {icon: 1})
+                    $.ajax({
+                        url : '${ctx}/workMaterialCollect/total/import',
+                        type : "post",
+                        async:false,
+                        cache: false,        // 不缓存数据
+                        processData: false,  // 不处理数据
+                        contentType: false,   // 不设置内容类型
+                        data : new FormData(top.$("#importForm")[0]),
+                        success : function(data) {
+                            if (data.success){
+                                $("#"+status).val("已上传");
+                                // $("#"+status).attr("style","background-color: white;");
+                                parent.layer.msg(data.msg, {icon: 1});
+                            }else {
+                                parent.layer.msg(data.msg, {icon: 2});
+                            }
+                        }
+                    });
                 },
 
                 btn3: function(index){
@@ -139,16 +122,8 @@
 </head>
 <body>
 <div id="importBox" class="hide">
-	<%--<form id="importForm"style="padding-left:20px;text-align:center;"><br/>--%>
-		<%--<input id="file"  value="" name="file"  type="file"  style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　--%>
-		<%--<div>--%>
-			<%--<input type="hidden" name ="itemHideId" id="itemHideId"/>--%>
-			<%--<input type="hidden"  name ="projectTypeId" id="projectTypeId"/>--%>
-			<%--<input type="hidden"  name ="remarks" id="remarksId"/>--%>
-		<%--</div>--%>
-	<%--</form>--%>
-	<form id="importForm" action="${ctx}/workMaterialCollect/total/import" method="post" style="padding-left:20px;text-align:center;" enctype="multipart/form-data"><br/>
-		<input id="uploadFile" name="file"  type="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　
+	<form id="importForm" style="padding-left:20px;text-align:center;" method="post" enctype="multipart/form-data"><br/>
+		<input  value="" id="file" name="file"  type="file"  style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　
 		<div>
 			<input type="hidden" name ="itemHideId" id="itemHideId"/>
 			<input type="hidden"  name ="projectTypeId" id="projectTypeId"/>