Merge branch 'master' of http://123.56.95.229:10010/r/高精
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
<el-row>
|
||||
<span style="margin-left: 10px">零件图号</span>
|
||||
<el-input v-model="Partpaint" clearable size="small" style="width:170px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
|
||||
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
|
||||
<el-button size="small" type="primary" icon="el-icon-search" plain style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="清除所有机床零件信息" placement="top">
|
||||
<el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" plain @click="Empty()">清空</el-button>
|
||||
</el-tooltip>
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
<div style="margin-top: 8px;margin-bottom: 8px">
|
||||
<span style="margin: 5px">领料单编号:</span>
|
||||
<el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
|
||||
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
|
||||
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
|
||||
<!-- <el-button size="small" type="warning" style="float: right;margin-right: 10px" @click="prepareConfirm()">备料确认</el-button>-->
|
||||
<el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right; margin-right: 30px" @click="inputPassword()">领料确认</el-button>
|
||||
<el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right; margin-right: 30px" class="button111" @click="inputPassword()">领料确认</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
<div style="width: 27%;float: left;margin-right: 16px">
|
||||
@@ -680,3 +680,20 @@ export default {
|
||||
background: #E9F0F9 !important;
|
||||
}
|
||||
</style>
|
||||
<style lang="scss">
|
||||
.button111{
|
||||
background:rgb(253,246,236);
|
||||
border-color: #ff9759;
|
||||
color: #ff9759;
|
||||
&:hover{
|
||||
background: #ff9759;
|
||||
border-color: #ff9759;
|
||||
color: white;
|
||||
}
|
||||
&:focus{
|
||||
background: #ff9759;
|
||||
border-color: #ff9759;
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
<!-- :value="item.value"/>-->
|
||||
<!-- </el-select>-->
|
||||
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 180px;margin: 10px 10px 0px 10px"/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
|
||||
<el-button type="primary" size="small" style="margin: 15px 0 0 10px" @click="wareHousing">出库</el-button>
|
||||
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
|
||||
<el-button type="warning" size="small" style="margin: 15px 0 0 10px" plain @click="wareHousing">出库</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<el-card>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
</el-select>
|
||||
<span>零件图号:</span>
|
||||
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;"/>
|
||||
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=500;total = 0">查询</el-button>
|
||||
<el-button type="primary" class="el-icon-search" size="small" plain style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=500;total = 0">查询</el-button>
|
||||
</el-card>
|
||||
|
||||
<el-card style="width: 49.5%; float: left">
|
||||
|
||||
Reference in New Issue
Block a user