开票功能修改

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

@@ -616,7 +616,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 							<th>发票状态</th><%--正常--%>
 							<th>被退标记</th>
 								<%--<th><span class="require-item">*</span>被退票号</th>
@@ -646,9 +646,9 @@
 									<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>">
 										<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>
 									</td>
-									<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
+									<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
 										<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>
-									</td>
+									</td>--%>
 									<td title="${workAccount.state}">
 											${workAccount.state}
 									</td>

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

@@ -616,7 +616,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 							<th>发票状态</th><%--正常--%>
 							<th>被退标记</th>
 								<%--<th><span class="require-item">*</span>被退票号</th>
@@ -646,9 +646,9 @@
 									<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>">
 										<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>
 									</td>
-									<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
+									<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
 										<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>
-									</td>
+									</td>--%>
 									<td title="${workAccount.state}">
 											${workAccount.state}
 									</td>

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

@@ -114,11 +114,15 @@
 				},
 				success:function(data){
 					var d = JSON.parse(data);
-					$("#bank").val(d.bank);
-					$("#orUnicode").val(d.orUnicode);
-					$("#bankNumber").val(d.bankNumber);
-					$("#telephone").val(d.telephone);
-					$("#address").val(d.adress);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
 					$("#ids").val(d.ids);
 				}
 			})
@@ -423,7 +427,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">地址：</label>
+					<label class="layui-form-label">注册地址：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.address}"/>
 					</div>
@@ -611,7 +615,7 @@
 							<th><span class="require-item">*</span>税率</th>
 							<th><span class="require-item">*</span>金额</th>
 							<th><span class="require-item">*</span>税额</th>
-							<th><span class="require-item">*</span>累计登记金额</th>
+							<%--<th><span class="require-item">*</span>累计登记金额</th>--%>
 							<th><span class="require-item">*</span>发票状态</th><%--正常--%>
 							<th><span class="require-item">*</span>被退标记</th>
 								<%--<th><span class="require-item">*</span>被退票号</th>
@@ -641,9 +645,9 @@
 									<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
 									</td>
-									<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
+									<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
-									</td>
+									</td>--%>
 									<td title="${workAccount.state}">
 											${workAccount.state}
 									</td>

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

@@ -375,7 +375,7 @@
 						<th>税率</th>
 						<th>金额</th>
 						<th>税额</th>
-						<th>累计登记金额</th>
+						<%--<th>累计登记金额</th>--%>
 						<th>发票状态</th><%--正常--%>
 						<th>被退标记</th>
 						<th>被退票号</th>
@@ -405,9 +405,9 @@
 								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>">
 									<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
+								<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
 									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>
-								</td>
+								</td>--%>
 								<td title="${workAccount.state}">
 										${workAccount.state}
 								</td>

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

@@ -114,11 +114,15 @@
                 },
                 success:function(data){
                     var d = JSON.parse(data);
-                    $("#bank").val(d.bank);
-                    $("#orUnicode").val(d.orUnicode);
-                    $("#bankNumber").val(d.bankNumber);
-                    $("#telephone").val(d.telephone);
-                    $("#address").val(d.adress);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
                     $("#ids").val(d.ids);
                 }
             })
@@ -416,7 +420,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">地址：</label>
+					<label class="layui-form-label">注册地址：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.address}"/>
 					</div>
@@ -604,7 +608,7 @@
 							<th><span class="require-item">*</span>税率</th>
 							<th><span class="require-item">*</span>金额</th>
 							<th><span class="require-item">*</span>税额</th>
-							<th><span class="require-item">*</span>累计登记金额</th>
+							<%--<th><span class="require-item">*</span>累计登记金额</th>--%>
 							<th><span class="require-item">*</span>发票状态</th><%--正常--%>
 							<th><span class="require-item">*</span>被退标记</th>
 								<%--<th><span class="require-item">*</span>被退票号</th>
@@ -634,9 +638,9 @@
 									<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
 									</td>
-									<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
+									<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
-									</td>
+									</td>--%>
 									<td title="${workAccount.state}">
 											${workAccount.state}
 									</td>

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

@@ -114,11 +114,15 @@
 				},
 				success:function(data){
 					var d = JSON.parse(data);
-					$("#bank").val(d.bank);
-					$("#orUnicode").val(d.orUnicode);
-					$("#bankNumber").val(d.bankNumber);
-					$("#telephone").val(d.telephone);
-					$("#address").val(d.adress);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
 					$("#ids").val(d.ids);
 				}
 			})
