合并冲突

spring

4 天以前 4ca2aeafbb3c753d98ba849fa5ebf817049b5803

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -19,7 +19,6 @@
        <!-- <el-button type="primary" @click="openForm('add')">新增</el-button> -->
        <el-button @click="handleOut">导出</el-button>
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
        <el-button type="primary" plain @click="handlePrint">打印</el-button>
      </div>
    </div>
    <div class="table_list">
@@ -40,7 +39,7 @@
        <el-table-column
          label="出库日期"
          prop="createTime"
          min-width="250"
          min-width="130"
          show-overflow-tooltip
        />
        <el-table-column
@@ -76,13 +75,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