代码调整

开票添加复制粘贴图片功能
项目类别添加描述功能

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -408,6 +408,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private User reportInternalAuditSignatureUploadFileUser;		//内审报告签章文件上传人信息
 	private Date reportInternalAuditSignatureUploadDate;		//内审报告签章文件上传时间
 	private String internalAuditFlag;		//内审报告判定条件
+	private String beginSubmitScale;	//送审规模(开始)
+	private String endSubmitScale;	//送审规模（结束）
 
 
 	private List<String> civilProjectList = Lists.newArrayList();
@@ -2655,4 +2657,20 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setInternalAuditFlag(String internalAuditFlag) {
 		this.internalAuditFlag = internalAuditFlag;
 	}
+
+	public String getBeginSubmitScale() {
+		return beginSubmitScale;
+	}
+
+	public void setBeginSubmitScale(String beginSubmitScale) {
+		this.beginSubmitScale = beginSubmitScale;
+	}
+
+	public String getEndSubmitScale() {
+		return endSubmitScale;
+	}
+
+	public void setEndSubmitScale(String endSubmitScale) {
+		this.endSubmitScale = endSubmitScale;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecordsExport.java

@@ -1514,6 +1514,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 	}
 
 
+	@ExcelField(title="送审规模（万元）", align=2, sort=10)
 	public BigDecimal getSubmitScale() {
 		return submitScale;
 	}
@@ -1863,7 +1864,6 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.reportTwoAuditDate = reportTwoAuditDate;
 	}
 
-	@ExcelField(title="项目规模", align=2, sort=10)
 	public String getProjectScale() {
 		return projectScale;
 	}
@@ -2252,6 +2252,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.ziXunBDE = ziXunBDE;
 	}
 
+	@ExcelField(title="项目等级", align=2, sort=10)
 	public String getSubmitMoneyStr() {
 		return submitMoneyStr;
 	}

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -805,8 +805,8 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         }
         ProjectRecords projectRecords = dao.getRuralProjectRecords(projectReportData.getProject().getId());
         Office recordsOffice =officeService.get(projectRecords.getOffice());
-        String title = "项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
-        String str =  "项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
+        String title = "项目【"+projectRecords.getProjectName()+"】报告质量复核盖章授权待审批";
+        String str =  "项目【"+projectRecords.getProjectName()+"】报告质量复核盖章授权待审批";
         // 用来设置启动流程的人员ID，引擎会自动把用户ID保存到activiti:initiator中
         identityService.setAuthenticatedUserId(user.getId());
         // 启动流程
