报销类型管理新增页和首页变更

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -316,7 +316,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 	}
 	public Page<ProjectRecords> ruralFindPageByRe(Page<ProjectRecords> page, ProjectRecords projectRecords,String userId) {
 		projectRecords.setPage(page);
-		projectRecords.setUserId(userId);
+		projectRecords.setUserId(UserUtils.getUser().getId());
 		List<ProjectRecords> recordsList = dao.ruralFindPageByRe(projectRecords);
 		page.setList(recordsList);
 		return page;

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -926,7 +926,10 @@ public class UserController extends BaseController {
                 map.put("pId", officeId);
                 String name = StringUtils.replace(e.getName(), " ", "");
                 name = StringEscapeUtils.unescapeHtml4(name);
+                String officeName = StringUtils.replace(e.getOffice().getName(), " ", "");
+                officeName = StringEscapeUtils.unescapeHtml4(officeName);
                 map.put("name", name);
+                map.put("officeId", officeName);
                 mapList.add(map);
             }
         }else{
@@ -947,6 +950,9 @@ public class UserController extends BaseController {
                     String name = StringUtils.replace(e.getName(), " ", "");
                     name = StringEscapeUtils.unescapeHtml4(name);
                     map.put("name", name);
+                    String officeName = StringUtils.replace(e.getOffice().getName(), " ", "");
+                    officeName = StringEscapeUtils.unescapeHtml4(officeName);
+                    map.put("officeId", officeName);
                     mapList.add(map);
                 }
             }

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -181,7 +181,9 @@ import com.jeeplus.modules.workregularapply.service.WorkRegularScoreService;
 import com.jeeplus.modules.workreimbur.entity.WorkReimbur;
 import com.jeeplus.modules.workreimbur.service.WorkReimburService;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
+import com.jeeplus.modules.workreimbursement.entity.WorkReimbursementTypeInfo;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementService;
+import com.jeeplus.modules.workreimbursement.service.WorkReimbursementTypeService;
 import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
 import com.jeeplus.modules.workrelationship.service.WorkRelationshipService;
 import com.jeeplus.modules.workrepay.entity.WorkRepay;
