This commit is contained in:
caoxinyu
2019-09-24 08:22:02 +08:00
parent 0758701e5e
commit ac47b69ea3
24 changed files with 241 additions and 136 deletions

View File

@@ -25,15 +25,12 @@
</el-select>
<span>零件图号:</span>
<el-input v-model="partNumber" clearable size="small" placeholder="零件图号" style="width: 200px;"/>
<el-button v-if="是否扫描 === false" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total = 0;pageList = 1;getTable()">查询</el-button>
<el-button v-if="是否扫描 === true" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total5 = 0;pageList5 = 1;getTable5()">查询</el-button>
<el-checkbox v-if="false" v-model="是否扫描">是否扫描查询</el-checkbox>
</el-row>
</div>
</el-card>
<el-card>
<span class="demonstration">开始日期: </span>
<el-date-picker
@@ -51,7 +48,9 @@
value-format="yyyy-MM-dd"
style="top: 1px;"
placeholder="选择开始日期"/>
<el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
<el-tooltip effect="dark" content="变更零件加工开始和结束时间" placement="top" open-delay="1200">
<el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
</el-tooltip>
<el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
<el-table
v-loading="listLoading"
@@ -144,7 +143,9 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 50px 10px 10px" @click="Selection">选入</el-button>
<el-tooltip effect="dark" content="将选中零件自动排出加工工序" placement="top" open-delay="1200">
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 50px 10px 10px" @click="Selection">选入</el-button>
</el-tooltip>
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 20px 10px 10px" @click="SelectionAll">全部选入</el-button>
</div>
<div v-if="是否扫描 === true" class="block" style="margin-top: 10px;">
@@ -431,9 +432,13 @@
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
<div style="float:right">
<el-button type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Discharge">虚拟排产</el-button>
<el-tooltip effect="dark" content="自动计算工序加工时间" placement="top" open-delay="1200">
<el-button type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Discharge">虚拟排产</el-button>
</el-tooltip>
<el-button v-if="可以确定零件计划" type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Plan" >确定零件计划</el-button>
<el-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" @click="allOut">全部选出</el-button>
<el-tooltip effect="dark" content="选出重新设置零件的加工时间" placement="top" open-delay="1200">
<el-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" @click="allOut">全部选出</el-button>
</el-tooltip>
</div>
</div>
</div>
@@ -1606,7 +1611,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin: 0px;
}
.el-date-editor{
width: 200px;
@@ -1647,7 +1652,4 @@ export default {
background-color: lightgreen!important;
border: 1px solid #1f2d3d;
}
.el-card{
margin: 0px;
}
</style>