@@ -1775,11 +1775,11 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             }else{
                 if ("yes".equals(flag)) {
 
-                    String titleStr = "项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";
-                    String content = "项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";
+                    String titleStr = "项目【"+projectRecords.getProjectName()+"】报告质量复核盖章授权审批通过";
+                    String content = "项目【"+projectRecords.getProjectName()+"】报告质量复核盖章授权审批通过";
                     if(StringUtils.isNotBlank(projectReportData.getNumber())){
-                        titleStr = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";
-                        content = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";
+                        titleStr = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核盖章授权审批通过";
+                        content = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核盖章授权审批通过";
                     }
                     str =  "报告名称:"+projectReportData.getName()+",工作内容类型:"+ WorkContentTypeController.getContentTypeName(projectReportData.getType(),"")+",项目所属部门:"+recordsOffice.getName();
                     projectReportData.setStatus("5");
@@ -1868,11 +1868,11 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
 
             } else {
                 if (!"yes".equals(flag)) {//报告驳回待办提醒
-                    title = "项目【"+ projectRecords.getProjectName()+"】新增报告质量复核被驳回";
-                    str = "项目【"+ projectRecords.getProjectName()+"】新增报告质量复核被驳回，请选择重新申请或删除报告";
+                    title = "项目【"+ projectRecords.getProjectName()+"】新增报告质量复核盖章授权被驳回";
+                    str = "项目【"+ projectRecords.getProjectName()+"】新增报告质量复核盖章授权被驳回，请选择重新申请或删除报告";
                     if(StringUtils.isNotBlank(projectReportData.getNumber())){
-                        title = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】新增报告质量复核被驳回";
-                        str = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】新增报告质量复核被驳回，请选择重新申请或删除报告";
+                        title = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】新增报告质量复核盖章授权被驳回";
+                        str = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】新增报告质量复核盖章授权被驳回，请选择重新申请或删除报告";
                     }
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(projectReportData.getId());
@@ -1891,11 +1891,11 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                     users.add( projectReportData.getCreateBy());
                 } else {
                     if (com.jeeplus.common.utils.StringUtils.isNotBlank(enname)) {//驳回重新申请待办信息
-                        str = "项目【"+ projectRecords.getProjectName()+"】报告质量复核待审批";
-                        title = "项目【"+ projectRecords.getProjectName()+"】报告质量复核待审批";
+                        str = "项目【"+ projectRecords.getProjectName()+"】报告质量复核盖章授权待审批";
+                        title = "项目【"+ projectRecords.getProjectName()+"】报告质量复核盖章授权待审批";
                         if(StringUtils.isNotBlank(projectReportData.getNumber())){
-                            title = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
-                            str = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
+                            title = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核盖章授权待审批";
+                            str = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核盖章授权待审批";
                         }
                         WorkProjectNotify notify = new WorkProjectNotify();
                         notify.setNotifyId(projectReportData.getId());

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -3203,10 +3203,13 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				projectReportData.setConditionType("1003");
 			}*/
 
+			//ProjectType 1.工程咨询 2.造价审核
 			switch (projectRecords.getProjectType()){
 				case "1":
 					if("8".equals(projectRecords.getAttachmentProjectSort())){
 						projectReportData.setConditionType("1006");
+					} else if("10".equals(projectRecords.getAttachmentProjectSort())){
+						projectReportData.setConditionType("1008");
 					}else{
 						projectReportData.setConditionType("10");
 					}

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

@@ -143,6 +143,12 @@ public class HelpController extends BaseController {
                 if(content.contains("{thisMonth}")){
                     content = content.replaceAll("\\{thisMonth}",String.valueOf(thisMonth)+"月 ");
                 }
+                if(content.contains("<")){
+                    content = content.replaceAll("&lt;","<");
+                }
+                if(content.contains("&gt;")){
+                    content = content.replaceAll("&gt;",">");
+                }
             }
         }
         map.put("title", title);

src/main/java/com/jeeplus/modules/workinvoice/entity/WorkInvoiceExport.java

@@ -470,6 +470,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.ext = ext;
 	}
 
+	@ExcelField(title="开票内容", align=2, sort=10)
 	public String getBillingContent() {
 		return billingContent;
 	}

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -890,12 +890,25 @@ public class WorkInvoiceAllController extends BaseController {
             Page<WorkInvoice> page = workInvoiceService.findListExport(new Page<WorkInvoice>(request, response, -1), workInvoice);
 			List<WorkInvoice> workInvoiceList = page.getList();
 			invoiceService.disposeListExport(workInvoiceList);
-			/*for (WorkInvoice invoice: workInvoiceList) {
-				invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
+			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+			for (MainDictDetail dictDetail: billingContentList) {
+				if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
+					workInvoice.setBillingContent(dictDetail.getLabel());
+					break;
+				}
+			}
+			for (WorkInvoice invoice: workInvoiceList) {
+				for (MainDictDetail dictDetail: billingContentList) {
+					if(invoice.getBillingContent().equals(dictDetail.getValue())){
+						invoice.setBillingContent(dictDetail.getLabel());
+						break;
+					}
+				}
+				/*invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
 				List<String> projectNameList = workInvoiceService.getProjectNameList(invoice);
 				String projectNameStr = String.join(",", projectNameList);
-				invoice.setProjectName(projectNameStr);
-			}*/
+				invoice.setProjectName(projectNameStr);*/
+			}
             new ExportExcel("发票管理", WorkInvoiceExport.class).setDataList(page.getList()).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllTwoController.java

@@ -742,12 +742,25 @@ public class WorkInvoiceAllTwoController extends BaseController {
 			String fileName = "发票一览表"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
 			Page<WorkInvoice> page = workInvoiceService.findListExport(new Page<WorkInvoice>(request, response, -1), workInvoice);
 			List<WorkInvoice> workInvoiceList = page.getList();
-			/*for (WorkInvoice invoice: workInvoiceList) {
-				invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
+			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+			for (MainDictDetail dictDetail: billingContentList) {
+				if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
+					workInvoice.setBillingContent(dictDetail.getLabel());
+					break;
+				}
+			}
+			for (WorkInvoice invoice: workInvoiceList) {
+				for (MainDictDetail dictDetail: billingContentList) {
+					if(invoice.getBillingContent().equals(dictDetail.getValue())){
+						invoice.setBillingContent(dictDetail.getLabel());
+						break;
+					}
+				}
+				/*invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
 				List<String> projectNameList = workInvoiceService.getProjectNameList(invoice);
 				String projectNameStr = String.join(",", projectNameList);
-				invoice.setProjectName(projectNameStr);
-			}*/
+				invoice.setProjectName(projectNameStr);*/
+			}
 			new ExportExcel("发票一览表", WorkInvoiceExport.class).setDataList(page.getList()).write(response, fileName).dispose();
 			return null;
 		} catch (Exception e) {

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceTwoController.java

@@ -791,12 +791,26 @@ public class WorkInvoiceTwoController extends BaseController {
             Page<WorkInvoice> page = workInvoiceService.findListExport(new Page<WorkInvoice>(request, response, -1), workInvoice);
 			List<WorkInvoice> workInvoiceList = page.getList();
 			workInvoiceService.disposeListExport(workInvoiceList);
-			/*for (WorkInvoice invoice: workInvoiceList) {
-				invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
+
+			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+			for (MainDictDetail dictDetail: billingContentList) {
+				if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
+					workInvoice.setBillingContent(dictDetail.getLabel());
+					break;
+				}
+			}
+			for (WorkInvoice invoice: workInvoiceList) {
+				for (MainDictDetail dictDetail: billingContentList) {
+					if(invoice.getBillingContent().equals(dictDetail.getValue())){
+						invoice.setBillingContent(dictDetail.getLabel());
+						break;
+					}
+				}
+				/*invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
 				List<String> projectNameList = workInvoiceService.getProjectNameList(invoice);
 				String projectNameStr = String.join(",", projectNameList);
-				invoice.setProjectName(projectNameStr);
-			}*/
+				invoice.setProjectName(projectNameStr);*/
+			}
     		new ExportExcel("发票一览表", WorkInvoiceExport.class).setDataList(page.getList()).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {

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

@@ -2109,6 +2109,12 @@ public class WorkProjectNotifyController extends BaseController {
 					if (StringUtils.isNotBlank(workInvoice.getId())) {
 						workInvoiceService.queryDetails(workInvoice);
 					}
+
+					//获取发票开户银行信息
+					String bankName = workInvoiceService.getBankNameByNameOrId(workInvoice.getBank());
+					if(StringUtils.isNotBlank(bankName)){
+						workInvoice.setBank(bankName);
+					}
 					workInvoice.setHome("home");
 					workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
 					String taskDefKey = workInvoice.getAct().getTaskDefKey();
@@ -5208,7 +5214,8 @@ public class WorkProjectNotifyController extends BaseController {
 						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
 						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
 						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
-						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageView";
+
+						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						//查询总审人员信息
 						RuralReportConsultant bzshbConsultant = new RuralReportConsultant();

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -171,6 +171,7 @@
 		a.project_id AS "projectId",
 		a.project_name AS "projectName",
 		a.scale_type AS "scaleType",
+		a.submit_scale AS "submitScale",
 		a.scale_unit AS "scaleUnit",
 		a.scale_quantity AS "scaleQuantity",
 		a.area_id AS "area.id",
@@ -556,6 +557,15 @@ END) as projectScale*/
 			<if test="endDate !=null">
 				AND a.create_date &lt; #{endDate}
 			</if>
+
+			<!-- 送审规模 -->
+			<if test="beginSubmitScale !=null and beginSubmitScale != ''">
+				AND a.submit_scale >= #{beginSubmitScale}
+			</if>
+			<if test="endSubmitScale !=null and endSubmitScale != ''">
+				AND a.submit_scale &lt; #{endSubmitScale}
+			</if>
+
 			<!-- 质量复核审核时间 -->
 			<if test="reportBeginDate !=null">
 				AND prd.audit_pass_date >= #{reportBeginDate}
@@ -855,7 +865,7 @@ END) as projectScale*/
 		,(select name from sys_user user where user.id=a.create_by) AS "createByName"
 		,o.name AS "createByOffice"
 		,sub.name as "projectMasterName"
-		,(case when a.submit_money = '1' then 'B级' when a.submit_money = '2' then 'A级' else '' end) as projectScale
+		,(case when a.submit_money = '1' then 'B级' when a.submit_money = '2' then 'A级' else '' end) as submitMoneyStr
 		,rprr.ZiXunBDE as "ziXunBDE"
 		,ifnull(prd.review_fee ,"") as "reviewFee"
 		,ifnull(prd.approval_fee ,"") as "approvalFee"
@@ -1013,6 +1023,14 @@ END) as projectScale*/
 			<if test="endDate !=null">
 				AND a.create_date &lt; #{endDate}
 			</if>
+
+			<!-- 送审规模 -->
+			<if test="beginSubmitScale !=null and beginSubmitScale != ''">
+				AND a.submit_scale >= #{beginSubmitScale}
+			</if>
+			<if test="endSubmitScale !=null and endSubmitScale != ''">
+				AND a.submit_scale &lt; #{endSubmitScale}
+			</if>
 			<!-- 质量复核审核时间 -->
 			<if test="reportBeginDate !=null">
 				AND prd.audit_pass_date >= #{reportBeginDate}
@@ -1409,6 +1427,14 @@ END) as projectScale*/
 				AND a.create_date &lt; #{endDate}
 			</if>
 
+			<!-- 送审规模 -->
+			<if test="beginSubmitScale !=null and beginSubmitScale != ''">
+				AND a.submit_scale >= #{beginSubmitScale}
+			</if>
+			<if test="endSubmitScale !=null and endSubmitScale != ''">
+				AND a.submit_scale &lt; #{endSubmitScale}
+			</if>
+
 			<!-- 质量复核审核时间 -->
 			<if test="reportBeginDate !=null">
 				AND prd.audit_pass_date >= #{reportBeginDate}

src/main/webapp/static/jquery-combox/styles/style.css

@@ -16,7 +16,7 @@ li{margin:0;}
 .combox_border{
 	border:1px solid #c2c2c2;
 	height:38px;
-	width:245px
+	width:245px;
 	background-color: #FFFFFF;
     background-image: none;
     border: 1px solid #e5e6e7;

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -1156,7 +1156,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>项目类别：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>项目类别<a href="javascript:void(0)" style='margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;' class="layui-icon layui-icon-tips" onclick="helpDetails('bz-0007')"></a>：</label>
                     <div class="layui-input-block readOnlyFFF">
                         <form:select placeholder="请选择" path="attachmentProjectSort" class="form-control judgment editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
                             <form:option value=""/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -1163,7 +1163,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>项目类别：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>项目类别<a href="javascript:void(0)" style='margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;' class="layui-icon layui-icon-tips" onclick="helpDetails('bz-0008')"></a>：</label>
                     <div class="layui-input-block readOnlyFFF">
                         <form:select path="attachmentProjectSort" class="form-control judgment editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
                             <form:option value=""/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -869,6 +869,18 @@
 								<input id="workContractInfoClientName" name="workContractInfo.client.name" value="${workContractInfoClientName}" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
+
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">送审规模(万元)：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<input id="beginSubmitScale" name="beginSubmitScale" value="${ruralProjectRecords.beginSubmitScale}" htmlEscape="false" maxlength="255"  class=" form-control layui-input query-group"/>
+								</input>
+								<span class="group-sep">-</span>
+								<input id="endSubmitScale" name="endSubmitScale" value="${ruralProjectRecords.endSubmitScale}" htmlEscape="false" maxlength="255"  class=" form-control layui-input query-group"/>
+								</input>
+							</div>
+						</div>
+
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间：</label>
 							<div class="layui-input-block readOnlyFFF">
@@ -1139,6 +1151,7 @@
 						return "<font style = 'font-size:14px;font-weight:500;'>"+d.client+"</font>";
 					}}
                 ,{field:'money',align:'center', title: '咨询营业收入(万元)',  width:140}
