Browse Source

合同申请、采购申请、采购订单优化

ouyj 9 months ago
parent
commit
6177bf664d
25 changed files with 321 additions and 106 deletions
  1. 1 1
      src/main/contract/com/yw/contract/contract/action/ContractPurchaseOrderAction.java
  2. 2 2
      src/main/contract/com/yw/contract/contract/dao/ContractEntryDaoImpl.java
  3. 3 2
      src/main/contract/com/yw/contract/contract/dao/ContractPurchaseDaoImpl.java
  4. 9 1
      src/main/contract/com/yw/contract/contract/model/ContractInfo.java
  5. 11 1
      src/main/contract/com/yw/contract/contract/model/ContractPurchaseForm.java
  6. 16 5
      src/main/contract/com/yw/contract/contract/service/ContractPurchaseOrderServiceImpl.java
  7. 1 1
      src/main/webapp/yw/bpm/instance/listFlowForDeal.jsp
  8. 7 0
      src/main/webapp/yw/bpm/instance/listFlowForMine.jsp
  9. 25 10
      src/main/webapp/yw/contract/contractFlowCustom/processContract.jsp
  10. 24 9
      src/main/webapp/yw/contract/contractFlowCustom/startContract.jsp
  11. 23 8
      src/main/webapp/yw/contract/contractFlowCustom/viewContract.jsp
  12. 14 2
      src/main/webapp/yw/contract/contractPurchaseOrder/createPurchaseOrder.jsp
  13. 14 2
      src/main/webapp/yw/contract/contractPurchaseOrder/editPurchaseOrder.jsp
  14. 14 2
      src/main/webapp/yw/contract/contractPurchaseOrder/infoPurchaseOrder.jsp
  15. 8 1
      src/main/webapp/yw/contract/contractPurchaseOrder/js/purchaseOrder.js
  16. 19 0
      src/main/webapp/yw/contract/contractPurchaseOrder/purchaseOrderList.jsp
  17. 20 5
      src/main/webapp/yw/contract/purchaseNoContract/processContractPurchase.jsp
  18. 5 0
      src/main/webapp/yw/contract/purchaseNoContract/selectContractPurchase.jsp
  19. 20 5
      src/main/webapp/yw/contract/purchaseNoContract/startContractPurchase.jsp
  20. 20 5
      src/main/webapp/yw/contract/purchaseNoContract/viewContractPurchase.jsp
  21. 5 0
      src/main/webapp/yw/contract/selectContract.jsp
  22. 7 0
      src/main/webapp/yw/master1_bpm/instance/listFlowForMine.jsp
  23. 16 12
      src/main/webapp/yw/master1_contract/contractPurchaseOrder/createPurchaseOrder.jsp
  24. 22 19
      src/main/webapp/yw/master1_contract/contractPurchaseOrder/editPurchaseOrder.jsp
  25. 15 13
      src/main/webapp/yw/master1_contract/contractPurchaseOrder/infoPurchaseOrder.jsp

+ 1 - 1
src/main/contract/com/yw/contract/contract/action/ContractPurchaseOrderAction.java

