Sfoglia il codice sorgente

采购表单修改

ouyj 11 mesi fa
parent
commit
a27a11fff0

+ 1 - 1
src/main/webapp/yw/contract/contractFlowCustom/startContract.jsp

@@ -201,7 +201,7 @@
 			 	合同审批单
 			 </div> 
 		</div> 
-		<div style="text-align:right;padding-right: 100px;">流程流水号:${contractInfo.processId}</div>
+		<div style="text-align:right;padding-right: 100px;">流程流水号:自动生成</div>
 	</div>
     <table class="l-table-edit line l-table-edit-custom" width="99%">
         <tr>

+ 39 - 9
src/main/webapp/yw/contract/contractPurchase/processContractPurchase.jsp

@@ -133,29 +133,60 @@
 	        border: 0px solid #ccc;
 	        vertical-align:middle; /* 垂直对齐方式 */ 
 	    } 
+	    
+	    /* 表格样式 */
+        table.l-table-edit-custom {
+            border-collapse: collapse;
+            width: 99%;
+        }
+        table.l-table-edit-custom th,
+        table.l-table-edit-custom td {
+            border: 1px solid #000;
+            padding: 8px;
+        }
+        table.l-table-edit-custom th {
+            background-color: #f2f2f2;
+        }
     </style>
 </head>
 
 
 <body>
 <form action="applianceBuyAction.do" method="post" id="formIns" name="formIns">
-    <table class="l-table-edit line" width="99%">
-        <tr>
+	<div>
+		<div style="height: auto; width: 189px;">
+	    <img src="${pageContext.request.contextPath}/images/yzlogo.png"  
+	         style="max-height: 77px; width: auto;">
+		</div>
+		<div style="text-align:center;"> 
+			 <div style="font-size: 20px;">	
+			 	湖南韫珠环保科技有限公司
+			 </div> 
+			 <div style="font-size: 20px;">	
+			 	采购申请单
+			 </div> 
+		</div> 
+		<div style="text-align:right;padding-right: 100px;">流程流水号:${contractPurchaseForm.processId}</div>
+	</div>
+    <table class="l-table-edit line l-table-edit-custom" width="99%">
+        <%-- <tr>
             <td class="l-table-edit-text">申请人:</td>
             <td class="l-table-edit-td">
                 <input type="hidden" id="initiator" name="contractPurchaseForm.initiator" value="${contractPurchaseForm.initiator}"/>${contractPurchaseForm.initiator}
             </td>
             <td class="l-table-edit-text">流程流水号:</td>
             <td class="l-table-edit-td">${contractPurchaseForm.processId}</td>
-        </tr>
+        </tr> --%>
         <tr>
-            <td class="l-table-edit-text">在职部门:</td>
-            <td class="l-table-edit-td">
+            <td class="l-table-edit-text" style="width: 150px;">申请部门:</td>
+            <td class="l-table-edit-td" style="width: 250px;">
                 <input type="hidden" id="department" name="contractPurchaseForm.department" value="${contractPurchaseForm.department}"/>
                 ${contractPurchaseForm.department}
+                
+                <input type="hidden" id="initiator" name="contractPurchaseForm.initiator" value="${contractPurchaseForm.initiator}"/>
             </td>
-            <td class="l-table-edit-text">申请日期:</td>
-            <td class="l-table-edit-td">
+            <td class="l-table-edit-text" style="width: 150px;">申请日期:</td>
+            <td class="l-table-edit-td" style="width: 250px;">
                 <input type="hidden" id="applyDate" name="contractPurchaseForm.applyDate" value="${contractPurchaseForm.applyDate}"/>
                 ${contractPurchaseForm.applyDate}
             </td>
@@ -226,8 +257,7 @@
                 </c:choose>	
 			</td> 
 		</tr>
-    </table>
-	<table class="l-table-edit line" width="99%">
+     
         <tr>
             <td class="l-table-edit-text">部门意见: 
                  <c:if test="${fn:contains(curTacheModel.table_fields, ',departmental_opinion,')}"> 

+ 38 - 7
src/main/webapp/yw/contract/contractPurchase/startContractPurchase.jsp

@@ -88,29 +88,60 @@
             text-align: center;
             padding-left: 0px;
         }
+        
+        /* 表格样式 */
+        table.l-table-edit-custom {
+            border-collapse: collapse;
+            width: 99%;
+        }
+        table.l-table-edit-custom th,
+        table.l-table-edit-custom td {
+            border: 1px solid #000;
+            padding: 8px;
+        }
+        table.l-table-edit-custom th {
+            background-color: #f2f2f2;
+        }
     </style>
 </head>
 
 
 <body>
 <form action="applianceBuyAction.do" method="post" id="formIns" name="formIns">