+                ,{field:'submitScale',align:'center', title: '送审规模(万元)',  width:140}
                 ,{field:'createName',align:'center', title: '登记人',  width:75}
                 ,{field: 'createDate', align:'center', title: '创建日期',width:110,templet: function(d){
 					var date=d.createDate;
@@ -1433,6 +1446,7 @@
                     ,"caseType":"${projectRecords.caseType}"
                     ,"caseCreateBy":"${projectRecords.caseCreateBy}"
                     ,"caseStatus":"${projectRecords.caseStatus}"
+                    ,"submitScale":"${projectRecords.submitScale}"
 					,"filingBatchAuditPassDate":"<fmt:formatDate value="${projectRecords.filingBatchAuditPassDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
 					,"paperFilingAuditPassDate":"<fmt:formatDate value="${projectRecords.paperFilingAuditPassDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
 					,"reportAuditDate":"<fmt:formatDate value="${projectRecords.reportAuditDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"

src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -326,7 +326,15 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">项目类别：</label>
+					<c:choose>
+						<%-- 未通过 --%>
+						<c:when test="${projectRecords.projectType == 1}">
+							<label class="layui-form-label">项目类别<a href="javascript:void(0)" style='margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;' class="layui-icon layui-icon-tips" onclick="helpDetails('bz-0008')"></a>：</label>
+						</c:when>
+						<c:otherwise>
+							<label class="layui-form-label">项目类别<a href="javascript:void(0)" style='margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;' class="layui-icon layui-icon-tips" onclick="helpDetails('bz-0007')"></a>：</label>
+						</c:otherwise>
+					</c:choose>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
 					</div>

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

@@ -4,8 +4,6 @@
 <head>
 	<title>发票审批</title>
 	<meta name="decorator" content="default"/>
-	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
-	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<style>
 		#workInvoiceProjectRelationList td{
 			padding-left: 0px;
@@ -19,50 +17,10 @@
 			  var ss= document.getElementById("iframe").contentWindow.document.getElementById("opinion").value
 			  $("#opinion").val(ss);
               if(obj == 1) {
-				  //非空验证
-				  var ff=true;
-				  $(".judgment").each(function(){
-					  var zhi=$(this).val();
-					  if (''==zhi || null == zhi){
-						  $(this).css("border","1px solid red")
-						  ff=false;
-					  }else{
-						  $(this).css("border","1px solid #f1f1f1")
-					  }
-				  });
-				  if (!ff){
-					  parent.layer.msg("发票号或开票金额未填写完整!", {icon: 5});
-					  return;
-				  }
                   $("#flag").val("yes");
               }else {
                   $("#flag").val("no");
               }
-			  if(  obj == 1 && $("#workAccountList tr").length==0){
-				  top.layer.alert('请添加发票明细！', {icon: 0});
-				  return;
-			  }
-
-			  var m = ${workInvoice.money};
-			  var money = "0.00";
-			  //自动计算出结果并填充在相应的输入框中
-			  var size = $("#workAccountList tr").length+count;
-			  for (var i = 0;i<size;i++){
-				  var _totalMoney = $("#workAccountList"+i+"_totalMoney").val();
-
-				  var delFlag = $("#workAccountList"+i+"_delFlag").val();
-				  if (_totalMoney!=undefined && isNumber(_totalMoney) && delFlag==0){
-					  if(money==""){
-						  money = parseFloat(_totalMoney).toFixed(2);
-					  }else {
-						  money = (parseFloat(money) + parseFloat(_totalMoney)).toFixed(2);
-					  }
-				  }
-			  }
-			  if(obj == 1 && money != m ){
-				  top.layer.alert('发票明细总开票金额与主信息开票金额不等，请重新填写！', {icon: 0});
-				  return;
-			  }
 
 			  $("#inputForm").submit();
 			  return true;
@@ -70,14 +28,6 @@
 		  return false;
 		}
 		$(document).ready(function() {
-			//初始化截图功能子页面。
-			$('#orgContent').attr("src","${ctx}/workinvoice/workInvoice/workInvoiceImageEdit");
-
-			layui.use('form', function () {
-				var form = layui.form;
-				form.render();
-			});
-
 			$("#name").focus();
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
@@ -95,38 +45,6 @@
 				}
 			});
 
-
-
-			$("#userImageBtn").click(function () {
-				top.layer.open({
-					type: 2,
-					area: ["750px", "500px"],
-					title: "上传图片",
-					btn: ['提交', '关闭'],
-					content: "${ctx}/sys/user/imageEdit", //  btn: ['确定', '关闭'],
-					yes: function (index, layero) {
-						console.log(1232131)
-						var body = top.layer.getChildFrame('body', index);
-						var inputForm = body.find('#inputForm');
-						console.log(inputForm)
-						var top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-						inputForm.attr("target", top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-						inputForm.validate();
-						if (inputForm.valid()) {
-							loading("正在提交，请稍等...");
-							inputForm.submit();
-						} else {
-							return;
-						}
-
-						top.layer.close(index);//关闭对话框。
-
-					},
-					cancel: function (index) {
-					}
-				});
-			});
-
 		});
 		function addRow1(list, idx, tpl, row){
 			var idx1 = $("#workInvoiceProjectRelationList tr").length;
@@ -176,24 +94,6 @@
 				}
 			});
 		}
