提示修改

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

@@ -49,7 +49,12 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
     @Transactional
     public void saveCollectEngineer(WorkMaterialCollectEngineer workMaterialCollectEngineer){
         String area = workMaterialCollectEngineer.getProjectSite();
-        area = area.substring(area.indexOf(",")+1);
+        String[] split;
+        if (null!=area&&!area.equals("")){
+            split = area.split(",");
+            area = split[1];
+        }
+//        area = area.substring(area.indexOf(",")+1);
         String uploadType = "";
         //获取基本保存信息
         workMaterialCollectEngineer.setProjectSite(area);
@@ -139,7 +144,12 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
     @Transactional(readOnly = false)
     public void saveAddWorkEng(WorkMaterialCollectEngineer workMaterialCollectEngineer){
         String area = workMaterialCollectEngineer.getProjectSite();
-        area = area.substring(area.indexOf(",")+1);
+        String[] split;
+        if (null!=area&&!area.equals("")){
+            split = area.split(",");
+            area = split[1];
+        }
+//        area = area.substring(area.indexOf(",")+1);
         //获取基本保存信息
         workMaterialCollectEngineer.setProjectSite(area);
         //获取修改状态

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

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
@@ -74,10 +75,10 @@ public class WorkMaterialCollectTotalController extends BaseController {
             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)){
+//                addMessage(redirectAttributes, "导入客户信息失败！失败信息："+check);
+//                return "redirect:"+ Global.getAdminPath()+"/workMaterialCollect/engineerSure/?repage";
+//            }
             List<WorkMaterialCollectTotal> duplicateRemoval = workMaterialCollectTotalService.getDuplicateRemoval(materialCollects);
 //            List<WorkMaterialCollectTotal> materialCollects = workMaterialCollectTotalService.getMaterialCollectImportExcel(ei);
             workMaterialCollectTotalService.getAdditionalInformation(duplicateRemoval,itemHideId,projectTypeId,remarks);
@@ -101,12 +102,12 @@ public class WorkMaterialCollectTotalController extends BaseController {
         }
 //        ajaxJson.setSuccess(false);
 //        ajaxJson.setMsg("上传失败");
-        addMessage(redirectAttributes, "上传成功!");
+//        addMessage(redirectAttributes, "上传成功!");
         return "redirect:"+ Global.getAdminPath()+"/workMaterialCollect/engineerSure/?repage";
     }
 //    @ResponseBody
 //    @RequestMapping("/import1")
-//    public AjaxJson importFileAjs(@RequestParam(value = "file")MultipartFile file, String itemHideId, String projectTypeId, String remarks) throws Exception{
+//    public AjaxJson importFileAjs(@RequestParam("file")MultipartFile file, String itemHideId, String projectTypeId, String remarks) throws Exception{
 //        AjaxJson ajaxJson = new AjaxJson();
 ////        try {
 //            StringBuilder failureMsg = new StringBuilder();

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

@@ -41,13 +41,13 @@
         line-height: 30px;
     }
     .model_list1{
-        height: 41px;width: 100%; border-radius:15px;border: 1px solid #dd514c
+        height: 41px;width: 100%; border-radius:15px;border: 1px solid #999999;
     }
     .model_list2{
         float:left;width: 20%;height: 41px;border-radius:15px 0px 0px 15px;text-align: center
     }
     .model_list3{
-        text-align: center;width: 100%;height: 41px;font-size:80%" type="text" name="marterialName" onchange="materialNameUpdate()
+        text-align: center;width: 100%;height: 39px;font-size:15px;
     }
     .model_list4{
         float:left;background-color: yellow;width: 65%;height: 41px
@@ -59,7 +59,16 @@
         float:left;width: 14%;height: 41px;border-radius:0px 15px 15px 0px;text-align: center
     }
     .model_list7{
-        width: 50%;height:50%;margin-top:17%;margin-left:8%;text-align: center;
+        width: 43%;height:56%;margin-top:18%;margin-left:8%;text-align: center;
+    }
+    .model_tips_list{
+        height: 10px;
+    }
+    .css_a_href{
+        color: #999999;
+    }
+    .css_a_href_tips{
+        /*color: #0e90d2;*/
     }
 </style>
 <script>
@@ -67,12 +76,11 @@
         materialSolr('','','','',"/workMaterialCollect/total/list.do");
     })
     function loadlistProject() {
-
     }
 </script>
 <body>
 <div style="">
