Browse Source

Merge remote-tracking branch 'origin/master'

user5 4 năm trước cách đây
mục cha
commit
31d062f4da

+ 2 - 0
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1238,6 +1238,8 @@ public class WorkProjectNotifyController extends BaseController {
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/workinvoice/workInvoiceView";
 					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						model.addAttribute("identification","workinvoiceCancel");
+						model.addAttribute("identificationName","发票作废审核意见");
 						if (StringUtils.isNotBlank(taskDefKey) && ("bmzr".equals(taskDefKey) ||
 								"scbzr".equals(taskDefKey))) {
 							return "modules/workinvoice/conditionWorkInvoiceAudit";

+ 45 - 17
src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceAudit.jsp

@@ -14,6 +14,8 @@
 		var validateForm;
 		function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
 		  if(validateForm.form()){
+			  var ss= document.getElementById("iframe").contentWindow.document.getElementById("opinion").value
+			  $("#opinion").val(ss);
               if(obj == 1) {
                   $("#flag").val("yes");
               }else {
@@ -41,6 +43,7 @@
 					}
 				}
 			});
+
 		});
 		function addRow1(list, idx, tpl, row){
 			var idx1 = $("#workInvoiceProjectRelationList tr").length;
@@ -65,6 +68,31 @@
 				}
 			});
 		}
+		function f1(row) {
+			// window.parent.document.getElementById('opinion').value = row;
+			$("#opinion").val(row)
+		}
+		function openDialogre(title,url,width,height,target,buttons) {
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端,就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端,根据用户设置的width和height显示。
+			}
+			var split = buttons.split(",");
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				skin: 'three-btns',
+				content: url,
+				btn: split,
+				btn1: function(index, layero){
+					top.layer.close(index)
+					document.getElementById('iframe').contentWindow.location.reload();
+				}
+			});
+		}
 	</script>
 </head>
 <body>
@@ -80,6 +108,7 @@
 		<form:hidden path="act.procDefId"/>
 		<form:hidden id="flag" path="act.flag"/>
 		<c:set var="status" value="${workInvoice.act.status}" />
+		<input type="hidden" id="opinion" name="act.comment" value="" maxlength="255">
 
 		<div class="form-group layui-row first lw14">
 			<div class="form-group-label"><h2>基本信息</h2></div>
@@ -218,12 +247,6 @@
 					<form:textarea path="cancellationRemark" readonly="true"  class="form-control" htmlEscape="false" rows="4"  maxlength="255"/>
 				</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="act.comment" class="form-control " rows="5" maxlength="20"/>
-                    </div>
-                </div>
 		</div>
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>发票明细</h2></div>
@@ -231,17 +254,17 @@
 				<table id="contentTable" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<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><%--正常--%>
-						<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>金额</th>
+						<th>税额</th>
+						<th>累计登记金额</th>
+						<th>发票状态</th><%--正常--%>
+						<th>被退标记</th>
+						<th>被退票号</th>
+						<th>开票日期</th>
 					</tr>
 					</thead>
 					<tbody id="workAccountList">
@@ -289,6 +312,11 @@
 				</table>
 			</div>
 		</div>
+		<div class="form-group-label">
+			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
+			<h2>审批意见</h2>
+		</div>
+		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>审批流程</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container" >