user5 vor 4 Jahren
Ursprung
Commit
755b8642af

+ 6 - 6
src/main/java/com/jeeplus/modules/workreimbursement/entity/WorkAccount.java

@@ -38,8 +38,8 @@ public class WorkAccount extends DataEntity<WorkAccount> {
 	private String projectReportNumber;//项目报告号
 	private String officeId;//部门id
 	private String reimbursementName;//报销人
-	private String bills;//单据数量
-	private String evectionNumber;//出差天数
+	private Integer bills;//单据数量
+	private Double evectionNumber;//出差天数
 	private Integer projectRadio;   //是否项目报销(1:项目报销 0:非项目报销)
 	private String reimburseRemarks;   //非项目报销  报销详情
 
@@ -165,19 +165,19 @@ public class WorkAccount extends DataEntity<WorkAccount> {
 		this.reimbursementName = reimbursementName;
 	}
 
-	public String getBills() {
+	public Integer getBills() {
 		return bills;
 	}
 
-	public void setBills(String bills) {
+	public void setBills(Integer bills) {
 		this.bills = bills;
 	}
 
-	public String getEvectionNumber() {
+	public Double getEvectionNumber() {
 		return evectionNumber;
 	}
 
-	public void setEvectionNumber(String evectionNumber) {
+	public void setEvectionNumber(Double evectionNumber) {
 		this.evectionNumber = evectionNumber;
 	}
 

+ 1 - 1
src/main/resources/mappings/modules/workreimbursement/WorkAccountDao.xml

@@ -170,7 +170,7 @@
 		<if test="type != null and type != ''">
 			type = #{type},
 		</if>
-		<if test="money != null and money != ''">
+		<if test="money != null">
 			money = #{money},
 		</if>
 		<if test="financialSubjects != null and financialSubjects != ''">

+ 1 - 5
src/main/webapp/WEB-INF/tags/sys/reimburselectReproject.tag

@@ -56,11 +56,7 @@ var  userId=$("#submitterIdId").val();
 
 	<input id="${id}Id" name="${name}"  type="hidden" value="${value}"/>
 	<div class="input-group">
-		<input id="${id}Name"  name="${labelName }" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name"  name="${labelName }" ${allowInput?'':'readonly="readonly"'}  onclick="searchGrid${id}()" type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="background-color: #ffffff; ${cssStyle}"/>
-			<span class="input-group-btn">
-	       		 <button type="button" onclick="searchGrid${id}()" id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>
-	             </button>
-       		 </span>
     </div>
 	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>

+ 1 - 3
src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -408,9 +408,7 @@
                     }
                 }
             }
-            if (money!='0.00') {
                 $("#moneys").val(money);
-            }
         }
         function getMoneyVATT(index){
             var money = "0.00";
@@ -648,7 +646,7 @@
                         <th width="200px">报销项目</th>
                         <th width="200px">报告号</th>
                         <th width="200px">报销类型</th>
-                        <th width="200px">费用(元)</th>
+                        <th width="200px"><font color="red">*</font>费用(元)</th>
                         <th width="200px">收据张数</th>
                         <th width="200px">出差天数</th>
                         <th width="200px">内容</th>

+ 2 - 4
src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

@@ -414,9 +414,7 @@
                     }
                 }
             }
-            if (money!='0.00') {
                 $("#moneys").val(money);
-            }
         }
         function getBackMoney(value){
             var money = "0.00";
@@ -770,10 +768,10 @@
                 <tr>
                     <th width="200px"><font color="red">*</font>报销人</th>
                     <th width="200px">报销部门</th>
-                    <th width="200px"><font color="red">*</font>报销项目</th>
+                    <th width="200px">报销项目</th>
                     <th width="200px">报告号</th>
                     <th width="200px">报销类型</th>
-                    <th width="200px">费用(元)</th>
+                    <th width="200px"><font color="red">*</font>费用(元)</th>
                     <th width="200px">收据张数</th>
                     <th width="200px">出差天数</th>
                     <th width="200px">内容</th>