@@ -66,7 +66,7 @@ public class ContractPurchaseOrderAction  extends BaseAction {
 			this.path = this.toList(request, response);   
 		} else if ("purchaseOrderList".equals(task)) {
 			this.path = purchaseOrderList(request, response);
-		}else if ("toCreate".equals(task)) {//前往创建印章页面
+		}else if ("toCreate".equals(task)) {//前往创建订单页面
 			this.toCreatePurchaseOrder(request,response);
 			this.path = "/yw/contract/contractPurchaseOrder/createPurchaseOrder.jsp";
 			return;

+ 2 - 2
src/main/contract/com/yw/contract/contract/dao/ContractEntryDaoImpl.java

@@ -32,11 +32,11 @@ public class ContractEntryDaoImpl extends BaseDao implements ContractEntryDao {
 	public List<ContractInfo> contractEntryList(int p, int pSize, ParameterHelper ph, ContractInfo info, IAppSession oasession) throws Exception {
 		StringBuffer sb = new StringBuffer("SELECT ec.universalid, ec.contract_number,ec.firstparty_name,ec.secondparty_name,ec.contract_name,ec.contract_type,ec.contract_signdate,"
 				+ " ec.contract_type,tu1.name AS duty_man_name,tu2.name AS salesman_name," + "tg.GROUPNAME AS duty_department_name ,ed.dname AS contract_type_name, ec.au_state, ec.flow_id,"
-				+ " ec.execute_state,ec.supplier_code,ec.supplier_name,ec.l_form_ins_id,ec.l_form_ins_id,ec.flow_ins_id, ec.is_valid,ec.process_id,ec.contract_entrying_date,ec.purchase_id,ec.purchase_number "
+				+ " ec.execute_state,ec.supplier_code,ec.supplier_name,ec.l_form_ins_id,ec.l_form_ins_id,ec.flow_ins_id, ec.is_valid,ec.process_id,ec.contract_entrying_date,ec.purchase_id,ec.purchase_number,a.v_ins_sub_name "
 				+ " FROM contract ec LEFT JOIN t_user tu1 ON ec.duty_man=tu1.UNIVERSALID " + "LEFT JOIN t_user tu2 ON ec.salesman=tu2.UNIVERSALID "
 				+ " LEFT JOIN t_group tg ON ec.duty_department=tg.UNIVERSALID " + "LEFT JOIN contract_data_dictionary ed ON ec.contract_type=ed.dvalue "
 				+ " AND ed.parentid = (SELECT universalid FROM contract_data_dictionary WHERE dvalue = '" + ContractConstant.CONTRACT_TYPE + "' AND group_root_id=" + oasession.getUnit().getId() + ")"
-				+ " AND ed.is_valid = '1' " + "WHERE ec.contract_status='0' AND ec.isdraft = '0'  AND ec.unit_id=" + oasession.getUnit().getId());
+				+ " AND ed.is_valid = '1' left join bpm_flow_instance a on a.l_ins_id = ec.flow_ins_id " + " WHERE ec.contract_status='0' AND ec.isdraft = '0'  AND ec.unit_id=" + oasession.getUnit().getId());
 		sb.append(whereListSql(ph));
 		// String sql="SELECT ec.universalid,
 		// ec.contract_number,ec.contract_name,ec.contract_type,ec.contract_signdate,"

+ 3 - 2
src/main/contract/com/yw/contract/contract/dao/ContractPurchaseDaoImpl.java

@@ -18,6 +18,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public class ContractPurchaseDaoImpl extends BaseDao implements ContractPurchaseDao {
 
@@ -281,7 +282,7 @@ public class ContractPurchaseDaoImpl extends BaseDao implements ContractPurchase
 	@Override
 	public List<ContractPurchaseForm> contractPurchaseList(int n_p, int n_pSize, ParameterHelper ph,
 			ContractPurchaseForm contractPurchaseForm) throws Exception {
-		StringBuffer sb = new StringBuffer("SELECT t.* FROM contract_purchase_form t WHERE 1=1 and t.is_valid=1 ");
+		StringBuffer sb = new StringBuffer("SELECT t.*,a.v_ins_sub_name FROM contract_purchase_form t left join bpm_flow_instance a on a.l_ins_id = t.flow_ins_id WHERE 1=1 and t.is_valid=1 ");
 		if (null != ph.getParam("processId") && !"".equals(ph.getParam("processId"))) {
 			sb.append(" AND t.process_id LIKE '%" + ph.getParam("processId") + "%'");
 		}
@@ -306,7 +307,7 @@ public class ContractPurchaseDaoImpl extends BaseDao implements ContractPurchase
 		if (null != ph.getParam("syncStatus") && !"".equals(ph.getParam("syncStatus"))) {
 			sb.append(" AND t.sync_status = '" + ph.getParam("syncStatus") + "'");
 		}
-		sb.append(" order by t.create_time desc ");
+		sb.append(" order by t.create_time desc "); 
 		return getPagerService().queryForObject(n_p, n_pSize, sb.toString(), contractPurchaseForm); 
 	}
 

+ 9 - 1
src/main/contract/com/yw/contract/contract/model/ContractInfo.java

@@ -236,6 +236,9 @@ public class ContractInfo {
 	
 	private String seTache;
 	
+	//子标题 
+    private String v_ins_sub_name;
+    
 	public Long getUnit_id() {
 		return unit_id;
 	}
@@ -728,5 +731,10 @@ public class ContractInfo {
 	public void setPurchaseNumber(String purchaseNumber) {
 		this.purchaseNumber = purchaseNumber;
 	}
-	
+	public String getV_ins_sub_name() {
+		return v_ins_sub_name;
+	}
+	public void setV_ins_sub_name(String v_ins_sub_name) {
+		this.v_ins_sub_name = v_ins_sub_name;
+	}
 }

+ 11 - 1
src/main/contract/com/yw/contract/contract/model/ContractPurchaseForm.java

@@ -123,6 +123,9 @@ public class ContractPurchaseForm {
     
     @Column(name="sync_status",type=Types.INTEGER)
     private Integer syncStatus;		 //同步状态,0未同步,1MES同步,2金蝶云同步,3全部同步
+    
+    //子标题 
+    private String v_ins_sub_name;
 
 	public Long getUniversalid() {
 		return universalid;
@@ -403,5 +406,12 @@ public class ContractPurchaseForm {
 	public void setSyncStatus(Integer syncStatus) {
 		this.syncStatus = syncStatus;
 	}
-	
+
+	public String getV_ins_sub_name() {
+		return v_ins_sub_name;
+	}
+
+	public void setV_ins_sub_name(String v_ins_sub_name) {
+		this.v_ins_sub_name = v_ins_sub_name;
+	}
 }

+ 16 - 5
src/main/contract/com/yw/contract/contract/service/ContractPurchaseOrderServiceImpl.java

@@ -38,7 +38,14 @@ public class ContractPurchaseOrderServiceImpl implements ContractPurchaseOrderSe
     
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public int addContractPurchaseOrder(ContractPurchaseOrder contractPurchaseOrder) throws Exception {
+		int orderStatus = contractPurchaseOrder.getOrderStatus();
+		if(orderStatus == 1){
+			if(ObjectUtils.isEmpty(contractPurchaseOrder.getPurchaseOrderDetails())){
+				return -98;
+			}
+		}
 		int num = purchaseOrderDao.addContractPurchaseOrder(contractPurchaseOrder);
 		List<ContractPurchaseOrderDetail> contractPurchaseOrderDetailList = contractPurchaseOrder.getPurchaseOrderDetails();
 		if (num > 0) { 
@@ -49,8 +56,7 @@ public class ContractPurchaseOrderServiceImpl implements ContractPurchaseOrderSe
 				detail.setCreateTime(new Date());
 				detail.setUnitId(contractPurchaseOrder.getUnitId());
 				purchaseOrderDao.addObject(detail);
-			}
-			int orderStatus = contractPurchaseOrder.getOrderStatus();
+			} 
 			if(orderStatus == 1){
 				this.insertPurchaseOrder(contractPurchaseOrder.getUniversalid());
 			}
@@ -66,10 +72,16 @@ public class ContractPurchaseOrderServiceImpl implements ContractPurchaseOrderSe
 	}
  
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public int editContractPurchaseOrder(ContractPurchaseOrder contractPurchaseOrder) throws Exception {
 		Long orderId = contractPurchaseOrder.getUniversalid();
 		List<ContractPurchaseOrderDetail> contractPurchaseOrderDetailList = contractPurchaseOrder.getPurchaseOrderDetails();
-		
+		int orderStatus = contractPurchaseOrder.getOrderStatus();
+		if(orderStatus == 1){
+			if(ObjectUtils.isEmpty(contractPurchaseOrderDetailList)){
+				return -98;
+			}
+		}
 		int num  = purchaseOrderDao.editContractPurchaseOrder(contractPurchaseOrder,"universalid");
 		if(num > 0){
 			ContractPurchaseOrderDetail contractPurchaseOrderDetail = new ContractPurchaseOrderDetail(); 
@@ -85,8 +97,7 @@ public class ContractPurchaseOrderServiceImpl implements ContractPurchaseOrderSe
 				detail.setCreateTime(new Date());
 				detail.setUnitId(contractPurchaseOrder.getUnitId());
 				purchaseOrderDao.addObject(detail); 
-			}
-			int orderStatus = contractPurchaseOrder.getOrderStatus();
+			} 
 			if(orderStatus == 1){
 				this.insertPurchaseOrder(contractPurchaseOrder.getUniversalid());
 			}

+ 1 - 1
src/main/webapp/yw/bpm/instance/listFlowForDeal.jsp

@@ -30,7 +30,7 @@
 									var html = row.insId.insName;
 									return html;
 								}},
-							{ display : '子标题', name : 'insId.insSubName', width : 100,
+							{ display : '子标题', name : 'insId.insSubName', width : 250,
 								render : function (row){
 									var html = row.insId.insSubName;
 									return html;

+ 7 - 0
src/main/webapp/yw/bpm/instance/listFlowForMine.jsp

@@ -112,6 +112,9 @@
 					      					}
 					                    	if(row.state.value != 2 && row.state.value != 0){
 					                    		html += '<a href=\"#\" onclick=\"backTins('+row.insId+')\">收回</a>&nbsp;';
+					                    	}
+					                    	if(row.state.value == 2 && (row.modelId.modelId == '200001' || row.modelId.modelId == '200002')){
+					                    		html += '<a href=\"#\" onclick=\"toPurchaseOrder();\">采购订单</a>&nbsp;';
 					                    	}
 											return html;
 										}
@@ -212,6 +215,10 @@
 			}
 		}); 
 	}