@@ -423,7 +427,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">地址：</label>
+					<label class="layui-form-label">注册地址：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.address}"/>
 					</div>
@@ -611,7 +615,7 @@
 							<th><span class="require-item">*</span>税率</th>
 							<th><span class="require-item">*</span>金额</th>
 							<th><span class="require-item">*</span>税额</th>
-							<th><span class="require-item">*</span>累计登记金额</th>
+							<%--<th><span class="require-item">*</span>累计登记金额</th>--%>
 							<th><span class="require-item">*</span>发票状态</th><%--正常--%>
 							<th><span class="require-item">*</span>被退标记</th>
 								<%--<th><span class="require-item">*</span>被退票号</th>
@@ -641,9 +645,9 @@
 									<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
 									</td>
-									<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
+									<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
-									</td>
+									</td>--%>
 									<td title="${workAccount.state}">
 											${workAccount.state}
 									</td>

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

@@ -114,11 +114,16 @@
                 },
                 success:function(data){
                     var d = JSON.parse(data);
-                    $("#bank").val(d.bank);
-                    $("#orUnicode").val(d.orUnicode);
-                    $("#bankNumber").val(d.bankNumber);
-                    $("#telephone").val(d.telephone);
-                    $("#address").val(d.adress);
+                    // $("#bank").val(d.bank);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
                     $("#ids").val(d.ids);
                 }
             })
@@ -416,7 +421,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">地址：</label>
+					<label class="layui-form-label">注册地址：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.address}"/>
 					</div>
@@ -604,7 +609,7 @@
 							<th><span class="require-item">*</span>税率</th>
 							<th><span class="require-item">*</span>金额</th>
 							<th><span class="require-item">*</span>税额</th>
-							<th><span class="require-item">*</span>累计登记金额</th>
+							<%--<th><span class="require-item">*</span>累计登记金额</th>--%>
 							<th><span class="require-item">*</span>发票状态</th><%--正常--%>
 							<th><span class="require-item">*</span>被退标记</th>
 								<%--<th><span class="require-item">*</span>被退票号</th>
@@ -634,9 +639,9 @@
 									<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
 									</td>
-									<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
+									<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
-									</td>
+									</td>--%>
 									<td title="${workAccount.state}">
 											${workAccount.state}
 									</td>

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

@@ -114,11 +114,16 @@
 				},
 				success:function(data){
 					var d = JSON.parse(data);
-					$("#bank").val(d.bank);
-					$("#orUnicode").val(d.orUnicode);
-					$("#bankNumber").val(d.bankNumber);
-					$("#telephone").val(d.telephone);
-					$("#address").val(d.adress);
+					// $("#bank").val(d.bank);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
 					$("#ids").val(d.ids);
 				}
 			})
@@ -423,7 +428,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">地址：</label>
+					<label class="layui-form-label">注册地址：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.address}"/>
 					</div>
@@ -611,7 +616,7 @@
 							<th><span class="require-item">*</span>税率</th>
 							<th><span class="require-item">*</span>金额</th>
 							<th><span class="require-item">*</span>税额</th>
-							<th><span class="require-item">*</span>累计登记金额</th>
+							<%--<th><span class="require-item">*</span>累计登记金额</th>--%>
 							<th><span class="require-item">*</span>发票状态</th><%--正常--%>
 							<th><span class="require-item">*</span>被退标记</th>
 								<%--<th><span class="require-item">*</span>被退票号</th>
@@ -641,9 +646,9 @@
 									<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
 									</td>
-									<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
+									<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
-									</td>
+									</td>--%>
 									<td title="${workAccount.state}">
 											${workAccount.state}
 									</td>

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

@@ -281,11 +281,15 @@
 				},
 				success:function(data){
 					var d = JSON.parse(data);
-					//$("#bank").val(d.bank);
-					$("#orUnicode").val(d.orUnicode);
-					//$("#bankNumber").val(d.bankNumber);
-					$("#telephone").val(d.telephone);
-					$("#address").val(d.registerAddress);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
 					$("#ids").val(d.ids);
 					window.bankShow(d.bankList);
 				}
