Merge branch 'xiaoyang' into dev

wanshenmean

11 小时以前 2db17e312a9bf0cff60917104447260b86178ca2

 Code/WMS/WIDESEA_WMSClient/src/views/stock/groupPalle.vue

@@ -123,6 +123,15 @@
        align: "left",

        bind: { key: "stockStatusEmun", data: [] },

      },

      
      {

        field: "mesUploadStatus",

        title: "MES状态",

        type: "int",

        width: 120,

        align: "left",

        bind: { key: "mesUploadStatusEnum", data: [] },

      },

    //   {

    //     field: "locationCode",

    //     title: TEXT.locationCode,