报销申请部分修改

src/main/java/com/jeeplus/modules/workreimbursement/entity/WorkAccount.java

@@ -40,6 +40,8 @@ public class WorkAccount extends DataEntity<WorkAccount> {
 	private String reimbursementName;//报销人
 	private String bills;//单据数量
 	private String evectionNumber;//出差天数
+	private Integer projectRadio;   //是否项目报销(1:项目报销 0：非项目报销)
+	private String reimburseRemarks;   //非项目报销  报销详情
 
 
 	public String getInvoiceType() {
@@ -194,4 +196,20 @@ public class WorkAccount extends DataEntity<WorkAccount> {
 	public void setTypeName(String typeName) {
 		this.typeName = typeName;
 	}
+
+	public Integer getProjectRadio() {
+		return projectRadio;
+	}
+
+	public void setProjectRadio(Integer projectRadio) {
+		this.projectRadio = projectRadio;
+	}
+
+	public String getReimburseRemarks() {
+		return reimburseRemarks;
+	}
+
+	public void setReimburseRemarks(String reimburseRemarks) {
+		this.reimburseRemarks = reimburseRemarks;
+	}
 }

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -138,6 +138,9 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                 workAccount.setFinancialSubjectss(workAccount.getFinancialSubjects());
                 workAccount.setFinancialSubjects("");
             }
+            if(null != workAccount.getProjectRadio() && workAccount.getProjectRadio() == 0){
+                workAccount.getProject().setProjectName(workAccount.getReimburseRemarks());
+            }
         }
         workReimbursement.setWorkAccountList(workAccounts);
         workReimbursement.setReimbursementVATTaxes(reimbursementVATTaxDao.findList(new ReimbursementVATTax(workReimbursement)));
@@ -221,6 +224,7 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
 
     public Page<WorkReimbursement> findPage(Page<WorkReimbursement> page, WorkReimbursement workReimbursement) {
         workReimbursement.getSqlMap().put("dsf", dataScopeFilter(workReimbursement.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_REIMBURSEMENT.getValue()));
+        workReimbursement.setCreateBy(UserUtils.getUser());
         int count = dao.queryCount(workReimbursement);
         page.setCount(count);
         page.setCountFlag(false);
@@ -498,9 +502,15 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                 if(null == workAccount.getId()){
                     continue;
                 }
-                //添加人员部门id
-                User user = UserUtils.get(workAccount.getReimbursementName());
-                workAccount.setOfficeId(user.getOffice().getId());
+                if(StringUtils.isNotBlank(workAccount.getReimbursementName())){
+                    //添加人员部门id
+                    User user = UserUtils.get(workAccount.getReimbursementName());
+                    workAccount.setOfficeId(user.getOffice().getId());
+                }
+                //根据是否为项目报销设置数据信息
+                if(null != workAccount.getProjectRadio() && workAccount.getProjectRadio() == 0){
+                    workAccount.setReimburseRemarks(workAccount.getProject().getProjectName());
+                }
                 if (WorkAccount.DEL_FLAG_NORMAL.equals(workAccount.getDelFlag())) {
                     List<WorkAccountAudit> workAccountAudits = workAccount.getWorkAccountAuditList();
                     List<WorkAccountAudit> workAccountAuditList = new ArrayList<>();

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -757,7 +757,7 @@ public class WorkReimbursementController extends BaseController {
 		model.addAttribute("obj", projectId);
 		model.addAttribute("allowInput", true);
 		model.addAttribute("page", page);
-		return "modules/sys/gridselectcallproject";
+		return "modules/sys/gridselectcallprojectOnReimbur";
 		//return "modules/sys/gridselect";
 	}
 }

src/main/resources/mappings/modules/workreimbursement/WorkAccountDao.xml

@@ -19,7 +19,9 @@
 		a.del_flag AS "delFlag",
 		a.project_id as "project.id",
 		a.bills as "bills",
-		a.evection_number as "evectionNumber"
+		a.evection_number as "evectionNumber",
+		a.project_radio as "projectRadio",
+		a.reimburse_remarks as "reimburseRemarks"
 	</sql>
 	
 	<sql id="workAccountJoins">
@@ -122,7 +124,9 @@
 			reimbursement_name,
 			bills,
 			evection_number,
-			office_id
+			office_id,
+			project_radio,
+			reimburse_remarks
 		) VALUES (
 			#{id},
 			#{type},
@@ -142,7 +146,9 @@
 			#{reimbursementName},
 			#{bills},
 			#{evectionNumber},
-			#{officeId}
+			#{officeId},
+			#{projectRadio},
+			#{reimburseRemarks}
 		)
 	</insert>
 