-
-		function insertTemporaryFile(tValue,fileName){
-			var list = "${workInvoice.workAttachments}";
-			var size = (list.split('url')).length-1;
-
-			var temporaryFilePath = tValue;
-			const file = new File([temporaryFilePath], fileName); // 创建File对象
-			var attachmentId = "";
-			var attachmentFlag = "115";
-			var timestamp = new Date().getTime();
-
-			var storeAs = "workInvoice";
-			var uploadPath = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/" + storeAs;
-			/*将这段字符串存到数据库即可*/
-			var divId = "_attachment";
-			$("#addFile" + divId).show();
-			temporaryMultitest(storeAs, file,temporaryFilePath, attachmentId, attachmentFlag, uploadPath, divId, size);
-		}
 	</script>
 </head>
 <body>
@@ -289,7 +189,7 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>实际开票单位：</label>
+				<label class="layui-form-label">实际开票单位：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.client.name}"/>
 				</div>
@@ -332,18 +232,6 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label">收款类型：</label>
-				<div class="layui-input-block">
-					<input id="chargeType" htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.chargeType}" />
-				</div>
-			</div>
-			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label">开票内容：</label>
-				<div class="layui-input-block">
-					<input id="billingContent" htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.billingContent}" />
-				</div>
-			</div>
-			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>开票金额(元)：</label>
 				<div class="layui-input-block">
 					<input id="kaipiao" htmlEscape="false" readonly="true"   class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="##00.00"/>"/>
