From 3c6f6c1e3016e38146a4c46be6e7b625c35591f2 Mon Sep 17 00:00:00 2001
From: zhai <1528081232@qq.com>
Date: 星期四, 18 十二月 2025 11:49:18 +0800
Subject: [PATCH] 1、添加报表 2、修改添加报表报错
---
src/main/webapp/WEB-INF/view/gh/physical/physicalForm.jsp | 113 +++++++++++++++++++++++++++-----------------------------
1 files changed, 54 insertions(+), 59 deletions(-)
diff --git a/src/main/webapp/WEB-INF/view/gh/physical/physicalForm.jsp b/src/main/webapp/WEB-INF/view/gh/physical/physicalForm.jsp
index e9d72c7..04df825 100644
--- a/src/main/webapp/WEB-INF/view/gh/physical/physicalForm.jsp
+++ b/src/main/webapp/WEB-INF/view/gh/physical/physicalForm.jsp
@@ -110,7 +110,7 @@
</td>
</tr>
<tr>
- <td class="tbtitle">宸ヤ綔鍗曚綅锛�</td>
+ <td class="tbtitle">鍗曚綅/閮ㄩ棬鍚嶇О锛�</td>
<td style="width: 30%;">
<input class="easyui-textbox" id="deptName"
name="deptName" type="text" style="width:300px"
@@ -184,46 +184,46 @@
</td>
</tr>
+ <%-- <tr>--%>
+ <%-- <td class="tbtitle">鍙栨牱鏂瑰紡锛�</td>--%>
+ <%-- <td colspan="3">--%>
+ <%-- <input class="easyui-textbox" name="sampleMethod"--%>
+ <%-- data-options="multiline:true"--%>
+ <%-- style="height:60px;width:850px" value="${physicalForm.sampleMethod}"/>--%>
+ <%-- </td>--%>
+ <%-- </tr>--%>
+ <%-- <tr>--%>
+ <%-- <td class="tbtitle">娴嬭瘯椤圭洰鍙婃牱鍝侀噺闇�姹傦細</td>--%>
+ <%-- <td colspan="3">--%>
+ <%-- <input class="easyui-textbox" name="testProject"--%>
+ <%-- data-options="multiline:true"--%>
+ <%-- style="height:60px;width:850px" value="${physicalForm.testProject}"/>--%>
+ <%-- </td>--%>
+ <%-- </tr>--%>
+ <%-- <tr>--%>
+ <%-- <td class="tbtitle">閫佹鏈烘瀯锛�</td>--%>
+ <%-- <td colspan="3">--%>
+ <%-- <input class="easyui-textbox" name="sendInstitution"--%>
+ <%-- data-options="multiline:true"--%>
+ <%-- style="height:60px;width:850px" value="${physicalForm.sendInstitution}"/>--%>
+ <%-- </td>--%>
+ <%-- </tr>--%>
<tr>
- <td class="tbtitle">鍙栨牱鏂瑰紡锛�</td>
- <td colspan="3">
- <input class="easyui-textbox" name="sampleMethod"
- data-options="multiline:true"
- style="height:60px;width:850px" value="${physicalForm.sampleMethod}"/>
- </td>
- </tr>
- <tr>
- <td class="tbtitle">娴嬭瘯椤圭洰鍙婃牱鍝侀噺闇�姹傦細</td>
- <td colspan="3">
- <input class="easyui-textbox" name="testProject"
- data-options="multiline:true"
- style="height:60px;width:850px" value="${physicalForm.testProject}"/>
- </td>
- </tr>
- <tr>
- <td class="tbtitle">閫佹鏈烘瀯锛�</td>
- <td colspan="3">
- <input class="easyui-textbox" name="sendInstitution"
- data-options="multiline:true"
- style="height:60px;width:850px" value="${physicalForm.sendInstitution}"/>
- </td>
- </tr>
- <tr>
- <td class="tbtitle">鐮旂┒鐩殑锛�</td>
+ <td class="tbtitle">鐢宠鐩殑鍙婂埄鐢ㄦ垚鏁堬細</td>
<td colspan="3">
<input class="easyui-textbox" name="researchPurpose"
data-options="multiline:true"
style="height:60px;width:850px" value="${physicalForm.researchPurpose}"/>
</td>
</tr>
- <tr>
- <td class="tbtitle">鐮旂┒鍐呭锛�</td>
- <td colspan="3">
- <input class="easyui-textbox" name="researchContent"
- data-options="multiline:true"
- style="height:60px;width:850px" value="${physicalForm.researchContent}"/>
- </td>
- </tr>
+ <%-- <tr>--%>
+ <%-- <td class="tbtitle">鐮旂┒鍐呭锛�</td>--%>
+ <%-- <td colspan="3">--%>
+ <%-- <input class="easyui-textbox" name="researchContent"--%>
+ <%-- data-options="multiline:true"--%>
+ <%-- style="height:60px;width:850px" value="${physicalForm.researchContent}"/>--%>
+ <%-- </td>--%>
+ <%-- </tr>--%>
<tr>
<td class="tbtitle">棰勬湡鎴愭灉锛�</td>
<td colspan="3">
@@ -232,14 +232,14 @@
style="height:60px;width:850px" value="${physicalForm.expectedResult}"/>
</td>
</tr>
- <tr>
- <td class="tbtitle">鐢宠鍗曚綅鎰忚锛�</td>
- <td colspan="3">
- <input class="easyui-textbox" name="applyDeptOpinion"
- data-options="multiline:true"
- style="height:60px;width:850px" value="${physicalForm.applyDeptOpinion}"/>
- </td>
- </tr>
+ <%-- <tr>--%>
+ <%-- <td class="tbtitle">鐢宠鍗曚綅鎰忚锛�</td>--%>
+ <%-- <td colspan="3">--%>
+ <%-- <input class="easyui-textbox" name="applyDeptOpinion"--%>
+ <%-- data-options="multiline:true"--%>
+ <%-- style="height:60px;width:850px" value="${physicalForm.applyDeptOpinion}"/>--%>
+ <%-- </td>--%>
+ <%-- </tr>--%>
</table>
</form>
</div>
@@ -269,11 +269,11 @@
<div class="easyui-accordion">
<c:forEach items="${physicalInfoList}" var="physicalInfo">
<div style="overflow:hidden;"
- title="妗ｅ彿锛�${physicalInfo.parentPhysicalInfo.archivalCode} ${physicalInfo.parentPhysicalInfo.fileTitle}">
+ title="妗ｅ彿锛�${physicalInfo.parentPhysicalInfo.projectNum} ${physicalInfo.parentPhysicalInfo.projectName}">
<table cellspacing="0" cellpadding="0">
<tr>
- <th style="width:6%;text-align:center;">浠跺彿</th>
- <th style="width:40%;text-align:center;">棰樺悕</th>
+ <th style="width:6%;text-align:center;">鏍峰搧绫诲瀷</th>
+ <th style="width:40%;text-align:center;">鎵�灞炴捣鍩熸垨鑸</th>
<th style="width:15%;text-align:center;"></th>
<th>
<input type="checkbox" class="flat"
@@ -295,8 +295,8 @@
<c:forEach items="${physicalInfo.physicalDetailList}"
var="physicalDetail">
<tr>
- <td style="text-align:center;">${physicalDetail.itemNumber}</td>
- <td style="text-align:center;">${physicalDetail.itemTitle}</td>
+ <td style="text-align:center;">${physicalDetail.sampleType}</td>
+ <td style="text-align:center;">${physicalDetail.vesselVoyage}</td>
<td style="text-align:center;"></td>
<td>
<input type="checkbox" class="flat"
@@ -373,10 +373,10 @@
<c:if test="${task!=null || approvePermission}">
<button class="pt-btn pt-btn-primary" onclick="dealFlow()">娴佺▼鍔炵悊</button>
</c:if>
- <c:if test="${physicalForm.flowState==1}">
- <button class="pt-btn pt-btn-warning" onclick="reportPrinting()"><i class="fa fa-map-o"></i>鎵撳嵃瀹炵墿鍒╃敤鍗�
- </button>
- </c:if>
+
+ <button class="pt-btn pt-btn-warning" onclick="reportPrinting()"><i class="fa fa-map-o"></i>鎵撳嵃瀹炵墿鍒╃敤鍗�
+ </button>
+
<button class="pt-btn pt-btn-default" onclick="closeWindow()">鍏抽棴</button>
</div>
</div>
@@ -893,15 +893,10 @@
//鎵撳嵃瀹炵墿鍒╃敤鍗�
function reportPrinting() {
- var flag = ${archivesUtilizationForm.utilizationType==1};
- // var reportFile = "borrow_approval.ureport.xml";
- var reportFile = "borrow_approval_hn.ureport.xml";
- if (flag) {
- // reportFile = "borrow_approval_sampling.ureport.xml";
- reportFile = "borrow_approval_hn.ureport.xml";
- }
+
+ var reportFile = "borrow_approval_gh.ureport.xml";
var path = "<%=path%>";
- var url = path + "/ureport/preview?_u=file:" + reportFile + "&_i=1&formId=" + '${archivesUtilizationForm.formId}';
+ var url = path + "/ureport/preview?_u=file:" + reportFile + "&_i=1&formId=" + '${physicalForm.formId}';
window.open(url);
}
--
Gitblit v1.9.1