@@ -196,6 +202,12 @@
 		<if test="officeId != null and officeId != ''">
 			office_id = #{officeId},
 		</if>
+		<if test="projectRadio != null and projectRadio != ''">
+			project_radio = #{projectRadio},
+		</if>
+		<if test="reimburseRemarks != null and reimburseRemarks != ''">
+			reimburse_remarks = #{reimburseRemarks},
+		</if>
 			update_by = #{updateBy.id},
 			update_date = #{updateDate}
 		WHERE id = #{id}

src/main/resources/mappings/modules/workreimbursement/WorkReimbursementDao.xml

@@ -45,8 +45,11 @@
 		SELECT 
 			<include refid="workReimbursementColumns"/>,
 		a.money AS "money"
+		,a.office_id as "officeId"
+		,su.name as "submitterName"
 		FROM work_reimbursement a
 		<include refid="workReimbursementJoins"/>
+		left join sys_user su on su.id = a.submitter_id
 		WHERE a.id = #{id}
 	</select>
 	
@@ -89,6 +92,7 @@
 				AND wa.reimbursement_name = #{submitterId}
 			</if>
 			${sqlMap.dsf}
+			or wa.reimbursement_name = #{createBy.id}
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -135,6 +139,7 @@
 				AND wa.reimbursement_name = #{submitterId}
 			</if>
 			${sqlMap.dsf}
+			or wa.reimbursement_name = #{createBy.id}
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -244,7 +249,12 @@
 		UPDATE work_reimbursement SET 	
 			number = #{number},
 			business_type = #{businessType},
-			office_id = #{officeId},
+			<if test="officeId != null and officeId !=''">
+				office_id = #{officeId},
+			</if>
+			<if test="submitterId != null and submitterId !=''">
+				submitter_id = #{submitterId},
+			</if>
 			<if test="limitCond != 1">
 				submitter_date = #{submitterDate},
 			</if>
@@ -257,7 +267,6 @@
 			remarks = #{remarks},
 			company_id = #{companyId},
 			submitter = #{submitter},
-		    submitter_id = #{submitterId},
 		    bank_card = #{bankCard},
 			ext = #{ext},
 		    is_public = #{isPublic},

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

@@ -34,9 +34,17 @@ var  userId=$("#submitterIdId").val();
 	    	 }
 	    	 var items = item.split('_item_');
 			console.log(items)
-	    	 $("#${id}Id").val(items[0]);
-	    	 $("#${id}Name").val(items[1]);
-			 $("#${id}ReportNumber").val(items[2]);
+			//判断是否选择报销项目
+			if(items[0] == 1){
+				$("#${id}Radio").val(items[0]);
+				$("#${id}Id").val(items[1]);
+				$("#${id}Name").val(items[2]);
+				$("#${id}ReportNumber").val(items[3]);
+			}else{
+				$("#${id}Radio").val(items[0]);
+				$("#${id}Name").val(items[1]);
+				$("#${id}ReportNumber").val("");
+			}
 			 top.layer.close(index);//关闭对话框。
              //setValue(item.split('_item_')[0]);
 		  },
@@ -49,7 +57,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}"
-		class="${cssClass}" style="${cssStyle}"/>
+		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>

src/main/webapp/WEB-INF/tags/sys/reimburtreeselectUser.tag

@@ -25,7 +25,7 @@
 	<input id="${id}Id" name="${name}" class="${cssClass}" 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}"
-		class="${cssClass}" style="${cssStyle}"/>
+		class="${cssClass}" style="background-color: #ffffff; ${cssStyle} "/>
        		
     </div>
 	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>

src/main/webapp/WEB-INF/tags/sys/treeselectAccessoryNoParent.tag

@@ -25,7 +25,7 @@
 	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
 	<div class="input-group">
 		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="true"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