@@ -364,14 +252,14 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">开票时间：</label>
 				<div class="layui-input-block">
-					<input class="form-control layer-date laydate-icon layui-input laydate-icondate" id="invoiceDate" name="invoiceDate" value="<fmt:formatDate
+					<input class="form-control layer-date laydate-icon layui-input laydate-icondate" readonly="true"  id="invoiceDate" name="invoiceDate" value="<fmt:formatDate
 							value="${workInvoice.invoiceDate}" pattern="yyyy-MM-dd"/>">
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">领票时间：</label>
 				<div class="layui-input-block">
-					<input placeholder="请选择领票时间" class="form-control layer-date laydate-icon layui-input laydate-icondate" id="takeDate" name="takeDate" value="<fmt:formatDate
+					<input placeholder="请选择领票时间" class="form-control layer-date laydate-icon layui-input laydate-icondate" readonly="true"  id="takeDate" name="takeDate" value="<fmt:formatDate
 							value="${workInvoice.takeDate}" pattern="yyyy-MM-dd"/>">
 				</div>
 			</div>
@@ -405,15 +293,6 @@
 					<form:textarea path="remarks" readonly="true" htmlEscape="false" rows="4" class="form-control" style="background-color: #f1f1f1" />
 				</div>
 			</div>
-
-			<%--<div>
-
-					&lt;%&ndash;嵌入子页面&ndash;%&gt;
-				<iframe id="orgContent" src="" style="border:1px dashed #000;" width="100%" height="450px" frameborder="0">
-				</iframe>
-
-			</div>--%>
-
 		</div>
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>附件信息</h2></div>

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

