d多种格式导出修改

pengcheng
1 parent 6e4eb5c9
Showing 3 changed files with 2 additions and 5 deletions
src/main/java/com/huaheng/pc/jasper/JasperController.java
src/main/resources/templates/config/shipmentType/edit.html
src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html
@@ -86,7 +86,7 @@ public class JasperController {
  
         parameters = parameters == null ? new HashMap<>() : parameters;
         String jasperPath ="C:/Users/Administrator/JaspersoftWorkspace/MyReports/" + reportName + ".jasper";
-        String docType="xml";
+        String docType="pdf";
         DocType type = DocTypeUtil.getEnumDocType(docType);
         String fileName =reportName;
         List list =new ArrayList();
@@ -48,7 +48,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">出库流程：</label>
             <div class="col-sm-8">
-                <select id="receiptFlow" name="shipmentFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}" th:field="*{receiptFlow}">
+                <select id="shipmentFlow" name="shipmentFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('shippingFlow')}" th:field="*{shipmentFlow}">
                     <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
                 </select>
             </div>
@@ -18,9 +18,6 @@
 									<div class="select-list">
 										<ul>
 											<li>
-												出库单号：<input type="text" name="shipmentCode"/>
-											</li>
-											<li>
 												容器编号：<input type="text" name="containerCode"/>
 											</li>
 											<li>