-		class="${cssClass}" style="${cssStyle}"/>
+		class="${cssClass}" style="background-color: #ffffff; ${cssStyle}"/>
        		
     </div>
 	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>

src/main/webapp/webpage/modules/sys/gridselectcallproject.jsp

@@ -18,8 +18,8 @@
 			    $('#contentTable thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
 			    	  $('#contentTable tbody tr td input.i-checks').iCheck('uncheck');
 			    	});
-			    
-			
+
+
 		});
 
 		function getSelectedItem(){
@@ -35,7 +35,7 @@
 					return "-1";
 				  }
 			    var id =  $("#contentTable tbody tr td input.i-checks:checkbox:checked").attr("id");
-			    
+
 				var label = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codelabel").html();
 				var number = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codenumber").html();
 				return id+"_item_"+label+"_item_"+number;
@@ -124,8 +124,8 @@
 					</tbody>
 				</table>
 				<table:page page="${page}"></table:page>
+		</div>
 	</div>
-</div>
 	</div>
 </div>
 </body>

src/main/webapp/webpage/modules/sys/gridselectcallprojectOnReimbur.jsp

@@ -0,0 +1,173 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+
+            <%--var val = "<%=request.getAttribute("state")%>";--%>
+            <%--if(val!=null){--%>
+                <%--alert("++++++++++");--%>
+			<%--};--%>
+
+            $('#contentTable thead tr th input.i-checks').on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定
+			    	  $('#contentTable tbody tr td input.i-checks').iCheck('check');
+			    	});
+
+			    $('#contentTable thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
+			    	  $('#contentTable tbody tr td input.i-checks').iCheck('uncheck');
+			    	});
+			$("#td4").addClass("hide");
+
+			 $("input[name='ext']").on('ifChecked', function(event){
+                 var radioVal = $(this).val();
+                 if(radioVal == 1){
+                     //$("#td1").removeClass("hide");
+                     $("#td2").removeClass("hide");
+                     $("#td3").removeClass("hide");
+                     $("#td4").addClass("hide");
+                     $("#tr1").show()
+                 }else{
+                     //$("#td1").addClass("hide");
+                     $("#td2").addClass("hide");
+                     $("#td3").addClass("hide");
+                     $("#td4").removeClass("hide");
+                     $("#tr1").hide()
+                 }
+             });
+		});
+
+		function getSelectedItem() {
+			//获取单选框中得值
+			var radio = $("input[type='radio']:checked").val();
+			if (radio == 1){
+				var size = $("#contentTable tbody tr td input.i-checks:checked").size();
+				if (size == 0) {
+					top.layer.alert('请至少选择一条数据!', {icon: 0, title: '警告'});
+					return "-1";
+				}
+
+				if (size > 1) {
+					top.layer.alert('只能选择一条数据!', {icon: 0, title: '警告'});
+					return "-1";
+				}
+				var id = $("#contentTable tbody tr td input.i-checks:checkbox:checked").attr("id");
+
+				var label = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codelabel").html();
+				var number = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codenumber").html();
+				return radio + "_item_" +id + "_item_" + label + "_item_" + number;
+			}else{
+				var reimburseRemarks = $("#reimburseRemarks").val();
+				if(reimburseRemarks == undefined || reimburseRemarks == null || reimburseRemarks == ''){
+					top.layer.msg("请输入报销详情")
+				}
+				return radio + "_item_" + reimburseRemarks;
+			}
+		}
+		function page(n,s){
+			if(n) $("#pageNo").val(n);
+			if(s) $("#pageSize").val(s);
+			$("#searchForm").attr("action","${url}");
+			$("#searchForm").submit();
+	    	return false;
+	    }
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="obj" action="${url}" method="post" class="form-inline">
+					<input type="hidden" name="url" value="${url}"/>
+					<input type="hidden" name="isTotal" value="${isTotal}"/>
+					<input type="hidden" name="fieldLabels" value="${fieldLabels}"/>
+					<input type="hidden" name="fieldKeys" value="${fieldKeys}"/>
+					<input type="hidden" name="searchLabel" value="${searchLabel}"/>
+					<input type="hidden" name="searchKey" value="${searchKey}"/>
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<div id="td3">
+						<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+					</div>
+					<div class="commonQuery">
+						<div class="layui-input-block">
+							<input type="radio" class="i-checks" name="ext" checked id="ext" value="1">
+							<label for="ext">项目报销</label>
+							<input type="radio" class="i-checks" name="ext" id="ext1" value="0">
+							<label for="ext1">非项目报销</label>
+						</div>
+					</div>
+					<%--<div id="td1" class="commonQuery">
+						<div class="layui-item query athird">
+							<span class="layui-form-label">项目名称：</span>
+							<div class="layui-input-block">
+								<form:input path="${searchKey}" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird fr">
+							<div class="input-group">
+								<button id="searchReset" class="fixed-btn searchReset fr" style="margin-right: 0px;" onclick="resetSearch()">重置</button>
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>--%>
+					<div id="td4" class="commonQuery">
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label"><span class="require-item">*</span>报销详情：</label>
+							<div class="layui-input-block">
+								<input type="text" id="reimburseRemarks" name="reimburseRemarks" value="" htmlEscape="false" class="form-control required layui-input" maxlength="255">
+							</div>
+						</div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div id="td2" class="full-width fl form-group first">
+			<div class="layui-item layui-col-xs12 form-table-container">
+				<table id="contentTable" class="table details table-bordered table-condensed">
+					<thead>
+					<tr>
+						<th width="50px"></th>
+						<c:forEach items="${labelNames}" var="projectName"  varStatus="status">
+							<th>项目名称</th>
+							<th>项目编号</th>
+							<th>合同名称</th>
+							<th>报告号</th>
+							<th>委托方</th>
+						</c:forEach>
+					</tr>
+					</thead>
+					<tbody>
+					<c:choose>
+						<c:when test="${not empty page.list}">
+					<c:forEach items="${page.list}" var="obj">
+						<tr>
+							<td> <input type="checkbox" id="${fns:getValue(obj, 'id')}" class="i-checks"></td>
+							<td class="codelabel">${obj.projectName}</td>
+							<td class="codeprojectId">${obj.projectId}</td>
+							<td class="codeCName">${obj.workContractInfo.name}</td>
+							<td class="codenumber">${obj.reportData.number}</td>
+							<td class="codeCCName">${obj.workContractInfo.client.name}</td>
+						</tr>
+					</c:forEach>
+					</c:when>
+					<c:otherwise>
+						<tr>
+							<td colspan="5" align="center">
+								暂无数据
+							</td>
+						</tr>
+					</c:otherwise>
+					</c:choose>
+					</tbody>
+				</table>
+				<table:page page="${page}"></table:page>
+		</div>
+	</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceForm.jsp