@@ -321,6 +321,23 @@
 			});
 			/*--------------*/
 
+			var length=$("#workInvoiceProjectRelationList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
 		});
 
 		function setValuee (obj){
@@ -441,6 +458,24 @@
 
 			}
 
+			var length=$("#workInvoiceProjectRelationList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
+
 		}
 
 		function newSetPNumber(obj,ids,isProject,details){
@@ -528,6 +563,24 @@
 
 			}
 
+			var length=$("#workInvoiceProjectRelationList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
+
 		}
 
 

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

@@ -322,6 +322,23 @@
 			});
 			/*--------------*/
 
+			var length=$("#workInvoiceProjectRelationList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
 		});
 
 		function setValuee (obj){
@@ -434,6 +451,24 @@
 
 			}
 
+			var length=$("#workInvoiceProjectRelationList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
+
 		}
 
 		function newSetPNumber(obj,ids,isProject,details){
@@ -521,6 +556,24 @@
 
 			}
 
+			var length=$("#workInvoiceProjectRelationList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
+
 		}
 
 		function addRow(list, idx, tpl, row){

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

@@ -163,6 +163,25 @@
 			$("#attachment_btn").click(function () {
 				$("#attachment_file").click();
 			});
+
+
+			var length=$("#workInvoiceProjectRelationList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
         });
 
         function setValuee(obj){
@@ -249,6 +268,24 @@
 
 			}
 
+			var length=$("#workInvoiceProjectRelationList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
+
 		}
 		function newSetPNumber(obj,ids,isProject,details){
 			var idx=ids.split("_")[0]
@@ -335,6 +372,24 @@
 
 			}
 
+			var length=$("#workInvoiceProjectRelationList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
+
 		}
 
 

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

@@ -612,14 +612,14 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">开票时间：</label>
 					<div class="layui-input-block">
-						<input class="form-control layer-date laydate-icon layui-input laydate-icondate" id="invoiceDate" name="invoiceDate" value="<fmt:formatDate
+						<input class="form-control layer-date laydate-icon layui-input laydate-icondate" readonly="true" id="invoiceDate" name="invoiceDate" value="<fmt:formatDate
 							value="${workInvoice.invoiceDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">领票时间：</label>
 					<div class="layui-input-block">
