Browse Source

发票添加选择实际开票单位级联出开户行信息功能

user5 3 years atrás
parent
commit
8e488f9511

+ 4 - 1
src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientBankDao.java

@@ -20,4 +20,7 @@ public interface WorkClientBankDao extends CrudDao<WorkClientBank> {
     List<WorkClientBank> findListByClient(WorkClientBank workClientBank);
     //根据客户信息表id查出来对应的银行信息
     List<WorkClientBank> getLinkBank(WorkClientBank workClientBank);
-}
+
+    //根据名称查询开户行信息名称
+    WorkClientBank getByBankName(String bankName);
+}

+ 8 - 0
src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -170,6 +170,14 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
     public List<WorkClientBank> findBankList(WorkClientInfo workClientInfo)  {
         return workClientBankDao.findListByClient(new WorkClientBank(workClientInfo));
     }
+    /**
+     * 获取银行开户信息
+     * @param bankName
+     * @return
+     */
+    public WorkClientBank getBankInfo(String bankName)  {
+        return workClientBankDao.getByBankName(bankName);
+    }
 
     /**
      * 获取附件列表信息

+ 1 - 0
src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -980,6 +980,7 @@ public class WorkInvoiceController extends BaseController {
 		}*/
 
 		map.put("bank",bank);
+		map.put("bankList",list);
 		map.put("bankNumber",bankNumber);
 		map.put("telephone",workClientInfo.getTelephone());
 		map.put("orUnicode",workClientInfo.getUscCode());

+ 17 - 0
src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceTwoController.java

@@ -1004,6 +1004,7 @@ public class WorkInvoiceTwoController extends BaseController {
 		}*/
 
 		map.put("bank",bank);
+		map.put("bankList",list);
 		map.put("bankNumber",bankNumber);
 		map.put("telephone",workClientInfo.getTelephone());
 		map.put("orUnicode",workClientInfo.getUscCode());
@@ -1011,6 +1012,22 @@ public class WorkInvoiceTwoController extends BaseController {
 		map.put("ids",workClientInfo.getId());
 		return JsonMapper.toJsonString(map);
 	}