@@ -350,12 +350,12 @@
 			</div>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>发票详情</h2></div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>上级/本公司开票：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="<c:choose><c:when test="${workInvoice.ext eq '0'}">本公司开票	</c:when><c:when test="${workInvoice.ext eq '1'}">上级公司开票</c:when></c:choose>"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceModify.jsp

@@ -357,12 +357,12 @@
 			</div>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>发票详情</h2></div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>上级/本公司开票：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="<c:choose><c:when test="${workInvoice.ext eq '0'}">本公司开票	</c:when><c:when test="${workInvoice.ext eq '1'}">上级公司开票</c:when></c:choose>"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAudit.jsp

@@ -81,9 +81,9 @@
 		<div class="form-group layui-row first ">
 			<div class="form-group-label"><h2>基础信息</h2></div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>报销人：</label>
+				<label class="layui-form-label">报销人：</label>
 				<div class="layui-input-block">
-					<form:input path="submitterName" htmlEscape="false"  id="submitterName"  class="form-control layui-input" value = "${workReimbursement.submitterName}"/>
+					<form:input path="submitterName" htmlEscape="false" readonly="true"  id="submitterName"  class="form-control layui-input" value = "${workReimbursement.submitterName}"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
@@ -313,13 +313,22 @@
 					</c:if>
 					</tbody>
 				</table>
