Merge remote-tracking branch 'refs/remotes/origin/dev_erjitaocan' into dev

spring

5 天以前 931aebc875a4d927aae21a36250e2008616c02e4

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -46,7 +46,7 @@
        <el-table-column
          label="出库日期"
          prop="createTime"
          min-width="250"
          min-width="130"
          show-overflow-tooltip
        />
        <el-table-column
@@ -82,13 +82,13 @@
        <el-table-column
          label="含税单价(元)"
          prop="taxInclusiveUnitPrice"
          width="100"
          width="200"
          show-overflow-tooltip
        />
        <el-table-column
          label="含税总价(元)"
          prop="taxInclusiveTotalPrice"
          width="100"
          width="200"
          show-overflow-tooltip
        />
        <el-table-column