From 63211c7592b9c7b814de2756d338ffd33ac0c58f Mon Sep 17 00:00:00 2001
From: zhai <1528081232@qq.com>
Date: 星期一, 19 一月 2026 16:37:38 +0800
Subject: [PATCH] 1、提交验收按钮新增判断是否关联附件 2、借阅暂存添加不可外借新增提醒 3、成果表单借阅管理修改为借阅记录 4、合格资料模块,导出文件按钮需要添加日志 5、装盒按钮调整:需要一个确认按钮并且可以更改盒号,调整盒号时能同步展示盒号容量 6、对接斑马打印机 7、利用用户修改

---
 src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp b/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp
index 13781aa..7395933 100644
--- a/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp
+++ b/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp
@@ -148,9 +148,6 @@
                                        style="width:310px"
                                        value="${borrowForm.deptAddress}"
                                        data-options="tipPosition:'bottom'"/>
-                                <input type="hidden" id="utilizationMethod" name="utilizationMethod" type="text"
-                                       style="width:310px" value="${borrowForm.utilizationMethod}"
-                                       readonly/>
                             </td>
                         </tr>
                         <tr>
@@ -185,13 +182,19 @@
                                        value="${borrowForm.borrowTel}"
                                        data-options="tipPosition:'bottom'" readonly/>
                             </td>
-                            <td class="tbtitle">娑夊瘑璇佷功缂栧彿:</td>
+<%--                            <td class="tbtitle">娑夊瘑璇佷功缂栧彿:</td>--%>
+<%--                            <td>--%>
+<%--                                <input class="easyui-textbox" id="certificateNumber" name="certificateNumber"--%>
+<%--                                       type="text"--%>
+<%--                                       style="width:310px"--%>
+<%--                                       value="${borrowForm.certificateNumber}"--%>
+<%--                                       data-options="tipPosition:'bottom'" readonly/>--%>
+<%--                            </td>--%>
+                            <td class="tbtitle">鏄惁閫氳繃娴佺▼:</td>
                             <td>
-                                <input class="easyui-textbox" id="certificateNumber" name="certificateNumber"
-                                       type="text"
-                                       style="width:310px"
-                                       value="${borrowForm.certificateNumber}"
-                                       data-options="tipPosition:'bottom'" readonly/>
+                                <input type="hidden" id="utilizationMethod" name="utilizationMethod" type="text"
+                                       style="width:310px" value="${borrowForm.utilizationMethod}"
+                                       readonly/>
                             </td>
                         </tr>
                         <tr>
@@ -242,8 +245,8 @@
                              title="妗e彿锛�${borrowInfo.parentBorrowInfo.archivalCode}   ${borrowInfo.parentBorrowInfo.fileTitle}">
                             <table cellspacing="0" cellpadding="0">
                                 <tr>
-                                    <th style="width:6%;text-align:center;">浠跺彿</th>
-                                    <th style="width:35%;text-align:center;">棰樺悕</th>
+                                    <th style="width:10%;text-align:center;">妗e彿</th>
+                                    <th style="width:30%;text-align:center;">棰樺悕</th>
                                     <th style="width:10%;text-align:center;">瀵嗙骇</th>
                                     <th style="width:10%;text-align:center;">娑夊瘑椤电爜</th>
                                     <th>
@@ -269,7 +272,7 @@
                                 <c:forEach items="${borrowInfo.borrowDetailList}"
                                            var="borrowDetail">
                                     <tr>
-                                        <td style="text-align:center;">${borrowDetail.itemNumber}</td>
+                                        <td style="text-align:center;">${borrowDetail.itemCode}</td>
                                         <td style="text-align:center;">${borrowDetail.itemTitle}</td>
                                         <td style="text-align:center;">${borrowDetail.securityClassification}</td>
                                         <td style="text-align:center;">${borrowDetail.securityPageNum}</td>
@@ -352,7 +355,7 @@
                 <button class="pt-btn pt-btn-primary" onclick="dealFlow()">娴佺▼鍔炵悊</button>
             </c:if>
             <%--            <c:if test="${borrowForm.flowState==1}">--%>
-            <%--                <button class="pt-btn pt-btn-warning" onclick="reportPrinting()"><i class="fa fa-map-o"></i>鎵撳嵃鍊熼槄鍗�--%>
+                            <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-default" onclick="closeWindow()">鍏抽棴</button>

--
Gitblit v1.9.1