-				<table id="contentMoneys" class="table table-bordered table-condensed summary">
-					<tr>
-						<td width="200px" style="vertical-align:middle;text-align: center;padding: 0px;"><label>总报销费用(元)：</label></td>
-						<td >
+				<table id="contentMoneys" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+					<thead>
+					<tr style="border: 0px">
+						<td width="200px" style="vertical-align:middle;text-align: center;background-color: #ffffff;"><label>总报销费用(元)：</label></td>
+						<td width="200px" style="background-color: #ffffff;"></td>
+						<td width="200px" style="background-color: #ffffff;"></td>
+						<td width="200px" style="background-color: #ffffff;"></td>
+						<td width="200px" style="background-color: #ffffff;"></td>
+						<td width="200px" style="border: 0px;font-weight: bold;text-align: center;background-color: #ffffff;">
 							<fmt:formatNumber value="${workReimbursement.money}" pattern="#,#00.00"/>
 						</td>
+						<td width="200px" style="background-color: #ffffff;"></td>
+						<td width="200px" style="background-color: #ffffff;"></td>
+						<td width="200px" style="background-color: #ffffff;"></td>
 					</tr>
+					</thead>
 				</table>
 			</div>
 		</div>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementCWAudit.jsp

@@ -632,13 +632,22 @@
                         </c:if>
                         </tbody>
                     </table>
-                    <table id="contentMoneys" class="table table-bordered table-condensed summary">
-                        <tr>
-                            <td width="200px" style="vertical-align:middle;text-align: center;padding: 0px;"><label>总报销费用(元)：</label></td>
-                            <td >
+                    <table id="contentMoneys" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+                        <thead>
+                        <tr style="border: 0px">
+                            <td width="200px" style="vertical-align:middle;text-align: center;background-color: #ffffff;"><label>总报销费用(元)：</label></td>
+                            <td width="200px" style="background-color: #ffffff;"></td>
+                            <td width="200px" style="background-color: #ffffff;"></td>
+                            <td width="200px" style="background-color: #ffffff;"></td>
+                            <td width="200px" style="background-color: #ffffff;"></td>
+                            <td width="200px" style="border: 0px;font-weight: bold;text-align: center;background-color: #ffffff;">
                                 <fmt:formatNumber value="${workReimbursement.money}" pattern="#,#00.00"/>
                             </td>
+                            <td width="200px" style="background-color: #ffffff;"></td>
+                            <td width="200px" style="background-color: #ffffff;"></td>
+                            <td width="200px" style="background-color: #ffffff;"></td>
                         </tr>
+                        </thead>
                     </table>
                 </div>
             </div>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -504,21 +504,21 @@
     <form:form id="inputForm" modelAttribute="workReimbursement" action="${ctx}/workreimbursement/workReimbursement/save" method="post" class="form-horizontal" >
         <form:hidden path="id"/>
         <form:hidden path="achivesId"/>
+        <form:hidden path="submitterId"/>
         <input type="hidden" id="numberFlag" value="${workReimbursement.number}" />
         <input id="wId" type="hidden" value="${workReimbursement.id}">
         <div class="form-group layui-row first">
             <div class="form-group-label"><h2>基础信息</h2></div>
             <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>经办人：</label>
+                <label class="layui-form-label">经办人：</label>
                 <div class="layui-input-block with-icon">
                     <div class="input-group">
-                        <sys:gridSelectUser id="submitterId" name="submitterId" value="${workReimbursement.submitterId}" labelName="submitterName" labelValue="${workReimbursement.submitterName}"
-                                            allowInput="false"   title="用户" url="${ctx}/sys/office/gridSelectUser" cssClass="form-control required layui-input" isAll="true" type="null"  isSingle="true"></sys:gridSelectUser>
+                        <form:input path="submitterName" htmlEscape="false" readonly="true" class="form-control layui-input" value = "${workReimbursement.submitterName}"/>
                     </div>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>报销编号：</label>
+                <label class="layui-form-label">报销编号：</label>
                 <div class="layui-input-block">
                     <div class="input-group">
                         <form:input path="number" id="number" htmlEscape="false"  readonly="true"  class="form-control layui-input"/>
@@ -645,7 +645,7 @@
                         <%--<th width="60px">编号</th>--%>
                         <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>
@@ -661,6 +661,7 @@
                             <tr id="workAccountList${index.index}">
                                 <td class="hide">
                                     <input id="workAccountList${index.index}_id" name="workAccountList[${index.index}].id" type="hidden" value="${workAccount.id}"/>