+	
+	function toPurchaseOrder(){ 
+    	window.parent.f_addTab(new Date().getTime(), '采购订单', '${pageContext.request.contextPath }/contractPurchaseOrderAction.do?task=toList&tabid=' + getCurrentTabId()); 
+    }
 </script>
 </head>
 <body>

+ 25 - 10
src/main/webapp/yw/contract/contractFlowCustom/processContract.jsp

@@ -206,8 +206,8 @@
             font-size: 14px;
             font-weight: normal;
             line-height: 20px;
-            font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-        }
+            font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;  
+        } 
 
         .input-width {
             width: 100px;
@@ -227,6 +227,21 @@
         table.l-table-edit-custom th {
             background-color: #f2f2f2;
         }
+        
+        table.l-table-edit-new {
+            border-collapse: collapse;
+            width: 99%;
+            text-align: center;
+        }
+        table.l-table-edit-new th,
+        table.l-table-edit-new td {
+            border: 1px solid #000;
+            padding: 8px 0 !important;
+            text-align: center;
+        }
+        table.l-table-edit-new th {
+            background-color: #f2f2f2;
+        }
     </style>
 </head>
 
@@ -688,15 +703,15 @@
                 </td>
             </tr>
         </table>
-        <table class="l-table-edit line" width="99%">
+        <table class="l-table-edit-new" width="99%"  border="1" cellspacing="0" cellpadding="0" style="border-collapse: collapse;">
             <tr>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单位</th>  
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th> 
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料编码</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料名称</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">型号/规格</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">单位</th>  
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">数量</th> 
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">单价</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">税率</th> 
             </tr>
 			<c:forEach items="${contractMaterialList}" var="items">
                 <tr class="startTr1">

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

@@ -154,7 +154,7 @@
             font-size: 14px;
             font-weight: normal;
             line-height: 20px;
-            font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+            font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; 
         }
 
         .input-width {
@@ -185,6 +185,21 @@
         /* .l-table-edit-text {
         	width: 70px;
         } */
+        
+        table.l-table-edit-new {
+            border-collapse: collapse;
+            width: 99%;
+            text-align: center;
+        }
+        table.l-table-edit-new th,
+        table.l-table-edit-new td {
+            border: 1px solid #000;
+            padding: 8px 0 !important;
+            text-align: center;
+        }
+        table.l-table-edit-new th {
+            background-color: #f2f2f2;
+        }
     </style>
 </head>
 
@@ -329,15 +344,15 @@
                 </td>
             </tr>
         </table>
-        <table class="l-table-edit line" width="99%">
+        <table class="l-table-edit-new" width="99%" border="1" cellspacing="0" cellpadding="0" style="border-collapse: collapse;">
             <tr>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单位</th>  
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th> 
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料编码</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料名称</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">型号/规格</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">单位</th>  
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">数量</th> 
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">单价</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">税率</th> 
             </tr>
 
             <tr id="firstPoint"></tr> 

+ 23 - 8
src/main/webapp/yw/contract/contractFlowCustom/viewContract.jsp

@@ -82,6 +82,21 @@
         .l-table-edit-text {
         	width: 100px;
         } 
+        
+        table.l-table-edit-new {
+            border-collapse: collapse;
+            width: 99%;
+            text-align: center;
+        }
+        table.l-table-edit-new th,
+        table.l-table-edit-new td {
+            border: 1px solid #000;
+            padding: 8px 0 !important;
+            text-align: center;
+        }
+        table.l-table-edit-new th {
+            background-color: #f2f2f2;
+        }
     </style>
 </head>
 
@@ -284,15 +299,15 @@
                 </td>
             </tr>
         </table>
-        <table class="l-table-edit line" width="99%">
+        <table class="l-table-edit-new" width="99%">
             <tr>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单位</th>  
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th> 
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料编码</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料名称</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">型号/规格</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">单位</th>  
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">数量</th> 
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">单价</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">税率</th> 
             </tr>
 			<c:forEach items="${contractMaterialList}" var="items">
                 <tr class="startTr1">

+ 14 - 2
src/main/webapp/yw/contract/contractPurchaseOrder/createPurchaseOrder.jsp

@@ -30,7 +30,19 @@
 body {
 	background-color: white;
 }
- 
+.l-table-edit-new {
+    width: 100px;
+}
+table.l-table-edit-new {
+    border-collapse: collapse;
+    width: 99%;
+    text-align: center;
+}
+table.l-table-edit-new th,
+table.l-table-edit-new td { 
+    padding: 8px 0 !important;
+    text-align: center;
+} 
 </STYLE>
 <script type="text/javascript">
 	var isSubmitting = false; // 全局提交锁 
@@ -183,7 +195,7 @@ body {
 				                </td>
 				            </tr>
 				        </table>
-				        <table class="l-table-edit line" width="99%">
+				        <table class="l-table-edit-new" width="99%">
 				            <tr>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>

+ 14 - 2
src/main/webapp/yw/contract/contractPurchaseOrder/editPurchaseOrder.jsp

@@ -30,7 +30,19 @@
 body {
 	background-color: white;
 }
- 
+.l-table-edit-new {
+    width: 100px;
+}
+table.l-table-edit-new {
+    border-collapse: collapse;
+    width: 99%;
+    text-align: center;
+}
+table.l-table-edit-new th,
+table.l-table-edit-new td { 
+    padding: 8px 0 !important;
+    text-align: center;
+} 
 </STYLE>
 <script type="text/javascript">
 	$(document).ready(function() {
@@ -186,7 +198,7 @@ body {
 				                </td>
 				            </tr>
 				        </table>
-				        <table class="l-table-edit line" width="99%">
+				        <table class="l-table-edit-new" width="99%">
 				            <tr>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>

+ 14 - 2
src/main/webapp/yw/contract/contractPurchaseOrder/infoPurchaseOrder.jsp

@@ -30,7 +30,19 @@
 body {
 	background-color: white;
 }
- 
+.l-table-edit-new {
+    width: 100px;
+}
+table.l-table-edit-new {
+    border-collapse: collapse;
+    width: 99%;
+    text-align: center;
+}
+table.l-table-edit-new th,
+table.l-table-edit-new td { 
+    padding: 8px 0 !important;
+    text-align: center;
+} 
 </STYLE>
 <script type="text/javascript">
 	$(document).ready(function() {
@@ -194,7 +206,7 @@ body {
 				                </td>
 				            </tr>
 				        </table>
-				        <table class="l-table-edit line" width="99%">
+				        <table class="l-table-edit-new" width="99%">
 				            <tr>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>

+ 8 - 1
src/main/webapp/yw/contract/contractPurchaseOrder/js/purchaseOrder.js

@@ -399,6 +399,13 @@ function saveForm(actionUrl, formName, url) {
 				if(url){ 
 					return;
 				}
+			}else if(data == -98){
+				addError("没有物料明细!"); 
+				dialogWarn.close(); 
+				result = false;
+				if(url){ 
+					return;
+				}
 			}else{
 				//isSubmitting = false; 
 				dialogWarn.close(); 
@@ -410,7 +417,7 @@ function saveForm(actionUrl, formName, url) {
 			}
 		},
 		error : function() {
-			//isSubmitting = false; 
+			//isSubmitting = false;  
 			dialogWarn.close(); 
 			alert("数据处理失败,请检查网络重新登录或联系管理员!");
 			result = false;

+ 19 - 0
src/main/webapp/yw/contract/contractPurchaseOrder/purchaseOrderList.jsp

@@ -61,6 +61,25 @@ function loadPurchaseOrderList(params) {
 						    			 } 
 						             }
 						        },
+						        { display: '来源', name: 'source',
+						        	 render: function (item)
+						             {
+						                 if(item.source == 0) {
+						    				return '无';
+						    			 }else if(item.source == 1){
+						    				 return '合同申请单';
+						    			 }else if(item.source == 2){
+						    				 return '采购申请单';
+						    			 }else{
+						    				 return '';
+						    			 } 
+						             }
+						        },
+						        {
+									display : '创建时间',
+									name : 'createTime',
+									width : 200
+								},
 								{
 									display : '操作',
 									isAllowHide : false,

+ 20 - 5
src/main/webapp/yw/contract/purchaseNoContract/processContractPurchase.jsp

@@ -147,6 +147,21 @@
         table.l-table-edit-custom th {
             background-color: #f2f2f2;
         }
+        
+        table.l-table-edit-new {
+            border-collapse: collapse;
+            width: 99%;
+            text-align: center;
+        }
+        table.l-table-edit-new th,
+        table.l-table-edit-new td {
+            border: 1px solid #000;
+            padding: 8px 0 !important;
+            text-align: center;
+        }
+        table.l-table-edit-new th {
+            background-color: #f2f2f2;
+        }
     </style>
 </head>
 
@@ -340,13 +355,13 @@
                 </td>
             </tr>
         </table>
-        <table class="l-table-edit line" width="99%">
+        <table class="l-table-edit-new" width="99%" border="1" cellspacing="0" cellpadding="0" style="border-collapse: collapse;">
             <tr>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料编码</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料名称</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">型号/规格</th>
                 <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 供应商</th>   -->
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">数量</th> 
                 <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
                 <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th>  -->
             </tr>

+ 5 - 0
src/main/webapp/yw/contract/purchaseNoContract/selectContractPurchase.jsp

@@ -32,6 +32,11 @@ function loadContractPurchaseList(params) {
 									name : 'processId',
 									width : 200
 								},
+								{
+									display : '流程子标题',
+									name : 'v_ins_sub_name',
+									width : 250
+								},
 								{
 									display : '采购编号',
 									name : 'contractPurchaseNumber',

+ 20 - 5
src/main/webapp/yw/contract/purchaseNoContract/startContractPurchase.jsp

@@ -103,6 +103,21 @@
         table.l-table-edit-custom th {
             background-color: #f2f2f2;
         }
+        
+        table.l-table-edit-new {
+            border-collapse: collapse;
+            width: 99%;
+            text-align: center;
+        }
+        table.l-table-edit-new th,
+        table.l-table-edit-new td {
+            border: 1px solid #000;
+            padding: 8px 0 !important;
+            text-align: center;
+        }
+        table.l-table-edit-new th {
+            background-color: #f2f2f2;
+        }
     </style>
 </head>
 
@@ -162,13 +177,13 @@
                 </td>
             </tr>
         </table>
-        <table class="l-table-edit line" width="99%">
+        <table class="l-table-edit-new" width="99%" border="1" cellspacing="0" cellpadding="0" style="border-collapse: collapse;">
             <tr>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料编码</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料名称</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">型号/规格</th>
                 <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 供应商</th>   -->
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">数量</th> 
                 <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
                 <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th>  -->
             </tr>

+ 20 - 5
src/main/webapp/yw/contract/purchaseNoContract/viewContractPurchase.jsp

@@ -108,6 +108,21 @@
         table.l-table-edit-custom th {
             background-color: #f2f2f2;
         }
+        
+        table.l-table-edit-new {
+            border-collapse: collapse;
+            width: 99%;
+            text-align: center;
+        }
+        table.l-table-edit-new th,
+        table.l-table-edit-new td {
+            border: 1px solid #000;
+            padding: 8px 0 !important;
+            text-align: center;
+        }
+        table.l-table-edit-new th {
+            background-color: #f2f2f2;
+        }
     </style>
 </head>
 
@@ -201,12 +216,12 @@
                 </td>
             </tr>
         </table>
-        <table class="l-table-edit line" width="99%">
+        <table class="l-table-edit-new" width="99%" border="1" cellspacing="0" cellpadding="0" style="border-collapse: collapse;">
             <tr>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料编码</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料名称</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">型号/规格</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">数量</th> 
                 <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
                 <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th>  -->
             </tr>

+ 5 - 0
src/main/webapp/yw/contract/selectContract.jsp

@@ -31,6 +31,11 @@
 										name : 'processId',
 										width : 200
 									},
+									{
+										display : '流程子标题',
+										name : 'v_ins_sub_name',
+										width : 250
+									},
 									{
 										display : '合同编号',
 										name : 'contract_number',

+ 7 - 0
src/main/webapp/yw/master1_bpm/instance/listFlowForMine.jsp

@@ -127,6 +127,9 @@ function searchByKword(s){
 						 html+= '<div class="div_btn"><input type="button" onclick=\'backTins('
 								 + arr.insId + ');\' class="btn_c" value="收&nbsp;回" /></div>';
 					 }
+					 if(arr.state.value == 2 && (arr.modelId.modelId == '200001' || arr.modelId.modelId == '200002')){
+						 html+= '<div class="div_btn"><input type="button" onclick=\'toPurchaseOrder();\' class="btn_c" value="采购订单" /></div>';
+                 	 }
 					 html+= '</div>';
 					 html+= '</div>';
 	             }
@@ -172,6 +175,10 @@ function urge(insId){
 		}
 	});
 }
+
+function toPurchaseOrder(){ 
+	item('MTContractPurchaseOrderAction.do?task=toList');
+}
 </script>
 </head>
 <body>

+ 16 - 12
src/main/webapp/yw/master1_contract/contractPurchaseOrder/createPurchaseOrder.jsp

@@ -42,6 +42,10 @@ body {
 	background: #fff;
 	overflow: hidden;
 } 
+.l-table-edit-new {
+    width: 100px; 
+    text-align: center;
+}
 </STYLE>
 <script type="text/javascript">
 	$(document).ready(function() {
@@ -203,12 +207,12 @@ body {
 				        </table>
 				        <table class="l-table-edit line" width="99%">
 				            <tr>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th> 
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th> 
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料编码</th>
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料名称</th>
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">型号/规格</th> 
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">数量</th> 
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">单价</th>
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">税率</th> 
 				            </tr>
 				
 				            <tr id="firstPoint"></tr>
@@ -244,23 +248,23 @@ body {
     <!-- ***************************************************模板 ------- 物料信息-->
     <tr id="template_1" class="startTr1 hide">
 
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width materialCode" readonly>
         </td>
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width materialName" readonly>
         </td>
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width materialModel" readonly>
             <input type="hidden" name="" class="measureName">  
         </td> 
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width qty" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
         </td>
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width price" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
         </td>
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width cess" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
              <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
         </td>

+ 22 - 19
src/main/webapp/yw/master1_contract/contractPurchaseOrder/editPurchaseOrder.jsp

@@ -41,7 +41,10 @@ body {
 	background: #fff;
 	overflow: hidden;
 } 
- 
+.l-table-edit-new {
+    width: 100px; 
+    text-align: center;
+}
 </STYLE>
 <script type="text/javascript">
 	$(document).ready(function() {
@@ -207,33 +210,33 @@ body {
 				        </table>
 				        <table class="l-table-edit line" width="99%">
 				            <tr>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th> 
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th> 
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料编码</th>
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料名称</th>
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">型号/规格</th> 
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">数量</th> 
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">单价</th>
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">税率</th> 
 				            </tr>
 							<c:forEach items="${contractPurchaseOrderDetailList}" var="items"> 
 				                <tr class="startTr1">
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="hidden" name="" class="input-width universalid"  value="${items.universalid}">
 				                        <input type="text" name="" class="input-width materialCode TextDisplay"  value="${items.materialCode}" readonly>
 				                    </td>
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="text" name="" class="input-width materialName TextDisplay" value="${items.materialName}" readonly>
 				                    </td>
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="text" name="" class="input-width materialModel TextDisplay" value="${items.materialModel}" readonly>
 				                        <input type="hidden" name="" class="measureName" value="${items.measureName}">
 				                    </td> 
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="text" name="" class="input-width qty TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.qty}">
 				                    </td>
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="text" name="" class="input-width price TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.price}">
 				                    </td>
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="text" name="" class="input-width cess TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.cess}">
 				                        <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
 				                    </td> 
@@ -272,23 +275,23 @@ body {
     <!-- ***************************************************模板 ------- 物料信息-->
     <tr id="template_1" class="startTr1 hide">
 
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width materialCode" readonly>
         </td>
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width materialName" readonly>
         </td>
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width materialModel" readonly>
             <input type="hidden" name="" class="measureName">  
         </td> 
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width qty" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
         </td>
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width price" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
         </td>
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
             <input type="text" name="" class="input-width cess" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
              <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
         </td>

+ 15 - 13
src/main/webapp/yw/master1_contract/contractPurchaseOrder/infoPurchaseOrder.jsp

@@ -40,7 +40,9 @@ body {
 	background: #fff;
 	overflow: hidden;
 } 
- 
+.l-table-edit-new {
+    width: 100px; 
+}
 </STYLE>
 <script type="text/javascript">
 	$(document).ready(function() {
@@ -213,33 +215,33 @@ body {
 				        </table>
 				        <table class="l-table-edit line" width="99%">
 				            <tr>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th> 
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th> 
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料编码</th>
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">物料名称</th>
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">型号/规格</th> 
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">数量</th> 
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">单价</th>
+				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">税率</th> 
 				            </tr>
 							<c:forEach items="${contractPurchaseOrderDetailList}" var="items"> 
 				                <tr class="startTr1">
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="hidden" name="" class="input-width universalid"  value="${items.universalid}">
 				                        <input type="text" name="" class="input-width materialCode TextDisplay"  value="${items.materialCode}" readonly>
 				                    </td>
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="text" name="" class="input-width materialName TextDisplay" value="${items.materialName}" readonly>
 				                    </td>
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="text" name="" class="input-width materialModel TextDisplay" value="${items.materialModel}" readonly>
 				                        <input type="hidden" name="" class="measureName" value="${items.measureName}">
 				                    </td> 
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="text" name="" class="input-width qty TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.qty}">
 				                    </td>
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="text" name="" class="input-width price TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.price}">
 				                    </td>
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;text-align: center;">
 				                        <input type="text" name="" class="input-width cess TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.cess}">
 				                        <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
 				                    </td>