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);
    }