-    <table class="l-table-edit line" width="99%">
-        <tr>
+	<div>
+		<div style="height: auto; width: 189px;">
+	    <img src="${pageContext.request.contextPath}/images/yzlogo.png"  
+	         style="max-height: 77px; width: auto;">
+		</div>
+		<div style="text-align:center;"> 
+			 <div style="font-size: 20px;">	
+			 	湖南韫珠环保科技有限公司
+			 </div> 
+			 <div style="font-size: 20px;">	
+			 	采购申请单
+			 </div> 
+		</div> 
+		<div style="text-align:right;padding-right: 100px;">流程流水号:自动生成</div>
+	</div>
+    <table class="l-table-edit line l-table-edit-custom" width="99%">
+        <%-- <tr>
             <td class="l-table-edit-text">申请人:</td>
             <td class="l-table-edit-td">
                 <input type="hidden" id="initiator" name="contractPurchaseForm.initiator" value="${initiator}"/>${initiator}
             </td>
             <td class="l-table-edit-text">流程流水号:</td>
             <td class="l-table-edit-td">自动生成</td>
-        </tr>
+        </tr> --%>
         <tr>
-            <td class="l-table-edit-text">在职部门:</td>
-            <td class="l-table-edit-td">
+            <td class="l-table-edit-text" style="width: 150px;">申请部门:</td>
+            <td class="l-table-edit-td" style="width: 250px;">
                 <input type="hidden" id="department" name="contractPurchaseForm.department" value="${department}"/>
                 ${department}
+                
+                <input type="hidden" id="initiator" name="contractPurchaseForm.initiator" value="${initiator}"/>
             </td>
-            <td class="l-table-edit-text">申请日期:</td>
-            <td class="l-table-edit-td">
+            <td class="l-table-edit-text" style="width: 150px;">申请日期:</td>
+            <td class="l-table-edit-td" style="width: 250px;">
                 <input type="hidden" id="applyDate" name="contractPurchaseForm.applyDate" value="${applyDate}"/>
                 ${applyDate}
             </td>

+ 37 - 10
src/main/webapp/yw/contract/contractPurchase/viewContractPurchase.jsp

@@ -91,28 +91,57 @@
 	        border: 0px solid #ccc;
 	        vertical-align:middle; /* 垂直对齐方式 */ 
 	    } 
+	    
+	    /* 表格样式 */
+        table.l-table-edit-custom {
+            border-collapse: collapse;
+            width: 99%;
+        }
+        table.l-table-edit-custom th,
+        table.l-table-edit-custom td {
+            border: 1px solid #000;
+            padding: 8px;
+        }
+        table.l-table-edit-custom th {
+            background-color: #f2f2f2;
+        }
     </style>
 </head>
 
 
 <body>
 <form action="applianceBuyAction.do" method="post" id="formIns" name="formIns">
-    <table class="l-table-edit line" width="99%">
-        <tr>
+	<div>
+		<div style="height: auto; width: 189px;">
+	    <img src="${pageContext.request.contextPath}/images/yzlogo.png"  
+	         style="max-height: 77px; width: auto;">
+		</div>
+		<div style="text-align:center;"> 
+			 <div style="font-size: 20px;">	
+			 	湖南韫珠环保科技有限公司
+			 </div> 
+			 <div style="font-size: 20px;">	
+			 	采购申请单
+			 </div> 
+		</div> 
+		<div style="text-align:right;padding-right: 100px;">流程流水号:${contractPurchaseForm.processId}</div>
+	</div>
+    <table class="l-table-edit line l-table-edit-custom" width="99%">
+        <%-- <tr>
             <td class="l-table-edit-text">申请人:</td>
             <td class="l-table-edit-td">
                ${contractPurchaseForm.initiator}
             </td>
             <td class="l-table-edit-text">流程流水号:</td>
             <td class="l-table-edit-td">${contractPurchaseForm.processId}</td>
-        </tr>
+        </tr> --%>
         <tr>
-            <td class="l-table-edit-text">在职部门:</td>
-            <td class="l-table-edit-td"> 
+            <td class="l-table-edit-text" style="width: 150px;">申请部门:</td>
+            <td class="l-table-edit-td" style="width: 250px;"> 
                 ${contractPurchaseForm.department}
             </td>
-            <td class="l-table-edit-text">申请日期:</td>
-            <td class="l-table-edit-td">
+            <td class="l-table-edit-text" style="width: 150px;">申请日期:</td>
+            <td class="l-table-edit-td" style="width: 250px;">
                ${contractPurchaseForm.applyDate}
             </td>
         </tr>
@@ -143,9 +172,7 @@
 				${contractPurchaseForm.supplierName}  
 			</td> 
 		</tr> 
-    </table>
-
-	 <table class="l-table-edit line" width="99%">
+     
         <tr>
             <td class="l-table-edit-text">部门意见: 
             </td>