+
+
+	/**
+	 * 根据银行信息查询具体数据
+	 * @param bankName
+	 * @return
+	 */
+	@RequestMapping(value = "getBankInfo")
+	@ResponseBody
+	public String getBankInfo(String bankName) {
+		HashMap<Object, Object> map = Maps.newHashMap();
+		WorkClientBank bankInfo = workClientInfoService.getBankInfo(bankName);
+		map.put("data",bankInfo);
+		return JsonMapper.toJsonString(map);
+	}
+
 	/**
 	 * 获取经办人部门信息
 	 * @return

+ 2 - 2
src/main/resources/mappings/modules/sys/RoleDao.xml

@@ -315,7 +315,7 @@
 		</if>
 		<!-- 数据范围过滤 -->
 		${sqlMap.dsf}
-		ORDER BY a.number ASC  
+		ORDER BY a.number ASC
 	</select>
 
 	<select id="findListRole" resultType="Role">
@@ -602,4 +602,4 @@
 		set role_id = #{roleId}
 		where user_id = #{userId}
 	</update>
-</mapper>
+</mapper>

+ 28 - 20
src/main/resources/mappings/modules/workclientinfo/WorkClientBankDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.modules.workclientinfo.dao.WorkClientBankDao">
-    
+
 	<sql id="workClientBankColumns">
 		a.id AS "id",
 		a.create_by AS "createBy.id",
@@ -14,22 +14,22 @@
 		a.bank_number AS "bankNumber",
 		a.client_id AS "clientId.id"
 	</sql>
-	
+
 	<sql id="workClientBankJoins">
         LEFT JOIN work_client_info b ON b.id = a.client_id
 	</sql>
-	
-    
+
+
 	<select id="get" resultType="WorkClientBank" >
-		SELECT 
+		SELECT
 			<include refid="workClientBankColumns"/>
 		FROM work_client_bank a
 		<include refid="workClientBankJoins"/>
 		WHERE a.id = #{id}
 	</select>
-	
+
 	<select id="findList" resultType="WorkClientBank" >
-		SELECT 
+		SELECT
 			<include refid="workClientBankColumns"/>
             ,b.name AS "clientId.name"
 		FROM work_client_bank a
@@ -66,15 +66,15 @@
         </where>
             ORDER BY a.update_date DESC
     </select>
-	
+
 	<select id="findAllList" resultType="WorkClientBank" >
-		SELECT 
+		SELECT
 			<include refid="workClientBankColumns"/>
 		FROM work_client_bank a
 		<include refid="workClientBankJoins"/>
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
-		</where>		
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -84,7 +84,7 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert">
 		INSERT INTO work_client_bank(
 			id,
@@ -110,9 +110,9 @@
 			#{clientId.id}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE work_client_bank SET 	
+		UPDATE work_client_bank SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			remarks = #{remarks},
@@ -121,8 +121,8 @@
 			client_id = #{clientId.id}
 		WHERE id = #{id}
 	</update>
-	
-	
+
+
 	<!--物理删除-->
 	<update id="delete">
 		DELETE FROM work_client_bank
@@ -135,10 +135,10 @@
             </otherwise>
         </choose>
 	</update>
-	
+
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE work_client_bank SET 
+		UPDATE work_client_bank SET
 			del_flag = #{DEL_FLAG_DELETE}
         <choose>
             <when test="id !=null and id != ''">
@@ -149,8 +149,8 @@
             </otherwise>
         </choose>
 	</update>
-	
-	
+
+
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
 	<select id="findUniqueByProperty" resultType="WorkClientBank" statementType="STATEMENT">
 		select * FROM work_client_bank  where ${propertyName} = '${value}'
@@ -163,4 +163,12 @@
 		<include refid="workClientBankJoins"/>
 		WHERE a.client_id = #{clientId.id}
 	</select>
-</mapper>
+
+	<select id="getByBankName" resultType="WorkClientBank" >
+		SELECT
+		<include refid="workClientBankColumns"/>
+		FROM work_client_bank a
+		<include refid="workClientBankJoins"/>
+		WHERE a.our_bank = #{bankName}
+	</select>
+</mapper>

+ 6 - 1
src/main/webapp/webpage/modules/workclientinfo/all/workClientInfoForm.jsp

@@ -577,7 +577,8 @@
                             <thead>
                             <tr>
                                 <th class="sort-column companyType"><%--<font color="red">*</font>--%>开户银行</th>
-                                <th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
+                                <th width="300px;"><%--<font color="red">*</font>--%>开户账号</th>
+                                <th width="300px;">备注信息</th>
                                 <th width="100px">操作</th>
                             </tr>
                             </thead>
@@ -600,6 +601,10 @@
                                         <input placeholder="请输入开户账号 " id="workClientBankList{{idx}}_bankNumber" onblur="testBankNumber(this.value)" name="workClientBankList[{{idx}}].bankNumber" type="text" value="{{row.bankNumber}}" maxlength="25"  class="form-control required digits "/>
                                     </td>
 
+                                    <td>
+                                        <input placeholder="请输入备注信息 " id="workClientBankList{{idx}}_remarks" name="workClientBankList[{{idx}}].remarks" type="text" value="{{row.remarks}}" maxlength="255"  class="form-control "/>
+                                    </td>
+
                                     <td class="text-center op-td" width="10">
                                         {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workClientBankList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
                                     </td>

+ 6 - 1
src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -615,7 +615,8 @@
                             <thead>
                             <tr>
                                 <th class="sort-column companyType"><%--<font color="red">*</font>--%>开户银行</th>
-                                <th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
+                                <th width="300px;"><%--<font color="red">*</font>--%>开户账号</th>
+                                <th width="300px;"><%--<font color="red">*</font>--%>备注信息</th>
                                 <th width="100px">操作</th>
                             </tr>
                             </thead>
@@ -638,6 +639,10 @@
                                         <input placeholder="请输入开户账号 " id="workClientBankList{{idx}}_bankNumber" onblur="testBankNumber(this.value)" name="workClientBankList[{{idx}}].bankNumber" type="text" value="{{row.bankNumber}}" maxlength="25"  class="form-control required digits "/>
                                     </td>
 
+                                    <td>
+                                        <input placeholder="请输入备注信息 " id="workClientBankList{{idx}}_remarks" name="workClientBankList[{{idx}}].remarks" type="text" value="{{row.remarks}}" maxlength="255"  class="form-control "/>
+                                    </td>
+
                                     <td class="text-center op-td" width="10">
                                         {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workClientBankList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
                                     </td>

+ 3 - 1
src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormDetail.jsp

@@ -127,7 +127,8 @@
                         <tr>
                             <th width="80px">序号</th>
                             <th ><%--<font color="red">*</font>--%>开户银行</th>
-                            <th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
+                            <th width="300px;"><%--<font color="red">*</font>--%>开户账号</th>
+                            <th width="300px;"><%--<font color="red">*</font>--%>备注信息</th>
 
                         </tr>
                         </thead>
@@ -137,6 +138,7 @@
                                 <td>${status.index + 1}</td>
                                 <td>${workClientBank.ourBank}</td>
                                 <td>${workClientBank.bankNumber}</td>
+                                <td>${workClientBank.remarks}</td>
                             </tr>
                         </c:forEach>
                         <c:if test="${bankSize == 0}">

+ 67 - 4
src/main/webapp/webpage/modules/workinvoice/workInvoiceAllForm.jsp

@@ -35,6 +35,18 @@
 					parent.layer.msg("请选择发票类型",{icon:0});
 					return false;
 				}
+				if(invoiceType == 1){
+					var bank = $("#bank").val();
+					if(null == bank || undefined == bank || '' == bank){
+						parent.layer.msg("请选择开户银行",{icon:0});
+						return false;
+					}
+					var bankNumber = $("#bankNumber").val();
+					if(null == bankNumber || undefined == bankNumber || '' == bankNumber){
+						parent.layer.msg("银行账号不可为空",{icon:0});
+						return false;
+					}
+				}
 				var leng=$("#workInvoiceProjectRelationList tr").length;
 				if (leng>1){
 					var count=0;
@@ -101,6 +113,8 @@
 				$(".count2").show();
 			}
 
+			setValuee('${workInvoice.client.id}')
+
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 				form.on("radio(invoiceType)", function(event){
@@ -148,6 +162,50 @@
 				$("#attachment_btn").click(function () {
 					$("#attachment_file").click();
 				});
+				window.bankShow = function (data){
+					$('#bank').html('<option value="">请选择开户行信息</option>')
+					//对选中开票单位的银行做级联操作
+					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);
+							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].ourBank));
+						}
+					}
+
+					layui.form.render("select");
+					form.render();
+				}
+
+				layui.form.on('select(bankFilter)',function(d) {
+					if(null == d.value || undefined == d.value || '' == d.value){
+						$('#bankNumber').val("");
+						$('#bankRemarks').html('');
+					}else{
+						$.ajax({
+							type:"post",
+							url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getBankInfo',
+							data:{"bankName":d.value},
+							dataType:"json",
+							async: false,
+							success:function(data){
+								var info = data.data
+								$('#bankNumber').val(info.bankNumber);
+								if(null != info.remarks && undefined != info.remarks && '' != info.remarks){
+									$('#bankRemarks').html('备注:' + info.remarks);
+								}else{
+									$('#bankRemarks').html('');
+								}
+							}
+						})
+					}
+				});
 			});
 			/*$('#money').keyup(function(){
                 var c=$(this);
@@ -212,6 +270,8 @@
 		});
 
 		function setValuee(obj){
+			$("#bankNumber").val("");
+			$('#bankRemarks').html('');
 			$.ajax({
 				type:'post',
 				url:'${ctx}/workinvoice/workInvoice/getWorkClientInfo',
@@ -220,12 +280,13 @@
 				},
 				success:function(data){
 					var d = JSON.parse(data);
-					$("#bank").val(d.bank);
+					//$("#bank").val(d.bank);
 					$("#orUnicode").val(d.orUnicode);
-					$("#bankNumber").val(d.bankNumber);
+					//$("#bankNumber").val(d.bankNumber);
 					$("#telephone").val(d.telephone);
 					$("#address").val(d.registerAddress);
 					$("#ids").val(d.ids);
+					window.bankShow(d.bankList);
 				}
 			})
 		}
@@ -877,13 +938,15 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行:</label>
 					<div class="layui-input-block">
-						<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>
 					<div class="layui-input-block">
-						<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>

+ 67 - 4
src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoForm.jsp

@@ -35,6 +35,18 @@
 					parent.layer.msg("请选择发票类型",{icon:0});
 					return false;
 				}
+				if(invoiceType == 1){
+					var bank = $("#bank").val();
+					if(null == bank || undefined == bank || '' == bank){
+						parent.layer.msg("请选择开户银行",{icon:0});
+						return false;
+					}
+					var bankNumber = $("#bankNumber").val();
+					if(null == bankNumber || undefined == bankNumber || '' == bankNumber){
+						parent.layer.msg("银行账号不可为空",{icon:0});
+						return false;
+					}
+				}
 				var leng=$("#workInvoiceProjectRelationList tr").length;
 				if (leng>1){
 					var count=0;
@@ -101,6 +113,8 @@
 				$(".count2").show();
 			}
 
+			setValuee('${workInvoice.client.id}')
+
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 				form.on("radio(invoiceType)", function(event){
@@ -148,6 +162,50 @@
 				$("#attachment_btn").click(function () {
 					$("#attachment_file").click();
 				});
+				window.bankShow = function (data){
+					$('#bank').html('<option value="">请选择开户行信息</option>')
+					//对选中开票单位的银行做级联操作
+					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);
+							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].ourBank));
+						}
+					}
+
+					layui.form.render("select");
+					form.render();
+				}
+
+				layui.form.on('select(bankFilter)',function(d) {
+					if(null == d.value || undefined == d.value || '' == d.value){
+						$('#bankNumber').val("");
+						$('#bankRemarks').html('');
+					}else{
+						$.ajax({
+							type:"post",
+							url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getBankInfo',
+							data:{"bankName":d.value},
+							dataType:"json",
+							async: false,
+							success:function(data){
+								var info = data.data
+								$('#bankNumber').val(info.bankNumber);
+								if(null != info.remarks && undefined != info.remarks && '' != info.remarks){
+									$('#bankRemarks').html('备注:' + info.remarks);
+								}else{
+									$('#bankRemarks').html('');
+								}
+							}
+						})
+					}
+				});
 			});
 			/*$('#money').keyup(function(){
                 var c=$(this);
@@ -212,6 +270,8 @@
 		});
 
 		function setValuee(obj){
+			$("#bankNumber").val("");
+			$('#bankRemarks').html('');
 			$.ajax({
 				type:'post',
 				url:'${ctx}/workinvoice/workInvoice/getWorkClientInfo',
@@ -220,12 +280,13 @@
 				},
 				success:function(data){
 					var d = JSON.parse(data);
-					$("#bank").val(d.bank);
+					//$("#bank").val(d.bank);
 					$("#orUnicode").val(d.orUnicode);
-					$("#bankNumber").val(d.bankNumber);
+					//$("#bankNumber").val(d.bankNumber);
 					$("#telephone").val(d.telephone);
 					$("#address").val(d.registerAddress);
 					$("#ids").val(d.ids);
+					window.bankShow(d.bankList);
 				}
 			})
 		}
@@ -846,13 +907,15 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行:</label>
 					<div class="layui-input-block">
-						<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>
 					<div class="layui-input-block">
-						<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>

+ 70 - 4
src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -38,6 +38,20 @@
 					}
 				}
 
+				var invoiceType=$('input:radio[name="invoiceType"]:checked').val();
+				if(invoiceType == 1){
+					var bank = $("#bank").val();
+					if(null == bank || undefined == bank || '' == bank){
+						parent.layer.msg("请选择开户银行",{icon:0});
+						return false;
+					}
+					var bankNumber = $("#bankNumber").val();
+					if(null == bankNumber || undefined == bankNumber || '' == bankNumber){
+						parent.layer.msg("银行账号不可为空",{icon:0});
+						return false;
+					}
+				}
+
 				if(obj == 2){
                     $("#flag").val("no");
                 }else{
@@ -64,6 +78,7 @@
             return false;
         }
         $(document).ready(function() {
+			setValuee('${workInvoice.client.id}')
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 				form.on("radio(invoiceType)", function(event){
@@ -97,6 +112,52 @@
 					}
 					form.render();
 				})
+
+
+				window.bankShow = function (data){
+					$('#bank').html('<option value="">请选择开户行信息</option>')
+					//对选中开票单位的银行做级联操作
+					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);
+							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].ourBank));
+						}
+					}
+
+					layui.form.render("select");
+					form.render();
+				}
+
+				layui.form.on('select(bankFilter)',function(d) {
+					if(null == d.value || undefined == d.value || '' == d.value){
+						$('#bankNumber').val("");
+						$('#bankRemarks').html('');
+					}else{
+						$.ajax({
+							type:"post",
+							url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getBankInfo',
+							data:{"bankName":d.value},
+							dataType:"json",
+							async: false,
+							success:function(data){
+								var info = data.data
+								$('#bankNumber').val(info.bankNumber);
+								if(null != info.remarks && undefined != info.remarks && '' != info.remarks){
+									$('#bankRemarks').html('备注:' + info.remarks);
+								}else{
+									$('#bankRemarks').html('');
+								}
+							}
+						})
+					}
+				});
 			});
 
 			var newDrawerRadio = '${workInvoice.newDrawer}';//后端获取值
@@ -188,6 +249,8 @@
 			});
         });
         function setValuee(obj){
+			$("#bankNumber").val("");
+			$('#bankRemarks').html('');
             $.ajax({
                 type:'post',
                 url:'${ctx}/workinvoice/workInvoice/getWorkClientInfo',
@@ -196,12 +259,13 @@
                 },
                 success:function(data){
                     var d = JSON.parse(data);
-                    $("#bank").val(d.bank);
+					//$("#bank").val(d.bank);
                     $("#orUnicode").val(d.orUnicode);
-                    $("#bankNumber").val(d.bankNumber);
+					//$("#bankNumber").val(d.bankNumber);
                     $("#telephone").val(d.telephone);
                     $("#address").val(d.adress);
                     $("#ids").val(d.ids);
+					window.bankShow(d.bankList);
                 }
             })
         }
@@ -855,13 +919,15 @@
 				<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 ="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>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  class="form-control number layui-input"/>
+						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" readonly="true" placeholder="请输入银行账号"  class="form-control number layui-input"/>
 					</div>
 				</div>
 				<div class="layui-form-item count2">

+ 68 - 5
src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoForm.jsp

@@ -35,6 +35,19 @@
 					parent.layer.msg("请选择发票类型",{icon:0});
 					return false;
 				}
+				if(invoiceType == 1){
+					var bank = $("#bank").val();
+					if(null == bank || undefined == bank || '' == bank){
+						parent.layer.msg("请选择开户银行",{icon:0});
+						return false;
+					}
+					var bankNumber = $("#bankNumber").val();
+					if(null == bankNumber || undefined == bankNumber || '' == bankNumber){
+						parent.layer.msg("银行账号不可为空",{icon:0});
+						return false;
+					}
+				}
+
 				var leng=$("#workInvoiceProjectRelationList tr").length;
 				if (leng>1){
 					var count=0;
@@ -101,6 +114,7 @@
 				$(".count1").hide();
 				$(".count2").show();
 			}
+			setValuee('${workInvoice.client.id}')
 
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
@@ -147,6 +161,50 @@
 					}
 				});
 
+				window.bankShow = function (data){
+					$('#bank').html('<option value="">请选择开户行信息</option>')
+					//对选中开票单位的银行做级联操作
+					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);
+							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].ourBank));
+						}
+					}
+
+					layui.form.render("select");
+					form.render();
+				}
+
+				layui.form.on('select(bankFilter)',function(d) {
+					if(null == d.value || undefined == d.value || '' == d.value){
+						$('#bankNumber').val("");
+						$('#bankRemarks').html('');
+					}else{
+						$.ajax({
+							type:"post",
+							url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getBankInfo',
+							data:{"bankName":d.value},
+							dataType:"json",
+							async: false,
+							success:function(data){
+								var info = data.data
+								$('#bankNumber').val(info.bankNumber);
+								if(null != info.remarks && undefined != info.remarks && '' != info.remarks){
+									$('#bankRemarks').html('备注:' + info.remarks);
+								}else{
+									$('#bankRemarks').html('');
+								}
+							}
+						})
+					}
+				});
 			});
             /*$('#money').keyup(function(){
                 var c=$(this);
@@ -214,7 +272,9 @@
 			});
         });
 
-        function setValuee(obj){
+		function setValuee (obj){
+			$("#bankNumber").val("");
+			$('#bankRemarks').html('');
             $.ajax({
                 type:'post',
                 url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getWorkClientInfo',
@@ -223,12 +283,13 @@
                 },
                 success:function(data){
                     var d = JSON.parse(data);
-                    $("#bank").val(d.bank);
+                    //$("#bank").val(d.bank);
                     $("#orUnicode").val(d.orUnicode);
-                    $("#bankNumber").val(d.bankNumber);
+                    //$("#bankNumber").val(d.bankNumber);
                     $("#telephone").val(d.telephone);
                     $("#address").val(d.registerAddress);
                     $("#ids").val(d.ids);
+					window.bankShow(d.bankList);
                 }
             })
         }
@@ -881,13 +942,15 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行:</label>
 					<div class="layui-input-block">
-						<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>
 					<div class="layui-input-block">
-						<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>

+ 67 - 4
src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoModify.jsp

@@ -37,6 +37,19 @@
 						}
 					}
 				}
+				var invoiceType=$('input:radio[name="invoiceType"]:checked').val();
+				if(invoiceType == 1){
+					var bank = $("#bank").val();
+					if(null == bank || undefined == bank || '' == bank){
+						parent.layer.msg("请选择开户银行",{icon:0});
+						return false;
+					}
+					var bankNumber = $("#bankNumber").val();
+					if(null == bankNumber || undefined == bankNumber || '' == bankNumber){
+						parent.layer.msg("银行账号不可为空",{icon:0});
+						return false;
+					}
+				}
 				if(obj == 2){
                     $("#flag").val("no");
                 }else{
@@ -63,6 +76,7 @@
             return false;
         }
         $(document).ready(function() {
+			setValuee('${workInvoice.client.id}')
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 				form.on("radio(invoiceType)", function(event){
@@ -96,6 +110,50 @@
 					}
 					form.render();
 				})
+				window.bankShow = function (data){
+					$('#bank').html('<option value="">请选择开户行信息</option>')
+					//对选中开票单位的银行做级联操作
+					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);
+							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].ourBank));
+						}
+					}
+
+					layui.form.render("select");
+					form.render();
+				}
+
+				layui.form.on('select(bankFilter)',function(d) {
+					if(null == d.value || undefined == d.value || '' == d.value){
+						$('#bankNumber').val("");
+						$('#bankRemarks').html('');
+					}else{
+						$.ajax({
+							type:"post",
+							url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getBankInfo',
+							data:{"bankName":d.value},
+							dataType:"json",
+							async: false,
+							success:function(data){
+								var info = data.data
+								$('#bankNumber').val(info.bankNumber);
+								if(null != info.remarks && undefined != info.remarks && '' != info.remarks){
+									$('#bankRemarks').html('备注:' + info.remarks);
+								}else{
+									$('#bankRemarks').html('');
+								}
+							}
+						})
+					}
+				});
 			});
 
 			var newDrawerRadio = '${workInvoice.newDrawer}';//后端获取值
@@ -187,6 +245,8 @@
 			});
         });
         function setValuee(obj){
+			$("#bankNumber").val("");
+			$('#bankRemarks').html('');
             $.ajax({
                 type:'post',
                 url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getWorkClientInfo',
@@ -195,12 +255,13 @@
                 },
                 success:function(data){
                     var d = JSON.parse(data);
-                    $("#bank").val(d.bank);
+                    //$("#bank").val(d.bank);
                     $("#orUnicode").val(d.orUnicode);
-                    $("#bankNumber").val(d.bankNumber);
+                    //$("#bankNumber").val(d.bankNumber);
                     $("#telephone").val(d.telephone);
                     $("#address").val(d.adress);
                     $("#ids").val(d.ids);
+					window.bankShow(d.bankList);
                 }
             })
         }
@@ -836,13 +897,15 @@
 				<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 ="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>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  class="form-control number layui-input"/>
+						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" readonly="true" placeholder="请输入银行账号"  class="form-control number layui-input"/>
 					</div>
 				</div>
 				<div class="layui-form-item count2">