发票页面修改

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

@@ -36,6 +36,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	private static final long serialVersionUID = 1L;
 	private String number;		// 发票申请编号
 	private String processInstanceId; // 流程实例编号
+	private String clientName;		// 实际开票单位
 	private WorkClientInfo client;		// 实际开票单位
 	private ProjectRecords project;		// 开票项目(来源项目登记)
 	private String projectName;		// 项目名称
@@ -717,4 +718,12 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setActualDrawerName(String actualDrawerName) {
 		this.actualDrawerName = actualDrawerName;
 	}
+
+	public String getClientName() {
+		return clientName;
+	}
+
+	public void setClientName(String clientName) {
+		this.clientName = clientName;
+	}
 }

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

@@ -1699,6 +1699,7 @@ public class WorkProjectNotifyController extends BaseController {
 							return "modules/workinvoice/workInvoiceAuditEnd";
 						}
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+						model.addAttribute("workInvoice", workInvoice);
 						return "modules/workinvoice/workInvoiceModify";
 					}
 				} else if (workProjectNotify.getType().equals("212")) {    //开票管理

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -6,7 +6,7 @@
 		DISTINCT(a.id) AS "id",
 		a.number AS "number",
 		a.process_instance_id AS "processInstanceId",
-		a.client_id AS "client.id",
+		a.client_name AS "clientName",
 		a.project_id AS "project.id",
 		a.project_name AS "projectName",
 		a.money AS "money",
@@ -76,7 +76,7 @@
 		DISTINCT(a.id) AS "id",
 		a.number AS "number",
 		a.process_instance_id AS "processInstanceId",
-		a.client_id AS "client.id",
+		a.client_name AS "clientName",
 		a.project_id AS "project.id",
 		a.project_name AS "projectName",
 		a.money AS "money",
@@ -161,7 +161,7 @@
 		a.id,
 		a.number,
 		a.process_instance_id as "processInstanceId",
-		a.client_id as clientId,
+		a.client_name as clientName,
 		a.project_id as projectId,
 		a.project_name as "projectName",
 		a.money as "money",
@@ -337,9 +337,6 @@
 				AND date_format(a.receipt_money_date,'%Y-%m-%d') <= date_format(#{receiptEndDate},'%Y-%m-%d')
 			</if>
 
-			<if test="client != null and client.id != null and client.id != ''">
-				AND a.client_id = #{client.id}
-			</if>
 			<if test="project != null and project.id != null and project.id != ''">
 				AND a.project_id = #{project.id}
 			</if>
@@ -489,9 +486,6 @@
 				AND date_format(a.receipt_money_date,'%Y-%m-%d') &lt;= date_format(#{receiptEndDate},'%Y-%m-%d')
 			</if>
 
-			<if test="client != null and client.id != null and client.id != ''">
-				AND a.client_id = #{client.id}
-			</if>
 			<if test="project != null and project.id != null and project.id != ''">
 				AND a.project_id = #{project.id}
 			</if>
@@ -525,6 +519,9 @@
 			<if test="money != null and money != ''">
 				AND a.money = #{money}
 			</if>
+			<if test="clientName != null and clientName != ''">
+				AND a.clientName = #{clientName}
+			</if>
 			<!--<if test="submitterId != null and submitterId != ''">
 				AND a.create_by = #{submitterId}
 			</if>-->
@@ -837,7 +834,7 @@
 		a.id AS "id",
 		a.number AS "number",
 		a.process_instance_id AS "processInstanceId",
-		a.client_id AS "client.id",
+		a.client_name AS "clientName",
 		a.project_id AS "project.id",
 		a.money AS "money",
 		a.money AS "moneyStr",
@@ -938,9 +935,6 @@
 				AND date_format(a.receipt_money_date,'%Y-%m-%d') &lt;= date_format(#{receiptEndDate},'%Y-%m-%d')
 			</if>
 
-			<if test="client != null and client.id != null and client.id != ''">
-				AND a.client_id = #{client.id}
-			</if>
 			<if test="project != null and project.id != null and project.id != ''">
 				AND a.project_id = #{project.id}
 			</if>
@@ -1072,9 +1066,6 @@
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
 				AND a.create_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
-			<if test="client != null and client.id != null and client.id != ''">
-				AND a.client_id = #{client.id}
-			</if>
 			<if test="project != null and project.id != null and project.id != ''">
 				AND a.project_id = #{project.id}
 			</if>
@@ -1208,9 +1199,6 @@
 				AND date_format(a.receipt_money_date,'%Y-%m-%d') &lt;= date_format(#{receiptEndDate},'%Y-%m-%d')
 			</if>
 
-			<if test="client != null and client.id != null and client.id != ''">
-				AND a.client_id = #{client.id}
-			</if>
 			<if test="project != null and project.id != null and project.id != ''">
 				AND a.project_id = #{project.id}
 			</if>
@@ -1247,6 +1235,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="clientName != null and clientName != ''">
+				AND a.clientName = #{clientName}
+			</if>
 			<!--<if test="submitterId != null and submitterId != ''">
 				AND a.create_by = #{submitterId}
 			</if>-->
@@ -1381,9 +1372,6 @@
 				AND date_format(a.receipt_money_date,'%Y-%m-%d') &lt;= date_format(#{receiptEndDate},'%Y-%m-%d')
 			</if>
 
-			<if test="client != null and client.id != null and client.id != ''">
-				AND a.client_id = #{client.id}
-			</if>
 			<if test="project != null and project.id != null and project.id != ''">
 				AND a.project_id = #{project.id}
 			</if>
@@ -1521,7 +1509,7 @@
 		INSERT INTO work_invoice(
 			id,
 			number,
-			client_id,
+			client_name,
 			project_id,
 			project_name,
 			money,
@@ -1566,7 +1554,7 @@
 		) VALUES (
 			#{id},
 			#{number},
-			#{client.id},
+			#{clientName},
 			#{project.id},
 			#{projectName},
 			#{money},
@@ -1614,7 +1602,7 @@
 	<update id="update">
 		UPDATE work_invoice SET
 			number = #{number},
-			client_id = #{client.id},
+			client_name = #{clientName},
 			project_id = #{project.id},
 			project_name = #{projectName},
 			money = #{money},
@@ -1875,9 +1863,6 @@
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
 				AND a.create_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
-			<if test="client != null and client.id != null and client.id != ''">
-				AND a.client_id = #{client.id}
-			</if>
 			<if test="project != null and project.id != null and project.id != ''">
 				AND a.project_id = #{project.id}
 			</if>
@@ -2043,9 +2028,6 @@
 				AND date_format(a.receipt_money_date,'%Y-%m-%d') &lt;= date_format(#{WorkInvoice.receiptEndDate},'%Y-%m-%d')
 			</if>
 
-			<if test="WorkInvoice.client != null and WorkInvoice.client.id != null and WorkInvoice.client.id != ''">
-				AND a.client_id = #{WorkInvoice.client.id}
-			</if>
 			<if test="WorkInvoice.project != null and WorkInvoice.project.id != null and WorkInvoice.project.id != ''">
 				AND a.project_id = #{WorkInvoice.project.id}
 			</if>
@@ -2194,9 +2176,6 @@
 				AND date_format(a.receipt_money_date,'%Y-%m-%d') &lt;= date_format(#{WorkInvoice.receiptEndDate},'%Y-%m-%d')
 			</if>
 
-			<if test="WorkInvoice.client != null and WorkInvoice.client.id != null and WorkInvoice.client.id != ''">
-				AND a.client_id = #{WorkInvoice.client.id}
-			</if>
 			<if test="WorkInvoice.project != null and WorkInvoice.project.id != null and WorkInvoice.project.id != ''">
 				AND a.project_id = #{WorkInvoice.project.id}
 			</if>
@@ -2345,9 +2324,6 @@
 				AND date_format(a.receipt_money_date,'%Y-%m-%d') &lt;= date_format(#{WorkInvoice.receiptEndDate},'%Y-%m-%d')
 			</if>
 
-			<if test="WorkInvoice.client != null and WorkInvoice.client.id != null and WorkInvoice.client.id != ''">
-				AND a.client_id = #{WorkInvoice.client.id}
-			</if>
 			<if test="WorkInvoice.project != null and WorkInvoice.project.id != null and WorkInvoice.project.id != ''">
 				AND a.project_id = #{WorkInvoice.project.id}
 			</if>
@@ -2503,9 +2479,6 @@
 				AND date_format(a.receipt_money_date,'%Y-%m-%d') &lt;= date_format(#{WorkInvoice.receiptEndDate},'%Y-%m-%d')
 			</if>
 
-			<if test="WorkInvoice.client != null and WorkInvoice.client.id != null and WorkInvoice.client.id != ''">
-				AND a.client_id = #{WorkInvoice.client.id}
-			</if>
 			<if test="WorkInvoice.project != null and WorkInvoice.project.id != null and WorkInvoice.project.id != ''">
 				AND a.project_id = #{WorkInvoice.project.id}
 			</if>

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

@@ -117,7 +117,7 @@
 
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
-				form.on("radio(invoiceType)", function(event){
+				/*form.on("radio(invoiceType)", function(event){
 					var radioVal = $(this).val();
 					//专票必填
 					if(radioVal == 1){
@@ -135,7 +135,7 @@
 						$("#address").attr("class","form-control layui-input");
 						$("#telephone").attr("class","form-control isTel layui-input");
 					}
-				});
+				});*/
 
 				form.on('radio(newDrawerRadio)',function (event) {
 					var radioVal = $(this).val();
@@ -911,43 +911,49 @@
 					</div>
 				</div>
 				<div class="layui-form-item count1">
-				<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 with-icon">
 						<sys:gridselect url="${ctx}/workinvoice/workInvoice/selectclient" id="client" name="client.id"  value="${workInvoice.client.id}"  title="选择开票单位" labelName="workInvoice.client.name" cssStyle="background-color: #fff"
 										labelValue="${workInvoice.client.name}" cssClass="form-control judgment layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
 					</div>
+				</div>--%>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label double-line"><span class="require-item invoicetype">*</span>实际开票单位：</label>
+					<div class="layui-input-block">
+						<form:input id="clientName" path="clientName" htmlEscape="false" placeholder="请输入实际开票单位"  maxlength="64" class="form-control judgment layui-input"/>
+					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label double-line"><span class="require-item invoicetype">*</span>纳税人识别号：</label>
+					<label class="layui-form-label double-line">纳税人识别号：</label>
 					<div class="layui-input-block">
 						<form:input id="orUnicode" path="orUnicode" htmlEscape="false" placeholder="请输入纳税人识别号"   class="form-control isUscCode layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>地址：</label>
+					<label class="layui-form-label">地址：</label>
 					<div class="layui-input-block">
 						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入地址"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>电话：</label>
+					<label class="layui-form-label">电话：</label>
 					<div class="layui-input-block">
 						<form:input id="telephone" path="telephone" htmlEscape="false"  placeholder="请输入电话"  class="form-control isTel layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
+					<label class="layui-form-label">开户银行：</label>
 					<div class="layui-input-block">
-						<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
-						<span id="bankRemarks" class="spanzj" style="color:red;"></span>
-						<%--<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>--%>
+						<%--<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
+						<span id="bankRemarks" class="spanzj" style="color:red;"></span>--%>
+						<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
+					<label class="layui-form-label">银行账号：</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" placeholder="请输入银行账号"  onkeyup="this.value=this.value.replace(/[^\d-]/g,'')" class="form-control layui-input"/>
 					</div>
 				</div>
 				</div>

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

@@ -530,7 +530,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">开票单位：</label>
 							<div class="layui-input-block with-icon">
-								<form:input path="client.name" htmlEscape="false"  class=" form-control layui-input"/>
+								<form:input path="clientName" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
@@ -767,7 +767,7 @@
                     ,"areaName":"${workInvoice.project.county}"
                     ,"reportNumber":"${workInvoice.project.reportData.number}"
                     ,"projName":"${workInvoice.projectName}"
-                    ,"clientName":"${workInvoice.client.name}"
+                    ,"clientName":"${workInvoice.clientName}"
                     ,"officeName":"${workInvoice.office.name}"
                     ,"responsibleName":"${workInvoice.createBy.name}"
                     ,"receiptMoney":"${workInvoice.receiptMoney}"

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

@@ -117,7 +117,7 @@
 
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
-				form.on("radio(invoiceType)", function(event){
+				/*form.on("radio(invoiceType)", function(event){
 					var radioVal = $(this).val();
 					//专票必填
 					if(radioVal == 1){
@@ -135,7 +135,7 @@
 						$("#address").attr("class","form-control layui-input");
 						$("#telephone").attr("class","form-control isTel layui-input");
 					}
-				});
+				});*/
 
 				form.on('radio(newDrawerRadio)',function (event) {
 					var radioVal = $(this).val();
@@ -880,43 +880,49 @@
 					</div>
 				</div>
 				<div class="layui-form-item count1">
-				<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 with-icon">
 						<sys:gridselect url="${ctx}/workinvoice/workInvoice/selectclient" id="client" name="client.id"  value="${workInvoice.client.id}"  title="选择开票单位" labelName="workInvoice.client.name" cssStyle="background-color: #fff"
 										labelValue="${workInvoice.client.name}" cssClass="form-control judgment layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
 					</div>
+				</div>--%>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label double-line"><span class="require-item invoicetype">*</span>实际开票单位：</label>
+					<div class="layui-input-block">
+						<form:input id="clientName" path="clientName" htmlEscape="false" placeholder="请输入实际开票单位"  maxlength="64" class="form-control judgment layui-input"/>
+					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label double-line"><span class="require-item invoicetype">*</span>纳税人识别号：</label>
+					<label class="layui-form-label double-line">纳税人识别号：</label>
 					<div class="layui-input-block">
 						<form:input id="orUnicode" path="orUnicode" htmlEscape="false" placeholder="请输入纳税人识别号"   class="form-control isUscCode layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>地址：</label>
+					<label class="layui-form-label">地址：</label>
 					<div class="layui-input-block">
 						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入地址"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>电话：</label>
+					<label class="layui-form-label">电话：</label>
 					<div class="layui-input-block">
 						<form:input id="telephone" path="telephone" htmlEscape="false"  placeholder="请输入电话"  class="form-control isTel layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
+					<label class="layui-form-label">开户银行：</label>
 					<div class="layui-input-block">
-						<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
-						<span id="bankRemarks" class="spanzj" style="color:red;"></span>
-						<%--<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>--%>
+						<%--<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
+						<span id="bankRemarks" class="spanzj" style="color:red;"></span>--%>
+						<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
+					<label class="layui-form-label">银行账号：</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" placeholder="请输入银行账号" onkeyup="this.value=this.value.replace(/[^\d-]/g,'')" class="form-control layui-input"/>
 					</div>
 				</div>
 				</div>

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

@@ -86,7 +86,7 @@
 			<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="${workInvoice.project.workContractInfo.client.name}"/>
+					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.clientName}"/>
 				</div>
 			</div>
 			<%--<div class="layui-item layui-col-sm6">--%>
@@ -113,7 +113,7 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>实际开票单位：</label>
 				<div class="layui-input-block">
-					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.client.name}"/>
+					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.clientName}"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">

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

@@ -541,7 +541,7 @@
 			<div class="layui-item layui-col-sm6 count1">
 				<label class="layui-form-label"><span class="require-item">*</span>实际开票单位：</label>
 				<div class="layui-input-block">
-					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.client.name}"/>
+					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.clientName}"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6 count1">

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

@@ -38,7 +38,7 @@
 					}
 				}
 
-				var invoiceType=$('input:radio[name="invoiceType"]:checked').val();
+				/*var invoiceType=$('input:radio[name="invoiceType"]:checked').val();
 				if(invoiceType == 1){
 					var bank = $("#bank").val();
 					if(null == bank || undefined == bank || '' == bank){
@@ -50,7 +50,7 @@
 						parent.layer.msg("银行账号不可为空",{icon:0});
 						return false;
 					}
-				}
+				}*/
 
 				if(obj == 2){
                     $("#flag").val("no");
@@ -81,7 +81,7 @@
 			setValuee('${workInvoice.client.id}')
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
-				form.on("radio(invoiceType)", function(event){
+				/*form.on("radio(invoiceType)", function(event){
 					var radioVal = $(this).val();
 					//专票必填
 					if(radioVal == 1){
@@ -99,7 +99,7 @@
 						$("#address").attr("class","form-control layui-input");
 						$("#telephone").attr("class","form-control isTel layui-input");
 					}
-				});
+				});*/
 
 				form.on('radio(newDrawerRadio)',function (event) {
 					var radioVal = $(this).val();
@@ -120,7 +120,7 @@
 					for (var info in data){
 						if(data[info].ourBank == '${workInvoice.bank}'){
 							$('#bank').append(new Option(data[info].ourBank,data[info].ourBank,true,true));
-							$("#bankNumber").val(data[info].bankNumber);
+							//$("#bankNumber").val(data[info].bankNumber);
 							if(null != data[info].remarks && undefined != data[info].remarks && '' != data[info].remarks){
 								$('#bankRemarks').html('备注：' + data[info].remarks);
 							}else{
@@ -137,7 +137,7 @@
 
 				layui.form.on('select(bankFilter)',function(d) {
 					if(null == d.value || undefined == d.value || '' == d.value){
-						$('#bankNumber').val("");
+						//$('#bankNumber').val("");
 						$('#bankRemarks').html('');
 					}else{
 						var clientId = $("#clientId").val();
@@ -149,7 +149,7 @@
 							async: false,
 							success:function(data){
 								var info = data.data
-								$('#bankNumber').val(info.bankNumber);
+								//$('#bankNumber').val(info.bankNumber);
 								if(null != info.remarks && undefined != info.remarks && '' != info.remarks){
 									$('#bankRemarks').html('备注：' + info.remarks);
 								}else{
@@ -250,7 +250,7 @@
 			});
         });
         function setValuee(obj){
-			$("#bankNumber").val("");
+			//$("#bankNumber").val("");
 			$('#bankRemarks').html('');
             $.ajax({
                 type:'post',
@@ -261,10 +261,10 @@
                 success:function(data){
                     var d = JSON.parse(data);
 					//$("#bank").val(d.bank);
-                    $("#orUnicode").val(d.orUnicode);
+                    //$("#orUnicode").val(d.orUnicode);
 					//$("#bankNumber").val(d.bankNumber);
-                    $("#telephone").val(d.telephone);
-                    $("#address").val(d.adress);
+                    //$("#telephone").val(d.telephone);
+                    //$("#address").val(d.adress);
                     $("#ids").val(d.ids);
 					window.bankShow(d.bankList);
                 }
@@ -891,44 +891,50 @@
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="个人开票" value="2">
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 count1">
+				<%--<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"
 										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 count1">
+					<label class="layui-form-label double-line"><span class="require-item invoicetype">*</span>实际开票单位：</label>
+					<div class="layui-input-block">
+						<form:input id="clientName" path="clientName" htmlEscape="false" placeholder="请输入实际开票单位"  maxlength="64" class="form-control judgment layui-input"/>
+					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>纳税人识别号：</label>
+					<label class="layui-form-label">纳税人识别号：</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 count1">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>地址：</label>
+					<label class="layui-form-label">地址：</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 count1">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>电话：</label>
+					<label class="layui-form-label">电话：</label>
 					<div class="layui-input-block">
 						<form:input id="telephone" path="telephone" placeholder="请输入电话" htmlEscape="false"    class="form-control isTel layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
+					<label class="layui-form-label">开户银行：</label>
 					<div class="layui-input-block">
-						<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
-						<span id="bankRemarks" class="spanzj" style="color:red;"></span>
-						<%--<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>--%>
+						<%--<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
+						<span id="bankRemarks" class="spanzj" style="color:red;"></span>--%>
+						<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
+					<label class="layui-form-label">银行账号：</label>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" readonly="true" placeholder="请输入银行账号"  class="form-control number layui-input"/>
+						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  class="form-control number layui-input"/>
 					</div>
 				</div>
 				<div class="layui-form-item count2">

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

@@ -35,7 +35,7 @@
 					parent.layer.msg("请选择发票类型",{icon:0});
 					return false;
 				}
-				if(invoiceType == 1){
+				/*if(invoiceType == 1){
 					var bank = $("#bank").val();
 					if(null == bank || undefined == bank || '' == bank){
 						parent.layer.msg("请选择开户银行",{icon:0});
@@ -46,7 +46,7 @@
 						parent.layer.msg("银行账号不可为空",{icon:0});
 						return false;
 					}
-				}
+				}*/
 
 				var leng=$("#workInvoiceProjectRelationList tr").length;
 				if (leng>1){
@@ -119,7 +119,7 @@
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 
-				form.on("radio(invoiceType)", function(event){
+				/*form.on("radio(invoiceType)", function(event){
 					var radioVal = $(this).val();
 					//专票必填
 					if(radioVal == 1){
@@ -137,7 +137,7 @@
 						$("#address").attr("class","form-control layui-input");
 						$("#telephone").attr("class","form-control isTel layui-input");
 					}
-				});
+				});*/
 
 				form.on('radio(newDrawerRadio)',function (event) {
 					var radioVal = $(this).val();
@@ -915,43 +915,50 @@
 					</div>
 				</div>
 				<div class="layui-form-item count1">
-				<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 with-icon">
 						<sys:gridselect url="${ctx}/workinvoiceTwo/workinvoiceTwo/selectclient" id="client" name="client.id"  value="${workInvoice.client.id}"  title="选择开票单位" labelName="workInvoice.client.name" cssStyle="background-color: #fff"
 										labelValue="${workInvoice.client.name}" cssClass="form-control judgment layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
 					</div>
+				</div>--%>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label double-line"><span class="require-item invoicetype">*</span>实际开票单位：</label>
+					<div class="layui-input-block">
+						<form:input id="clientName" path="clientName" htmlEscape="false" placeholder="请输入实际开票单位"  maxlength="64" class="form-control judgment layui-input"/>
+					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label double-line"><span class="require-item invoicetype">*</span>纳税人识别号：</label>
+					<label class="layui-form-label double-line">纳税人识别号：</label>
 					<div class="layui-input-block">
 						<form:input id="orUnicode" path="orUnicode" htmlEscape="false" placeholder="请输入纳税人识别号"   class="form-control isUscCode layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>地址：</label>
+					<label class="layui-form-label">地址：</label>
 					<div class="layui-input-block">
 						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入地址"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>电话：</label>
+					<label class="layui-form-label">电话：</label>
 					<div class="layui-input-block">
 						<form:input id="telephone" path="telephone" htmlEscape="false"  placeholder="请输入电话"  class="form-control isTel layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
+					<label class="layui-form-label">开户银行：</label>
 					<div class="layui-input-block">
-						<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
-						<%--<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>--%>
+						<%--<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>--%>
+						<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>
 						<span id="bankRemarks" class="spanzj" style="color:red;"></span>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
+					<label class="layui-form-label">银行账号：</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" 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="请输入银行账号" onkeyup="this.value=this.value.replace(/[^\d-]/g,'')"  class="form-control layui-input"/>--%>
 					</div>
 				</div>
 				</div>

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

@@ -618,7 +618,7 @@
 							<div class="layui-item query athird">
 								<label class="layui-form-label">开票单位：</label>
 								<div class="layui-input-block with-icon">
-									<form:input path="client.name" htmlEscape="false"  class=" form-control layui-input"/>
+									<form:input path="clientName" htmlEscape="false"  class=" form-control layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item query athird">
@@ -857,7 +857,7 @@
                     ,"invoiceType":"${workInvoice.invoiceTypeStr}"
                     ,"projectId":"${workInvoice.project.id}"
                     ,"projName":"${workInvoice.projectName}"
-                    ,"clientName":"${workInvoice.client.name}"
+                    ,"clientName":"${workInvoice.clientName}"
                     ,"officeName":"${workInvoice.office.name}"
                     ,"responsibleName":"${workInvoice.createBy.name}"
                     ,"receiptMoney":"${workInvoice.receiptMoney}"

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

@@ -37,7 +37,7 @@
 						}
 					}
 				}
-				var invoiceType=$('input:radio[name="invoiceType"]:checked').val();
+				/*var invoiceType=$('input:radio[name="invoiceType"]:checked').val();
 				if(invoiceType == 1){
 					var bank = $("#bank").val();
 					if(null == bank || undefined == bank || '' == bank){
@@ -49,7 +49,7 @@
 						parent.layer.msg("银行账号不可为空",{icon:0});
 						return false;
 					}
-				}
+				}*/
 				if(obj == 2){
                     $("#flag").val("no");
                 }else{
@@ -79,7 +79,7 @@
 			setValuee('${workInvoice.client.id}')
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
-				form.on("radio(invoiceType)", function(event){
+				/*form.on("radio(invoiceType)", function(event){
 					var radioVal = $(this).val();
 					//专票必填
 					if(radioVal == 1){
@@ -97,7 +97,7 @@
 						$("#address").attr("class","form-control layui-input");
 						$("#telephone").attr("class","form-control isTel layui-input");
 					}
-				});
+				});*/
 
 				form.on('radio(newDrawerRadio)',function (event) {
 					var radioVal = $(this).val();
@@ -116,7 +116,7 @@
 					for (var info in data){
 						if(data[info].ourBank == '${workInvoice.bank}'){
 							$('#bank').append(new Option(data[info].ourBank,data[info].ourBank,true,true));
-							$("#bankNumber").val(data[info].bankNumber);
+							//$("#bankNumber").val(data[info].bankNumber);
 							if(null != data[info].remarks && undefined != data[info].remarks && '' != data[info].remarks){
 								$('#bankRemarks').html('备注：' + data[info].remarks);
 							}else{
@@ -133,7 +133,7 @@
 
 				layui.form.on('select(bankFilter)',function(d) {
 					if(null == d.value || undefined == d.value || '' == d.value){
-						$('#bankNumber').val("");
+						//$('#bankNumber').val("");
 						$('#bankRemarks').html('');
 					}else{
 						var clientId = $("#clientId").val();
@@ -145,7 +145,7 @@
 							async: false,
 							success:function(data){
 								var info = data.data
-								$('#bankNumber').val(info.bankNumber);
+								//$('#bankNumber').val(info.bankNumber);
 								if(null != info.remarks && undefined != info.remarks && '' != info.remarks){
 									$('#bankRemarks').html('备注：' + info.remarks);
 								}else{
@@ -246,7 +246,7 @@
 			});
         });
         function setValuee(obj){
-			$("#bankNumber").val("");
+			//$("#bankNumber").val("");
 			$('#bankRemarks').html('');
             $.ajax({
                 type:'post',
@@ -257,10 +257,10 @@
                 success:function(data){
                     var d = JSON.parse(data);
                     //$("#bank").val(d.bank);
-                    $("#orUnicode").val(d.orUnicode);
+                    //$("#orUnicode").val(d.orUnicode);
                     //$("#bankNumber").val(d.bankNumber);
-                    $("#telephone").val(d.telephone);
-                    $("#address").val(d.adress);
+                    //$("#telephone").val(d.telephone);
+                    //$("#address").val(d.adress);
                     $("#ids").val(d.ids);
 					window.bankShow(d.bankList);
                 }
@@ -869,44 +869,50 @@
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="个人开票" value="2">
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 count1">
+				<%--<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}/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 count1">
+					<label class="layui-form-label double-line"><span class="require-item invoicetype">*</span>实际开票单位：</label>
+					<div class="layui-input-block">
+						<form:input id="clientName" path="clientName" htmlEscape="false" placeholder="请输入实际开票单位"  maxlength="64" class="form-control judgment layui-input"/>
+					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>纳税人识别号：</label>
+					<label class="layui-form-label">纳税人识别号：</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 count1">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>地址：</label>
+					<label class="layui-form-label">地址：</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 count1">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>电话：</label>
+					<label class="layui-form-label">电话：</label>
 					<div class="layui-input-block">
 						<form:input id="telephone" path="telephone" placeholder="请输入电话" htmlEscape="false"    class="form-control isTel layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
+					<label class="layui-form-label">开户银行：</label>
 					<div class="layui-input-block">
-						<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
-						<span id="bankRemarks" class="spanzj" style="color:red;"></span>
-						<%--<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>--%>
+						<%--<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
+						<span id="bankRemarks" class="spanzj" style="color:red;"></span>--%>
+						<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
+					<label class="layui-form-label">银行账号：</label>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" readonly="true" placeholder="请输入银行账号"  class="form-control number layui-input"/>
+						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  class="form-control number layui-input"/>
 					</div>
 				</div>
 				<div class="layui-form-item count2">

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

@@ -128,7 +128,7 @@
 				<div class="layui-item layui-col-sm6 count1">
 					<label class="layui-form-label"><span class="require-item">*</span>实际开票单位：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.client.name}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.clientName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 count1">