工作内容-隐蔽工程量上传操作

src/main/java/com/jeeplus/modules/workcontent/web/WorkConcealProjectController.java

@@ -107,6 +107,7 @@ public class WorkConcealProjectController extends BaseController {
             List<WorkConcealProject> list = ei.getDataList(WorkConcealProject.class);
 			List<WorkConcealProject> listAll = new ArrayList<>();
 			for (WorkConcealProject workConcealProject : list) {
+				workConcealProject.setType(type);
 				if(StringUtils.isNotBlank(workConcealProject.getCostPart()) && null != workConcealProject.getWorkAmount() && null != workConcealProject.getWorkConcealProjectSerialNum()){
 					listAll.add(workConcealProject);
 				}

src/main/webapp/WEB-INF/tags/table/importExcelCost.tag

@@ -4,30 +4,26 @@
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入controller的url --%>
 <button id="btnImport" class="nav-btn nav-btn-import" data-toggle="tooltip" data-placement="left" title="导入"><i class="fa fa-folder-open-o"></i> 导入</button>
 <div id="importBox" class="hide">
-		<form id="importForm2" action="${url}" method="post" enctype="multipart/form-data" onsubmit="loading('正在导入，请稍等...');">
-            <select id="concealType" name="conceal">
-				<option value="0">请选择</option>
-				<option value="workSiteLevel">场平工程量确认单</option>
-				<option value="workConcealProject">屏蔽工程量确认单</option>
-			</select>
-			<br/>
-			<input id="uploadFile" name="file" type="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　
-		</form>
+	<form id="importForm2" action="${url}" method="post" enctype="multipart/form-data" onsubmit="loading('正在导入，请稍等...');">
+		<br/>
+		<input id="uploadFile" name="file" type="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　
+
+	</form>
 </div>
 <script type="text/javascript">
-$(document).ready(function() {
-	$("#btnImport").click(function(){
-		top.layer.open({
-		    type: 1, 
-		    area: [500, 300],
-		    title:"导入数据",
-		    content:$("#importBox").html() ,
-		    btn: ['下载模板','确定', '关闭'],
-			    btn1: function(index, layero){
-				  window.location.href='${url}/template';
-			  },
-		    btn2: function(index, layero){
-                    /*$('#importForm2').ajaxSubmit({
+	$(document).ready(function() {
+		$("#btnImport").click(function(){
+			top.layer.open({
+				type: 1,
+				area: [500, 300],
+				title:"导入数据",
+				content:$("#importBox").html() ,
+				btn: ['下载模板','确定', '关闭'],
+				btn1: function(index, layero){
+					window.location.href='${url}/template';
+				},
+				btn2: function(index, layero){
+					/*$('#importForm2').ajaxSubmit({
                         dataType: "json",
                         success: function (result) {
                             console.log(result);
@@ -42,35 +38,33 @@ $(document).ready(function() {
                         }
                     });*/
 
-                var formData = new FormData();
-                formData.append("file",top.$("#uploadFile")[0].files[0]);
-                formData.append("type",top.$("#concealType").val());
+					var formData = new FormData();
+					formData.append("file",top.$("#uploadFile")[0].files[0]);
+					$.ajax({
+						type: 'post',
+						url: "${url}",
+						data: formData,
+						dataType: "json",
+						cache: false,
+						processData: false,
+						contentType: false,
+					}).success(function (result) {
+						if(result.code == 0){
+							genRow(result.data);
+						}else {
+							top.layer.msg("导入文件异常："+result.message);
+						}
+					}).error(function () {
+						top.layer.msg("导入文件失败！");
+					});
+					top.layer.close(index);
+				},
+				btn3: function(index){
+					top.layer.close(index);
+				}
+			});
+		});
 
-                $.ajax({
-                        type: 'post',
-                        url: "${url}",
-                        data: formData,
-                        dataType: "json",
-                        cache: false,
-                        processData: false,
-                        contentType: false,
-                    }).success(function (result) {
-                        if(result.code == 0){
-                            genRow(result.data);
-                        }else {
-                            top.layer.msg("导入文件异常："+result.message);
-                        }
-                    }).error(function () {
-                        top.layer.msg("导入文件失败！");
-                    });
-				    top.layer.close(index);
-			  },
-			  btn3: function(index){
-				  top.layer.close(index);
-    	       }
-		}); 
 	});