@@ -925,9 +929,9 @@
 					</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"><span class="require-item invoicetype">*</span>注册地址：</label>
 					<div class="layui-input-block">
-						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入地址"  class="form-control layui-input"/>
+						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入注册地址"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -1181,7 +1185,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -1215,9 +1219,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control"/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control"/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -690,7 +690,7 @@
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=3','"+ d.id +"','"+ d.id+"','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" >修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=3','"+ d.id+"','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" >修改</a>";
                         }
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {

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

@@ -65,6 +65,7 @@
 		$(document).ready(function() {
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
+				setValuee('${workInvoice.client.id}')
 				form.on("radio(invoiceType)", function(event){
 					var radioVal = $(this).val();
 					//专票必填
@@ -96,6 +97,54 @@
 					}
 					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{
+						var clientId = $("#clientId").val();
+						$.ajax({
+							type:"post",
+							url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getBankInfo',
+							data:{"bankName":d.value,"clientId":clientId},
+							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}';//后端获取值
@@ -196,12 +245,18 @@
 				},
 				success:function(data){
 					var d = JSON.parse(data);
-					$("#bank").val(d.bank);
-					$("#orUnicode").val(d.orUnicode);
-					$("#bankNumber").val(d.bankNumber);
-					$("#telephone").val(d.telephone);
-					$("#address").val(d.adress);
+					//$("#bank").val(d.bank);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
 					$("#ids").val(d.ids);
+					window.bankShow(d.bankList);
 				}
 			})
 		}
@@ -823,9 +878,9 @@
 					</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"><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"/>
+						<form:input id="address" path="address" placeholder="请输入注册地址" htmlEscape="false"    class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
@@ -834,16 +889,18 @@
 						<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">
+				<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 count1">
+				<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="请输入银行账号"  class="form-control number 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 class="layui-form-item count2">
@@ -1074,7 +1131,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 								<%--							<th width="150px">操作</th>--%>
 						</tr>
 						</thead>
@@ -1108,9 +1165,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"  readonly="true"  class="form-control "/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control "/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -480,7 +480,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 							<th>发票状态</th><%--正常--%>
 							<th>被退标记</th>
 							<%--<th><span class="require-item">*</span>被退票号</th>
@@ -510,9 +510,9 @@
 								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>">
 									<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
+								<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
 									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>
-								</td>
+								</td>--%>
 								<td title="${workAccount.state}">
 										${workAccount.state}
 								</td>

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

@@ -281,11 +281,15 @@
 				},
 				success:function(data){
 					var d = JSON.parse(data);
-					//$("#bank").val(d.bank);
-					$("#orUnicode").val(d.orUnicode);
-					//$("#bankNumber").val(d.bankNumber);
-					$("#telephone").val(d.telephone);
-					$("#address").val(d.registerAddress);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
 					$("#ids").val(d.ids);
 					window.bankShow(d.bankList);
 				}
@@ -894,9 +898,9 @@
 					</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"><span class="require-item invoicetype">*</span>注册地址：</label>
 					<div class="layui-input-block">
-						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入地址"  class="form-control layui-input"/>
+						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入注册地址"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -1150,7 +1154,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -1184,9 +1188,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control judgment"/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control judgment"/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -524,7 +524,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 						</tr>
 						</thead>
 						<tbody id="workAccountList">
@@ -557,9 +557,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control"/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control"/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -480,7 +480,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 							<th>发票状态</th><%--正常--%>
 							<th>被退标记</th>
 							<%--<th><span class="require-item">*</span>被退票号</th>
@@ -510,9 +510,9 @@
 								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>">
 									<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
+								<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
 									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>
-								</td>
+								</td>--%>
 								<td title="${workAccount.state}">
 										${workAccount.state}
 								</td>

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

@@ -195,7 +195,7 @@
 						<th><span class="require-item">*</span>税率</th>
 						<th><span class="require-item">*</span>金额</th>
 						<th><span class="require-item">*</span>税额</th>
-						<th><span class="require-item">*</span>累计登记金额</th>
+						<%--<th><span class="require-item">*</span>累计登记金额</th>--%>
 						<th><span class="require-item">*</span>发票状态</th><%--正常--%>
 						<th><span class="require-item">*</span>被退标记</th>
 						<th><span class="require-item">*</span>被退票号</th>
@@ -225,9 +225,9 @@
 								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
 									<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
+								<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
 									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
-								</td>
+								</td>--%>
 								<td title="${workAccount.state}">
 										${workAccount.state}
 								</td>

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

@@ -820,7 +820,7 @@
 						<th width="80px">税率</th>
 						<th width="100px">金额</th>
 						<th width="100px">税额</th>
-						<th width="100px">累计登记金额</th>
+						<%--<th width="100px">累计登记金额</th>--%>
 						<th width="80px">操作</th>
 						<%--<th><span class="require-item">*</span>发票状态</th>&lt;%&ndash;正常&ndash;%&gt;--%>
 						<%--<th><span class="require-item">*</span>被退标记</th>--%>
@@ -859,9 +859,9 @@
 								<td>
 									<input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control number"/>
 								</td>
-								<td>
+								<%--<td>
 									<input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control"/>
-								</td>
+								</td>--%>
 
 									<input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -791,7 +791,7 @@
 						<th width="80px">税率</th>
 						<th width="100px">金额</th>
 						<th width="100px">税额</th>
-						<th width="100px">累计登记金额</th>
+						<%--<th width="100px">累计登记金额</th>--%>
 						<th width="80px">操作</th>
 						<%--<th><span class="require-item">*</span>发票状态</th>&lt;%&ndash;正常&ndash;%&gt;--%>
 						<%--<th><span class="require-item">*</span>被退标记</th>--%>
@@ -830,9 +830,9 @@
 								<td>
 									<input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control number"/>
 								</td>
-								<td>
+								<%--<td>
 									<input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control"/>
-								</td>
+								</td>--%>
 
 									<input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -173,11 +173,15 @@
                 },
                 success:function(data){
                     var d = JSON.parse(data);
-                    $("#bank").val(d.bank);
-                    $("#orUnicode").val(d.orUnicode);
-                    $("#bankNumber").val(d.bankNumber);
-                    $("#telephone").val(d.telephone);
-                    $("#address").val(d.adress);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
                     $("#ids").val(d.ids);
                 }
             })