@@ -430,6 +432,8 @@ public class WorkProjectNotifyController extends BaseController {
 	private ProjectImplementEarlyService projectImplementEarlyService;
 	@Autowired
 	private ProjectTemplateService projectTemplateService;
+	@Autowired
+	private WorkReimbursementTypeService workReimbursementTypeService;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -898,6 +902,14 @@ public class WorkProjectNotifyController extends BaseController {
 			if (StringUtils.isNotBlank(workProjectNotify.getType())) {
 				if (workProjectNotify.getType().equals("13")) {    //报销
 					WorkReimbursement workReimbursement = workReimbursementService.get(workProjectNotify.getNotifyId());
+					//判断报销类型状态并添加报销类型信息数据
+					if(StringUtils.isNotBlank(workReimbursement.getType())){
+						WorkReimbursementTypeInfo workReimbursementTypeInfo = workReimbursementTypeService.get(workReimbursement.getType());
+						workReimbursement.setWorkReimbursementTypeInfo(workReimbursementTypeInfo);
+						if(StringUtils.isNotBlank(workReimbursementTypeInfo.getStandardDetail())){
+							workReimbursement.setTypeName(workReimbursementTypeInfo.getStandardDetail());
+						}
+					}
 					workReimbursement.setAct(getByAct(workReimbursement.getProcessInstanceId()));
 					workReimbursement.setHome("home");
 					model.addAttribute("workReimbursement", workReimbursement);

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

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workreimbursement.entity;
 
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sysmtree.entity.SysMtree;
@@ -21,7 +22,8 @@ import java.util.List;
 public class WorkAccount extends DataEntity<WorkAccount> {
 	
 	private static final long serialVersionUID = 1L;
-	private String type;		// 类型
+	private String type;		// 报销类别
+	private String typeName;		// 报销类别
 	private String financialSubjects;		// 财务科目
 	private String financialSubjectss;		// 财务科目
 	private String moneyAbstract;		// 报销费用摘要
@@ -31,6 +33,14 @@ public class WorkAccount extends DataEntity<WorkAccount> {
 	private WorkReimbursement workReimbursement;		// 报销单主键 父类
 	private List<WorkAccountAudit> workAccountAuditList;		// 报销单主键 父类
 	private String invoiceType;//发票类型
+	private String projectName;//项目名称
+	private ProjectRecords project;//项目
+	private String projectReportNumber;//项目报告号
+	private String officeId;//部门id
+	private String reimbursementName;//报销人
+	private String bills;//单据数量
+	private String evectionNumber;//出差天数
+
 
 	public String getInvoiceType() {
 		return invoiceType;
@@ -120,4 +130,68 @@ public class WorkAccount extends DataEntity<WorkAccount> {
 	public void setWorkAccountAuditList(List<WorkAccountAudit> workAccountAuditList) {
 		this.workAccountAuditList = workAccountAuditList;
 	}
+
+	public String getProjectName() {
+		return projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
+	public String getProjectReportNumber() {
+		return projectReportNumber;
+	}
+
+	public void setProjectReportNumber(String projectReportNumber) {
+		this.projectReportNumber = projectReportNumber;
+	}
+
+	public String getOfficeId() {
+		return officeId;
+	}
+
+	public void setOfficeId(String officeId) {
+		this.officeId = officeId;
+	}
+
+	public String getReimbursementName() {
+		return reimbursementName;
+	}
+
+	public void setReimbursementName(String reimbursementName) {
+		this.reimbursementName = reimbursementName;
+	}
+
+	public String getBills() {
+		return bills;
+	}
+
+	public void setBills(String bills) {
+		this.bills = bills;
+	}
+
+	public String getEvectionNumber() {
+		return evectionNumber;
+	}
+
+	public void setEvectionNumber(String evectionNumber) {
+		this.evectionNumber = evectionNumber;
+	}
+
+	public ProjectRecords getProject() {
+		return project;
+	}
+
+	public void setProject(ProjectRecords project) {
+		this.project = project;
+	}
+
+	public String getTypeName() {
+		return typeName;
+	}
+
+	public void setTypeName(String typeName) {
+		this.typeName = typeName;
+	}
 }

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

@@ -59,6 +59,8 @@ public class WorkReimbursement extends ActEntity<WorkReimbursement> {
 	private String checkMoneys;
 	private String createOffice;// 创建人的部门编号
 	private String type;
+	private String typeName;
+	private WorkReimbursementTypeInfo workReimbursementTypeInfo;
 	public String getCreateOffice() {
 		return createOffice;
 	}
@@ -487,4 +489,20 @@ public class WorkReimbursement extends ActEntity<WorkReimbursement> {
 	public void setType(String type) {
 		this.type = type;
 	}
+
+	public WorkReimbursementTypeInfo getWorkReimbursementTypeInfo() {
+		return workReimbursementTypeInfo;
+	}
+
+	public void setWorkReimbursementTypeInfo(WorkReimbursementTypeInfo workReimbursementTypeInfo) {
+		this.workReimbursementTypeInfo = workReimbursementTypeInfo;
+	}
+
+	public String getTypeName() {
+		return typeName;
+	}
+
+	public void setTypeName(String typeName) {
+		this.typeName = typeName;
+	}
 }

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

@@ -488,6 +488,9 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     public void updateWorkReimbursementInfo(WorkReimbursement workReimbursement) {
         try {
             for (WorkAccount workAccount : workReimbursement.getWorkAccountList()) {
+                if(null == workAccount.getId()){
+                    continue;
+                }
                 if (WorkAccount.DEL_FLAG_NORMAL.equals(workAccount.getDelFlag())) {
                     List<WorkAccountAudit> workAccountAudits = workAccount.getWorkAccountAuditList();
                     List<WorkAccountAudit> workAccountAuditList = new ArrayList<>();
@@ -625,10 +628,12 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
         if (!"modifyApply".equals(taskDefKey) && !taskDefKey.contains("audit") && !taskDefKey.contains("cw") ) {
             actTaskService.claim(workReimbursement.getAct().getTaskId(), UserUtils.getUser().getId());
         }else if(taskDefKey.contains("cw")) {
-            updateWorkReimbursementInfo(workReimbursement);
+            //updateWorkReimbursementInfo(workReimbursement);
         }else{
             workReimbursement.getAct().setFlag("yes");
-            updateWorkReimbursementInfo(workReimbursement);
+            if("modifyApply".equals(taskDefKey)) {
+                updateWorkReimbursementInfo(workReimbursement);
+            }
         }
         String comment = "";
         if (workReimbursement.getStatus().equals("4")){

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

@@ -40,7 +40,9 @@ import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.workreimbursement.entity.WorkAccount;
 import com.jeeplus.modules.workreimbursement.entity.WorkAccountAudit;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
+import com.jeeplus.modules.workreimbursement.entity.WorkReimbursementTypeInfo;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementService;
+import com.jeeplus.modules.workreimbursement.service.WorkReimbursementTypeService;
 import com.jeeplus.modules.workreimbursement.utils.VarStr;
 import com.jeeplus.modules.workreimbursementback.entity.WorkReimbursementBack;
 import com.jeeplus.modules.workreimbursementback.service.WorkReimbursementBackService;
@@ -120,6 +122,8 @@ public class WorkReimbursementController extends BaseController {
 	private WorkProjectUserDao workProjectUserDao;
 	@Autowired
 	private WorkReimbursementBackService workReimbursementBackService;
+	@Autowired
+	private WorkReimbursementTypeService workReimbursementTypeService;
 
 	@ModelAttribute
 	public WorkReimbursement get(@RequestParam(required=false) String id) {
@@ -157,6 +161,14 @@ public class WorkReimbursementController extends BaseController {
 		String view = "workReimbursementFormAdd";
 		Office office = UserUtils.getSelectOffice();
 		String tabId = request.getParameter("tabId");
+		//判断报销类型状态并添加报销类型信息数据
+		if(StringUtils.isNotBlank(workReimbursement.getType())){
+			WorkReimbursementTypeInfo workReimbursementTypeInfo = workReimbursementTypeService.get(workReimbursement.getType());
+			workReimbursement.setWorkReimbursementTypeInfo(workReimbursementTypeInfo);
+			if(StringUtils.isNotBlank(workReimbursementTypeInfo.getStandardDetail())){
+				workReimbursement.setTypeName(workReimbursementTypeInfo.getStandardDetail());
+			}
+		}
 		if("1".equals(tabId)){
 			view = "workReimbursementFormDetail";
 		}else if("3".equals(tabId)){

src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -253,7 +253,7 @@
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",
 		o.top_company AS "office.name"
-		FROM project_records a
+		FROM rural_project_records a
 		<include refid="projectRecordsJoins"/>
 		LEFT JOIN work_project_user w on a.id = w.project_id
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
@@ -662,6 +662,7 @@
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",
 		o.name AS "office.name"
+		,prd.number as "reportData.number"
 		FROM rural_project_records a
 		<include refid="projectRecordsJoins"/>
 		LEFT JOIN work_project_user w on a.id = w.project_id
@@ -671,6 +672,7 @@
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		LEFT JOIN sys_office s ON s.id = a.company_id
 		LEFT JOIN sys_office o ON o.id = a.office_id
+		LEFT JOIN project_report_data prd ON a.id = prd.project_id
 		where a.status='5'  and a.del_flag='0' and w.user_id=#{userId} and w.del_flag='0'
 		and wci.del_flag='0' and (wci.completion_status!='5' or wci.completion_status is null)
 		GROUP BY a.id

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -424,7 +424,9 @@
 	<select id="findUserByOfficeId" resultType="User" useCache="true">
 		SELECT
 		a.id, a.name, a.login_name,a.photo
+		,so.name as "office.name"
 		FROM sys_user a
+		left join sys_office so on so.id = a.office_id
 		LEFT JOIN work_staff_achives uo ON uo.user_id = a.id
 		LEFT JOIN sys_office o ON o.id = uo.office_id
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL}

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

@@ -16,7 +16,10 @@
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.remarks AS "remarks",
-		a.del_flag AS "delFlag"
+		a.del_flag AS "delFlag",
+		a.project_id as "project.id",
+		a.bills as "bills",
+		a.evection_number as "evectionNumber"
 	</sql>
 	
 	<sql id="workAccountJoins">
@@ -26,16 +29,36 @@
 	<select id="get" resultType="WorkAccount" >
 		SELECT 
 			<include refid="workAccountColumns"/>
+		,su.name as "reimbursementName"
+		,so.name as "officeId"
+		,p.project_name as "project.projectName"
+		,prd.number as "projectReportNumber"
+		,t.standard_detail as "typeName"
 		FROM work_account a
 		<include refid="workAccountJoins"/>
+		left join sys_user su on su.id = a.reimbursement_name
+		left join sys_office so on so.id = su.office_id
+		left join rural_project_records p on p.id = a.project_id
+		left join project_report_data prd on prd.project_id = p.id
+		left join work_reimbursement_type_info t on a.type = t.id
 		WHERE a.id = #{id}
 	</select>
 	
 	<select id="findList" resultType="WorkAccount" >
 		SELECT 
 			<include refid="workAccountColumns"/>
+			,su.name as "reimbursementName"
+			,so.name as "officeId"
+			,p.project_name as "project.projectName"
+			,prd.number as "projectReportNumber"
+			,t.standard_detail as "typeName"
 		FROM work_account a
 		<include refid="workAccountJoins"/>
+		left join sys_user su on su.id = a.reimbursement_name
+		left join sys_office so on so.id = su.office_id
+		left join rural_project_records p on p.id = a.project_id
+		left join project_report_data prd on prd.project_id = p.id
+		left join work_reimbursement_type_info t on a.type = t.id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="workReimbursement != null and workReimbursement != ''">
@@ -94,7 +117,11 @@
 			update_date,
 			remarks,
 			del_flag,
-			invoice_type
+			invoice_type,
+			project_id,
+			reimbursement_name,
+			bills,
+			evection_number
 		) VALUES (
 			#{id},
 			#{type},
@@ -109,7 +136,11 @@
 			#{updateDate},
 			#{remarks},
 			#{delFlag},
-			#{invoiceType}
+			#{invoiceType},
+			#{project.id},
+			#{reimbursementName},
+			#{bills},
+			#{evectionNumber}
 		)
 	</insert>
 
@@ -127,17 +158,41 @@
 	</update>
 	
 	<update id="update">
-		UPDATE work_account SET 	
+		UPDATE work_account SET
+		<if test="type != null and type != ''">
 			type = #{type},
+		</if>
+		<if test="money != null and money != ''">
 			money = #{money},
+		</if>
+		<if test="financialSubjects != null and financialSubjects != ''">
 			financial_subjects = #{financialSubjects},
+		</if>
+		<if test="moneyAbstract != null and moneyAbstract != ''">
 			money_abstract = #{moneyAbstract},
+		</if>
+		<if test="tax != null and tax != ''">
 			tax = #{tax},
+		</if>
 			work_reimbursement_id = #{workReimbursement.id},
-			update_by = #{updateBy.id},
-			update_date = #{updateDate},
+		<if test="remarks != null and remarks != ''">
 			remarks = #{remarks},
-			invoice_type = #{invoiceType}
+		</if>
+		<if test="invoiceType != null and invoiceType != ''">
+			invoice_type = #{invoiceType},
+		</if>
+			project_id = #{project.id},
+		<if test="reimbursementName != null and reimbursementName != ''">
+			reimbursement_name = #{reimbursementName},
+		</if>
+		<if test="bills != null and bills != ''">
+			bills = #{bills},
+		</if>
+		<if test="evectionNumber != null and evectionNumber != ''">
+			evection_number = #{evectionNumber},
+		</if>
+			update_by = #{updateBy.id},
+			update_date = #{updateDate}
 		WHERE id = #{id}
 	</update>
 	

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

@@ -11,7 +11,6 @@
 		a.submitter AS "submitter",
 		a.submitter_date AS "submitterDate",
 		a.project_id AS "project.id",
-		a.money AS "money",
 		a.backmoney as "backmoney",
 		a.backmoneys as "backmoneys",
 		a.checkMoneys as "checkMoneys",
@@ -45,7 +44,8 @@
     
 	<select id="get" resultType="WorkReimbursement" >
 		SELECT 
-			<include refid="workReimbursementColumns"/>
+			<include refid="workReimbursementColumns"/>,
+		a.money AS "money"
 		FROM work_reimbursement a
 		<include refid="workReimbursementJoins"/>
 		WHERE a.id = #{id}
@@ -54,15 +54,18 @@
 	<select id="findList" resultType="WorkReimbursement" >
 		SELECT 
 			<include refid="workReimbursementColumns"/>
+		,wa.reimbursement_name AS "submitterId"
+		,wa.money as "money"
 		FROM work_reimbursement a
-		<include refid="workReimbursementJoins"/>
+		left join work_account wa on wa.work_reimbursement_id =a.id
+		left join rural_project_records p on p.id = wa.project_id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="id != null and id != ''">
 				AND a.id = #{id}
 			</if>
 			<if test="project != null and project.id != null and project.id != ''">
-				AND a.project_id = #{project.id}
+				AND wa.project_id = #{project.id}
 			</if>
 			<if test="status != '' and status != null">
 				AND a.status = #{status}
@@ -82,7 +85,7 @@
 			<if test="submitterId != null and submitterId != ''">
 				AND a.submitter_id = #{submitterId}
 			</if>
-			${sqlMap.dsf} or a.submitter_id=#{currentUser.id}
+			${sqlMap.dsf}
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -97,13 +100,15 @@
 	<select id="queryCount" resultType="int" >
 		SELECT count(1)
 		FROM work_reimbursement a
+		left join work_account wa on wa.work_reimbursement_id =a.id
+		left join rural_project_records p on p.id = wa.project_id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="id != null and id != ''">
 				AND a.id = #{id}
 			</if>
 			<if test="project != null and project.id != null and project.id != ''">
-				AND a.project_id = #{project.id}
+				AND wa.project_id = #{project.id}
 			</if>
 			<if test="status != '' and status != null">
 				AND a.status = #{status}
@@ -123,7 +128,7 @@
 			<if test="submitterId != null and submitterId != ''">
 				AND a.submitter_id = #{submitterId}
 			</if>
-			${sqlMap.dsf} or a.submitter_id=#{currentUser.id}
+			${sqlMap.dsf}
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -137,7 +142,8 @@
 	
 	<select id="findAllList" resultType="WorkReimbursement" >
 		SELECT 
-			<include refid="workReimbursementColumns"/>
+			<include refid="workReimbursementColumns"/>,
+		a.money AS "money"
 		FROM work_reimbursement a
 		<include refid="workReimbursementJoins"/>
 		<where>

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

@@ -31,7 +31,7 @@
 	       		 <button type="button"  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>
 <script type="text/javascript">
@@ -40,9 +40,9 @@
 		if ($("#${id}Button").hasClass("disabled")){
 			return true;
 		}
-		// 正常打开	
+		// 正常打开
 		top.layer.open({
-		    type: 2, 
+		    type: 2,
 		    area: ['300px', '420px'],
 		    title:"选择${title}",
 		    ajaxData:{selectIds: $("#${id}Id").val()},
@@ -100,7 +100,7 @@
     	cancel: function(index){ //或者使用btn2
     	           //按钮【按钮二】的回调
     	       }
-		}); 
-	
+		});
+
 	});
 </script>

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

@@ -37,7 +37,8 @@
 			    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();
-				return id+"_item_"+label;
+				var number = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codenumber").html();
+				return id+"_item_"+label+"_item_"+number;
 		}
 		function page(n,s){
 			if(n) $("#pageNo").val(n);
@@ -76,6 +77,7 @@
 							<th>项目名称</th>
 							<th>项目编号</th>
 							<th>合同名称</th>
+							<th>报告号</th>
 							<th>委托方</th>
 						</c:forEach>
 					</tr>
@@ -87,9 +89,10 @@
 						<tr>
 							<td> <input type="checkbox" id="${fns:getValue(obj, 'id')}" class="i-checks"></td>
 							<td class="codelabel">${obj.projectName}</td>
-							<td class="codelabel">${obj.projectId}</td>
-							<td class="codelabel">${obj.workContractInfo.name}</td>
-							<td class="codelabel">${obj.workContractInfo.client.name}</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>

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

@@ -103,7 +103,7 @@
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value = "${workReimbursement.officeName}"/>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">银行卡号：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"  class="form-control layui-input" value = "${workReimbursement.bankCard}"/>
@@ -123,12 +123,18 @@
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workReimbursement.project.projectName}"/>
 				</div>
 			</div>
-				<%--<div class="layui-item layui-col-sm6 td1">
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">报销类别：</label>
+				<div class="layui-input-block">
+					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workReimbursement.typeName}"/>
+				</div>
+			</div>
+				&lt;%&ndash;<div class="layui-item layui-col-sm6 td1">
                     <label class="layui-form-label">项目负责人：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true"  class="form-control layui-input" value="${workReimbursement.projectMasterName}"/>
                     </div>
-                </div>--%>
+                </div>&ndash;%&gt;
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label double-line">是否对公报销：</label>
 				<div class="layui-input-block">
@@ -159,7 +165,7 @@
 				<div class="layui-input-block">
 					<input 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">报销日期：</label>
@@ -253,15 +259,19 @@
 		</div>--%>
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>报销详情</h2></div>
-			<div class="layui-item layui-col-xs12 form-table-container" >
-				<table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
+			<div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
+				<table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details">
 					<thead>
 					<tr>
-						<th width="200px">财务科目</th>
-						<th>报销费用摘要</th>
-						<th width="150px">发票类型</th>
-						<th width="150px">报销费用（元）</th>
-						<th>备注</th>
+						<th width="200px">报销人</th>
+						<th width="200px">报销部门</th>
+						<th width="200px">报销项目</th>
+						<th width="200px">报告号</th>
+						<th width="200px">报销类型</th>
+						<th width="200px">费用（元）</th>
+						<th width="200px">收据张数</th>
+						<th width="200px">出差天数</th>
+						<th width="200px">内容</th>
 					</tr>
 					</thead>
 					<tbody id="workAccountList">
@@ -270,27 +280,33 @@
 							<tr id="workAccountList${index.index}">
 								<td class="hide">
 								</td>
-								<td>
-									<div class="project_reimbursement_div">
-											${fns:getMainDictLabel(workAccount.financialSubjects, 'project_reimbursement', '')}
-									</div>
-									<div class="not_project_reimbursement_div" style="display:none;">
-											${fns:getMainDictLabel(workAccount.financialSubjectss, 'not_project_reimbursement', '')}
-									</div>
+								<td style="text-align: center; vertical-align: middle">
+										${workAccount.reimbursementName}
 								</td>
-								<td title="${workAccount.moneyAbstract}">
-										${workAccount.moneyAbstract}
+								<td style="text-align: center; vertical-align: middle">
+										${workAccount.officeId}
 								</td>
-								<td title="${workAccount.invoiceType}">
-										${workAccount.invoiceType}
+								<td style="text-align: center; vertical-align: middle" title="${workAccount.project.projectName}">
+										${workAccount.project.projectName}
 								</td>
-								<td>
+								<td style="text-align: center; vertical-align: middle" title="${workAccount.projectReportNumber}">
+										${workAccount.projectReportNumber}
+								</td>
+								<td style="text-align: center; vertical-align: middle" title="${workAccount.typeName}">
+										${workAccount.typeName}
+								</td>
+								<td style="text-align: center; vertical-align: middle">
 									<fmt:formatNumber value="${workAccount.money}" pattern="#,#00.00"/>
 								</td>
-								<td title="${workAccount.remarks}">
+								<td style="text-align: center; vertical-align: middle" title="${workAccount.bills}">
+										${workAccount.bills}
+								</td>
+								<td style="text-align: center; vertical-align: middle" title="${workAccount.evectionNumber}">
+										${workAccount.evectionNumber}
+								</td>
+								<td style="text-align: center; vertical-align: middle" title="${workAccount.remarks}">
 										${workAccount.remarks}
 								</td>
-
 							</tr>
 						</c:forEach>
 

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

@@ -12,7 +12,7 @@
                 if(obj == 1){
                     $('#flag').val('yes');
                     var idx1 = $("#contentTable tbody").length;
-                    for(var i = 0;i < idx1; i++){
+                    /*for(var i = 0;i < idx1; i++){
                         var idx2 = $("#workAccountList"+i+" tr").length;
                         var financialSubjectss = $("#workAccountList"+i+"_financialSubjectss").val();
                         var financialSubjects = $("#workAccountList"+i+"_financialSubjects").val();
@@ -58,7 +58,7 @@
                             parent.layer.msg("实际报销总额不能为负数,请确认输入!", {icon: 5});
                             return false;
                         }
-                    }
+                    }*/
                 }else{
                     $('#flag').val('no');
                 }
@@ -286,7 +286,7 @@
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value = "${workReimbursement.officeName}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6">
+                <%--<div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">银行卡号：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true"  class="form-control layui-input" value = "${workReimbursement.bankCard}"/>
@@ -306,12 +306,18 @@
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workReimbursement.project.projectName}"/>
                     </div>
                 </div>
-                    <%--<div class="layui-item layui-col-sm6 td1">
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">报销类别：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workReimbursement.typeName}"/>
+                    </div>
+                </div>
+                    &lt;%&ndash;<div class="layui-item layui-col-sm6 td1">
                         <label class="layui-form-label">项目负责人：</label>
                         <div class="layui-input-block">
                             <input htmlEscape="false"  readonly="true"  class="form-control layui-input" value="${workReimbursement.projectMasterName}"/>
                         </div>
-                    </div>--%>
+                    </div>&ndash;%&gt;
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label double-line">是否对公报销：</label>
                     <div class="layui-input-block">
@@ -342,7 +348,7 @@
                     <div class="layui-input-block">
                         <input 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">报销日期：</label>
@@ -434,7 +440,7 @@
                     </table>
                 </div>
             </div>--%>
-        <div class="form-group layui-row">
+        <%--<div class="form-group layui-row">
             <div class="form-group-label"><h2>报销详情</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <table id="contentTable" class="table table-bordered table-condensed no-bottom-margin can-edit">
@@ -569,8 +575,73 @@
                     var workAccountListRowIdx = 0, workAccountAuditListTpl = $("#workAccountAuditListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 </script>
             </div>
-        </div>
+        </div>--%>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>报销详情</h2></div>
+                <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
+                    <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+                        <thead>
+                        <tr>
+                            <th width="200px">报销人</th>
+                            <th width="200px">报销部门</th>
+                            <th width="200px">报销项目</th>
+                            <th width="200px">报告号</th>
+                            <th width="200px">报销类型</th>
+                            <th width="200px">费用（元）</th>
+                            <th width="200px">收据张数</th>
+                            <th width="200px">出差天数</th>
+                            <th width="200px">内容</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workAccountList">
+                        <c:if test="${not empty workReimbursement.workAccountList}">
+                            <c:forEach items="${workReimbursement.workAccountList}" var="workAccount" varStatus="index">
+                                <tr id="workAccountList${index.index}">
+                                    <td class="hide">
+                                    </td>
+                                    <td style="text-align: center; vertical-align: middle">
+                                            ${workAccount.reimbursementName}
+                                    </td>
+                                    <td style="text-align: center; vertical-align: middle">
+                                            ${workAccount.officeId}
+                                    </td>
+                                    <td style="text-align: center; vertical-align: middle" title="${workAccount.project.projectName}">
+                                            ${workAccount.project.projectName}
+                                    </td>
+                                    <td style="text-align: center; vertical-align: middle" title="${workAccount.projectReportNumber}">
+                                            ${workAccount.projectReportNumber}
+                                    </td>
+                                    <td style="text-align: center; vertical-align: middle" title="${workAccount.typeName}">
+                                            ${workAccount.typeName}
+                                    </td>
+                                    <td style="text-align: center; vertical-align: middle">
+                                        <fmt:formatNumber value="${workAccount.money}" pattern="#,#00.00"/>
+                                    </td>
+                                    <td style="text-align: center; vertical-align: middle" title="${workAccount.bills}">
+                                            ${workAccount.bills}
+                                    </td>
+                                    <td style="text-align: center; vertical-align: middle" title="${workAccount.evectionNumber}">
+                                            ${workAccount.evectionNumber}
+                                    </td>
+                                    <td style="text-align: center; vertical-align: middle" title="${workAccount.remarks}">
+                                            ${workAccount.remarks}
+                                    </td>
+                                </tr>
+                            </c:forEach>
 
+                        </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>
+                        </tr>
+                    </table>
+                </div>
+            </div>
         <div class="form-group layui-row">
             <div class="form-group-label"><h2>专用发票信息</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >

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

@@ -11,7 +11,7 @@
             if($("#submitterDate").val()==null || $("#submitterDate").val()==''){
                 $("#submitterDate").val(getNowFormatDate());
             }
-            $("input[name='ext']").on('ifChecked', function(event){
+            /*$("input[name='ext']").on('ifChecked', function(event){
                 var radioVal = $(this).val();
                 if(radioVal == 0){
                     $(".td1").removeClass("hide");
@@ -27,7 +27,7 @@
                 $("#ext1").iCheck('check')
             }else{
                 $("#ext").iCheck('check')
-            }
+            }*/
             $("input[name='isPublic']").on('ifChecked', function(event){
                 var radioVal = $(this).val();
                 if(radioVal == 1){
@@ -270,14 +270,16 @@
             if(list == '#workAccountList'){
                 tpl = tpl.replace("workAccountList[0].financialSubjects","workAccountList["+idx1+"].financialSubjects");
                 tpl = tpl.replace("workAccountList[0].financialSubjectss","workAccountList["+idx1+"].financialSubjectss");
-                var ext = $("input[name='ext']:checked").val();
+                /*var ext = $("input[name='ext']:checked").val();
                 if(ext == 0){
                     tpl = tpl.replace("not_project_reimbursement_div","not_project_reimbursement_div\" style=\"display:none;\"");
                     tpl = tpl.replace("project_reimbursement_div\" style=\"display:none;\"","project_reimbursement_div");
                 }else {
                     tpl = tpl.replace("project_reimbursement_div","project_reimbursement_div\" style=\"display:none;\"");
                     tpl = tpl.replace("not_project_reimbursement_div\" style=\"display:none;\"","not_project_reimbursement_div\"");
-                }
+                }*/
+                tpl = tpl.replace("not_project_reimbursement_div","not_project_reimbursement_div\" style=\"display:none;\"");
+                tpl = tpl.replace("project_reimbursement_div\" style=\"display:none;\"","project_reimbursement_div");
                 bornTemplete(list, idx, tpl, row, idx1);
             }
             var idx2 = $("#reimbursementVATTaxes tr").length;
@@ -466,6 +468,20 @@
                 return false;
             }
         }
+        function setParentInfo(parentId){
+            $.ajax({
+                url:"${ctx}/reimbursementType/reimbursementType/jsonData",
+                dataType:"json",
+                data:{id:parentId},
+                success:function (data) {
+                    if(data.proofread==1&&data.grade==1){
+                        $("#maxDeductTr").show();
+                    }else {
+                        $("#maxDeductTr").hide();
+                    }
+                }
+            })
+        }
     </script>
     <style>
         /*超过5个汉字，调整label的长度，以下是配套的*/
@@ -476,6 +492,10 @@
         .query .layui-input-block {
             margin-left: 116px;
         }
+        #workAccountList td{
+            padding-left: 0px;
+            padding-right: 0px;
+        }
     </style>
 </head>
 <body>
@@ -515,31 +535,24 @@
                     <input type="hidden" id="officeId" name="officeId" value="${workReimbursement.officeId}">
                 </div>
             </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">
                     <form:input path="bankCard" htmlEscape="false"  id="bankCard" minlength="16" maxlength="19" class="form-control number required layui-input" value = "${workReimbursement.bankCard}"/>
                 </div>
-            </div>
-            <div class="layui-item layui-col-sm6">
+            </div>--%>
+            <%--<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="radio" class="i-checks" name="ext" checked id="ext" value="0">
                     <label for="ext">项目报销</label>
                     <input type="radio" class="i-checks" name="ext" id="ext1" value="1">
                     <label for="ext1">非项目报销</label>
-                        <%--<input type="text" name="title" lay-verify="title" autocomplete="off" readonly="true" placeholder="" class="layui-input" value="全过程管理用户01">--%>
+                        &lt;%&ndash;<input type="text" name="title" lay-verify="title" autocomplete="off" readonly="true" placeholder="" class="layui-input" value="全过程管理用户01">&ndash;%&gt;
                 </div>
-            </div>
-            <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label">报销类型：</label>
-                <div class="layui-input-block with-icon">
-                    <sys:treeselect id="officeId" name="officeId" value="${workReimbursement.officeId}" labelName="officeName" labelValue="${workReimbursement.officeName}"
-                                    title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
-                </div>
-            </div>
+            </div>--%>
 
-            <div class="layui-item layui-col-sm6 td1">
+            <%--<div class="layui-item layui-col-sm6 td1">
                 <label class="layui-form-label"><span class="require-item">*</span>报销项目：</label>
                 <div class="layui-input-block with-icon">
                     <sys:gridselectReproject url="${ctx}/workreimbursement/workReimbursement/selectReproject" id="project" name="project.id"  value="${workReimbursement.project.id}"  title="选择报销项目" labelName="project.projectName"
@@ -548,20 +561,27 @@
             </div>
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label">报销类别：</label>
+                <div class="layui-input-block with-icon">
+                    <sys:treeselectAccessoryNoParent id="reviewParent" name="type" value="${workReimbursement.workReimbursementTypeInfo.id}" labelName="typeName" labelValue="${workReimbursement.workReimbursementTypeInfo.standardDetail}"
+                                                     title="报销类别" url="/reimbursementType/reimbursementType/treeData" extId="${workReimbursement.workReimbursementTypeInfo.id}"  cssClass="form-control  layui-input" allowClear="true" notAllowSelectParent="true"/>
+                </div>
+            </div>--%>
+            <%--<div class="layui-item layui-col-sm6">
+                <label class="layui-form-label">报销类别：</label>
                 <div class="layui-input-block">
                     <form:select id="type" path="type" class="form-control simple-select ">
                         <form:option value="" label=""/>
                         <form:options items="${fns:getMainDictList('reimbursement_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                     </form:select>
                 </div>
-            </div>
+            </div>--%>
             <%--<div class="layui-item layui-col-sm6 td1">
                 <label class="layui-form-label">项目负责人：</label>
                 <div class="layui-input-block">
                     <form:input path="projectMasterName" htmlEscape="false"  readonly="true" id="projectMasterName"  class="form-control layui-input"/>
                 </div>
             </div>--%>
-            <div class="layui-item layui-col-sm6">
+            <%--<div class="layui-item layui-col-sm6">
                 <label class="layui-form-label double-line"><span class="require-item">*</span>是否对公报销：</label>
                 <div class="layui-input-block">
                     <input type="radio" class="i-checks" name="isPublic" checked id="isPublic" value="0">
@@ -597,7 +617,7 @@
                     <form:input path="userName" htmlEscape="false"  readonly="true" id="userName"  class="form-control required layui-input" value="${workReimbursement.submitterName}"/>
                     <input type="hidden" id="createById" name="createBy.id" value="${workReimbursement.createBy.id}">
                 </div>
-            </div>
+            </div>--%>
 
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label"><span class="require-item">*</span>报销日期：</label>
@@ -613,125 +633,6 @@
                 </div>
             </div>
         </div>
-        <%--<div class="form-group layui-row">
-            <div class="form-group-label"><h2>借款明细</h2></div>
-            <div class="layui-item layui-col-xs12 form-table-container" >
-                <table id="contentTable3" class="table table-bordered table-condensed can-edit no-bottom-margin">
-                    <thead>
-                    <tr>
-                        <th width="190px">借款日期</th>
-                        <th width="190px">借款类型</th>
-                        <th width="190px">借款项目</th>
-                        <th width="190px">借款金额</th>
-                        <th width="180px">未还金额</th>
-                        <th width="100px">本次还款</th>
-                        <th width="120px">借款编号</th>
-                    </tr>
-                    </thead>
-                    <tbody id="reimbursementBackList">
-                    <c:if test="${not empty workReimbursement.reimbursementBackList}">
-                        <c:forEach items="${workReimbursement.reimbursementBackList}" var="reimbursementBack" varStatus="index">
-                            <tr id="reimbursementBackList${index.index}">
-                                <td class="hide">
-                                    <input id="reimbursementBackList${index.index}_id" name="reimbursementBackList[${index.index}].id" type="hidden" value="${reimbursementBack.id}"/>
-                                    <input id="reimbursementBackList${index.index}_workLoanId" name="reimbursementBackList[${index.index}].workLoan.id" type="hidden" value="${reimbursementBack.workLoan.id}"/>
-                                    <input id="reimbursementBackList${index.index}_delFlag" name="reimbursementBackList[${index.index}].delFlag" type="hidden" value="0"/>
-                                </td>
-                                <td>
-                                    <input id="reimbursementBackList${index.index}_1"   type="text" maxlength="20"  readonly="true" class=" form-control layui-input"
-                                           value="<fmt:formatDate value="${reimbursementBack.workLoan.loanDate}" pattern="yyyy-MM-dd"/>"/>
-                                    </input>
-                                </td>
-                                <td>
-                                    <input id="reimbursementBackList${index.index}_2"  readonly="true" type="text" value="${reimbursementBack.workLoan.type}"   class="form-control"/>
-                                </td>
-                                <td>
-                                    <input id="reimbursementBackList${index.index}_3"  readonly="true" type="text" value="${reimbursementBack.workLoan.projectRecords.projectName}"   class="form-control"/>
-                                </td>
-                                <td>
-                                    <input id="reimbursementBackList${index.index}_4"  readonly="true" type="text" value="${reimbursementBack.workLoan.money}"   class="form-control"/>
-                                </td>
-                                <td>
-                                    <input id="reimbursementBackList${index.index}_5"  readonly="true" type="text" value="${reimbursementBack.workLoan.notRepay}"   class="form-control"/>
-                                </td>
-                                <td>
-                                    <input id="reimbursementBackList${index.index}_6" onchange="getBackMoney(this.value)" name="reimbursementBackList[${index.index}].money" type="text" value="${reimbursementBack.money}"  placeholder="请输入金额" maxlength="10"  class="form-control number "/>
-                                </td>
-                                <td>
-                                    <input id="reimbursementBackList${index.index}_7"  readonly="true" type="text" value="${reimbursementBack.workLoan.num}"   class="form-control"/>
-                                </td>
-                            </tr>
-                        </c:forEach>
-                    </c:if>
-                    </tbody>
-                </table>
-                <table id="contentMoneys1" class="table table-bordered table-condensed can-edit summary">
-                    <tr>
-                        <td  style="width:190px;vertical-align:middle;text-align: center;"><label><font color="red">*</font>合计</label></td>
-                        <td  width="190px" style="vertical-align:middle;text-align: center;">
-                           -
-                        </td >
-                        <td  width="190px" style="vertical-align:middle;text-align: center;">
-                           -
-                        </td>
-                        <td  width="190px" style="vertical-align:middle;text-align: center;">
-                           -
-                        </td>
-                        <td width="180px" style="vertical-align:middle;text-align: center;">
-                           -
-                        </td>
-                        <td width="100px" style="vertical-align:middle;text-align: center;">
-                            <input  id="backmoney" value="${workReimbursement.backmoney}" name="backmoney" htmlEscape="false" readonly="true"   maxlength="12"  class="form-control "/>
-                        </td>
-                        <td  width="120px" style="vertical-align:middle;text-align: center;">
-                            -
-                        </td>
-                    </tr>
-                </table>
-                <script type="text/template" id="reimbursementBackTpl">//<!--
-                        <tr>
-                            <td class="hide">
-                                <input  id="reimbursementBackList{{idx}}_id" name="reimbursementBackList[{{idx}}].id" type="hidden" value="{{row.id}}">
-                                <input id="reimbursementBackList{{idx}}_delFlag" name="reimbursementBackList[{{idx}}].delFlag" type="hidden" value="0"/>
-                                <input id="reimbursementBackList{{idx}}_workLoanId" name="reimbursementBackList[{{idx}}].workLoan.id" type="hidden" value="{{row.workLoan.id}}"/>
-                            </td>
-                              <td>
-                              <input  id="leaveDetailList{{idx}}_1" value="{{row.workLoan.loanDate}} "  readOnly="true"  type="text" maxlength="20" class=" form-control layer-date layui-input "/></input>
-							</td>
-                            <td >
-                                <input id="reimbursementBackList{{idx}}_2"  readOnly="true"  value="{{row.workLoan.type}}" class="form-control"/>
-                            </td>
-                            <td >
-                                <input id="reimbursementBackList{{idx}}_3"  readOnly="true"  value="{{row.workLoan.projectRecords.projectName}}" class="form-control"/>
-                            </td>
-                             <td >
-                                <input id="reimbursementBackList{{idx}}_4"  readOnly="true"  value="{{row.workLoan.money}}" class="form-control"/>
-                            </td>
-                             <td >
-                                <input id="reimbursementBackList{{idx}}_5"  readOnly="true"  value="{{row.workLoan.notRepay}}" class="form-control"/>
-                            </td>
-                             <td >
-                                <input id="reimbursementBackList{{idx}}_6" onchange="getBackMoney(this.value)" name="reimbursementBackList[{{idx}}].money"  value="{{row.money}}" placeholder="请输入金额" maxlength="10"  class="form-control number "/>
-                            </td>
-                             <td >
-                                <input id="reimbursementBackList{{idx}}_7"  readOnly="true"  value="{{row.workLoan.num}}" class="form-control"/>
-                            </td>
-
-                        </tr>//-->
-                </script>
-                <script type="text/javascript">
-                    var reimbursementBackIdx = 0; var reimbursementBackTpl = $("#reimbursementBackTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                    function addRowRecord(list, idx, tpl, row){
-                        if(idx==0) {
-                            reimbursementBackIdx = $("#reimbursementBackList tr").length;
-                            idx = reimbursementBackIdx;
-                        }
-                        bornTemplete(list, idx, tpl, row, idx);
-                        reimbursementBackIdx +=1;
-                    }
-                </script>
-            </div>
-        </div>--%>
         <div class="form-group layui-row">
             <div class="form-group-label"><h2>报销详情</h2></div>
             <div class="layui-item nav-btns">
@@ -741,11 +642,16 @@
                 <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details">
                     <thead>
                     <tr>
-                        <th width="200px"><font color="red">*</font>财务科目</th>
-                        <th><font color="red">*</font>报销费用摘要</th>
-                        <th width="150px"><font color="red">*</font>发票类型</th>
-                        <th width="150px"><font color="red">*</font>报销费用（元）</th>
-                        <th width="200px">备注</th>
+                        <%--<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>
+                        <th width="200px">出差天数</th>
+                        <th width="200px">内容</th>
                         <th width="100px">操作</th>
                     </tr>
                     </thead>
@@ -757,32 +663,48 @@
                                     <input id="workAccountList${index.index}_id" name="workAccountList[${index.index}].id" type="hidden" value="${workAccount.id}"/>
                                     <input id="workAccountList${index.index}_delFlag" name="workAccountList[${index.index}].delFlag" type="hidden" value="0"/>
                                 </td>
-                                <td>
-                                    <div class="project_reimbursement_div">
-                                        <form:select id="workAccountList${index.index}_financialSubjects" path="workAccountList[${index.index}].financialSubjects" class="form-control required">
-                                            <form:option value="" label="请选择"/>
-                                            <form:options items="${fns:getMainDictList('project_reimbursement')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                        </form:select>
+                                <%--<td>
+                                    <div style="width: 60px">
+                                        <input readonly="readonly" style="text-align: center"  value="${index.index+1}" type="text" class="form-control contentDetail"/>
+
                                     </div>
-                                    <div class="not_project_reimbursement_div" style="display:none;">
-                                        <form:select id="workAccountList${index.index}financialSubjectss" path="workAccountList[${index.index}].financialSubjectss" class="form-control required">
-                                            <form:option value="" label="请选择"/>
-                                            <form:options items="${fns:getMainDictList('not_project_reimbursement')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                        </form:select>
+                                </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}"
+                                                                   title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </div>
                                 </td>
                                 <td>
-                                    <input id="workAccountList${index.index}_moneyAbstract"  name="workAccountList[${index.index}].moneyAbstract" maxlength="32" type="text" value="${workAccount.moneyAbstract}"  placeholder="请输入费用摘要"  class="form-control required"/>
+                                    <input id="workAccountList${index.index}_reimbursementNameofficeId"  name="workAccountList[${index.index}].officeId" maxlength="32" type="text" value="${workAccount.officeId}" readonly="readonly"  class="form-control required"/>
                                 </td>
+
+
                                 <td>
-                                    <select id="workAccountList${index.index}_invoiceType" name="workAccountList[${index.index}].invoiceType" class="form-control ">
-                                        <option value="专票" <c:if test="${'专票' eq workAccount.invoiceType}">selected</c:if>>专票</option>
-                                        <option value="普票" <c:if test="${'普票' eq workAccount.invoiceType}">selected</c:if>>普票</option>
-                                    </select>
+                                    <div class="not_project_reimbursement_div"  style="width: 200px">
+                                        <sys:reimburselectReproject url="${ctx}/workreimbursement/workReimbursement/selectReproject" id="workAccountList${index.index}_project" name="workAccountList[${index.index}].project.id"  value="${workAccount.project.id}"  title="选择报销项目" labelName="workAccountList[${index.index}].project.projectName"
+                                                                    labelValue="${workAccount.project.projectName}" cssClass="form-control required layui-input" fieldLabels="工程" fieldKeys="projectName" searchLabel="工程名称" searchKey="projectName" />
+                                    </div>
                                 </td>
                                 <td>
+                                    <input id="workAccountList${index.index}_projectReportNumber"  name="workAccountList[${index.index}].projectReportNumber" type="text" value="${workAccount.projectReportNumber}" maxlength="32" readonly="readonly"  class="form-control"/>
+                                </td>
+                                <td style="text-align:center;">
+                                    <div class="project_reimbursement_div"  style="width: 200px">
+                                        <sys:treeselectAccessoryNoParent id="workAccountList${index.index}_type" name="workAccountList[${index.index}].type" value="${workAccount.type}" labelName="workAccountList[${index.index}].typeName" labelValue="${workAccount.typeName}"
+                                                                         title="报销类别" url="/reimbursementType/reimbursementType/treeData" extId=""  cssClass="form-control  layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                    </div>
+                                </td>
+
+                                <td>
                                     <input id="workAccountList${index.index}_money" onchange="getMoney(this.value)" name="workAccountList[${index.index}].money" type="text" value="${workAccount.money}"  placeholder="请输入金额" maxlength="10"  class="form-control number required"/>
                                 </td>
+                                <td style="text-align:center;">
+                                    <input id="workAccountList${index.index}_bills"  name="workAccountList[${index.index}].bills" type="text" value="${workAccount.bills}" maxlength="32" placeholder="请输入单据张数"  class="form-control number"/>
+                                </td>
+                                <td style="text-align:center;">
+                                    <input id="workAccountList${index.index}_evectionNumber"  name="workAccountList[${index.index}].evectionNumber" type="text" value="${workAccount.evectionNumber}" maxlength="32" placeholder="请输入出差天数"  class="form-control number"/>
+                                </td>
                                 <td>
                                     <input id="workAccountList${index.index}_remarks" name="workAccountList[${index.index}].remarks" type="text" value="${workAccount.remarks}" maxlength="32" placeholder="请输入备注"  class="form-control"/>
                                 </td>
@@ -804,45 +726,59 @@
                     </tr>
                 </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}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
-                                        </td>
-                                        <td>
-                                            <div class="project_reimbursement_div">
-                                                <form:select id="workAccountList{{idx}}_financialSubjects" path="workAccountList[0].financialSubjects" class="form-control required">
-                                                    <form:option value="" label="请选择"/>
-                                                    <form:options items="${fns:getMainDictList('project_reimbursement')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                                </form:select>
-                                            </div>
-                                            <div class="not_project_reimbursement_div" style="display:none;">
-                                                <form:select id="workAccountList{{idx}}_financialSubjectss" path="workAccountList[0].financialSubjectss" class="form-control required">
-                                                    <form:option value="" label="请选择"/>
-                                                    <form:options items="${fns:getMainDictList('not_project_reimbursement')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                                </form:select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <input id="workAccountList{{idx}}_moneyAbstract"  name="workAccountList[{{idx}}].moneyAbstract" type="text" value="{{row.moneyAbstract}}" maxlength="32" placeholder="请输入费用摘要"  class="form-control required"/>
-                                        </td>
-                                          <td style="text-align:center;">
-                                             <select id="workAccountList{{idx}}_invoiceType" name="workAccountList[{{idx}}].invoiceType" class="form-control required">
-                                              <option value="专票">专票</option>
-                                              <option value="普票">普票</option>
-                                          </select>
-                                        </td>
-                                        <td>
-                                            <input id="workAccountList{{idx}}_money" onchange="getMoney(this.value)" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  placeholder="请输入金额" maxlength="10" class="form-control number required"/>
-                                        </td>
-                                        <td>
-                                            <input id="workAccountList{{idx}}_remarks" name="workAccountList[{{idx}}].remarks" type="text" value="{{row.remarks}}"  placeholder="请输入备注" maxlength="32" class="form-control "/>
-                                        </td>
+                    <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}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
+                        </td>
+                        <%--<td>
+                            <div style="width: 60px">
+                                <input readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                            </div>
+                        </td>--%>
+                        <td>
+                            <div class="project_reimbursement_div"  style="width: 200px">
+                                <sys:reimburtreeselectUser id="workAccountList{{idx}}_reimbursementName" name="workAccountList[{{idx}}].reimbursementName" value="${projectRecords.leaderIds}" labelName="workAccountList[{{idx}}].name" labelValue="{{row.reimbursementName}}"
+                                    title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                            </div>
+                        </td>
+                        <td>
+                            <div class="not_project_reimbursement_div"  style="width: 200px">
+                                <input id="workAccountList{{idx}}_reimbursementNameofficeId"  type="text" value="{{row.officeId}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                            </div>
+                        </td>
+                        <td>
+                            <div class="not_project_reimbursement_div"  style="width: 200px">
+                                <sys:reimburselectReproject url="${ctx}/workreimbursement/workReimbursement/selectReproject" id="workAccountList{{idx}}_project" name="workAccountList[{{idx}}].project.id"  value="${workReimbursement.project.id}"  title="选择报销项目" labelName="workAccountList[{{idx}}].project.projectName"
+                                               labelValue="{{row.projectName}}" cssClass="form-control required layui-input" fieldLabels="工程" fieldKeys="projectName" searchLabel="工程名称" searchKey="projectName" ></sys:reimburselectReproject>
+                            </div>
+                        </td>
+                        <td>
+                            <input id="workAccountList{{idx}}_projectReportNumber"  name="workAccountList[{{idx}}].projectReportNumber" type="text" value="{{row.projectReportNumber}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td style="text-align:center;">
+                            <div class="project_reimbursement_div"  style="width: 200px">
+                                <sys:treeselectAccessoryNoParent id="workAccountList{{idx}}_type" name="workAccountList[{{idx}}].type" value="${workReimbursement.workReimbursementTypeInfo.id}" labelName="workAccountList[{{idx}}].typeName" labelValue="${workReimbursement.workReimbursementTypeInfo.standardDetail}"
+                                     title="报销类别" url="/reimbursementType/reimbursementType/treeData" extId=""  cssClass="form-control  layui-input" allowClear="true" notAllowSelectParent="true"/>
+                            </div>
+                        </td>
+                        <td>
+                            <input id="workAccountList{{idx}}_money" onchange="getMoney(this.value)" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  placeholder="请输入费用" maxlength="10" class="form-control number"/>
+                        </td>
+                        <td style="text-align:center;">
+                            <input id="workAccountList{{idx}}_bills"  name="workAccountList[{{idx}}].bills" type="text" value="{{row.bills}}" maxlength="32" placeholder="请输入单据张数"  class="form-control number"/>
+                        </td>
+                        <td style="text-align:center;">
+                            <input id="workAccountList{{idx}}_evectionNumber"  name="workAccountList[{{idx}}].evectionNumber" type="text" value="{{row.evectionNumber}}" maxlength="32" placeholder="请输入出差天数"  class="form-control number"/>
+                        </td>
+                        <td>
+                            <input id="workAccountList{{idx}}_remarks" name="workAccountList[{{idx}}].remarks" type="text" value="{{row.remarks}}"  placeholder="请输入内容" maxlength="32" class="form-control "/>
+                        </td>
 
-                                        <td class="text-center op-td" >
-                                            {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workAccountList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
-                                        </td>
-                                    </tr>//-->
+                        <td class="text-center op-td" >
+                            {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workAccountList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
+                        </td>
+                    </tr>//-->
                 </script>
             </div>
         </div>

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

@@ -100,7 +100,7 @@
                 <input htmlEscape="false"  readonly="true" class="form-control layui-input" value = "${workReimbursement.officeName}"/>
             </div>
         </div>
-        <div class="layui-item layui-col-sm6">
+        <%--<div class="layui-item layui-col-sm6">
             <label class="layui-form-label">银行卡号：</label>
             <div class="layui-input-block">
                 <input htmlEscape="false" readonly="true"  class="form-control layui-input" value = "${workReimbursement.bankCard}"/>
@@ -123,15 +123,15 @@
         <div class="layui-item layui-col-sm6">
             <label class="layui-form-label">报销类别：</label>
             <div class="layui-input-block">
-                <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workReimbursement.type}"/>
+                <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workReimbursement.typeName}"/>
             </div>
         </div>
-        <%--<div class="layui-item layui-col-sm6 td1">
+        &lt;%&ndash;<div class="layui-item layui-col-sm6 td1">
             <label class="layui-form-label">项目负责人：</label>
             <div class="layui-input-block">
                 <input htmlEscape="false"  readonly="true"  class="form-control layui-input" value="${workReimbursement.projectMasterName}"/>
             </div>
-        </div>--%>
+        </div>&ndash;%&gt;
         <div class="layui-item layui-col-sm6">
             <label class="layui-form-label double-line">是否对公报销：</label>
             <div class="layui-input-block">
@@ -162,7 +162,7 @@
             <div class="layui-input-block">
                 <input 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">报销日期：</label>
@@ -256,18 +256,19 @@
     </div>--%>
     <div class="form-group layui-row">
         <div class="form-group-label"><h2>报销详情</h2></div>
-        <div class="layui-item layui-col-xs12 form-table-container" >
-            <table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
+            <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
+                <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details">
                 <thead>
                 <tr>
-                    <th width="200px">财务科目</th>
-                    <th>报销费用摘要</th>
-                    <th width="150px">发票类型</th>
-                    <th width="150px">报销费用（元）</th>
-                    <th width="100px">备注</th>
-                    <th width="150px" >U8科目</th>
-                    <th width="150px" class="isShow">考核科目</th>
-                    <th width="150px">考核金额（元）</th>
+                    <th width="200px">报销人</th>
+                    <th width="200px">报销部门</th>
+                    <th width="200px">报销项目</th>
+                    <th width="200px">报告号</th>
+                    <th width="200px">报销类型</th>
+                    <th width="200px">费用（元）</th>
+                    <th width="200px">收据张数</th>
+                    <th width="200px">出差天数</th>
+                    <th width="200px">内容</th>
                 </tr>
                 </thead>
                 <tbody id="workAccountList">
@@ -279,34 +280,32 @@
                                     <tr>
                                         <td class="hide">
                                         </td>
-                                        <td>
-                                            <div class="project_reimbursement_div">
-                                                    ${fns:getMainDictLabel(workAccount.financialSubjects, 'project_reimbursement', '')}
-                                            </div>
-                                            <div class="not_project_reimbursement_div" style="display:none;">
-                                                    ${fns:getMainDictLabel(workAccount.financialSubjectss, 'not_project_reimbursement', '')}
-                                            </div>
+                                        <td style="text-align: center; vertical-align: middle">
+                                                    ${workAccount.reimbursementName}
                                         </td>
-                                        <td title="${workAccount.moneyAbstract}">
-                                                ${workAccount.moneyAbstract}
+                                        <td style="text-align: center; vertical-align: middle">
+                                                    ${workAccount.officeId}
                                         </td>
-                                        <td title="${workAccount.invoiceType}">
-                                                ${workAccount.invoiceType}
+                                        <td style="text-align: center; vertical-align: middle" title="${workAccount.project.projectName}">
+                                                ${workAccount.project.projectName}
                                         </td>
-                                        <td>
-                                            <fmt:formatNumber value="${workAccount.money}" pattern="#,#00.00"/>
+                                        <td style="text-align: center; vertical-align: middle" title="${workAccount.projectReportNumber}">
+                                                ${workAccount.projectReportNumber}
                                         </td>
-                                        <td title="${workAccount.remarks}">
-                                                ${workAccount.remarks}
+                                        <td style="text-align: center; vertical-align: middle" title="${workAccount.typeName}">
+                                                ${workAccount.typeName}
                                         </td>
-                                        <td>
-                                                ${fns:getMainDictLabel(workAccountAudit.u8Subjects, 'u8_subjects', '')}
+                                        <td style="text-align: center; vertical-align: middle">
+                                            <fmt:formatNumber value="${workAccount.money}" pattern="#,#00.00"/>
                                         </td>
-                                        <td class="isShow">
-                                                ${fns:getMainDictLabel(workAccountAudit.checkSubjects, 'check_subjects', '')}
+                                        <td style="text-align: center; vertical-align: middle" title="${workAccount.bills}">
+                                                ${workAccount.bills}
                                         </td>
-                                        <td>
-                                                ${workAccountAudit.checkMoney}
+                                        <td style="text-align: center; vertical-align: middle" title="${workAccount.evectionNumber}">
+                                                ${workAccount.evectionNumber}
+                                        </td>
+                                        <td style="text-align: center; vertical-align: middle" title="${workAccount.remarks}">
+                                                ${workAccount.remarks}
                                         </td>
 
                                     </tr>
@@ -326,13 +325,12 @@
                                         <td>
                                         </td>
                                         <td>
-                                                ${fns:getMainDictLabel(workAccountAudit.u8Subjects, 'u8_subjects', '')}
                                         </td>
-                                        <td class="isShow">
-                                                ${fns:getMainDictLabel(workAccountAudit.checkSubjects, 'check_subjects', '')}
+                                        <td>
+                                        </td>
+                                        <td>
                                         </td>
                                         <td>
-                                                ${workAccountAudit.checkMoney}
                                         </td>
 
                                     </tr>
@@ -344,31 +342,32 @@
                             <tr>
                                 <td class="hide">
                                 </td>
-                                <td>
-                                    <div class="project_reimbursement_div">
-                                            ${fns:getMainDictLabel(workAccount.financialSubjects, 'project_reimbursement', '')}
-                                    </div>
-                                    <div class="not_project_reimbursement_div" style="display:none;">
-                                            ${fns:getMainDictLabel(workAccount.financialSubjectss, 'not_project_reimbursement', '')}
-                                    </div>
+                                <td style="text-align: center; vertical-align: middle">
+                                            ${workAccount.reimbursementName}
                                 </td>
-                                <td title="${workAccount.moneyAbstract}">
-                                        ${workAccount.moneyAbstract}
+                                <td style="text-align: center; vertical-align: middle">
+                                            ${workAccount.officeId}
                                 </td>
-                                <td title="${workAccount.invoiceType}">
-                                        ${workAccount.invoiceType}
+                                <td style="text-align: center; vertical-align: middle" title="${workAccount.project.projectName}">
+                                        ${workAccount.project.projectName}
                                 </td>
-                                <td>
-                                    <fmt:formatNumber value="${workAccount.money}" pattern="#,#00.00"/>
+                                <td style="text-align: center; vertical-align: middle" title="${workAccount.projectReportNumber}">
+                                        ${workAccount.projectReportNumber}
                                 </td>
-                                <td title="${workAccount.remarks}">
-                                        ${workAccount.remarks}
+                                <td style="text-align: center; vertical-align: middle" title="${workAccount.typeName}">
+                                        ${workAccount.typeName}
                                 </td>
-                                <td>
+                                <td style="text-align: center; vertical-align: middle">
+                                    <fmt:formatNumber value="${workAccount.money}" pattern="#,#00.00"/>
+                                </td>
+                                <td style="text-align: center; vertical-align: middle" title="${workAccount.bills}">
+                                        ${workAccount.bills}
                                 </td>
-                                <td class="isShow">
+                                <td style="text-align: center; vertical-align: middle" title="${workAccount.evectionNumber}">
+                                        ${workAccount.evectionNumber}
                                 </td>
-                                <td>
+                                <td style="text-align: center; vertical-align: middle" title="${workAccount.remarks}">
+                                        ${workAccount.remarks}
                                 </td>
                             </tr>
                         </c:if>
@@ -380,6 +379,10 @@
             <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}"/>
@@ -391,7 +394,7 @@
                     <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>
+                    </td>--%>
                 </tr>
             </table>
         </div>

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

@@ -40,7 +40,7 @@
                         <div class="layui-item query athird">
                             <label class="layui-form-label">报销项目：</label>
                             <div class="layui-input-block with-icon">
-                                <sys:gridselectcallproject url="${ctx}/workreimbursement/workReimbursement/selectproject" id="project" name="project.id"  value="${workReimbursement.project.id}"  title="选择报销项目" labelName="project.projectName"
+                                <sys:gridselectcallproject url="${ctx}/workreimbursement/workReimbursement/selectReproject" id="project" name="project.id"  value="${workReimbursement.project.id}"  title="选择报销项目" labelName="project.projectName"
                                                            labelValue="${workReimbursement.project.projectName}"  cssClass="form-control widthClass layui-input" fieldLabels="工程" fieldKeys="projectName" searchLabel="工程名称" searchKey="projectName"></sys:gridselectcallproject>
                             </div>
                         </div>

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

@@ -477,6 +477,20 @@
             }
 
         }
+        function setParentInfo(parentId){
+            $.ajax({
+                url:"${ctx}/reimbursementType/reimbursementType/jsonData",
+                dataType:"json",
+                data:{id:parentId},
+                success:function (data) {
+                    if(data.proofread==1&&data.grade==1){
+                        $("#maxDeductTr").show();
+                    }else {
+                        $("#maxDeductTr").hide();
+                    }
+                }
+            })
+        }
     </script>
     <style>
         /*超过5个汉字，调整label的长度，以下是配套的*/
@@ -487,6 +501,10 @@
         .query .layui-input-block {
             margin-left: 116px;
         }
+        #workAccountList td{
+            padding-left: 0px;
+            padding-right: 0px;
+        }
     </style>
 </head>
 <body>
@@ -533,7 +551,7 @@
                     <input type="hidden" id="officeId" name="officeId" value="${workReimbursement.officeId}">
                 </div>
             </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">
                     <form:input path="bankCard" htmlEscape="false"  id="bankCard" minlength="16" maxlength="19" class="form-control number required layui-input" value = "${workReimbursement.bankCard}"/>
@@ -546,7 +564,7 @@
                     <label for="ext">项目报销</label>
                     <input type="radio" class="i-checks" name="ext" id="ext1" value="1">
                     <label for="ext1">非项目报销</label>
-                        <%--<input type="text" name="title" lay-verify="title" autocomplete="off" readonly="true" placeholder="" class="layui-input" value="全过程管理用户01">--%>
+                        &lt;%&ndash;<input type="text" name="title" lay-verify="title" autocomplete="off" readonly="true" placeholder="" class="layui-input" value="全过程管理用户01">&ndash;%&gt;
                 </div>
             </div>
 
@@ -557,12 +575,19 @@
                                                labelValue="${workReimbursement.project.projectName}" cssClass="form-control required layui-input" fieldLabels="工程" fieldKeys="projectName" searchLabel="工程名称" searchKey="projectName" ></sys:gridselectReproject>
                 </div>
             </div>
-                <%--<div class="layui-item layui-col-sm6 td1">
+            <div class="layui-item layui-col-sm6">
+                <label class="layui-form-label">报销类别：</label>
+                <div class="layui-input-block with-icon">
+                    <sys:treeselectAccessoryNoParent id="reviewParent" name="type" value="${workReimbursement.workReimbursementTypeInfo.id}" labelName="typeName" labelValue="${workReimbursement.workReimbursementTypeInfo.standardDetail}"
+                                                     title="报销类别" url="/reimbursementType/reimbursementType/treeData" extId="${workReimbursement.workReimbursementTypeInfo.id}"  cssClass="form-control  layui-input" allowClear="true" notAllowSelectParent="true"/>
+                </div>
+            </div>
+                &lt;%&ndash;<div class="layui-item layui-col-sm6 td1">
                     <label class="layui-form-label">项目负责人：</label>
                     <div class="layui-input-block">
                         <form:input path="projectMasterName" htmlEscape="false"  readonly="true" id="projectMasterName"  class="form-control layui-input"/>
                     </div>
-                </div>--%>
+                </div>&ndash;%&gt;
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label double-line"><span class="require-item">*</span>是否对公报销：</label>
                 <div class="layui-input-block">
@@ -599,7 +624,7 @@
                     <form:input path="userName" htmlEscape="false"  readonly="true" id="userName"  class="form-control required layui-input" value="${workReimbursement.submitterName}"/>
                     <input type="hidden" id="createById" name="createBy.id" value="${workReimbursement.createBy.id}">
                 </div>
-            </div>
+            </div>--%>
 
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label"><span class="require-item">*</span>报销日期：</label>
@@ -739,15 +764,19 @@
         <div class="layui-item nav-btns">
             <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
         </div>
-        <div class="layui-item layui-col-xs12 form-table-container" >
-            <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin">
+        <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
+            <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details">
                 <thead>
                 <tr>
-                    <th width="200px"><font color="red">*</font>财务科目</th>
-                    <th><font color="red">*</font>报销费用摘要</th>
-                    <th width="150px"><font color="red">*</font>发票类型</th>
-                    <th width="150px"><font color="red">*</font>报销费用（元）</th>
-                    <th width="200px">备注</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>
+                    <th width="200px">出差天数</th>
+                    <th width="200px">内容</th>
                     <th width="100px">操作</th>
                 </tr>
                 </thead>
@@ -755,38 +784,44 @@
                 <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}_delFlag" name="workAccountList[${index.index}].delFlag" type="hidden" value="0"/>
-                            </td>
                             <td>
-                                <div class="project_reimbursement_div">
-                                    <form:select id="workAccountList${index.index}_financialSubjects" path="workAccountList[${index.index}].financialSubjects" class="form-control required">
-                                        <form:option value="" label="请选择"/>
-                                        <form:options items="${fns:getMainDictList('project_reimbursement')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                    </form:select>
-                                </div>
-                                <div class="not_project_reimbursement_div" style="display:none;">
-                                    <form:select id="workAccountList${index.index}financialSubjectss" path="workAccountList[${index.index}].financialSubjectss" class="form-control required">
-                                        <form:option value="" label="请选择"/>
-                                        <form:options items="${fns:getMainDictList('not_project_reimbursement')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                    </form:select>
+                                <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}"
+                                                               title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                 </div>
                             </td>
                             <td>
-                                <input id="workAccountList${index.index}_moneyAbstract"  name="workAccountList[${index.index}].moneyAbstract" maxlength="32" type="text" value="${workAccount.moneyAbstract}"  placeholder="请输入费用摘要"  class="form-control required"/>
+                                <input id="workAccountList${index.index}_reimbursementNameofficeId"  name="workAccountList[${index.index}].officeId" maxlength="32" type="text" value="${workAccount.officeId}" readonly="readonly"  class="form-control required"/>
+                            </td>
+
+
+                            <td>
+                                <div class="not_project_reimbursement_div"  style="width: 200px">
+                                    <sys:reimburselectReproject url="${ctx}/workreimbursement/workReimbursement/selectReproject" id="workAccountList${index.index}_project" name="workAccountList[${index.index}].project.id"  value="${workAccount.project.id}"  title="选择报销项目" labelName="workAccountList[${index.index}].project.projectName"
+                                                                labelValue="${workAccount.project.projectName}" cssClass="form-control required layui-input" fieldLabels="工程" fieldKeys="projectName" searchLabel="工程名称" searchKey="projectName" />
+                                </div>
                             </td>
                             <td>
-                                <select id="workAccountList${index.index}_invoiceType" name="workAccountList[${index.index}].invoiceType" class="form-control ">
-                                    <option value="专票" <c:if test="${'专票' eq workAccount.invoiceType}">selected</c:if>>专票</option>
-                                    <option value="普票" <c:if test="${'普票' eq workAccount.invoiceType}">selected</c:if>>普票</option>
-                                </select>
+                                <input id="workAccountList${index.index}_projectReportNumber"  name="workAccountList[${index.index}].projectReportNumber" type="text" value="${workAccount.projectReportNumber}" maxlength="32" readonly="readonly"  class="form-control"/>
+                            </td>
+                            <td style="text-align:center;">
+                                <div class="project_reimbursement_div"  style="width: 200px">
+                                    <sys:treeselectAccessoryNoParent id="workAccountList${index.index}_type" name="workAccountList[${index.index}].type" value="${workAccount.type}" labelName="workAccountList[${index.index}].typeName" labelValue="${workAccount.typeName}"
+                                                                     title="报销类别" url="/reimbursementType/reimbursementType/treeData" extId=""  cssClass="form-control  layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                </div>
                             </td>
+
                             <td>
-                                <input id="workAccountList${index.index}_money" onchange="getMoney(this.value)" name="workAccountList[${index.index}].money" type="text" value="${workAccount.money}"  placeholder="请输入金额"  maxlength="10" class="form-control number required"/>
+                                <input id="workAccountList${index.index}_money" onchange="getMoney(this.value)" name="workAccountList[${index.index}].money" type="text" value="${workAccount.money}"  placeholder="请输入金额" maxlength="10"  class="form-control number required"/>
+                            </td>
+                            <td style="text-align:center;">
+                                <input id="workAccountList${index.index}_bills"  name="workAccountList[${index.index}].bills" type="text" value="${workAccount.bills}" maxlength="32" placeholder="请输入单据张数"  class="form-control number"/>
+                            </td>
+                            <td style="text-align:center;">
+                                <input id="workAccountList${index.index}_evectionNumber"  name="workAccountList[${index.index}].evectionNumber" type="text" value="${workAccount.evectionNumber}" maxlength="32" placeholder="请输入出差天数"  class="form-control number"/>
                             </td>
                             <td>
-                                <input id="workAccountList${index.index}_remarks" name="workAccountList[${index.index}].remarks" type="text" value="${workAccount.remarks}"  maxlength="64" placeholder="请输入备注"  class="form-control"/>
+                                <input id="workAccountList${index.index}_remarks" name="workAccountList[${index.index}].remarks" type="text" value="${workAccount.remarks}" maxlength="32" placeholder="请输入备注"  class="form-control"/>
                             </td>
 
                             <td class="text-center op-td" >
@@ -807,44 +842,58 @@
             </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}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
-                                        </td>
-                                        <td>
-                                            <div class="project_reimbursement_div">
-                                                <form:select id="workAccountList{{idx}}_financialSubjects" path="workAccountList[0].financialSubjects" class="form-control required">
-                                                    <form:option value="" label="请选择"/>
-                                                    <form:options items="${fns:getMainDictList('project_reimbursement')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                                </form:select>
-                                            </div>
-                                            <div class="not_project_reimbursement_div" style="display:none;">
-                                                <form:select id="workAccountList{{idx}}_financialSubjectss" path="workAccountList[0].financialSubjectss" class="form-control required">
-                                                    <form:option value="" label="请选择"/>
-                                                    <form:options items="${fns:getMainDictList('not_project_reimbursement')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                                </form:select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <input id="workAccountList{{idx}}_moneyAbstract"  name="workAccountList[{{idx}}].moneyAbstract" type="text" maxlength="32" value="{{row.moneyAbstract}}"  placeholder="请输入费用摘要"  class="form-control required"/>
-                                        </td>
-                                         <td style="text-align:center;">
-                                             <select id="workAccountList{{idx}}_invoiceType" name="workAccountList[{{idx}}].invoiceType" class="form-control required">
-                                              <option value="专票">专票</option>
-                                              <option value="普票">普票</option>
-                                          </select>
-                                        </td>
-                                        <td>
-                                            <input id="workAccountList{{idx}}_money" onchange="getMoney(this.value)" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  placeholder="请输入金额" maxlength="10" class="form-control number required"/>
-                                        </td>
-                                        <td>
-                                            <input id="workAccountList{{idx}}_remarks" name="workAccountList[{{idx}}].remarks" type="text" value="{{row.remarks}}" maxlength="64" placeholder="请输入备注"  class="form-control "/>
-                                        </td>
+                        <td class="hide">
+                            <input id="workAccountList{{idx}}_id" name="workAccountList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                            <input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
+                        </td>
+                        <%--<td>
+                            <div style="width: 60px">
+                                <input readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                            </div>
+                        </td>--%>
+                        <td>
+                            <div class="project_reimbursement_div"  style="width: 200px">
+                                <sys:reimburtreeselectUser id="workAccountList{{idx}}_reimbursementName" name="workAccountList[{{idx}}].reimbursementName" value="${projectRecords.leaderIds}" labelName="workAccountList[{{idx}}].name" labelValue="{{row.reimbursementName}}"
+                                    title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                            </div>
+                        </td>
+                        <td>
+                            <div class="not_project_reimbursement_div"  style="width: 200px">
+                                <input id="workAccountList{{idx}}_reimbursementNameofficeId"  type="text" value="{{row.officeId}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                            </div>
+                        </td>
+                        <td>
+                            <div class="not_project_reimbursement_div"  style="width: 200px">
+                                <sys:reimburselectReproject url="${ctx}/workreimbursement/workReimbursement/selectReproject" id="workAccountList{{idx}}_project" name="workAccountList[{{idx}}].project.id"  value="${workReimbursement.project.id}"  title="选择报销项目" labelName="workAccountList[{{idx}}].project.projectName"
+                                               labelValue="{{row.projectName}}" cssClass="form-control required layui-input" fieldLabels="工程" fieldKeys="projectName" searchLabel="工程名称" searchKey="projectName" ></sys:reimburselectReproject>
+                            </div>
+                        </td>
+                        <td>
+                            <input id="workAccountList{{idx}}_projectReportNumber"  name="workAccountList[{{idx}}].projectReportNumber" type="text" value="{{row.projectReportNumber}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td style="text-align:center;">
+                            <div class="project_reimbursement_div"  style="width: 200px">
+                                <sys:treeselectAccessoryNoParent id="workAccountList{{idx}}_type" name="workAccountList[{{idx}}].type" value="${workReimbursement.workReimbursementTypeInfo.id}" labelName="workAccountList[{{idx}}].typeName" labelValue="${workReimbursement.workReimbursementTypeInfo.standardDetail}"
+                                     title="报销类别" url="/reimbursementType/reimbursementType/treeData" extId=""  cssClass="form-control  layui-input" allowClear="true" notAllowSelectParent="true"/>
+                            </div>
+                        </td>
+                        <td>
+                            <input id="workAccountList{{idx}}_money" onchange="getMoney(this.value)" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  placeholder="请输入费用" maxlength="10" class="form-control number"/>
+                        </td>
+                        <td style="text-align:center;">
+                            <input id="workAccountList{{idx}}_bills"  name="workAccountList[{{idx}}].bills" type="text" value="{{row.bills}}" maxlength="32" placeholder="请输入单据张数"  class="form-control number"/>
+                        </td>
+                        <td style="text-align:center;">
+                            <input id="workAccountList{{idx}}_evectionNumber"  name="workAccountList[{{idx}}].evectionNumber" type="text" value="{{row.evectionNumber}}" maxlength="32" placeholder="请输入出差天数"  class="form-control number"/>
+                        </td>
+                        <td>
+                            <input id="workAccountList{{idx}}_remarks" name="workAccountList[{{idx}}].remarks" type="text" value="{{row.remarks}}"  placeholder="请输入内容" maxlength="32" class="form-control "/>
+                        </td>
 
-                                        <td class="text-center op-td" >
-                                            {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workAccountList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
-                                        </td>
-                                    </tr>//-->
+                        <td class="text-center op-td" >
+                            {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workAccountList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
+                        </td>
+                    </tr>//-->
             </script>
         </div>
     </div>