diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index db28e5b1..d82822f5 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -18,7 +18,6 @@
           :value="item.value"/>
       </el-select>
       <span>机床号:</span>
-<<<<<<< HEAD
       <el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
         <el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
       </el-input>
@@ -26,11 +25,6 @@
       <el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
         <el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
       </el-input>
-=======
-      <el-input v-model="machineToolNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="SearchMachine" @change="empty1"/>
-      <span>组号:</span>
-      <el-input v-model="groupNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
->>>>>>> 45d3903a226c57546658abf8697edd180bd01975
       <span>零件号:</span>
       <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
       <br>