@@ -810,9 +814,9 @@
 					</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"><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"/>
+						<form:input id="address" path="address" placeholder="请输入注册地址" htmlEscape="false"    class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -1045,7 +1049,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 <%--							<th width="150px">操作</th>--%>
 						</tr>
 						</thead>
@@ -1079,9 +1083,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"  readonly="true"  class="form-control "/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control "/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -174,11 +174,15 @@
                 },
                 success:function(data){
                     var d = JSON.parse(data);
-                    $("#bank").val(d.bank);
-                    $("#orUnicode").val(d.orUnicode);
-                    $("#bankNumber").val(d.bankNumber);
-                    $("#telephone").val(d.telephone);
-                    $("#address").val(d.registerAddress);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
                     $("#ids").val(d.ids);
                 }
             })
@@ -771,9 +775,9 @@
 					</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"><span class="require-item invoicetype">*</span>注册地址：</label>
 					<div class="layui-input-block">
-						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入地址"  class="form-control layui-input"/>
+						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入注册地址"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -1010,7 +1014,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -1044,9 +1048,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control judgment"/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control judgment"/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -261,10 +261,15 @@
                 success:function(data){
                     var d = JSON.parse(data);
 					//$("#bank").val(d.bank);
-                    $("#orUnicode").val(d.orUnicode);
-					//$("#bankNumber").val(d.bankNumber);
-                    $("#telephone").val(d.telephone);
-                    $("#address").val(d.adress);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
                     $("#ids").val(d.ids);
 					window.bankShow(d.bankList);
                 }
@@ -906,9 +911,9 @@
 					</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"><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"/>
+						<form:input id="address" path="address" placeholder="请输入注册地址" htmlEscape="false"    class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
@@ -1159,7 +1164,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 <%--							<th width="150px">操作</th>--%>
 						</tr>
 						</thead>
@@ -1193,9 +1198,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"  readonly="true"  class="form-control "/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control "/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -765,7 +765,7 @@
 						<th width="80px">税率</th>
 						<th width="100px">金额</th>
 						<th width="100px">税额</th>
-						<th width="100px">累计登记金额</th>
+						<%--<th width="100px">累计登记金额</th>--%>
 						<th width="80px">操作</th>
 						<%--<th><span class="require-item">*</span>发票状态</th>&lt;%&ndash;正常&ndash;%&gt;--%>
 						<%--<th><span class="require-item">*</span>被退标记</th>--%>
