开票管理

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

@@ -570,6 +570,12 @@
 							value="${workInvoice.takeDate}" pattern="yyyy-MM-dd"/>">
 				</div>
 			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">对账人：</label>
+				<div class="layui-input-block  with-icon">
+					<input type="text"  readonly="true" value="${workInvoice.accountCheckingUserName}"  class="form-control layui-input" style="background-color: #f1f1f1" >
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
 				<div class="layui-item layui-col-sm8 lw6 with-textarea">

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

@@ -603,13 +603,13 @@
 				,{field:'invoiceType',align:'center', title: '发票类型',  width:90,templet:function(d){
 						return "<span title='"+ d.invoiceType +"'>" + d.invoiceType + "</span>";
 					}}
-                ,{field:'reportNumber',align:'center', title: '报告号', minWidth:150,templet:function(d){
-						<%--return "<a class=\"attention-info\" title=\"" + d.reportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.projectId + "&view=view','95%', '95%')\">" + d.reportNumber + "</a>";--%>
-						return d.reportNumber;
-                    }}
-                ,{field:'areaName',align:'center', title: '项目所在地', minWidth:80,templet:function(d){
-                        return "<span title='"+ d.areaName +"'>" + d.areaName + "</span>";
-                    }}
+                <%--,{field:'reportNumber',align:'center', title: '报告号', minWidth:150,templet:function(d){--%>
+				<%--		&lt;%&ndash;return "<a class=\"attention-info\" title=\"" + d.reportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.projectId + "&view=view','95%', '95%')\">" + d.reportNumber + "</a>";&ndash;%&gt;--%>
+				<%--		return d.reportNumber;--%>
+                <%--    }}--%>
+                <%--,{field:'areaName',align:'center', title: '项目所在地', minWidth:80,templet:function(d){--%>
+                <%--        return "<span title='"+ d.areaName +"'>" + d.areaName + "</span>";--%>
+                <%--    }}--%>
 				,{field:'createDate',align:'center', sort:true,title: '开票日期',  width:80}
 				,{field:'receiptMoneyDate',align:'center', sort:true,title: '收款日期',  width:80}
 				,{field:'receiptMoney',align:'center', title: '是否收款',  width:80}

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

@@ -597,6 +597,13 @@
 						<form:input id=""  path="" htmlEscape="false" readonly="true" class="form-control layui-input"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">对账人：</label>
+					<div class="layui-input-block  with-icon">
+						<sys:treeselect id="master" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}"
+										cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+					</div>
+				</div>
 			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>发票明细</h2></div>
@@ -604,13 +611,13 @@
 					<table id="contentTable" class="table table-bordered table-condensed can-edit">
 						<thead>
 						<tr>
-							<th><span class="require-item">*</span>发票代码</th>
+							<th>发票代码</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>税率</th>
+							<th>金额</th>
+							<th>税额</th>
+							<th>累计登记金额</th>
 <%--							<th width="150px">操作</th>--%>
 						</tr>
 						</thead>
@@ -624,7 +631,7 @@
                                             <input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
                                         </td>
                                     	<td>
-                                        	<input id="workAccountList{{idx}}_code" name="workAccountList[{{idx}}].code" type="text" value="{{row.code}}"    class="form-control required"/>
+                                        	<input id="workAccountList{{idx}}_code" name="workAccountList[{{idx}}].code" type="text" value="{{row.code}}"    class="form-control "/>
                                    		 </td>
                                     	 <td>
                                         	<input id="workAccountList{{idx}}_number" name="workAccountList[{{idx}}].number" type="text" value="{{row.number}}"    class="form-control required"/>
@@ -634,25 +641,25 @@
                                         </td>
                                         <td>
                                         <div class="input-group">
-                                            <input id="workAccountList{{idx}}_tax" onblur="setTaxMoney(this)" name="workAccountList[{{idx}}].tax" type="text" value="{{row.tax}}"    class="form-control number required"/><span class="input-group-addon">%</span>
+                                            <input id="workAccountList{{idx}}_tax" onblur="setTaxMoney(this)" name="workAccountList[{{idx}}].tax" type="text" value="{{row.tax}}"    class="form-control number "/><span class="input-group-addon">%</span>
                                             </div>
 
                                         </td>
                                         <td>
-                                            <input id="workAccountList{{idx}}_taxMoney" name="workAccountList[{{idx}}].taxMoney" type="text" value="{{row.taxMoney}}"    class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_taxMoney" name="workAccountList[{{idx}}].taxMoney" type="text" value="{{row.taxMoney}}"    class="form-control "/>
                                         </td>
 										<td>
