Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-20 2ab9e3e914b6c29a3ab34d7b73113e751e113f0f

 src/views/reportForm/locationReport/index.vue

@@ -166,7 +166,7 @@
          isShowColumn: true,
          default: true,
          unit: "",
          textAlign:"left"
          textAlign:"right"
        },
        {
          label: "预留数量",
@@ -174,7 +174,7 @@
          isShowColumn: true,
          default: true,
          unit: "",
          textAlign:"left"
          textAlign:"right"
        },
        {
          label: "单位",
@@ -189,7 +189,7 @@
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值"),
          textAlign:"left",
          textAlign:"right",
          unit: "￥"
        }
      ]