@@ -804,9 +804,9 @@
 								<td>
 									<input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control number"/>
 								</td>
-								<td>
+								<%--<td>
 									<input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control"/>
-								</td>
+								</td>--%>
 
 									<input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -296,7 +296,7 @@
 							<th><span class="require-item">*</span>税率</th>
 							<th><span class="require-item">*</span>金额</th>
 							<th><span class="require-item">*</span>税额</th>
-							<th><span class="require-item">*</span>累计登记金额</th>
+							<%--<th><span class="require-item">*</span>累计登记金额</th>--%>
 							<th><span class="require-item">*</span>发票状态</th><%--正常--%>
 							<th><span class="require-item">*</span>被退标记</th>
 							<%--<th><span class="require-item">*</span>被退票号</th>
@@ -326,9 +326,9 @@
 								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
 									<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
+								<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
 									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
-								</td>
+								</td>--%>
 								<td title="${workAccount.state}">
 										${workAccount.state}
 								</td>

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

@@ -114,6 +114,7 @@
 				$(".count1").hide();
 				$(".count2").show();
 			}
+			console.log("获取开票信息")
 			setValuee('${workInvoice.client.id}')
 
 			layui.use(['form', 'layer'], function () {
@@ -285,11 +286,19 @@
                 success:function(data){
                     var d = JSON.parse(data);
                     //$("#bank").val(d.bank);
-                    $("#orUnicode").val(d.orUnicode);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
                     //$("#bankNumber").val(d.bankNumber);
-                    $("#telephone").val(d.telephone);
-                    $("#address").val(d.registerAddress);
-                    $("#ids").val(d.ids);
+                    // $("#telephone").val(d.telephone);
+                    // $("#address").val(d.registerAddress);
+					$("#ids").val(d.ids);
 					window.bankShow(d.bankList);
                 }
             })
@@ -929,9 +938,9 @@
 					</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"><span class="require-item invoicetype">*</span>注册地址：</label>
 					<div class="layui-input-block">
-						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入地址"  class="form-control layui-input"/>
+						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入注册地址"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -1187,7 +1196,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -1221,9 +1230,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control judgment"/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control judgment"/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -257,10 +257,15 @@
                 success:function(data){
                     var d = JSON.parse(data);
                     //$("#bank").val(d.bank);
-                    $("#orUnicode").val(d.orUnicode);
-                    //$("#bankNumber").val(d.bankNumber);
-                    $("#telephone").val(d.telephone);
-                    $("#address").val(d.adress);
+					if(!'${workInvoice.orUnicode}'){
+						$("#orUnicode").val(d.orUnicode);
+					}
+					if(!'${workInvoice.telephone}'){
+						$("#telephone").val(d.telephone);
+					}
+					if(!'${workInvoice.address}'){
+						$("#address").val(d.registerAddress);
+					}
                     $("#ids").val(d.ids);
 					window.bankShow(d.bankList);
                 }
@@ -884,9 +889,9 @@
 					</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"><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"/>
+						<form:input id="address" path="address" placeholder="请输入注册地址" htmlEscape="false"    class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
@@ -1137,7 +1142,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 <%--							<th width="150px">操作</th>--%>
 						</tr>
 						</thead>
@@ -1171,9 +1176,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"  readonly="true"  class="form-control "/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control "/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

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

@@ -138,7 +138,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
-					<label class="layui-form-label">地址：</label>
+					<label class="layui-form-label">注册地址：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.address}"/>
 					</div>
@@ -364,7 +364,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 							<th>发票状态</th><%--正常--%>
 							<th>被退标记</th>
 							<%--<th><span class="require-item">*</span>被退票号</th>
@@ -394,9 +394,9 @@
 								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
 									<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
+								<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
 									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>
-								</td>
+								</td>--%>
 								<td title="${workAccount.state}">
 										${workAccount.state}
 								</td>
@@ -417,7 +417,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-			<div class="form-group-label"><h2>发票明细</h2></div>
+			<div class="form-group-label"><h2>收款明细</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container">
 				<table id="receiptTable" class="table table-bordered table-condensed details">
 					<thead>

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

@@ -302,7 +302,7 @@
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
-							<th>累计登记金额</th>
+							<%--<th>累计登记金额</th>--%>
 							<th>发票状态</th><%--正常--%>
 							<th>被退标记</th>
 							<%--<th><span class="require-item">*</span>被退票号</th>