+                                    <input id="workAccountList${index.index}_projectRadio" name="workAccountList[${index.index}].projectRadio" type="hidden" value="${workAccount.projectRadio}"/>
                                     <input id="workAccountList${index.index}_delFlag" name="workAccountList[${index.index}].delFlag" type="hidden" value="0"/>
                                 </td>
                                 <%--<td>
@@ -717,18 +718,29 @@
                     </c:if>
                     </tbody>
                 </table>
-                <table id="contentMoneys" class="table table-bordered table-condensed can-edit summary">
-                    <tr>
-                        <td width="200px" style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>总报销费用(元)：</label></td>
-                        <td >
-                            <input htmlEscape="false" id="moneys" name="money" readonly="true" class="form-control layui-input" value="${workReimbursement.money}"/>
-                        </td>
-                    </tr>
+                <table id="contentMoneys" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+                    <thead>
+                        <tr style="border: 0px">
+                            <td width="200px" style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>总报销费用(元)：</label></td>
+                            <td width="200px"></td>
+                            <td width="200px"></td>
+                            <td width="200px"></td>
+                            <td width="200px"></td>
+                            <td width="200px" style="border: 0px">
+                                <input htmlEscape="false" style="border: 0px; font-weight: bold;" id="moneys" name="money" readonly="true" class="form-control layui-input" value="${workReimbursement.money}"/>
+                            </td>
+                            <td width="200px"></td>
+                            <td width="200px"></td>
+                            <td width="200px"></td>
+                            <td width="100px"></td>
+                        </tr>
+                    </thead>
                 </table>
                 <script type="text/template" id="workAccountListTpl">//<!--
                     <tr id="workAccountList{{idx}}">
                         <td class="hide">
                             <input id="workAccountList{{idx}}_id" name="workAccountList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                            <input id="workAccountList{{idx}}_projectRadio"  name="workAccountList[{{idx}}].projectRadio" type="hidden" value="{{row.projectRadio}}"/>
                             <input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
                         </td>
                         <%--<td>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormDetail.jsp

@@ -376,27 +376,23 @@
                 </c:if>
                 </tbody>
             </table>
-            <table id="contentMoneys" class="table table-bordered table-condensed summary">
-                <tr>
-                    <td width="200px" style="vertical-align:middle;text-align: center;padding: 0px;"><label>总报销费用(元)：</label></td>
-                    <td >
-                        <fmt:formatNumber value="${workReimbursement.money}" pattern="#,#00.00"/>
-                    </td>
-                    <%--<td width="200px" style="vertical-align:middle;text-align: center;padding: 0px;"><label>总报销费用(元)：</label></td>
-                    <td>
-                        <input htmlEscape="false" id="moneys"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workReimbursement.money}" pattern="#,#00.00"/>"/>
-                        <input htmlEscape="false" name="money" type="hidden"  readonly="true" class="form-control layui-input" value="${workReimbursement.money}"/>
-                    </td>
-                    <td width="150px" style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>考核金额总额(元)：</label></td>
-                    <td >
-                        <input htmlEscape="false" id="checkMoneys"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workReimbursement.checkMoneys}" pattern="#,#00.00"/>"/>
-                    </td>
-                    <td width="150px" style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>实际报销费用(元)：</label></td>
-                    <td >
-                        <input htmlEscape="false" id="backmoneys"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workReimbursement.backmoneys}" pattern="#,#00.00"/>"/>
-                    </td>--%>
-                </tr>
-            </table>
+                <table id="contentMoneys" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+                    <thead>
+                    <tr style="border: 0px">
+                        <td width="200px" style="vertical-align:middle;text-align: center;background-color: #ffffff;"><label>总报销费用(元)：</label></td>
+                        <td width="200px" style="background-color: #ffffff;"></td>
+                        <td width="200px" style="background-color: #ffffff;"></td>
+                        <td width="200px" style="background-color: #ffffff;"></td>
+                        <td width="200px" style="background-color: #ffffff;"></td>
+                        <td width="200px" style="border: 0px;font-weight: bold;text-align: center;background-color: #ffffff;">
+                            <fmt:formatNumber value="${workReimbursement.money}" pattern="#,#00.00"/>
+                        </td>
+                        <td width="200px" style="background-color: #ffffff;"></td>
+                        <td width="200px" style="background-color: #ffffff;"></td>
+                        <td width="200px" style="background-color: #ffffff;"></td>
+                    </tr>
+                    </thead>
+                </table>
         </div>
     </div>
     <div class="form-group layui-row">

