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

wangxinhui

昨天 a8756c3526832332db4ef5685348d9b188c2bf2b

 代码管理/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue

@@ -56,6 +56,7 @@
        ],
        [
          { title: "浜у搧鐗堟湰", field: "productVersion",type: "like"},
          { title: "搴撳瓨鍒涘缓鏃堕棿",field: "createDate",type: "datetime"},
        ]
      ]);
      const columns = ref([
@@ -144,6 +145,13 @@
          align: "left",
        },
        {
          field: "proinventoryage",
          title: "鎴愬搧搴撻緞",
          type: "string",
          width: 80,
          align: "left",
        },
        {
          field: "lotNumber",
          title: "浜у搧鎵瑰彿",
          type: "string",