Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/JiAnLiKu

wankeda

5 天以前 96f8501cc973232b340e36a61992ec1ad47e4a31

 WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue

@@ -133,7 +133,7 @@
          width: 90,
          align: "left",
          DisplayType:"link",
          sort:true
        
        },
        {
          field: "palletCode",
@@ -141,7 +141,7 @@
          type: "string",
          width: 90,
          align: "left",
          sort:true,
          //sort:true,
        },
        {
          field: "materialType",
@@ -149,7 +149,7 @@
          type: "string",
          width: 150,
          align: "left",
          sort:true,
          //sort:true,
          bind: { key: "InventoryMaterialType", data: [] },
        },
        {
@@ -158,7 +158,7 @@
          type: "string",
          width: 150,
          align: "left",
          sort:true,
          //sort:true,
        },
        {
          field: "wlstatus",
@@ -166,7 +166,7 @@
          type: "string",
          width: 150,
          align: "left",
          sort:true,
         // sort:true,
          bind: { key: "InventoryMaterialStatus", data: [] },
        },{
          field: "mgeneratetime",
@@ -174,7 +174,7 @@
          type: "datetime",
          width: 160,
          align: "left",
          sort:true,
         // sort:true,
        },
        {
          field: "isFull",
@@ -182,7 +182,7 @@
          type: "string",
          width: 150,
          align: "left",
          sort:true,
         // sort:true,
          bind: { key: "yesno", data: [] },
        },
        {
@@ -191,7 +191,7 @@
          type: "string",
          width: 150,
          align: "left",
          sort:true,
         // sort:true,
          bind: { key: "stockStatusEmun", data: [] },
        },
        {
@@ -200,14 +200,14 @@
          type: "string",
          width: 150,
          align: "left",
          sort:true,
        //  sort:true,
        },{
          field: "remark",
          title: "备注",
          type: "string",
          width: 100,
          align: "left",
          sort:true,
          //sort:true,
        },
        {
          field: "creater",
@@ -215,7 +215,7 @@
          type: "string",
          width: 90,
          align: "left",
          sort:true,
          //sort:true,
        },
        {
          field: "createDate",
@@ -232,7 +232,7 @@
          type: "string",
          width: 100,
          align: "left",
          sort:true,
          //sort:true,
        },
        {
          field: "modifyDate",