-						<input placeholder="请选择领票时间" class="form-control layer-date laydate-icon layui-input laydate-icondate" id="takeDate" name="takeDate" value="<fmt:formatDate
+						<input placeholder="请选择领票时间" class="form-control layer-date laydate-icon layui-input laydate-icondate" readonly="true" id="takeDate" name="takeDate" value="<fmt:formatDate
 							value="${workInvoice.takeDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>

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

@@ -40,6 +40,17 @@
 
 				if(obj == 2){
                     $("#flag").val("no");
+
+					if($('#actualDrawerEmailAddress').val()==null||$('#actualDrawerEmailAddress').val()=="") {
+						parent.layer.msg("请填写电子邮箱!", {icon: 5});
+						return false;
+					}else{
+						var testEmail = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/;
+						if(!testEmail.test($('#actualDrawerEmailAddress').val())){
+							parent.layer.msg("电子邮箱格式不正确!", {icon: 5});
+							return false;
+						}
+					}
                 }else{
 					var flags=judgment();
 					if (leng==0){
@@ -210,6 +221,52 @@
 			$("#attachment_btn").click(function () {
 				$("#attachment_file").click();
 			});
+
+
+
+			$("#userEmailBtn").click(function () {
+				top.layer.open({
+					type: 2,
+					area: ["550px", "350px"],
+					title: "个人信息编辑",
+					content: "${ctx}/sys/user/infoEdit",
+					btn: ['确定', '关闭'],
+					skin: "two-btns",
+					yes: function (index, layero) {
+						var body = top.layer.getChildFrame('body', index);
+						var inputForm = $(body).find('#inputForm');
+						var email = inputForm.find('#email').val()
+						var top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+						inputForm.validate();
+						if (inputForm.valid()) {
+							loading("正在提交，请稍等...");
+							inputForm.submit();
+							$("#actualDrawerEmailAddress").val(email);
+						} else {
+							return;
+						}
+						top.layer.close(index);//关闭对话框。
+
+					},
+					cancel: function (index) {
+					}
+				});
+			});
+
+			$('#actualDrawerEmailAddress').blur(function (){
+				if($('#actualDrawerEmailAddress').val()==null||$('#actualDrawerEmailAddress').val()=="") {
+					/*$('#email').next("span").html("邮箱不能为空");
+                    $('#email').focus();*/
+				}else{
+					var testEmail = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/;
+					if(!testEmail.test($('#actualDrawerEmailAddress').val())){
+						$('#actualDrawerEmailAddressSpan').html("邮箱格式不正确");
+						//$('#actualDrawerEmailAddress').focus();
+					}else{
+						$('#actualDrawerEmailAddressSpan').html("");
+					}
+				}
+			});
         });
         function setValuee(obj){
             $.ajax({
@@ -231,10 +288,29 @@
 						$("#address").val(d.registerAddress);
 					}
 					$("#ids").val(d.ids);
-					bankShow(d.bankList);
+					newBankShow(d.bankList);
 				}
             })
         }
