This commit is contained in:
caoxinyu
2019-09-24 21:05:59 +08:00
parent 90c9e4e743
commit 681d3f3168
32 changed files with 81 additions and 81 deletions

View File

@@ -43,7 +43,7 @@
<span>工艺名称:</span>
<el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:200px"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
<el-tooltip effect="dark" content="新增补录工时" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="新增补录工时" placement="top">
<el-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>
</el-tooltip>
</el-row>

View File

@@ -5,16 +5,16 @@
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
<el-tooltip effect="dark" content="已导出和未导出备料单" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
</el-tooltip>
<el-tooltip effect="dark" content="打印备料单" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将选中零件分配为自家备料" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
<el-button type="info" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将选中零件分配为外购备料" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
<el-button type="warning" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
</el-tooltip>
</el-row>

View File

@@ -192,13 +192,13 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
<el-tooltip effect="dark" content="打回到零件分配" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="选中零件进行投产" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将不同组号中相同图号的零件合并" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
</el-tooltip>
</div>

View File

@@ -271,19 +271,19 @@
<el-table-column label="操作" width="490px" align="center">
<template slot-scope="scope">
<div>
<el-tooltip effect="dark" content="上移" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="上移" placement="top">
<el-button size="mini" icon="el-icon-arrow-up" type="primary" plain @click="upOne(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="下移" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="下移" placement="top">
<el-button size="mini" icon="el-icon-arrow-down" type="primary" plain @click="downOne(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="置顶" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="置顶" placement="top">
<el-button size="mini" icon="el-icon-upload2" type="primary" plain @click="TOP(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="置底" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="置底" placement="top">
<el-button size="mini" icon="el-icon-download" type="primary" plain @click="Down(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="删除" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
<el-button size="mini" icon="el-icon-delete" type="danger" plain @click="outParts(scope.row)"/>
</el-tooltip>
</div>

View File

@@ -22,13 +22,13 @@
</el-select>
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-tooltip effect="dark" content="自家备料查询" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="自家备料查询" placement="top">
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="自家备料完成" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="自家备料完成" placement="top">
<el-button size="small" icon="el-icon-success" type="info" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将备料件打回重新分配" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="将备料件打回重新分配" placement="top">
<el-button size="small" icon="el-icon-success" type="danger" style="margin-left: 10px" @click="back()">打回</el-button>
</el-tooltip>
</el-card>
@@ -68,10 +68,10 @@
<el-card>
<span>零件图号:</span>
<el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-tooltip effect="dark" content="外购备料确认" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="外购备料确认" placement="top">
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">查询</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="外购备料完成" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="外购备料完成" placement="top">
<el-button size="small" icon="el-icon-success" type="warning" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
</el-tooltip>
</el-card>

View File

@@ -190,13 +190,13 @@
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip effect="dark" content="将零件选择到采购单" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
<el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">制造部采购</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="所选零件分配到采购部" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
<el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="所选零件分配为自家生产" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
<el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
</el-tooltip>
</el-card>
@@ -292,12 +292,12 @@
</el-table-column>
<el-table-column label="操作" align="center" width="150px" fixed="right">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
<div style="display: inline-block;margin-right: 10px">
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip effect="dark" content="移出" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
</div>
@@ -365,12 +365,12 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
<div style="display: inline-block;margin-right: 10px">
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip effect="dark" content="移出" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
</div>

View File

@@ -82,7 +82,7 @@
<el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
<el-table-column label="[1]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
<div :class="colorCode[scope.$index][0]" @click="handleChange1(scope.$index, scope.row, 'form', 0)">
<h4>{{ process[scope.$index][0] }}</h4><h4>{{ planDate[scope.$index][0] }} </h4><h4> {{ realDate[scope.$index][0] }}</h4><h4> {{ worker[scope.$index][0] }}</h4>
</div>
@@ -91,7 +91,7 @@
</el-table-column>
<el-table-column label="[2]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
<div :class="colorCode[scope.$index][1]" @click="handleChange1(scope.$index, scope.row, 'form', 1)">
<h4>{{ process[scope.$index][1] }}</h4><h4>{{ planDate[scope.$index][1] }} </h4><h4> {{ realDate[scope.$index][1] }}</h4><h4> {{ worker[scope.$index][1] }}</h4>
</div>
@@ -100,7 +100,7 @@
</el-table-column>
<el-table-column label="[3]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
<div :class="colorCode[scope.$index][2]" @click="handleChange1(scope.$index, scope.row, 'form', 2)">
<h4>{{ process[scope.$index][2] }}</h4><h4>{{ planDate[scope.$index][2] }} </h4><h4> {{ realDate[scope.$index][2] }}</h4><h4> {{ worker[scope.$index][2] }}</h4>
</div>
@@ -109,7 +109,7 @@
</el-table-column>
<el-table-column label="[4]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
<div :class="colorCode[scope.$index][3]" @click="handleChange1(scope.$index, scope.row, 'form', 3)">
<h4>{{ process[scope.$index][3] }}</h4><h4>{{ planDate[scope.$index][3] }} </h4><h4> {{ realDate[scope.$index][3] }}</h4><h4> {{ worker[scope.$index][3] }}</h4>
</div>
@@ -118,7 +118,7 @@
</el-table-column>
<el-table-column label="[5]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
<div :class="colorCode[scope.$index][4]" @click="handleChange1(scope.$index, scope.row, 'form', 4)">
<h4>{{ process[scope.$index][4] }}</h4><h4>{{ planDate[scope.$index][4] }} </h4><h4> {{ realDate[scope.$index][4] }}</h4><h4> {{ worker[scope.$index][4] }}</h4>
</div>

View File

@@ -47,7 +47,7 @@
value-format="yyyy-MM-dd"
style="top: 1px;"
placeholder="选择开始日期"/>
<el-tooltip effect="dark" content="变更零件加工开始和结束时间" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" placement="top">
<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>
@@ -142,7 +142,7 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<el-tooltip effect="dark" content="将选中零件自动排出加工工序" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件自动排出加工工序" placement="top">
<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>
@@ -431,11 +431,11 @@
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
<div style="float:right">
<el-tooltip effect="dark" content="自动计算工序加工时间" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="自动计算工序加工时间" placement="top">
<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-tooltip effect="dark" content="选出重新设置零件的加工时间" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="选出重新设置零件的加工时间" placement="top">
<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>

View File

@@ -87,7 +87,7 @@
size="small"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip effect="dark" content="设定设备参数有效时间" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">