发票代码提交

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceAllService.java

@@ -1060,6 +1060,40 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 	 * @param workInvoice
 	 */
 	@Transactional(readOnly = false)
+	public String adminModify(WorkInvoice workInvoice) {
+		for (WorkInvoiceDetail buyDetails : workInvoice.getWorkAccountList()){
+			if (buyDetails.getId() == null){
+				continue;
+			}
+			if (buyDetails.DEL_FLAG_NORMAL.equals(buyDetails.getDelFlag())){
+				buyDetails.setInvoiceId(workInvoice.getId());
+				buyDetails.setComId(workInvoice.getCompanyId());
+				buyDetails.setOfficeId(workInvoice.getOffice().getId());
+				if (StringUtils.isBlank(buyDetails.getId())){
+					buyDetails.preInsert();
+					if(workInvoice.getInvoiceDate()!=null){
+						buyDetails.setDate(workInvoice.getInvoiceDate());
+					}else{
+						buyDetails.setDate(workInvoice.getUpdateDate());
+					}
+					workInvoiceDetailDao.insert(buyDetails);
+				}else{
+					buyDetails.preUpdate();
+					buyDetails.getUpdateBy().setId("");
+					workInvoiceDetailDao.update(buyDetails);
+				}
+			}else{
+				workInvoiceDetailDao.delete(buyDetails);
+			}
+		}
+		return "修改成功";
+	}
+
+	/**
+	 * 审核流程
+	 * @param workInvoice
+	 */
+	@Transactional(readOnly = false)
 	public String auditSaveBranch(WorkInvoice workInvoice,List<User> auditUsers) {
 			//所属部门
 			Office office = officeService.get(workInvoice.getOffice().getId());

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

@@ -21,11 +21,13 @@ import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.AreaService;
 import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysuseroffice.service.UserofficeService;
 import com.jeeplus.modules.workactivity.entity.Activity;
@@ -168,6 +170,22 @@ public class WorkInvoiceAllController extends BaseController {
 		model.addAttribute("WorkInvoice", invoice);
 		return "modules/workinvoice/workInvoiceProjectView";
 	}
+
+	/**
+	 * 工单执行（完成任务）
+	 * @param
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value = "adminModify")
+	public String adminModify(WorkInvoice workInvoice, Model model,
+							RedirectAttributes redirectAttributes) {
+		String str = workInvoiceService.adminModify(workInvoice);
+		addMessage(redirectAttributes, str);
+		return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
+	}
+
+
 	/**
 	 * 工单执行（完成任务）
 	 * @param
@@ -241,21 +259,37 @@ public class WorkInvoiceAllController extends BaseController {
 		}
 		String tabId = request.getParameter("tabId");
 		if("1".equals(tabId)){
+			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+			for (MainDictDetail dictDetail: billingContentList) {
+				if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
+					workInvoice.setBillingContent(dictDetail.getLabel());
+					break;
+				}
+			}
+			List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
+			for (MainDictDetail dictDetail: receiptTypeList) {
+				if(workInvoice.getChargeType().equals(dictDetail.getValue())){
+					workInvoice.setChargeType(dictDetail.getLabel());
+					break;
+				}
+			}
 			view = "workInvoiceView";
 		}else if("3".equals(tabId)){
-			ProcessInstance processInstance = actTaskService.getProcIns(workInvoice.getProcessInstanceId());
-			if (processInstance!=null) {
-				Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
-				Act act = new Act();
-				act.setTaskId(taskInfok.getId());
-				act.setTaskName(taskInfok.getName());
-				act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
-				act.setProcDefId(taskInfok.getProcessDefinitionId());
-				act.setProcInsId(taskInfok.getProcessInstanceId());
-				act.setTask(taskInfok);
-				workInvoice.setAct(act);
-				view = "workInvoiceAllModify";
+			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+			for (MainDictDetail dictDetail: billingContentList) {
+				if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
+					workInvoice.setBillingContent(dictDetail.getLabel());
+					break;
+				}
+			}
+			List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
+			for (MainDictDetail dictDetail: receiptTypeList) {
+				if(workInvoice.getChargeType().equals(dictDetail.getValue())){
+					workInvoice.setChargeType(dictDetail.getLabel());
+					break;
+				}
 			}
+			view = "workInvoiceAllModify";
 		}
 		// 环节编号
 		String taskDefKey = workInvoice.getAct().getTaskDefKey();

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

@@ -770,7 +770,7 @@ public class WorkInvoiceController extends BaseController {
 	public String selectproject(ProjectRecords project, String url, String fieldLabels, String fieldKeys, String searchLabel, String searchKey, String ids,Integer isProject,String details, HttpServletRequest request, HttpServletResponse response, Model model) {
 		project.setCompany(UserUtils.getSelectCompany());
 		project.setProjectStatus(ProjectStatusEnum.SIGNED.getValue());//已签状态
-		project.setLeaderNameStr(UserUtils.getUser().getName());
+		//project.setLeaderNameStr(UserUtils.getUser().getName());
 		Page<ProjectRecords> page = projectRecordsService.ruralFindPage(new Page<ProjectRecords>(request, response), project);
 		List<ProjectRecords> list = page.getList();
 		for (ProjectRecords info: list) {

src/main/resources/mappings/modules/workinvoicedetail/WorkInvoiceDetailDao.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.workinvoicedetail.dao.WorkInvoiceDetailDao">
-    
+
 	<sql id="workInvoiceDetailColumns">
 		a.id AS "id",
 		a.create_by AS "createBy.id",
@@ -88,7 +88,7 @@
 		a.invoice_id AS "invoiceId",
 		a.settle_flag AS "settleFlag"
 	</sql>
-	
+
 	<sql id="workInvoiceDetailJoins">
 		left join work_invoice w1 on w1.id = a.invoice_id
 		LEFT JOIN work_client_info w2 ON  w2.id = w1.client_id
@@ -100,18 +100,18 @@
 		left join sys_office s ON s.id = a.company_id
 		left join work_invoicereturn wir on wir.invoice_id =a.return_id
 	</sql>
-	
-    
+
+
 	<select id="get" resultType="WorkInvoiceDetail" >
-		SELECT 
+		SELECT
 			<include refid="workInvoiceDetailColumns"/>
 		FROM work_invoice_detail a
 		<include refid="workInvoiceDetailJoins"/>
 		WHERE a.id = #{id}
 	</select>
-	
+
 	<select id="findList" resultType="WorkInvoiceDetail" >
-		SELECT 
+		SELECT
 			<include refid="workInvoiceDetailColumns"/>
 		FROM work_invoice_detail a
 		<include refid="workInvoiceDetailJoins"/>
@@ -324,15 +324,15 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<select id="findAllList" resultType="WorkInvoiceDetail" >
-		SELECT 
+		SELECT
 			<include refid="workInvoiceDetailColumns"/>
 		FROM work_invoice_detail a
 		<include refid="workInvoiceDetailJoins"/>
 		<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}
@@ -361,7 +361,7 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert">
 		INSERT INTO work_invoice_detail(
 			id,
@@ -435,10 +435,12 @@
 			#{settleFlag}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE work_invoice_detail SET 	
-			update_by = #{updateBy.id},
+		UPDATE work_invoice_detail SET
+			<if test="updateBy.id!=null and updateBy.id!=''">
+				update_by = #{updateBy.id},
+			</if>
 			update_date = #{updateDate},
 			remarks = #{remarks},
 			number = #{number},
@@ -470,8 +472,8 @@
 			settle_flag = #{settleFlag}
 		WHERE id = #{id}
 	</update>
-	
-	
+
+
 	<!--物理删除-->
 	<update id="delete">
 		DELETE FROM work_invoice_detail
@@ -480,7 +482,7 @@
 
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE work_invoice_detail SET 
+		UPDATE work_invoice_detail SET
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
@@ -609,4 +611,4 @@
 	<select id="countByNumAndComp" resultType="int">
 		SELECT count(1) from work_invoice_detail WHERE  number = #{invoiceNum} AND company_id = #{comId}
 	</select>
-</mapper>
+</mapper>

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

@@ -378,6 +378,44 @@
 			}
 
 		}
+
+
+		function openDialogreModify(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				skin:"three-btns",
+				btn: ['提交','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2: function(index){
+				}
+			});
+
+		}
 	</script>
 	<style>
 		body{
@@ -650,7 +688,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",fixed: 'right',width:180,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",fixed: 'right',width:220,templet:function(d){
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
                         if(d.canedit1 != undefined && d.canedit1 =="1")
@@ -678,6 +716,10 @@
                             xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogre('变更发票管理', '${ctx}/workinvoiceAll/workInvoiceAll/alterForm?id="+ d.id +"','95%','95%')\" class=\"op-btn op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";
                         }*/
 
+						if(d.adminModify != undefined && d.adminModify =="1")
+						{
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('管理员修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >管理员修改</a>";
+						}
 						if(d.financeFlag != undefined && d.financeFlag =="1")
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"receiptInvoice('发票收款', '${ctx}/workinvoiceAll/workInvoiceAll/receiptForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" > 收款</a>";
@@ -748,6 +790,10 @@
                     <c:if test="${fns:getUser().id == workInvoice.createBy.id}"><c:if test="${workInvoice.invoiceState == '9' || workInvoice.invoiceState == '11' }">,"conditionCandelete":"1"</c:if></c:if>
                     <c:if test="${workInvoice.invoiceState == '2' && fns:getUser().id == workInvoice.createBy.id}">,"cancancel":"1"</c:if>
                     <c:if test="${workInvoice.invoiceState == '6' && fns:getUser().id == workInvoice.createBy.id}">,"conditionCancancel":"1"</c:if>
+					<%--管理员修改--%>
+					<shiro:hasPermission name="workinvoice:workInvoice:adminModify">
+						<c:if test="${workInvoice.invoiceState == '5'}">,"adminModify":"1"</c:if>
+					</shiro:hasPermission>
 					<shiro:hasPermission name="workinvoice:workInvoice:alteredit">
                     <c:if test="${workInvoice.invoiceState == '5'}">,"canalter":"1"</c:if>
                     </shiro:hasPermission>

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

@@ -4,6 +4,11 @@
 <head>
 	<title>发票管理</title>
 	<meta name="decorator" content="default"/>
+	<style>
+		#workInvoiceProjectRelationList tr td{
+			padding: 0px;
+		}
+	</style>
 	<script type="text/javascript">
         var validateForm;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -334,7 +339,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workInvoice" action="${ctx}/workinvoiceAll/workInvoiceAll/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workInvoice" action="${ctx}/workinvoiceAll/workInvoiceAll/adminModify" method="post" class="form-horizontal">
 			<form:hidden path="id"/>
 			<form:hidden path="invoiceDate"/>
 			<form:hidden path="home"/>
@@ -348,160 +353,158 @@
 			<%--<form:hidden path="invoiceNumber"/>--%>
 
 			<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  with-icon">
-						<input type="hidden" value="" id ="ids">
-						<sys:gridselectcallprojectt url="${ctx}/workinvoiceAll/workInvoiceAll/selectproject" id="project" name="project.id"  value="${workInvoice.project.id}"  title="选择所属项目" labelName="workInvoice.project.projectName"
-													labelValue="${workInvoice.project.projectName}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojectt>
-					</div>
+				<div class="form-group-label"><h2>发票项目信息</h2></div>
+				<div class="layui-table-body layui-item layui-col-xs12 form-table-container" >
+					<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>
+									<a onclick="openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=${list.projectId}','95%', '95%')">
+										<input type="text" value="${list.projectName}" readonly="readonly"  class="form-control"/></a>
+								</td>
+								<td>
+									<input type="text" value="${list.workContractName}" readonly="readonly"  class="form-control"/>
+								</td>
+								<td style="text-align:center;">
+									<input type="text" value="${list.projectNum}" readonly="readonly"  class="form-control"/>
+								</td>
+								<td>
+									<input type="text" value="${list.clientName}" readonly="readonly"  class="form-control"/>
+								</td>
+								<td>
+									<input type="text" value="${list.reportDataNum}" 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>
+			<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"   class="form-control layui-input" value="<c:choose><c:when test="${workInvoice.ext eq '0'}">本公司开票	</c:when><c:when test="${workInvoice.ext eq '1'}">上级公司开票</c:when></c:choose>"/>
+                        </div>
+                    </div>--%>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">发票申请编号：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">
-						<div class="input-group">
-							<form:input path="number" htmlEscape="false" readonly="true"   class="form-control layui-input"/>
-							<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>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="<c:choose><c:when test="${workInvoice.invoiceType eq '1'}">专票</c:when><c:when test="${workInvoice.invoiceType eq '2'}">普票</c:when></c:choose>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">合同名称：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>实际开票单位：</label>
 					<div class="layui-input-block">
-						<form:input id ="cInfoName" path="project.workContractInfo.name" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.client.name}"/>
 					</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">
