change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/webapp/personal_use_info.xhtml

@@ -66,9 +66,9 @@
               <p:inputText value="#{personalUseInfoController.department}"/>

               <p:outputLabel for="startTime" value="开始时间:" />
               <p:calendar id="startTime" value="#{personalUseInfoController.startTime}" pattern="yyyy-MM-dd HH:mm" />
               <p:calendar id="startTime" value="#{personalUseInfoController.startTime}" />
               <p:outputLabel for="endTime" value="截止时间:" />
               <p:calendar id="endTime" value="#{personalUseInfoController.endTime}" pattern="yyyy-MM-dd HH:mm" />
               <p:calendar id="endTime" value="#{personalUseInfoController.endTime}" />

               <p:commandLink styleClass="search" process="@form" update="@form"/>

@@ -92,6 +92,11 @@
                            actionListener="#{personalUseInfoController.detailInfo}"
                            oncomplete="PF('dialog').show()"/>


               <p:commandButton value="导出"
                            styleClass="store-btn"
                            ajax="false"
                            actionListener="#{personalUseInfoController.exportDetail}" />


         </p:panelGrid>
@@ -135,7 +140,7 @@
            </p:column>

            <p:column headerText="课题组">
               <h:outputText value="#{row.project}"/>
               <h:outputText value="#{row.projectName}"/>
            </p:column>

            <p:column headerText="部门">
@@ -207,7 +212,7 @@
   <p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false"
           width="1258">
      <div id="printTarget">
         <div style=" margin: 20mm 16mm 0mm 10mm;">
         <div style="margin: 20mm 16mm 0mm 10mm;">
            <h:form id="printDialog" style="width: 1100px">

               <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{personalUseInfoController.printTable['head']}</p:outputPanel>
@@ -234,7 +239,7 @@
                  </div>
               </div>

               <div style="margin-bottom: 20px;">
               <div style="margin-bottom: 10px;">
                  <div style="display: inline-flex;">
                     <div style="width: 100px;margin-left: 10px;">课题组：</div>
                     <div style="width: 300px;">#{personalUseInfoController.printTable['project']}</div>
@@ -246,6 +251,13 @@
                  <div style="display: inline-flex;float: right;">
                     <div style="width: 100px;">联系方式：</div>
                     <div style="width: 200px;">#{personalUseInfoController.printTable['phone']}</div>
                  </div>
               </div>

               <div style="margin-bottom: 20px;">
                  <div style="display: inline-flex;">
                     <div style="width: 100px;margin-left: 10px;">备注：</div>
                     <div>#{personalUseInfoController.printTable['note']}</div>
                  </div>
               </div>

@@ -282,17 +294,28 @@
                  </p:column>
               </p:dataTable>

               <div style="margin-top: 20px;margin-right: 94px;">
                  <div style="display: flex;flex-direction: row;justify-content: flex-end;">
                     <div style="width: 100px">签收人：</div>
                     <div style="width: 100px"></div>
                  </div>
               </div>
               <div style="display: flex;flex-direction: row;justify-content: space-between;margin-top:20px; ">
                  <div style="margin-left: 94px;">
                     <div style="display: flex;flex-direction: row;justify-content: flex-end;">
                        <div style="width: 100px">出库人：</div>
                        <div style="width: 100px"></div>
                     </div>
                     <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top:10px; ">
                        <div style="width: 100px">日期：</div>
                        <div style="width: 100px"></div>
                     </div>

               <div style="margin: 10px 94px 10px 0;">
                  <div style="display: flex;flex-direction: row;justify-content: flex-end;">
                     <div style="width: 100px">日期：</div>
                     <div style="width: 100px"></div>
                  </div>
                  <div style="margin-right: 94px;">
                     <div style="display: flex;flex-direction: row;justify-content: flex-end;">
                        <div style="width: 100px">签收人：</div>
                        <div style="width: 100px"></div>
                     </div>
                     <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top:10px;">
                        <div style="width: 100px">日期：</div>
                        <div style="width: 100px"></div>
                     </div>

                  </div>
               </div>