Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/entity/ErpAccount.java

@@ -1,13 +1,10 @@
 package com.jeeplus.modules.sg.financial.erpcredit.entity;
 
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
-import org.dozer.Mapping;
+
 
 import java.io.Serializable;
 
-/**
- * 导入实体类
- */
 public class ErpAccount implements Serializable {
     private static final long serialVersionUID = 1L;
 //    private String companyCode;//公司代码

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/entity/ErpCredit.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.sg.financial.erpcredit.entity;
 
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.DataEntity;
 
 import java.util.ArrayList;
@@ -26,7 +27,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     private List<ErpCreditChild2> erpCreditChild2s = new ArrayList<ErpCreditChild2>();
     private List<ErpCreditChild3> erpCreditChild3s = new ArrayList<ErpCreditChild3>();
 
-
+    @ExcelField(title="项目定义编码", align=2, sort=1)
     public String getItemId() {
         return itemId;
     }
@@ -34,7 +35,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setItemId(String itemId) {
         this.itemId = itemId;
     }
-
+    @ExcelField(title="项目名称", align=2, sort=2)
     public String getItemName() {
         return itemName;
     }
@@ -42,7 +43,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setItemName(String itemName) {
         this.itemName = itemName;
     }
-
+    @ExcelField(title="实际投资", align=2, sort=3)
     public Double getActualInvestment() {
         return actualInvestment;
     }
@@ -50,7 +51,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setActualInvestment(Double actualInvestment) {
         this.actualInvestment = actualInvestment;
     }
-
+    @ExcelField(title="移交生产的资产总值", align=2, sort=4)
     public Double getTransferAssets() {
         return transferAssets;
     }
@@ -58,7 +59,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setTransferAssets(Double transferAssets) {
         this.transferAssets = transferAssets;
     }
-
+    @ExcelField(title="建筑费", align=2, sort=5)
     public Double getConsBuildingFee() {
         return consBuildingFee;
     }
@@ -66,7 +67,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setConsBuildingFee(Double consBuildingFee) {
         this.consBuildingFee = consBuildingFee;
     }
-
+    @ExcelField(title="安装费", align=2, sort=6)
     public Double getConsInstallFee() {
         return consInstallFee;
     }
@@ -74,7 +75,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setConsInstallFee(Double consInstallFee) {
         this.consInstallFee = consInstallFee;
     }
-
+    @ExcelField(title="施工：合计", align=2, sort=7)
     public Double getConsTotalFee() {
         return consTotalFee;
     }
@@ -82,7 +83,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setConsTotalFee(Double consTotalFee) {
         this.consTotalFee = consTotalFee;
     }
-
+    @ExcelField(title="监理费", align=2, sort=8)
     public Double getOtherSupervisorFee() {
         return otherSupervisorFee;
     }
@@ -90,7 +91,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setOtherSupervisorFee(Double otherSupervisorFee) {
         this.otherSupervisorFee = otherSupervisorFee;
     }
-
+    @ExcelField(title="设计费", align=2, sort=9)
     public Double getOtherDesignFee() {
         return otherDesignFee;
     }
@@ -98,7 +99,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setOtherDesignFee(Double otherDesignFee) {
         this.otherDesignFee = otherDesignFee;
     }
-
+    @ExcelField(title="项目前期工作费", align=2, sort=10)
     public Double getOtherBeWorkFee() {
         return otherBeWorkFee;
     }
@@ -106,7 +107,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setOtherBeWorkFee(Double otherBeWorkFee) {
         this.otherBeWorkFee = otherBeWorkFee;
     }
-
+    @ExcelField(title="建设期贷款利息", align=2, sort=11)
     public Double getOtherBuildLoan() {
         return otherBuildLoan;
     }
@@ -114,7 +115,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setOtherBuildLoan(Double otherBuildLoan) {
         this.otherBuildLoan = otherBuildLoan;
     }
-
+    @ExcelField(title="线路施工赔偿费", align=2, sort=12)
     public Double getOtherLineDamages() {
         return otherLineDamages;
     }
@@ -122,7 +123,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setOtherLineDamages(Double otherLineDamages) {
         this.otherLineDamages = otherLineDamages;
     }
-
+    @ExcelField(title="法人管理费", align=2, sort=13)
     public Double getOtherLegalManage() {
         return otherLegalManage;
     }
@@ -130,7 +131,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     public void setOtherLegalManage(Double otherLegalManage) {
         this.otherLegalManage = otherLegalManage;
     }
-
+    @ExcelField(title="其他费用:合计", align=2, sort=14)
     public Double getOtherTotalFee() {
         return otherTotalFee;
     }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/web/ErpCreditController.java

@@ -210,24 +210,4 @@ public class ErpCreditController extends BaseController {
 		}
 		return j;
 	}