-						<form:input id ="pNumber" path="project.projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.orUnicode}"/>
 					</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">
-						<form:input id ="cName" path="project.workContractInfo.client.name" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.address}"/>
 					</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">
-						<form:input id ="prdNumber" path="project.reportData.number" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.telephone}"/>
 					</div>
 				</div>
-				<%--<div class="layui-item layui-col-sm6">--%>
-					<%--<label class="layui-form-label"><span class="require-item">*</span>所属部门：</label>--%>
-					<%--<div class="layui-input-block">--%>
-						<%--<form:input id ="officeName" path="office.name" htmlEscape="false"  readonly="true" class="form-control layui-input"/>--%>
-						<%--<form:hidden path="office.id" id ="officeId" />--%>
-					<%--</div>--%>
-				<%--</div>--%>
-			</div>
-			<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">
-						<c:choose>
-							<c:when test="${workInvoice.invoiceState == 4}">
-								<c:choose>
-									<c:when test="${workInvoice.ext ==0}">
-										<input value = "本公司开票" readonly="true" class="form-control layui-input"/>
-									</c:when>
-									<c:otherwise>
-										<input value = "上级公司开票" readonly="true"  class="form-control layui-input"/>
-									</c:otherwise>
-								</c:choose>
-							</c:when>
-							<c:otherwise>
-								<input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
-								<label for="ext">本公司开票</label>
-								<input type="radio" class="i-checks" name="ext" id="ext1" value="1">
-								<label for="ext1">上级公司开票</label>
-							</c:otherwise>
-						</c:choose>
-					</div>
-				</div>--%>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
-					<div class="layui-input-block">
-						<input type="radio" class="i-checks" name="invoiceType" checked id="invoiceType1" value="1">
-						<label for="invoiceType1">专票</label>
-						<input type="radio" class="i-checks" name="invoiceType" id="invoiceType" value="2">
-						<label for="invoiceType">普票</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.bank}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>实际开票单位：</label>
-					<div class="layui-input-block with-icon">
-						<sys:gridselect url="${ctx}/workinvoiceAll/workInvoiceAll/selectclient" id="client" name="client.id"  value="${workInvoice.client.id}"  title="选择开票单位" labelName="workInvoice.client.name"
-										labelValue="${workInvoice.client.name}" cssClass="form-control required layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
-						</td>
+					<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.bankNumber}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>纳税人识别号：</label>
+					<label class="layui-form-label">收款类型：</label>
 					<div class="layui-input-block">
