物料选择框调整

src/main/webapp/yw/contract/contractFlowCustom/js/contract.js

@@ -269,7 +269,7 @@ function material_search(){
 	var obj = window.top;
 	obj.$.ligerDialog.open({
 		title : '选择物料',
-		width : 860,
+		width : 1100,
 		height : 380,
 		url : 'contractEntry.do?task=toSelectMaterialForContract&checkbox=true',
 		buttons : [ {

src/main/webapp/yw/contract/selectMaterialForContract.jsp

@@ -23,10 +23,11 @@ $(document).ready(function(){
 	if('${checkValue}' != "" && typeof ('${checkValue}') != "undefined"){
 		checkValue = '${checkValue}'.split(",");
 	}
-	$(".mes_search").show();
-	$(".pur_search").hide();
-	$("#dataSource").val("1");
-	initMaterialList();
+	// 默认选择采购申请
+	$(".mes_search").hide();
+	$(".pur_search").show();
+	$("#dataSource").val("2");
+	initPurchaseDetailList();
 });
 
 function loadMaterialList(params) { 
@@ -37,27 +38,27 @@ function loadMaterialList(params) {
 								{
 									display : '物料编码',
 									name : 'itemCode',
-									width : 220
+									width : 180
 								},
 								{
 									display : '物料名称',
 									name : 'itemName',
-									width : 300
+									width : 250
 								},
 								{
 									display : '规格型号',
 									name : 'specification',
-									width : 200
+									width : 180
 								},
 								{
 									display : '单位',
 									name : 'measureName',
-									width : 120
+									width : 100
 								},
 								{
 									display : '类别',
 									name : 'itemTypeName',
-									width : 200
+									width : 180
 								}],
 						pageSize : 10,
 						checkbox: true, 
@@ -156,66 +157,67 @@ function loadPurchaseOrderMaterials(params) {
 			.ligerGrid(
 					{
 						columns : [
-								{
-									display : '采购申请单',
-									name : 'purchaseNumber',
-									width : 200,
-									render: function (row)
-						             { 
-										 row.purchaseNumber = row.contractPurchaseFormNumber;
-						                 return row.contractPurchaseFormNumber;
-						             }
-								},
-								{
-									display : '申请时间',
-									name : 'createTime',
-									width : 150 
-								},
 								{
 									display : '物料编码',
 									name : 'itemCode',
-									width : 220,
+									width : 180,
 									render: function (row)
-						             {
-										 row.itemCode = row.materialCode;
-						                 return row.materialCode;
-						             }
+									{
+										row.itemCode = row.materialCode;
+										return row.materialCode;
+									}
 								},
 								{
 									display : '物料名称',
 									name : 'itemName',
-									width : 300,
+									width : 250,
 									render: function (row)
-						             {
-										 row.itemName = row.materialName;
-						                 return row.materialName;
-						             }
+									{
+										row.itemName = row.materialName;
+										return row.materialName;
+									}
 								},
 								{
 									display : '规格型号',
 									name : 'specification',
-									width : 200,
+									width : 180,
 									render: function (row)
-						             {
-										 row.specification = row.materialModel;
-						                 return row.materialModel;
-						             }
+									{
+										row.specification = row.materialModel;
+										return row.materialModel;
+									}
 								},
 								{
 									display : '单位',
 									name : 'measureName',
-									width : 120 
+									width : 100
 								},
 								{
 									display : '可用数量',
 									name : 'qty',
-									width : 120,
+									width : 100,
+									render: function (row)
+									{
+										row.qty = row.qtyRemain;
+										return row.qtyRemain;
+									}
+								},
+								{
+									display : '采购申请单',
+									name : 'purchaseNumber',
+									width : 180,
 									render: function (row)
 						             { 
-										 row.qty = row.qtyRemain;
-						                 return row.qtyRemain;
+										 row.purchaseNumber = row.contractPurchaseFormNumber;
+						                 return row.contractPurchaseFormNumber;
 						             }
 								},
+								{
+									display : '申请时间',
+									name : 'createTime',
+									width : 120
+								},
+
 								{
 									display : '价格',
 									name : 'price',