-                                            <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control "/>
                                         </td>
                                         <td>
-                                            <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control "/>
                                         </td>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 
-                                            <input id="workAccountList{{idx}}_backSign" name="workAccountList[{{idx}}].backSign"  type="hidden" value="正常"  readonly="true"  class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_backSign" name="workAccountList[{{idx}}].backSign"  type="hidden" value="正常"  readonly="true"  class="form-control "/>
 
-                                            <input id="workAccountList{{idx}}_backNumber" name="workAccountList[{{idx}}].backNumber"  type="hidden" value=""  readonly="true"  class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_backNumber" name="workAccountList[{{idx}}].backNumber"  type="hidden" value=""  readonly="true"  class="form-control "/>
 
 
 <%--                                        <td class="text-center" width="10">--%>

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

@@ -4,6 +4,12 @@
 <head>
 	<title>发票管理</title>
 	<meta name="decorator" content="default"/>
+	<style>
+		#workInvoiceProjectRelationList td{
+			padding-left: 0px;
+			padding-right: 0px;
+		}
+	</style>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -48,53 +54,44 @@
 
 			<div class="form-group layui-row first lw14">
 				<div class="form-group-label"><h2>基本信息</h2></div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.project.projectName}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">发票申请编号：</label>
-					<div class="layui-input-block">
-						<div class="input-group">
-							<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.number}"/>
-							<span class="input-group-btn">
-							<label class="form-status"><c:choose><c:when test="${ empty workInvoice.invoiceState}">新添</c:when><c:otherwise>${fns:getDictLabel(workInvoice.invoiceState, 'audit_state','')}</c:otherwise>	</c:choose></label>
-						</span>
-						</div>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
-					<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.project.workContractInfo.name}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
-					<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.project.projectId}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
-					<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.project.workContractInfo.client.name}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
-					<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.project.reportData.number}"/>
-					</div>
+				<div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
+					<table id="contentTables" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+						<thead>
+						<tr>
+							<th width="200px"><font color="red">*</font>项目名称</th>
+							<th width="200px">合同名称</th>
+							<th width="200px">项目编号</th>
+							<th width="200px">委托方</th>
+							<th width="200px">报告号</th>
+								<%--						<th width="100px">操作</th>--%>
+						</tr>
+						</thead>
+						<tbody id="workInvoiceProjectRelationList">
+						<c:forEach items="${workInvoice.workInvoiceProjectRelationList}" var="list">
+							<tr>
+								<td>
+									<input type="text" value="${list.projectName}" maxlength="32" readonly="readonly"  class="form-control"/>
+								</td>
+								<td>
+									<input type="text" value="${list.workContractName}" maxlength="32" readonly="readonly"  class="form-control"/>
+								</td>
+								<td style="text-align:center;">
+									<input type="text" value="${list.projectNum}" maxlength="32" readonly="readonly"  class="form-control"/>
+								</td>
+								<td>
+									<input type="text" value="${list.clientName}" maxlength="32" readonly="readonly"  class="form-control"/>
+								</td>
+								<td>
+									<input type="text" value="${list.reportDataNum}" maxlength="32" readonly="readonly"  class="form-control"/>
+								</td>
+									<%--								<td class="text-center op-td" >--%>
+									<%--									{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workInvoiceProjectRelationList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}--%>
+									<%--								</td>--%>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
 				</div>
-				<%--<div class="layui-item layui-col-sm6">--%>
-					<%--<label class="layui-form-label"><span class="require-item">*</span>所属部门：</label>--%>
-					<%--<div class="layui-input-block">--%>
-						<%--<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.office.name}"/>--%>
-					<%--</div>--%>
-				<%--</div>--%>
 			</div>
 			<div class="form-group layui-row first lw14">
 				<div class="form-group-label"><h2>发票详情</h2></div>
@@ -170,12 +167,19 @@
 						<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="<fmt:formatDate value="${workInvoice.invoiceDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">对账人：</label>
+					<div class="layui-input-block  with-icon">
+						<input type="text"  readonly="true" value="${workInvoice.accountCheckingUserName}"  class="form-control layui-input" style="background-color: #f1f1f1" >
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm12">
 					<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="<fmt:formatDate value="${workInvoice.takeDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
+
 			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>发票明细</h2></div>