-						<form:input id="orUnicode" path="orUnicode" htmlEscape="false"    class="form-control isUscCode layui-input"/>
+						<input id="chargeType" htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.chargeType}" />
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>地址：</label>
+					<label class="layui-form-label">开票内容：</label>
 					<div class="layui-input-block">
-						<form:input id="address" path="address" htmlEscape="false"    class="form-control layui-input"/>
+						<input id="billingContent" htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${workInvoice.billingContent}" />
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>电话：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>开票金额(元)：</label>
 					<div class="layui-input-block">
-						<form:input id="telephone" path="telephone" htmlEscape="false"    class="form-control isTel layui-input"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="##00.00"/>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
+					<label class="layui-form-label">开票内容要求：</label>
 					<div class="layui-input-block">
-						<form:input id ="bank"  path="bank" htmlEscape="false"   class="form-control layui-input"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.content}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
+					<label class="layui-form-label">开票人：</label>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false"   class="form-control number layui-input"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.drawerName}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12">
-					<label class="layui-form-label"><span class="require-item">*</span>开票金额(元)：</label>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">开票时间：</label>
 					<div class="layui-input-block">
-						<input name="money" htmlEscape="false"  value="<fmt:formatNumber value="${workInvoice.money}" pattern="#.00#"/>" class="form-control required number layui-input"/>
+						<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-sm12 with-textarea">
-					<label class="layui-form-label">开票内容要求：</label>
-					<div class="layui-input-block">
-						<form:textarea path="content" id="contractTypeDoc" htmlEscape="false" rows="4"    class="form-control"/>
+				<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-sm6">
-					<label class="layui-form-label">开票人：</label>
-					<div class="layui-input-block">
-						<form:input id=""  path="" htmlEscape="false" readonly="true"  class="form-control layui-input"/>
+					<label class="layui-form-label">对账地区：</label>
+					<div class="layui-input-block  with-icon">
+						<input type="text"  readonly="true" value="${workInvoice.area.name}"  class="form-control layui-input" style="background-color: #f1f1f1" >
 					</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">
-						<form:input id=""  path="" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+						<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 class="layui-item layui-col-sm6">
-					<label class="layui-form-label">领票时间：</label>
+				<div class="layui-item layui-col-sm12 with-textarea">
+					<label class="layui-form-label double-line">备注：</label>
 					<div class="layui-input-block">
-						<form:input id=""  path="" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+						<form:textarea path="remarks" readonly="true" htmlEscape="false" rows="4" class="form-control" style="background-color: #f1f1f1" />
 					</div>
 				</div>
+
 			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>发票明细</h2></div>
@@ -509,14 +512,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 width="150px">操作</th>
+							<th>税率</th>
+							<th>金额</th>
+							<th>税额</th>
+							<th>累计登记金额</th>
 						</tr>
 						</thead>
 						<tbody id="workAccountList">
@@ -529,7 +531,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"/>
@@ -539,30 +541,26 @@
                                         </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">
-                                            {{#delBtn}}<span class="close" onclick="delRow(this, '#workAccountList{{idx}}')" title="删除">&times;</span>{{/delBtn}}
-                                        </td>
                                     </tr>//-->
 					</script>
 					<script type="text/javascript">
@@ -589,4 +587,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>