+		function newBankShow (data){
+			$('#bank').html('<option value="">请选择开户行信息</option>')
+			//对选中开票单位的银行做级联操作
+			for (var info in data){
+				if(data[info].id == '${workInvoice.bank}'){
+					$('#bank').append(new Option(data[info].ourBank,data[info].id,true,true));
+					$("#bankNumber").val(data[info].bankNumber);
+					if(null != data[info].remarks && undefined != data[info].remarks && '' != data[info].remarks){
+						$('#bankRemarks').html('备注：' + data[info].remarks);
+					}else{
+						$('#bankRemarks').html('');
+					}
+				}else{
+					$('#bank').append(new Option(data[info].ourBank,data[info].id));
+				}
+			}
+			layui.form.render("select");
+			form.render();
+		}
         function setDp(obj){
             $.ajax({
                 type:'post',
@@ -849,27 +925,27 @@
 <%--						<label for="invoiceType">普票</label>--%>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<div class="layui-item layui-col-sm6 count1">
 					<label class="layui-form-label"><span class="require-item">*</span>实际开票单位：</label>
 					<div class="layui-input-block readOnlyFFF with-icon">
-						<sys:gridselect url="${ctx}/workinvoice/workInvoice/selectclient" id="client" name="client.id"  value="${workInvoice.client.id}"  title="选择开票单位" labelName="workInvoice.client.name"
+						<sys:gridselect url="${ctx}/workinvoiceTwo/workinvoiceTwo/selectclient" id="client" name="client.id"  value="${workInvoice.client.id}"  title="选择开票单位" labelName="workInvoice.client.name"
 										labelValue="${workInvoice.client.name}" cssClass="form-control judgment layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
 						</td>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<div class="layui-item layui-col-sm6 count1">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>纳税人识别号：</label>
 					<div class="layui-input-block">
 						<form:input id="orUnicode" path="orUnicode" placeholder="请输入纳税人识别码" htmlEscape="false"    class="form-control isUscCode layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<div class="layui-item layui-col-sm6 count1">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>注册地址：</label>
 					<div class="layui-input-block">
 						<form:input id="address" path="address" placeholder="请输入注册地址" htmlEscape="false"    class="form-control layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<div class="layui-item layui-col-sm6 count1">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>电话：</label>
 					<div class="layui-input-block">
 						<form:input id="telephone" path="telephone" placeholder="请输入电话" htmlEscape="false"    class="form-control isTel layui-input"/>
@@ -883,16 +959,25 @@
 							<%--<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>--%>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<div class="layui-item layui-col-sm6 count1">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" readonly="true" placeholder="请输入银行账号" onkeyup="this.value=this.value.replace(/[^\d-]/g,'')"  class="form-control layui-input"/>
+						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" readonly="true" placeholder="请输入银行账号"  class="form-control layui-input"/>
+					</div>
+				</div>
+				<div class="layui-form-item count2">
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label"><span class="require-item">*</span>姓名：</label>
+						<div class="layui-input-block  with-icon">
+							<sys:treeselect id="newDrawer" name="newDrawerId" value="${workInvoice.newDrawerId}" labelName="newDrawerName" labelValue="${workInvoice.newDrawerName}"
+											cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+						</div>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>收款类型：</label>
 					<div class="layui-input-block readOnlyFFF">
-						<form:select  path="chargeType" class="form-control simple-select judgment" disabled="true">
+						<form:select  path="chargeType" class="form-control simple-select judgment" disabled="true" >
 							<form:options items="${fns:getMainDictList('receipt_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</div>
@@ -908,7 +993,7 @@
 				<div class="layui-item layui-col-sm12">
 					<label class="layui-form-label"><span class="require-item">*</span>开票金额(元)：</label>
 					<div class="layui-input-block">
-						<input name="money" htmlEscape="false" placeholder="请输入开票金额"  onkeyup="num(this)" value="<fmt:formatNumber value="${workInvoice.money}" pattern="#.00#"/>" class="form-control judgment number layui-input"/>
+						<input name="money" htmlEscape="false" placeholder="请输入开票金额"  value="<fmt:formatNumber value="${workInvoice.money}" pattern="#.00#"/>" class="form-control judgment number layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
@@ -936,6 +1021,27 @@
 					</div>
 				</div>
 				<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  with-icon">
+						<sys:treeselectNewDrawer id="actualDrawer" name="actualDrawerId" value="${workInvoice.actualDrawerId}" labelName="actualDrawerName" labelValue="${workInvoice.actualDrawerName}"
+												 cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>接收邮箱：</label>
+					<div class="layui-input-block">
+						<div class="input-group">
+							<form:input path="actualDrawerEmailAddress" htmlEscape="false"  value="${workInvoice.actualDrawerEmailAddress}" maxlength="50" class="form-control layui-input judgment email"/>
+							<span class="input-group-btn" style="font-size:14px;height: 40px;">
+								<a id="userEmailBtn" class="form-status"style="font-size:14px;height: 40px;line-height: 40px;background-color: #0f92fb;">完善电子邮箱</a>
+							</span>
+						</div>
+						<div>
+							<span id="actualDrawerEmailAddressSpan" class="help-inline" style="display:block;color: #cc5965"></span>
+						</div>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>对账人：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:treeselect id="master" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}"

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

@@ -222,6 +222,25 @@
 						})
 					}
 				});
+
+
+				var length=$("#workInvoiceProjectRelationList tr").length;
+				var count=length;
+				for (var i=1;i<=length;i++) {
+					var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+					if (delFlag == "1") {
+						count =count-1;
+					}
+				}
+				if(count==1){
+					$("#chargeType").val("2")
+					layui.form.render();
+				}else if (count>1){
+					$("#chargeType").val("1")
+					layui.form.render();
+				}else if(count == 0){
+					$("#projectFlag").val("");
+				}
 			});
             /*$('#money').keyup(function(){
                 var c=$(this);
@@ -480,6 +499,24 @@
 
 			}
 
+			var length=$("#workInvoiceProjectRelationList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
+
         }
 
 		function newSetPNumber(obj,ids,isProject,details){
@@ -566,6 +603,23 @@
 				}
 
 			}
+			var length=$("#workInvoiceProjectRelationList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#workInvoiceProjectRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
 
 		}