Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

haoxuan

2023-10-19 f73080c69548aba58d6a58e7e049d8eb79f9f7ed

 src/views/reportForm/inventoryReport/index.vue

@@ -217,42 +217,48 @@
          label: "单位成本",
          prop: "cost",
          default: false,
          isShowColumn: showcol.includes("单位成本")
          isShowColumn: showcol.includes("单位成本"),
          textAlign:"left"
        },
        {
          label: "总价值",
          prop: "value",
          default: false,
          isShowColumn: showcol.includes("总价值"),
          unit: "￥"
          unit: "￥",
          textAlign:"left"
        },
        {
          label: "在库",
          prop: "amount",
          default: true,
          isShowColumn: true,
          unit: ""
          unit: "",
          textAlign:"left"
        },
        {
          label: "可用库存",
          prop: "availableNumber",
          default: true,
          isShowColumn: true,
          unit: ""
          unit: "",
          textAlign:"left"
        },
        {
          label: "入库",
          prop: "in",
          default: false,
          isShowColumn: showcol.includes("入库"),
          unit: ""
          unit: "",
          textAlign:"left"
        },
        {
          label: "出库",
          prop: "out",
          isShowColumn: showcol.includes("出库"),
          default: false,
          unit: ""
          unit: "",
          textAlign:"left"
        },
        {
          label: "预测",
@@ -419,4 +425,5 @@
    flex: 1;
  }
}

</style>