-    
-});
 
 </script>

src/main/webapp/WEB-INF/tags/table/importExcelCostHideImport.tag

@@ -0,0 +1,82 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="url" type="java.lang.String" required="true"%>
+
+<!-- 引入layer插件 -->
+<link href="${ctxStatic}/layer-v2.3/layui/css/layui.css" type="text/css" rel="stylesheet"/>
+<script src="${ctxStatic}/layer-v2.3/layer/layer.js"></script>
+<script src="${ctxStatic}/layer-v2.3/layer/laydate/laydate.js"></script>
+<%-- 使用方法： 1.将本tag写在查询的form之前；2.传入controller的url --%>
+<button id="btnImport" class="nav-btn nav-btn-import" data-toggle="tooltip" data-placement="left" title="导入"><i class="fa fa-folder-open-o"></i> 导入</button>
+<div id="importBox" class="hide">
+	<form id="importForm2" action="${url}" method="post" enctype="multipart/form-data" onsubmit="loading('正在导入，请稍等...');">
+		<br/>
+		<div class="layui-form-item">
+			<label class="layui-form-label"><span class="require-item" style="color:red;font-size: 20px;">*</span>数据类型</label>
+			<select id="concealType" name="conceal">
+				<option value="">请选择</option>
+				<option value="workSiteLevel" selected="">场平工程量确认单</option>
+				<option value="workConcealProject">屏蔽工程量确认单</option>
+			</select>
+		</div>
+
+		<input id="uploadFile" name="file" type="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　
+	</form>
+</div>
+<script type="text/javascript">
+	$(document).ready(function() {
+		$("#btnImport").click(function(){
+			top.layer.open({
+				type: 1,
+				area: [500, 300],
+				title:"导入数据",
+				content:$("#importBox").html() ,
+				btn: ['下载模板','确定', '关闭'],
+				btn1: function(index, layero){
+					window.location.href='${url}/template';
+				},
+				btn2: function(index, layero){
+					var formData = new FormData();
+					formData.append("file",top.$("#uploadFile")[0].files[0]);
+					formData.append("type",top.$("#concealType").val());
+					//alert(top.$("#concealType").val());
+					var type = top.$("#concealType").val();
+					if(null == type || "" == type) {
+						top.layer.open({
+							title: '提示'
+							, content: '请选择导入的数据类型'
+						});
+						return false;
+					}
+					$.ajax({
+						type: 'post',
+						url: "${url}",
+						data: formData,
+						dataType: "json",
+						cache: false,
+						processData: false,
+						contentType: false,
+					}).success(function (result) {
+						if(result.code == 0){
+							if("workConcealProject" == result.data[0].type){
+								genRow(result.data);
+							}else if("workSiteLevel" == result.data[0].type){
+								genWorkSiteLevelRow(result.data);
+							}
+						}else {
+							top.layer.msg("导入文件异常："+result.message);
+						}
+					}).error(function () {
+						top.layer.msg("导入文件失败！");
+					});
+					top.layer.close(index);
+				},
+				btn3: function(index){
+					top.layer.close(index);
+				}
+			});
+		});
+
+	});
+
+</script>

src/main/webapp/webpage/modules/workcontent/workConcealProjectList.jsp

@@ -29,7 +29,7 @@
         <c:if test="${sign =='workSiteLevel'}">
             <div class="layui-item nav-btns" style="padding-left:0px;">
                 <a class="nav-btn nav-btn-add" onclick="addWorkSiteLevelRowCost('#workSiteLevel',workSiteLevelIdx,workSiteLevelTpl)" title="新增"><i class="fa fa-plus"></i> 新增</a>
-                <table:importExcelCost url="${ctx}/workConcealProject/workConcealProject/import"></table:importExcelCost> <!-- 导入按钮 -->
+                <table:importExcelCostHideImport url="${ctx}/workConcealProject/workConcealProject/import"></table:importExcelCostHideImport> <!-- 导入按钮 -->
             </div>
 
             <table id="contentTable" class="table table-bordered table-condensed can-edit">