Procházet zdrojové kódy

隐蔽工程量导入传值下拉框

user7 před 5 roky
rodič
revize
4586a391f2

+ 2 - 1
src/main/java/com/jeeplus/modules/workcontent/web/WorkConcealProjectController.java

@@ -99,7 +99,8 @@ public class WorkConcealProjectController extends BaseController {
 	 */
 	@ResponseBody
     @RequestMapping(value = "import", method=RequestMethod.POST)
-    public Object importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
+    public Object importFile(MultipartFile file, RedirectAttributes redirectAttributes,String type) {
+		System.out.println("-------------"+type);
         ResponseEntity<WorkConcealProject> responseEntity = new ResponseEntity<>();
 		try {
 			ImportExcel ei = new ImportExcel(file, 1, 0);

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

@@ -5,9 +5,13 @@
 <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/>
+            <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>
 </div>
 <script type="text/javascript">
@@ -40,6 +44,8 @@ $(document).ready(function() {
 
                 var formData = new FormData();
                 formData.append("file",top.$("#uploadFile")[0].files[0]);
+                formData.append("type",top.$("#concealType").val());
+
                 $.ajax({
                         type: 'post',
                         url: "${url}",

+ 1 - 2
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:importExcelCost url="${ctx}/workConcealProject/workConcealProject/import"></table:importExcelCost> <!-- 导入按钮 -->
             </div>
 
             <table id="contentTable" class="table table-bordered table-condensed can-edit">
@@ -94,7 +94,6 @@
                     }
                 }
             });
-
             var data = ${fns:toJson(workConcealProject)};
             for (var i=0; i<data.length; i++){
                 if(data[i].type == 'workSiteLevel') {