Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-20 2ab9e3e914b6c29a3ab34d7b73113e751e113f0f

 src/views/reportForm/locationReport/index.vue

@@ -165,14 +165,16 @@
          prop: "amount",
          isShowColumn: true,
          default: true,
          unit: ""
          unit: "",
          textAlign:"right"
        },
        {
          label: "预留数量",
          prop: "availableStore",
          isShowColumn: true,
          default: true,
          unit: ""
          unit: "",
          textAlign:"right"
        },
        {
          label: "单位",
@@ -187,6 +189,7 @@
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值"),
          textAlign:"right",
          unit: "￥"
        }
      ]
@@ -266,4 +269,5 @@
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped></style>
<style lang="scss" scoped>
</style>