src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

@@ -512,6 +512,7 @@
     <div class="container">
     <form:form id="inputForm" modelAttribute="workReimbursement" action="${ctx}/workreimbursement/workReimbursement/saveAudit" method="post" class="form-horizontal" >
     <form:hidden path="id"/>
+    <form:hidden path="submitterId"/>
     <form:hidden path="home"/>
     <form:hidden path="submitter" id="submitter" />
     <form:hidden path="act.taskId"/>
@@ -528,13 +529,12 @@
                 <label class="layui-form-label"><span class="require-item">*</span>报销人：</label>
                 <div class="layui-input-block with-icon">
                     <div class="input-group">
-                        <sys:gridSelectUser id="submitterId" name="submitterId" value="${workReimbursement.submitterId}" labelName="submitterName" labelValue="${workReimbursement.submitterName}"
-                                            allowInput="false"   title="用户" url="${ctx}/sys/office/gridSelectUser" cssClass="form-control required layui-input" isAll="true" type="null"  isSingle="true"></sys:gridSelectUser>
+                        <form:input path="submitterName" htmlEscape="false" readonly="true" class="form-control layui-input" value = "${workReimbursement.submitterName}"/>
                     </div>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>报销编号：</label>
+                <label class="layui-form-label">报销编号：</label>
                 <div class="layui-input-block">
                     <div class="input-group">
                         <form:input path="number" id="number" htmlEscape="false"  readonly="true"  class="form-control layui-input"/>
@@ -784,6 +784,11 @@
                 <c:if test="${not empty workReimbursement.workAccountList}">
                     <c:forEach items="${workReimbursement.workAccountList}" var="workAccount" varStatus="index">
                         <tr id="workAccountList${index.index}">
+                            <td class="hide">
+                                <input id="workAccountList${index.index}_id" name="workAccountList[${index.index}].id" type="hidden" value="${workAccount.id}"/>
+                                <input id="workAccountList${index.index}_projectRadio" name="workAccountList[${index.index}].projectRadio" type="hidden" value="${workAccount.projectRadio}"/>
+                                <input id="workAccountList${index.index}_delFlag" name="workAccountList[${index.index}].delFlag" type="hidden" value="0"/>
+                            </td>
                             <td>
                                 <div class="project_reimbursement_div"  style="width: 200px">
                                     <sys:reimburtreeselectUser id="workAccountList${index.index}_reimbursementName" name="workAccountList[${index.index}].reimbursementName" value="${projectRecords.leaderIds}" labelName="reimbursementNameName" labelValue="${workAccount.reimbursementName}"
@@ -832,13 +837,23 @@
                 </c:if>
                 </tbody>
             </table>
-            <table id="contentMoneys" class="table table-bordered table-condensed can-edit summary">
-                <tr>
+            <table id="contentMoneys" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+                <thead>
+                <tr style="border: 0px">
                     <td width="200px" style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>总报销费用(元)：</label></td>
-                    <td >
-                        <input htmlEscape="false" id="moneys" name="money" readonly="true" class="form-control layui-input" value="${workReimbursement.money}"/>
+                    <td width="200px"></td>
+                    <td width="200px"></td>
+                    <td width="200px"></td>
+                    <td width="200px"></td>
+                    <td width="200px" style="border: 0px">
+                        <input htmlEscape="false" style="border: 0px;font-weight: bold;" id="moneys" name="money" readonly="true" class="form-control layui-input" value="${workReimbursement.money}"/>
                     </td>
+                    <td width="200px"></td>
+                    <td width="200px"></td>
+                    <td width="200px"></td>
+                    <td width="100px"></td>
                 </tr>
+                </thead>
             </table>
             <script type="text/template" id="workAccountListTpl">//<!--
                                     <tr id="workAccountList{{idx}}">