-	/**
-	 * 下载导入请假表单数据模板
-	 */
-	@ResponseBody
-//	@RequiresPermissions("sg:financial:erpCredit:import")
-	@RequestMapping(value = "import/template")
-	public AjaxJson importFileTemplate(HttpServletResponse response) {
-		AjaxJson j = new AjaxJson();
-		try {
-			String fileName = "表单数据导入模板.xlsx";
-			List<ErpCredit> list = Lists.newArrayList();
-			new ExportExcel("表单数据", ErpCredit.class, 1).setDataList(list).write(response, fileName).dispose();
-			return null;
-		} catch (Exception e) {
-			j.setSuccess(false);
-			j.setMsg( "导入模板下载失败！失败信息："+e.getMessage());
-		}
-		return j;
-	}
-
 }

src/main/webapp/webpage/modules/sg/managementcenter/materialinfo/importmore.jsp

@@ -23,29 +23,30 @@
     </style>
 </head>
 <body style="height: 100%;line-height: 100%">
-<div style="padding: 10px; background-color: #F2F2F2;">
+<div style="padding: 10px;">
     <div class="layui-main-bgc">
         <div class="layui-row layui-col-space15">
             <div class="layui-col-md12">
                 <div class="layui-card">
                         <div class="layui-card-body" style="margin-top: 2px;">
-                            <form>
+                            <form class="layui-form">
                             <div class="layui-form-item">
                                 <div class="layui-inline">
-                                    <label class="layui-form-label" style="width: 100px;">*项目批次</label>
+                                    <label class="layui-form-label">*项目批次</label>
                                     <div class="layui-input-inline">
                                         <input type="text" id="myinput" autocomplete="off" placeholder=""  class="layui-input">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">*物料批次</label>
-                                    <%--<div class="layui-input-inline">--%>
-                                    <select name="suppliesBatch"  id="suppliesBatch">
-                                        <c:forEach var="item" items="${batch}">
-                                            <option value="${item.suppliesBatch}" label="${item.suppliesBatch}"></option>
-                                        </c:forEach>
-                                    </select>
-                                    <%--</div>--%>
+                                    <div class="layui-input-inline">
+                                        <select name="suppliesBatch"  id="suppliesBatch">
+                                            <option value="">请选择</option>
+                                            <c:forEach var="item" items="${batch}">
+                                                <option value="${item.suppliesBatch}">${item.suppliesBatch}</option>
+                                            </c:forEach>
+                                        </select>
+                                    </div>
                                 </div>
                             </div>
                             </form>
@@ -81,9 +82,11 @@
     /*//定义存放文件数组*/
     var arrayFile=[];
     /*加载layui文件上传*/
-    layui.use('upload', function(){
+    layui.use('form','upload', function(){
         var $ = layui.jquery
+            form = layui.form
             ,upload = layui.upload;
+            form.render();
         //多文件列表示例
         var tbodyListView = $('#tbody_List')
             ,uploadListIns = upload.render({