-    <div class="weui-cells model_top">
+    <div class="weui-cells model_top" style="">
         <div class="weui-cell">
             <div class="model_list1">
                 <div class="model_list2">
@@ -92,7 +100,7 @@
         <div class="weui-cell">
             <div class="weui-flex">
                 <div class="weui-flex__item">
-                    <input class="weui-input" type="text" readonly="readonly" style="background-color: white;text-align: center" onchange="projectTypeUpdate()"  name="" id='projectType' placeholder="分类"/>
+                    <input class="weui-input" type="text" readonly="readonly" style="text-align: center;" onchange="projectTypeUpdate()"  name="" id='projectType' placeholder="分类"/>
                 </div>
                 <div class="weui-flex__item">
                     <input  class="weui-input" type="text" style="background-color: white;text-align: center" readonly="readonly" id='datetime-picker' placeholder="时间" />
@@ -127,49 +135,33 @@
         title: "选择",
         items: ["材料","项目"]
     });
-    $("#projectType").select({
-        title: "选择分类",
-        items: ["分类","土建工程", "安装工程", "装饰工程", "绿化工程"]
-    });
     $("#city-picker").cityPicker({
         title: "请选择地址",
+        showDistrict:false,
         onChange: function (picker, values, displayValues) {
-            $("#city-picker").val("");
+            $("#city-picker").val("1");
         },
         onClose: function(picker) {
             var s = $("#city-picker").val();
-            var index=s.lastIndexOf(' ');
+            // var index=s.indexOf(' ');
+            var index = s.lastIndexOf(' ')
             var sub = s.substring(index+1,s.length);
             $("#city-picker").val(sub);
             $("#projectType").val("");
             $("#datetime-picker").val("");
-            // if (projectType == "分类") {
-            //     projectType='';
-            // }
-            // var time = $("#datetime-picker").val();
-            // if (time == '时间'){
-            //     time  = '';
-            // }
             materialSolr('','','',sub,"/workMaterialCollect/total/listOn.do");
         }
     });
     $("#datetime-picker").datetimePicker({
+        format : "yyyy-mm",
         times: function() {
             return [];
         },
         onClose: function(picker) {
             var value = picker.value[0];
-            // alert(value);
             $("#projectName").val("");
             $("#projectType").val("");
             $("#city-picker").val("");
-            // if (projectType == "分类") {
-            //     projectType='';
-            // }
-            // var projectSize = $("#city-picker").val();
-            // if (projectSize == '地区'){
-            //     projectSize = '';
-            // }
             $("#datetime-picker").val(value);
             materialSolr('','',value,'',"/workMaterialCollect/total/listOn.do");
         }
@@ -208,11 +200,14 @@
             $("#matarial").attr("style","");
             $("#project").attr("style","display: none");
             var projectName = $("#projectName").val();
+            clear1();
             materialSolr(projectName,'','','',"/workMaterialCollect/total/listOn.do");
         }else {
-            // $("#matarial").attr("style","display: none");
-            // $("#project").attr("style","");
-            // loadlistProject();
+            $("#matarial").attr("style","display: none");
+            $("#project").attr("style","");
+            var projectName = $("#projectName").val();
+            clear1();
+            projectSolr(projectName,'','',"/workMaterialCollect/total/project.list.do")
         }
     }
     function materialSolr(materialName,projectType,time,projectSize,url) {
@@ -242,11 +237,14 @@
                             "<div class='weui-flex__item model_fex_font-size'>"+data[i].unit+"</div>" +
                             "<div class='weui-flex__item model_fex_font-size'>/</div>" +
                             "<div class='weui-flex__item model_fex_font-size'>"+data[i].excludingTax+"</div>" +
-                            "<div class='weui-flex__item model_fex_font-size'><a href='/workMaterialCollect/total/view?id="+data[i].id+"'>查看</a></div>" +
+                            "<div class='weui-flex__item model_fex_font-size'><a class='css_a_href' href='/workMaterialCollect/total/view?id="+data[i].id+"'>查看</a></div>" +
                             "</div></div>";
-                        html+="<div class=\"weui-cells__tips\" style='width: 100%'>" +
-                            "来源:<a href='/workMaterialCollect/total/item_op?id="+data[i].id+"'>"+data[i].projectName+"</a>项目;分类:<span>"+data[i].projectType+"</span>;工程时间:<span>"+judgeTime(data[i].startDate)+"/"+judgeTime(data[i].endDate)+"</span>" +
-                            "</div>";
+                        html+="<div class=\"weui-cell model_tips_list\"><div class=\"weui-cells__tips\" style='width: 100%'>" +
+                            "来源项目:<a class='css_a_href_tips' href='/workMaterialCollect/total/item_op?id="+data[i].id+"'>"+data[i].projectName+"</a>" +
+                            "</div></div>";
+                        // html+="<div class=\"weui-cell\"><div class=\"weui-cells__tips\" style='width: 100%'>" +
+                        //     "来源:<a href='/workMaterialCollect/total/item_op?id="+data[i].id+"'>"+data[i].projectName+"</a>项目;分类:<span>"+data[i].projectType+"</span>;工程时间:<span>"+judgeTime(data[i].endDate)+"</span>" +
+                        //     "</div></div>";
                     }
                 }else {
                     html+="<div class='weui-cells__tips model_fex_font-size'>无数据</div>";
@@ -259,12 +257,14 @@
 <script>
     $("#projectArea").cityPicker({
         title: "请选择地址",
+        showDistrict:false,
         onChange: function (picker, values, displayValues) {
             $("#projectArea").val("");
         },
         onClose: function(picker) {
             var s = $("#projectArea").val();
-            var index=s.lastIndexOf(' ');
+            // var index=s.indexOf(' ');
+            var index = s.lastIndexOf(' ')
             var sub = s.substring(index+1,s.length);
             $("#projectTime").val("");
             $("#projectArea").val(sub);
@@ -311,7 +311,7 @@
                                 "<div class='weui-flex__item model_fex_font-size'>"+data[k].projectSite+"</div>" +
                                 "<div class='weui-flex__item model_fex_font-size'>"+data[k].workMaterialCollectTypes[i].projectType+"</div>" +
                                 "<div class='weui-flex__item model_fex_font-size'>/</div>" +
-                                "<div class='weui-flex__item model_fex_font-size'><a href='/workMaterialCollect/total/project.view?itemId="+data[k].id+"&projectTypeId="+data[k].workMaterialCollectTypes[i].id+"'>查看</a></div>" +
+                                "<div class='weui-flex__item model_fex_font-size'><a class='css_a_href' href='/workMaterialCollect/total/project.view?itemId="+data[k].id+"&projectTypeId="+data[k].workMaterialCollectTypes[i].id+"'>查看</a></div>" +
                                 "</div></div>";
                         }
                     }
@@ -333,9 +333,19 @@
         $("#projectType").val("");
         $("#city-picker").val("");
         $("#datetime-picker").val("");
-        $("#projectName").val("");
         $("#projectArea").val("");
         $("#projectAreaTime").val("");
     }
+    function clear1() {
+        $("#projectType").val("");
+        $("#city-picker").val("");
+        $("#datetime-picker").val("");
+        $("#projectArea").val("");
+        $("#projectAreaTime").val("");
+    }
+    $("#projectType").select({
+        title: "选择分类",
+        items: ["分类","土建工程", "安装工程", "装饰工程", "绿化工程"]
+    });
 </script>
 </html>

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

@@ -16,48 +16,60 @@
     <link rel="stylesheet" href="/static/wechat/wechat-btn.css"/>
 </head>
 <style>
+    .css_a_href{
+        color: #999999;
+    }
+    .model_fex_text-align{
+        text-align: center;
+    }
 </style>
 <script>
 </script>
 <body>
 <div class='weui-cells' style="margin-top: 0px">
+    <div class="weui-cell" style="background-color:#f5f9f4;">
+        <span style="color:#666666">项目基本信息</span>
+    </div>
     <div class="weui-cell" style="background-color: #f9f9f9;">
         <div class="weui-flex" style="width: 100%">
-            <div class="weui-flex__item">项目</div>
-            <div class="weui-flex__item">地区</div>
-            <div class="weui-flex__item">分类</div>
-            <div class="weui-flex__item">时间</div>
+            <div class="weui-flex__item model_fex_text-align">项目</div>
+            <div class="weui-flex__item model_fex_text-align">地区</div>
+            <div class="weui-flex__item model_fex_text-align">分类</div>
+            <div class="weui-flex__item model_fex_text-align">时间</div>
         </div>
     </div>
-    <div class="weui-cell" style="background-color: #f9f9f9;">
+    <div class="weui-cell" style="">
         <div class="weui-flex" style="width: 100%">
-            <div class="weui-flex__item">${workEng.projectName}</div>
-            <div class="weui-flex__item">${workEng.projectSite}</div>
-            <div class="weui-flex__item">${workType.projectType}</div>
-            <div class="weui-flex__item">${workEng.modelStartDate}/${workEng.modelEndDate}</div>
+            <div class="weui-flex__item model_fex_text-align">${workEng.projectName}</div>
+            <div class="weui-flex__item model_fex_text-align">${workEng.projectSite}</div>
+            <div class="weui-flex__item model_fex_text-align">${workType.projectType}</div>
+            <div class="weui-flex__item model_fex_text-align">${workEng.modelEndDate}</div>
         </div>
     </div>
 </div>
 <div class='weui-cells'>
+    <div class="weui-cell" style="background-color: #f5f9f4;">
+        <span style="color:#666666">材料基本信息</span>
+    </div>
     <div class="weui-cell" style="background-color: #f9f9f9;">
         <div class="weui-flex" style="width: 100%">
-            <div class="weui-flex__item">名称</div>
-            <div class="weui-flex__item">型号</div>
-            <div class="weui-flex__item">单位</div>
-            <div class="weui-flex__item">含税价</div>
-            <div class="weui-flex__item">除税价</div>
-            <div class="weui-flex__item">分析</div>
+            <div class="weui-flex__item model_fex_text-align">名称</div>
+            <div class="weui-flex__item model_fex_text-align">型号</div>
+            <div class="weui-flex__item model_fex_text-align">单位</div>
+            <div class="weui-flex__item model_fex_text-align">含税价</div>
+            <div class="weui-flex__item model_fex_text-align">除税价</div>
+            <div class="weui-flex__item model_fex_text-align">分析</div>
         </div>
     </div>
     <c:forEach items="${workTotal}" var="w">
-    <div class="weui-cell" style="background-color: #f9f9f9;">
-        <div class="weui-flex" style="width: 100%">
-            <div class="weui-flex__item">${w.materialName}</div>
-            <div class="weui-flex__item">${w.specifications}</div>
-            <div class="weui-flex__item">${w.unit}</div>
-            <div class="weui-flex__item">/</div>
-            <div class="weui-flex__item">${w.excludingTax}</div>
-            <div class="weui-flex__item"><a href="/workMaterialCollect/total/project.view.do?id=${w.id}&itemId=${itemId}">查看</a></div>
+    <div class="weui-cell" style="">
+        <div class="weui-flex" style="width: 100%;">
+            <div class="weui-flex__item model_fex_text-align">${w.materialName}</div>
+            <div class="weui-flex__item model_fex_text-align">${w.specifications}</div>
+            <div class="weui-flex__item model_fex_text-align">${w.unit}</div>
+            <div class="weui-flex__item model_fex_text-align">/</div>
+            <div class="weui-flex__item model_fex_text-align">${w.excludingTax}</div>
+            <div class="weui-flex__item model_fex_text-align"><a class="css_a_href" href="/workMaterialCollect/total/project.view.do?id=${w.id}&itemId=${itemId}">查看</a></div>
         </div>
     </div>
     </c:forEach>

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

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-    <title>材料价格</title>
+    <title>材料价格详情</title>
     <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0,viewport-fit=cover">
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
     <meta content="yes" name="apple-mobile-web-app-capable">
@@ -16,40 +16,49 @@
     <link rel="stylesheet" href="/static/wechat/wechat-btn.css"/>
 </head>
 <style>
+    .model_fex_text-align{
+        text-align: center;
+    }
 </style>
 <script>
 </script>
 <body>
 <div class='weui-cells' style="margin-top: 0px">
+    <div class="weui-cell" style="background-color: #f5f9f4">
+        <span style="color:#666666">材料基础信息</span>
+    </div>
     <div class="weui-cell" style="background-color: #f9f9f9;">
         <div class="weui-flex" style="width: 100%">
-            <div class="weui-flex__item">名称</div>
-            <div class="weui-flex__item">型号</div>
-            <div class="weui-flex__item">单位</div>
+            <div class="weui-flex__item model_fex_text-align">名称</div>
+            <div class="weui-flex__item model_fex_text-align">型号</div>
+            <div class="weui-flex__item model_fex_text-align">单位</div>
         </div>
     </div>
-    <div class="weui-cell" style="background-color: #f9f9f9;">
+    <div class="weui-cell" style="">
         <div class="weui-flex" style="width: 100%">
-            <div class="weui-flex__item">${workCollect.materialName}</div>
-            <div class="weui-flex__item">${workCollect.specifications}</div>
-            <div class="weui-flex__item">${workCollect.unit}</div>
+            <div class="weui-flex__item model_fex_text-align">${workCollect.materialName}</div>
+            <div class="weui-flex__item model_fex_text-align">${workCollect.specifications}</div>
+            <div class="weui-flex__item model_fex_text-align">${workCollect.unit}</div>
         </div>
     </div>
 </div>
 
 <div class='weui-cells'>
+    <div class="weui-cell" style="background-color: #f5f9f4;">
+        <span style="color:#666666">材料价格说明</span>
+    </div>
     <div class="weui-cell" style="background-color: #f9f9f9;">
         <div class="weui-flex" style="width: 100%">
-            <div class="weui-flex__item">最高除税价</div>
-            <div class="weui-flex__item">最低除税价</div>
-            <div class="weui-flex__item">平均价</div>
+            <div class="weui-flex__item model_fex_text-align">最高除税价</div>
+            <div class="weui-flex__item model_fex_text-align">最低除税价</div>
+            <div class="weui-flex__item model_fex_text-align">平均价</div>
         </div>
     </div>
-    <div class="weui-cell" style="background-color: #f9f9f9;">
+    <div class="weui-cell" style="">
         <div class="weui-flex" style="width: 100%">
-            <div class="weui-flex__item">${taxMax}</div>
-            <div class="weui-flex__item">${taxMin}</div>
-            <div class="weui-flex__item">${taxAvg}</div>
+            <div class="weui-flex__item model_fex_text-align">${taxMax}</div>
+            <div class="weui-flex__item model_fex_text-align">${taxMin}</div>
+            <div class="weui-flex__item model_fex_text-align">${taxAvg}</div>
         </div>
     </div>
 </div>

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

@@ -16,25 +16,32 @@
     <link rel="stylesheet" href="/static/wechat/wechat-btn.css"/>
 </head>
 <style>
+    .model_fex_text-align{
+        text-align: center;
+    }
 </style>
 <script>
 </script>
 <body>
 <div class='weui-cells' style="margin-top: 0px">
+    <div class="weui-cell" style="background-color: #f5f9f4;">
+        <span style="color:#666666">项目基本信息</span>
+    </div>
     <div class="weui-cell" style="background-color: #f9f9f9;">
         <div class="weui-flex" style="width: 100%">
-            <div class="weui-flex__item">项目</div>
-            <div class="weui-flex__item">地区</div>
-            <div class="weui-flex__item">分类</div>
-            <div class="weui-flex__item">时间</div>
+            <div class="weui-flex__item model_fex_text-align">项目</div>
+            <div class="weui-flex__item model_fex_text-align">地区</div>
+            <div class="weui-flex__item model_fex_text-align">分类</div>
+            <div class="weui-flex__item model_fex_text-align">时间</div>
         </div>
     </div>
-    <div class="weui-cell" style="background-color: #f9f9f9;">
+    <div class="weui-cell" style="">
         <div class="weui-flex" style="width: 100%">
-            <div class="weui-flex__item">${workEng.projectName}</div>
-            <div class="weui-flex__item">${workEng.projectSite}</div>
-            <div class="weui-flex__item">${workEng.projectType}</div>
-            <div class="weui-flex__item">${workEng.modelStartDate}/${workEng.modelEndDate}</div>
+            <div class="weui-flex__item model_fex_text-align">${workEng.projectName}</div>
+            <div class="weui-flex__item model_fex_text-align">${workEng.projectSite}</div>
+            <div class="weui-flex__item model_fex_text-align">${workEng.projectType}</div>
+            <div class="weui-flex__item model_fex_text-align">${workEng.modelEndDate}</div>
+            <%--${workEng.modelStartDate}/--%>
         </div>
     </div>
 </div>

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

@@ -3,7 +3,6 @@
 <html>
 <head>
 	<title>确认单采集编辑</title>
-	<meta http-equiv=Content-Type content=“text/html;charset=utf-8″>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
         $(document).ready(function() {
@@ -80,15 +79,26 @@
                     window.location.href='${ctx}/workMaterialCollect/total/import/template';
                 },
                 btn2: function(index, layero){
-                    <%--var formData = new FormData($("#importForm")[0]);--%>
-                    <%--var file = formData.get("file");--%>
-                    <%--alert(file);--%>
-                    <%--alert(formData);--%>
+                    // 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,--%>
-                        <%--traditional: true,--%>
+						<%--async:false,--%>
                         <%--cache: false,        // 不缓存数据--%>
                         <%--processData: false,  // 不处理数据--%>
                         <%--contentType: false,   // 不设置内容类型--%>
@@ -96,15 +106,16 @@
                             <%--parent.layer.msg("上传成功", {icon: 1});--%>
                         <%--},--%>
                         <%--error : function(arg1, arg2, arg3) {--%>
-                            <%--console.log(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","color:black");
+					$("#"+status).val("已上传");
+                    // $("#"+status).attr("style","background-color: white");
                     top.$("#importForm").submit();
+                    parent.layer.msg("上传成功", {icon: 1})
                 },
 
                 btn3: function(index){
@@ -128,8 +139,8 @@
 </head>
 <body>
 <div id="importBox" class="hide">
-	<%--<form id="importForm"style="padding-left:20px;text-align:center;" enctype="multipart/form-data"><br/>--%>
-		<%--<input id="uploadFile"  value=""  type="file" name="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　--%>
+	<%--<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"/>--%>
@@ -175,10 +186,10 @@
 										<a class="attention-info" href="javascript:void(0)" onclick="openDialogView('查看已上传的材料价格确认单', '${ctx}/workMaterialCollect/engineerSure/sureTotalView?projectTypeId=${workMaterialCollectType.id}','80%','80%')"><span title="${workMaterialCollectType.projectType}">${workMaterialCollectType.projectType}</span></a>
 										<%--<input id="workMaterialCollectTypes${index.index}_1"  readonly="true"   name="workMaterialCollectTypes[${index.index}].projectType" type="text" value="${workMaterialCollectType.projectType}"   class="form-control "/>--%>
 									</td>
-									<td>
-										<input id="workMaterialCollectTypes${index.index}_2" readonly="true"   name="workMaterialCollectTypes[${index.index}].projectPart" type="text" value="${workMaterialCollectType.projectPart}"   class="form-control "/>
+									<td style="text-align:center;vertical-align:middle;">
+										<input id="workMaterialCollectTypes${index.index}_2" readonly="true"   name="workMaterialCollectTypes[${index.index}].projectPart" type="text" value="${workMaterialCollectType.projectPart}"   class="form-control " style="background-color: white;text-align: center"/>
 									</td>
-									<td>
+									<td style="text-align:center;vertical-align:middle;">
 
 										<c:choose>
 											<c:when test="${fn:containsIgnoreCase(workMaterialCollectType.workattachment.attachmentName,'jpg')
@@ -205,11 +216,11 @@
 										<%--<a class="attention-info" href="javascript:void(0)" onclick="openDialogView('查看已上传的材料价格确认单', '${ctx}/workMaterialCollect/engineerSure/sureTotalView?projectTypeId=${workMaterialCollectType.id}','80%','80%')"><span title="${workMaterialCollectType.workattachment.attachmentName}">${workMaterialCollectType.workattachment.attachmentName}</span></a>--%>
 										<%--<input id="workMaterialCollectTypes${index.index}_3" readonly="true" name="workMaterialCollectTypes[${index.index}].workattachment.attachmentName" value="${workMaterialCollectType.workattachment.attachmentName}" class="form-control "/>--%>
 									</td>
-										<td>
-											<input id="workMaterialCollectTypes${index.index}_4" readonly="true" name="workMaterialCollectTypes[${index.index}].status" value="${workMaterialCollectType.status}" class="form-control "/>
+										<td style="text-align:center;vertical-align:middle;">
+											<input id="workMaterialCollectTypes${index.index}_4" readonly="true" name="workMaterialCollectTypes[${index.index}].status" value="${workMaterialCollectType.status}" class="form-control " style="background-color: white;text-align: center"/>
 										</td>
-										<td>
-											<input id="workMaterialCollectTypes${index.index}_6" readonly="true" name="workMaterialCollectTypes[${index.index}].remarks" value="${workMaterialCollectType.remarks}" class="form-control "/>
+										<td style="text-align:center;vertical-align:middle;">
+											<input id="workMaterialCollectTypes${index.index}_6" readonly="true" name="workMaterialCollectTypes[${index.index}].remarks" value="${workMaterialCollectType.remarks}" class="form-control " style="background-color: white;text-align: center"/>
 										</td>
 										<td class="hide">
 											<input id="workMaterialCollectTypes${index.index}_5" readonly="true" name="workMaterialCollectTypes[${index.index}].workattachment.url" value="${workMaterialCollectType.workattachment.url}" class="form-control "/>