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

wankeda

4 天以前 96f8501cc973232b340e36a61992ec1ad47e4a31

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

@@ -106,7 +106,7 @@
        type: "string",
        width: 90,
        align: "left",
        sort:true,
        // sort:true,
      },
      {
        field: "materielCode",
@@ -114,7 +114,7 @@
        type: "string",
        width: 150,
        align: "left",
        sort:true,
        // sort:true,
      },
      {
        field: "materielName",
@@ -122,7 +122,7 @@
        type: "string",
        width: 150,
        align: "left",
        sort:true,
        // sort:true,
      },
      {
        field: "orderNo",
@@ -130,7 +130,7 @@
        type: "decimal",
        width: 90,
        align: "left",
        sort:true,
        // sort:true,
      },
      {
        field: "batchNo",
@@ -138,31 +138,31 @@
        type: "string",
        width: 120,
        align: "left",
        sort:true,
        // sort:true,
      },
      {
        field: "serialNumber",
        title: "包号",
        type: "string",
        width: 50,
        align: "left",
        sort:true,
        },
      {
        field: "batchNoName",
        title: "物料批次详情",
        type: "int",
        width: 120,
        align: "left",
        sort:true,
      },
      // {
      //   field: "serialNumber",
      //   title: "包号",
      //   type: "string",
      //   width: 50,
      //   align: "left",
      //   sort:true,
      //   },
      // {
      //   field: "batchNoName",
      //   title: "物料批次详情",
      //   type: "int",
      //   width: 120,
      //   align: "left",
      //   // sort:true,
      // },
      {
        field: "stockQuantity",
        title: "重量",
        type: "string",
        width: 80,
        align: "left",
        sort:true,
        // sort:true,
      },
      {
        field: "status",
@@ -170,7 +170,7 @@
        type: "string",
        width: 120,
        align: "left",
        sort:true,
        // sort:true,
        bind: { key: "stockStatusEmun", data: [] },
      },
      {
@@ -179,7 +179,7 @@
        type: "string",
        width: 90,
        align: "left",
        sort:true,
        // sort:true,
      },
      {
        field: "createDate",