订单管理

@@ -349,14 +349,21 @@ function getAlreadyJudgedList(){
 
 
         columns: [[{
         columns: [[{
             title: "平台快递单号",
             title: "平台快递单号",
-            field: "sellerWaybillCode",
+            field: "platformWaybillCode",
             width: 30,
             width: 30,
             align: "center"
             align: "center"
         },  {
         },  {
             title: "收货仓库",
             title: "收货仓库",
             field: "depotNo",
             field: "depotNo",
             width: 20,
             width: 20,
-            align: "center"
+            align: "center",
+            formatter: function (value, rowData, rowIndex) {
+            	if (value == 0) {
+                    return "北京";
+                }else if(value == 1){
+                    return "南京";
+                }
+            }
         }, {
         }, {
             title: "商品件数",
             title: "商品件数",
             field: "productNum",
             field: "productNum",
@@ -364,7 +371,7 @@ function getAlreadyJudgedList(){
             align: "center"
             align: "center"
         }, {
         }, {
             title: "SKU-P",
             title: "SKU-P",
-            field: "skuStr",
+            field: "skup",
             width: 20,
             width: 20,
             align: "center"
             align: "center"
         }, {
         }, {
@@ -457,9 +464,9 @@ function addRejectPage(id) {
 }
 }
 
 
 function deliverGoods(id){
 function deliverGoods(id){
-	var expressCompany = $("#expressCompany").myCombobox("getValue");
+	var expressCompanyId = $("#expressCompany").myCombobox("getValue");
 	var waybillCode = $("#waybillCode").textbox("getValue");
 	var waybillCode = $("#waybillCode").textbox("getValue");
-	if(expressCompany==''){
+	if(expressCompanyId==''){
 		alert("请选择快递公司！");
 		alert("请选择快递公司！");
 		return;
 		return;
 	}
 	}
@@ -470,7 +477,7 @@ function deliverGoods(id){
 	$.post(contextPath + "/buyerOrder/updateOrderStatus", {
 	$.post(contextPath + "/buyerOrder/updateOrderStatus", {
         id : id,
         id : id,
         status : 4,
         status : 4,
-        expressCompay : expressCompany,
+        expressCompanyId : expressCompanyId,
         waybillCode : waybillCode
         waybillCode : waybillCode
     }, function(data) {
     }, function(data) {
         if (data.code == 200) {
         if (data.code == 200) {