@@ -332,9 +332,9 @@
 								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
 									<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
+								<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
 									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>
-								</td>
+								</td>--%>
 								<td title="${workAccount.state}">
 										${workAccount.state}
 								</td>

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceAudita.jsp

@@ -203,7 +203,7 @@
 						<th><span class="require-item">*</span>税率</th>
 						<th><span class="require-item">*</span>金额</th>
 						<th><span class="require-item">*</span>税额</th>
-						<th><span class="require-item">*</span>累计登记金额</th>
+						<%--<th><span class="require-item">*</span>累计登记金额</th>--%>
 						<th><span class="require-item">*</span>发票状态</th><%--正常--%>
 						<th><span class="require-item">*</span>被退标记</th>
 						<th><span class="require-item">*</span>被退票号</th>
@@ -233,9 +233,9 @@
 								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
 									<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
+								<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
 									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
-								</td>
+								</td>--%>
 								<td title="${workAccount.state}">
 										${workAccount.state}
 								</td>

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceForma.jsp

@@ -465,7 +465,7 @@
 						<th width="80px"><span class="require-item">*</span>税率</th>
 						<th width="100px"><span class="require-item">*</span>金额</th>
 						<th width="100px"><span class="require-item">*</span>税额</th>
-						<th width="100px"><span class="require-item">*</span>累计登记金额</th>
+						<%--<th width="100px"><span class="require-item">*</span>累计登记金额</th>--%>
 						<th width="80px">操作</th>
 							<%--<th><span class="require-item">*</span>发票状态</th>&lt;%&ndash;正常&ndash;%&gt;--%>
 							<%--<th><span class="require-item">*</span>被退标记</th>--%>
@@ -505,9 +505,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control number required"/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control required"/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceFormas.jsp

@@ -464,7 +464,7 @@
 						<th width="80px"><span class="require-item">*</span>税率</th>
 						<th width="100px"><span class="require-item">*</span>金额</th>
 						<th width="100px"><span class="require-item">*</span>税额</th>
-						<th width="100px"><span class="require-item">*</span>累计登记金额</th>
+						<%--<th width="100px"><span class="require-item">*</span>累计登记金额</th>--%>
 						<th width="80px">操作</th>
 							<%--<th><span class="require-item">*</span>发票状态</th>&lt;%&ndash;正常&ndash;%&gt;--%>
 							<%--<th><span class="require-item">*</span>被退标记</th>--%>
@@ -504,9 +504,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control number required"/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control required"/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceModifya.jsp

@@ -467,7 +467,7 @@
 							<th width="80px"><span class="require-item">*</span>税率</th>
 							<th width="100px"><span class="require-item">*</span>金额</th>
 							<th width="100px"><span class="require-item">*</span>税额</th>
-							<th width="100px"><span class="require-item">*</span>累计登记金额</th>
+							<%--<th width="100px"><span class="require-item">*</span>累计登记金额</th>--%>
 							<th width="80px">操作</th>
 								<%--<th><span class="require-item">*</span>发票状态</th>&lt;%&ndash;正常&ndash;%&gt;--%>
 								<%--<th><span class="require-item">*</span>被退标记</th>--%>
@@ -507,9 +507,9 @@
 										<td>
                                             <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control number required"/>
                                         </td>
-                                        <td>
+                                        <%--<td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control required"/>
-                                        </td>
+                                        </td>--%>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceViewa.jsp

@@ -183,7 +183,7 @@
 							<th><span class="require-item">*</span>税率</th>
 							<th><span class="require-item">*</span>金额</th>
 							<th><span class="require-item">*</span>税额</th>
-							<th><span class="require-item">*</span>累计登记金额</th>
+							<%--<th><span class="require-item">*</span>累计登记金额</th>--%>
 							<th><span class="require-item">*</span>发票状态</th><%--正常--%>
 							<th><span class="require-item">*</span>被退标记</th>
 							<th><span class="require-item">*</span>被退票号</th>
@@ -213,9 +213,9 @@
 									<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
 									</td>
-									<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
+									<%--<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
 										<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
-									</td>
+									</td>--%>
 									<td title="${workAccount.state}">
 											${workAccount.state}
 									</td>