宏图

src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue

@@ -20,10 +20,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-<<<<<<< HEAD
-        <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
-        <el-button type="primary" icon="el-icon-download" plain size="small" @click="exportExcel()">导出</el-button>
-=======
         <span>备料时间段:</span>
         <el-date-picker
           v-model="dateRange"
@@ -39,7 +35,6 @@
           end-placeholder="结束日期"/>
         <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
         <el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
->>>>>>> 6d4033c92a46c968832636b84ef2c64c7b192fe4
       </div>
     </el-card>
     <el-card style="width: 76%">