meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突input按钮

Browse Source
This commit is contained in:
chenjianan
2018-11-19 17:10:21 +08:00
parent 7222385e98
commit 42159275c3
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -18,7 +18,6 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>机床号:</span> <span>机床号:</span>
<<<<<<< HEAD
<el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1"> <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-button slot="append" icon="el-icon-search" @click="SearchMachine" />
</el-input> </el-input>
@@ -26,11 +25,6 @@
<el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px"> <el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
<el-button slot="append" icon="el-icon-search" @click="searchGroupList" /> <el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
</el-input> </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> <span>零件号:</span>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/> <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
<br> <br>