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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-02-17 11:50:15 +08:00
parent 4e8acde445 14b7f653cb
commit ff571c4e45
28 changed files with 2031 additions and 1455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -1,35 +1,39 @@
<template>
<div>
<el-card>
<el-row>
<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="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
<el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:0px" @click="edit2()">分配外购备料</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
<el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit()">分配自家备料</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
<el-button type="distribution" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
<div style="width: 1900px;overflow:auto">
<div style="white-space: nowrap">
<el-card>
<el-row>
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
<el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left:0px" @click="edit2()">分配外购备料</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
<el-button type="distribution" size="small" icon="el-icon-setting" style="margin-left:10px" @click="edit('BL')">分配自家备料</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
<el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 3px 0px 0 170px" @click="exportExcel">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
</div>
</div>
<el-card>
<el-table
v-loading="loading"
:data="tableData"
:header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
height="760"
style="width: 1408px; margin: 3px 0"
style="width: 1110px; margin: 3px 0"
size="mini"
border
stripe
@@ -43,30 +47,30 @@
type="selection"
width="50"
align="center"/>
<el-table-column label="备料分配" prop="备料分配" align="center" width="90">
<el-table-column label="进程" prop="备料分配" align="center" width="70">
<template slot-scope="scope">
<span v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</span>
<span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</span>
<span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</span>
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center" width="250" sortable="custom" show-overflow-tooltip>
<el-table-column label="零件名称" prop="零件名称" align="center" width="140px" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" align="center" width="180" sortable="custom" show-overflow-tooltip>
<el-table-column label="零件图号" prop="零件图号" align="center" width="180px" sortable="custom" show-overflow-tooltip>
<!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="60">
<el-table-column label="数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" width="120" show-overflow-tooltip>
<el-table-column label="材料" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
@@ -76,19 +80,19 @@
{{ scope.row.重量 }}
</template>
</el-table-column>
<el-table-column label="工艺要求" align="center" width="300" show-overflow-tooltip>
<el-table-column label="工艺要求" align="center" width="180" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
</template>
</el-table-column>
<el-table-column label="备料任务接受时间" align="center" width="140" show-overflow-tooltip>
<el-table-column label="接收时间" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备料任务接受时间 }}
{{ scope.row.备料任务接受时间 | formatTime }}
</template>
</el-table-column>
<el-table-column label="备料任务分配时间" align="center" width="140" show-overflow-tooltip>
<el-table-column label="分配时间" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备料任务分配时间 }}
{{ scope.row.备料任务分配时间 | formatTime }}
</template>
</el-table-column>
</el-table>
@@ -327,4 +331,21 @@ export default {
<style scoped>
</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>

220
src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
View File

@@ -532,49 +532,76 @@
</el-row>
</div>
</el-tooltip>
<el-tooltip :id="机床总装" placement="bottom" @mouseover.native.prevent="changeActive($event)">
<div slot="content" style="max-height: 200px;overflow: auto" v-html="returns1"/>
<div :title="tooltip" style="position: relative;left:520px;top:-1280px; width: 100px;height: 28px;">
<div :id="机床总装" placement="bottom" @mouseover.native.prevent="changeActive($event)">
<!-- <div slot="content" style="max-height: 200px;overflow: auto" v-html="returns1"/>-->
<div style="max-height: 200px;overflow: auto"/>
<!-- <div :title="tooltip" style="position: relative;left:520px;top:-1280px; width: 100px;height: 28px;">-->
<div style="position: relative;left:520px;top:-1280px; width: 100px;height: 28px;">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 机床总装 }}</div>
</el-row>
</div>
</el-tooltip>
<el-tooltip :id="部件装配" placement="bottom" @mouseover.native.prevent="changeActive($event)">
<div slot="content" style="max-height: 200px;overflow: auto" v-html="returns2"/>
<div :title="tooltip" style="position: relative;left:660px;top:-1308px; width: 100px;height: 28px;">
</div>
<div :id="部件装配" placement="bottom" @mouseover.native.prevent="changeActive($event)">
<!-- <div slot="content" style="max-height: 200px;overflow: auto" v-html="returns2"/>-->
<div style="max-height: 200px;overflow: auto"/>
<!-- <div :title="tooltip" style="position: relative;left:660px;top:-1308px; width: 100px;height: 28px;">-->
<div style="position: relative;left:660px;top:-1308px; width: 100px;height: 28px;">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 部件装配 }}</div>
</el-row>
</div>
</el-tooltip>
</div>
</div>
<el-card style="position: absolute;background: #ffffff;margin-top: -825px;margin-left: 1540px;height: 130px;width: 120px">
<div style="margin-top: 6px">
<div class="circle4" style="margin-top: 3px"/>
<el-tooltip>
<div slot="content">设备开机<br>电流计正常工作<br>工控机关机</div>
<span style="margin-left: 5px">电脑关机</span>
</el-tooltip>
</div>
<div style="margin-top: 6px">
<div class="circle" style="margin-top: 3px"/>
<span style="margin-left: 5px">设备开机</span>
</div>
<div style="margin-top: 6px">
<div class="circle1" style="margin-top: 3px"/>
<span style="margin-left: 5px">设备工作</span>
</div>
<div style="margin-top: 6px">
<div class="circle2" style="margin-top: 3px"/>
<span style="margin-left: 5px">设备关机</span>
</div>
<div style="margin-top: 6px">
<div class="circle3" style="margin-top: 3px"/>
<span style="margin-left: 5px">电流计故障</span>
</div>
</el-card>
<!-- <el-card style="position: absolute;background: #ffffff;margin-top: -825px;margin-left: 1540px;height: 130px;width: 120px">-->
<!-- <div style="margin-top: 6px">-->
<!-- <div class="circle4" style="margin-top: 3px"/>-->
<!-- <el-tooltip>-->
<!-- <div slot="content">设备开机<br>电流计正常工作<br>工控机关机</div>-->
<!-- <span style="margin-left: 5px">电脑关机</span>-->
<!-- </el-tooltip>-->
<!-- </div>-->
<!-- <div style="margin-top: 6px">-->
<!-- <div class="circle" style="margin-top: 3px"/>-->
<!-- <span style="margin-left: 5px">设备开机</span>-->
<!-- </div>-->
<!-- <div style="margin-top: 6px">-->
<!-- <div class="circle1" style="margin-top: 3px"/>-->
<!-- <span style="margin-left: 5px">设备工作</span>-->
<!-- </div>-->
<!-- <div style="margin-top: 6px">-->
<!-- <div class="circle2" style="margin-top: 3px"/>-->
<!-- <span style="margin-left: 5px">设备关机</span>-->
<!-- </div>-->
<!-- <div style="margin-top: 6px">-->
<!-- <div class="circle3" style="margin-top: 3px"/>-->
<!-- <span style="margin-left: 5px">电流计故障</span>-->
<!-- </div>-->
<!-- </el-card>-->
</el-card>
<div style="position: absolute;margin-top: -610px;margin-left: 490px;height: 350px;width: 124px;background-color: transparent">
<el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData1" style="width: 433px; text-align: center" size="mini">
<el-table-column label="总装机床" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
</el-table>
</div>
<div style="position: absolute;margin-top: -610px;margin-left: 625px;background-color: transparent">
<el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData2" max-height="365" style="width: 156px;text-align: center" size="mini">
<el-table-column label="总装机床" align="left" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}&nbsp;&nbsp;&nbsp;&nbsp;{{ scope.row.任务名称 }}
</template>
</el-table-column>
<!-- <el-table-column label="任务名称" align="left" width="70" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.任务名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</div>
</div>
</template>
@@ -586,6 +613,8 @@ import { mapGetters } from 'vuex' // 暂无用
export default {
data() {
return {
tableData1: '',
tableData2: '',
returns1: '',
returns2: '',
fang: '_fang',
@@ -668,6 +697,12 @@ export default {
this.connect()
// this.getwork_state()
this.getOP_state()
getZongzhuang().then(res2 => {
this.tableData1 = res2.data
})
getBuzhuang().then(res3 => {
this.tableData2 = res3.data
})
// this.timer = setInterval(this.getwork_state, 60 * 1000) // 工位状态 60秒 一刷新
},
beforeDestroy() {
@@ -711,7 +746,7 @@ export default {
},
// 工位电流值
// 1停机灰色 2开机黄色 3运行绿色 4报警红色
// 0 电流计故障 蓝闪 1 设备关机 灰闪 2 设备开机 黄闪 3 设备工作 绿闪 10断网或电脑关机 灰色
// 0 电流计故障 蓝 1 设备关机 灰 2 设备开机 黄 3 设备工作 绿 10断网或电脑关机 透明
getOP_state() {
getOP_state().then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -720,31 +755,31 @@ export default {
$('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle4')
$('#' + response.data[i].工位号 + '_circle').addClass('circle1') // 黄色闪
$('#' + response.data[i].工位号 + '_circle').addClass('circle1') // 黄色
} else if (response.data[i].状态代码 === '3') {
$('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle4')
$('#' + response.data[i].工位号 + '_circle').addClass('circle') // 绿色闪
$('#' + response.data[i].工位号 + '_circle').addClass('circle') // 绿色
} else if (response.data[i].状态代码 === '0') {
$('#' + response.data[i].工位号 + '_circle').removeClass('circle')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle4')
$('#' + response.data[i].工位号 + '_circle').addClass('circle3') // 蓝色闪
$('#' + response.data[i].工位号 + '_circle').addClass('circle3') // 蓝色
} else if (response.data[i].状态代码 === '1') {
$('#' + response.data[i].工位号 + '_circle').removeClass('circle')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle4')
$('#' + response.data[i].工位号 + '_circle').addClass('circle2') // 灰色闪
$('#' + response.data[i].工位号 + '_circle').addClass('circle2') // 灰色
} else {
$('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
$('#' + response.data[i].工位号 + '_circle').addClass('circle4') // 灰色
$('#' + response.data[i].工位号 + '_circle').addClass('circle4') // 灰色圈
}
}
})
@@ -759,6 +794,7 @@ export default {
this.returns2 = ''
if ($event.path[2].id === '机床总装') {
getZongzhuang().then(res2 => {
// this.tableData1 = res2.data
if (res2.data.length !== 0) {
this.returns1 = '<div slot="content">总装机床：<br>'
for (let i = 0; i < res2.data.length; i++) {
@@ -771,6 +807,7 @@ export default {
})
} else if ($event.path[2].id === '部件装配') {
getBuzhuang().then(res3 => {
this.tableData2 = res3.data
if (res3.data.length !== 0) {
this.returns2 = '<div slot="content">部件装配：<br>'
for (let i = 0; i < res3.data.length; i++) {
@@ -848,7 +885,19 @@ export default {
this.tooltip3 = '加工零件：' + response.data[0].零件图号_零件工艺计划
}
getOP_state2($event.path[2].id).then(res => {
if (res.data[0].状态代码 === '1') { this.tooltip2 = '设备状态：关机' } else if (res.data[0].状态代码 === '2') { this.tooltip2 = '设备状态：等待' } else if (res.data[0].状态代码 === '3') { this.tooltip2 = '设备状态：运行' } else if (res.data[0].状态代码 === '4') { this.tooltip2 = '设备状态：报警' }
if (res.data[0].状态代码 === '0') {
this.tooltip2 = '设备状态：设备报警'
} else if (res.data[0].状态代码 === '1') {
this.tooltip2 = '设备状态：关机'
} else if (res.data[0].状态代码 === '2') {
this.tooltip2 = '设备状态：等待'
} else if (res.data[0].状态代码 === '3') {
this.tooltip2 = '设备状态：运行'
} else if (res.data[0].状态代码 === '4') {
this.tooltip2 = '设备状态：报警'
} else if (res.data[0].状态代码 === '10') {
this.tooltip2 = '设备状态：工位电脑关闭'
}
})
})
}
@@ -960,7 +1009,7 @@ export default {
background-size:100% 100%;-moz-background-size:100% 100%;
overflow: hidden;
}
/*绿色闪*/
/*绿色*/
.circle{
float: left;
width: 10px;
@@ -969,9 +1018,9 @@ export default {
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
background: url('../../../assets/img/greenTwinkle.gif');
/*background: url('../../../assets/img/greenTwinkle.gif');*/
}
/*黄色闪*/
/*黄色*/
.circle1{
float: left;
width: 10px;
@@ -980,9 +1029,9 @@ export default {
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
background: url('../../../assets/img/yellowTwinkle.gif');
/*background: url('../../../assets/img/yellowTwinkle.gif');*/
}
/*灰色闪*/
/*灰色*/
.circle2{
float: left;
width: 10px;
@@ -991,25 +1040,26 @@ export default {
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
background: url('../../../assets/img/grayTwinkle.gif');
/*background: url('../../../assets/img/grayTwinkle.gif');*/
}
/*蓝色闪*/
/*红色*/
.circle3{
float: left;
width: 10px;
height: 10px;
background-color:dodgerblue;
background-color:red;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
background: url('../../../assets/img/blueTwinkle.gif');
/*background: url('../../../assets/img/blueTwinkle.gif');*/
}
/*灰色*/
/*灰色圈*/
.circle4{
float: left;
width: 10px;
height: 10px;
background-color:gray;
border:2px solid gray;
background-color:transparent;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
@@ -1027,3 +1077,71 @@ export default {
background-color:#FFBB00 ;
}
</style>
<style lang="scss">
/* 滚动条 */
.el-table__body-wrapper::-webkit-scrollbar-thumb {
background: rgb(42,118,206);
width: 1px;
border: none;
border-radius:4px;
}
.el-table__body-wrapper::-webkit-scrollbar {
color: rgb(42,118,206);
width: 4px;
}
/* 滚动条 */
.el-table td, .el-table th.is-leaf {
border: 0px solid #EBEEF5;
}
.el-table--border, .el-table--group {
border: 0px solid #EBEEF5;
}
.el-table::before {
left: 0;
bottom: 0;
width: 100%;
/* height: 1px; */
}
.el-table tbody tr:hover>td {
background-color:transparent!important
}
.el-table{
/* 表格字体颜色 */
color:black;
/* 表格边框颜色 */
/* border: 0.5px solid #758a99; */
height: 500px;
background: transparent;
}
/* 表格内背景颜色 */
.el-table th, .el-table tr,.el-table td{
border: 0;
background-color: transparent;
}
/* 双数行背景颜色 */
.el-table--striped .el-table__body tr.el-table__row--striped td {
background-color: transparent;
background-color: rgba(148, 144, 144, 0.3)
}
/* 使表格背景透明 */
.el-table th, .el-table tr {
background-color: transparent;
}
/* 删除表格下横线 */
.el-table::before {
left: 0;
bottom: 0;
width: 100%;
height: 0px;
}
/* 表格表头字体颜色 */
.el-table thead {
color: white;
font-weight: 500;
background-color: rgba(148, 144, 144, 0.3)
}
.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: transparent !important;
}
</style>

4
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -10,7 +10,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="机床号" style="margin-top:28px">
<el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px" placeholder="机床号" @change="typeChange1()">
<el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床号" @change="typeChange1()">
<el-option
v-for="item in toolNum"
:key="item.value"
@@ -22,7 +22,7 @@
</el-select>
</el-form-item>
<el-form-item label="分组">
<el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组" @change="total = 0;pageSize = 10;pageList = 1;getTable()">
<el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="分组" @change="total = 0;pageSize = 10;pageList = 1;getTable()">
<el-option
v-for="item in Num"
:key="item.value"

8
src/views/ManufacturingCenter/InventoryQuery/index.vue
View File

@@ -6,18 +6,18 @@
<el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
<!-- <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<!-- <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
<el-button type="success" plain size="small" @click="exportExcel()">导出</el-button>
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 20px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
<el-button type="success" icon="el-icon-bottom" plain size="small" @click="exportExcel()">导出</el-button>
<!-- <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
</el-row>
</div>
<el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 639px" size="mini">
<el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 579px" size="mini">
<el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="物料型号" align="center" width="240" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="物料型号" align="center" width="180" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>

226
src/views/ManufacturingCenter/MaterialArrival/index.vue
View File

@@ -1,116 +1,120 @@
<template>
<div class="app-container">
<el-card>
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup">
<el-option
v-for="item in Machines"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 120px;" @change="getTableData">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
<el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
</el-card>
<el-row>
<el-card style="width: 50%; float: left">
<el-table
:data="tableData"
loading="loading"
class="table"
highlight-current-row
border
stripe
height="750"
style="width: 100%"
@current-change="getCurrentRow">
<el-table-column align="center" type="index" label="序号" width="50"/>
<el-table-column align="center" label="机床号" show-overflow-tooltip width="120">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" show-overflow-tooltip width="120">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" show-overflow-tooltip min-width="190">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" show-overflow-tooltip width="140">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="数量" width="80">
<template slot-scope="scope">
{{ scope.row.投产数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="加工完成" width="110">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[50, 200, 300, 400]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card style="width: 34.5%; float: left">
<el-table
:data="tableData1"
loading="loading"
class="table"
style="max-height: 830px"
highlight-current-row
empty-text=" "
border
@row-click="getRow">
<el-table-column type="index" label="序号" width="50"/>
<el-table-column align="center" label="工艺名" min-width="100">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作者" show-overflow-tooltip min-width="90">
<template slot-scope="scope">
{{ scope.row.操作者 }}
</template>
</el-table-column>
<el-table-column align="center" label="排产日期" min-width="110">
<template slot-scope="scope">
{{ scope.row.排产日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成日期" min-width="110">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-row>
<div style="width: 100%;overflow:auto">
<div style="white-space: nowrap">
<el-card style="width: 1455px">
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup">
<el-option
v-for="item in Machines"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 120px;" @change="getTableData">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
<el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
</el-card>
<el-row>
<el-card style="width: 850px; margin-left: 0px;display: inline-block;" >
<el-table
:data="tableData"
loading="loading"
class="table"
highlight-current-row
border
stripe
height="750"
style="width: 100%"
@current-change="getCurrentRow">
<el-table-column align="center" type="index" label="序号" width="50"/>
<el-table-column align="center" label="机床号" show-overflow-tooltip width="120">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" show-overflow-tooltip width="120">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" show-overflow-tooltip min-width="190">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" show-overflow-tooltip width="140">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="数量" width="80">
<template slot-scope="scope">
{{ scope.row.投产数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="加工完成" width="110">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[50, 200, 300, 400]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card style="width: 600px; margin-left: 1px;display: inline-block;vertical-align: top;">
<el-table
:data="tableData1"
loading="loading"
class="table"
style="max-height: 830px"
highlight-current-row
empty-text=" "
border
@row-click="getRow">
<el-table-column type="index" label="序号" width="50"/>
<el-table-column align="center" label="工艺名" min-width="100">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作者" show-overflow-tooltip min-width="90">
<template slot-scope="scope">
{{ scope.row.操作者 }}
</template>
</el-table-column>
<el-table-column align="center" label="排产日期" min-width="110">
<template slot-scope="scope">
{{ scope.row.排产日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成日期" min-width="110">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-row>
</div>
</div>
</div>
</template>

113
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -1,9 +1,9 @@
<template>
<div class="app-container">
<el-card style="padding-top: 10px">
<el-card style="padding-top: 5px;">
<el-row>
<!-- <span>机床编号:</span>-->
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="machineChange">
<el-select v-model="machineNumberValue" filterable placeholder="机床图号" size="small" style="margin:0px;width: 180px" clearable @change="machineChange">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -14,14 +14,14 @@
</el-option>
</el-select>
<!-- <span>组号:</span>-->
<el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable @change="searchTable">
<el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin-left: 10px;width: 90px" size="small" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 50px">三表下达时间:&nbsp;&nbsp;{{ DeliveryTime }}</span>
<span style="margin-left: 20px">任务下达时间:&nbsp;&nbsp;{{ DeliveryTime }}</span>
<!-- <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>-->
<!-- <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchPart()">查询1</el-button>-->
<el-badge :value="value1" :max="99" class="item">
@@ -61,22 +61,22 @@
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </el-card>-->
<el-card>
<el-card style="">
<el-tabs type="border-card" @tab-click="selectPart">
<el-tab-pane label="基本件">
<el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 1140px" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/>
<el-table-column label="零件名称" align="center" width="120px">
<el-table-column label="零件名称" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="120px">
<el-table-column label="零件图号" align="center" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="前零件图号" align="center" width="120px">
<el-table-column label="前零件图号" align="center" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.前零件图号 }}
</template>
@@ -113,13 +113,13 @@
</el-table-column>
<el-table-column label="操作" align="center" width="100px">
<template slot-scope="scope">
<el-button type="danger" size="mini" icon="el-icon-delete" plain @click="OutParts(scope.row)">移出</el-button>
<el-button type="danger" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">移出</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="外购件">
<el-table :data="tableData2" stripe border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table :data="tableData2" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/>
<el-table-column label="物料代码" align="center" width="120">
<template slot-scope="scope">
@@ -169,7 +169,7 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="标准件">
<el-table :data="tableData3" stripe border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table :data="tableData3" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/>
<el-table-column label="物料代码" align="center" width="120">
<template slot-scope="scope">
@@ -219,38 +219,41 @@
</el-table>
</el-tab-pane>
</el-tabs>
<span>交货期：</span>
<el-date-picker
v-model="time"
size="small"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<span style="font-weight: bold">制造:</span>
<el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
<el-button type="primary" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
</el-tooltip>
<span style="margin-left: 40px;font-weight: bold">金工:</span>
<el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
<el-button type="danger" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="Production()">车间生产</el-button>
</el-tooltip>
<span style="margin-left: 40px;font-weight: bold">采购:</span>
<el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
<el-button type="success" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="PurchasingDepartment()">采购部门采购</el-button>
</el-tooltip>
<el-card style="padding: 3px">
<span>交货期：</span>
<el-date-picker
v-model="time"
size="small"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<span style="font-weight: bold">制造:</span>
<el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
<el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
</el-tooltip>
<span style="margin-left: 40px;font-weight: bold">金工:</span>
<el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
<el-button type="danger" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="Production()">车间生产</el-button>
</el-tooltip>
<span style="margin-left: 40px;font-weight: bold">采购:</span>
<el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
<el-button type="success" size="small" icon="el-icon-shopping-cart-full" plain style="margin-top: 3px; margin-left: 5px" @click="PurchasingDepartment()">采购部门采购</el-button>
</el-tooltip>
</el-card>
</el-card>
<el-card>
<el-card style="padding: 3px;">
<el-row>
<!-- <span>请购单号：</span>-->
<el-input v-model="PurchaseOrder" size="small" style="width: 155px" placeholder="请购单号" clearable/>
<el-button type="primary" size="mini" style="margin-left: 10px" plain @click="searchTable1()">查询</el-button>
<el-button type="warning" size="mini" style="margin-left: 10px" plain @click="handleAdd()">新增</el-button>
<el-button type="danger" size="mini" style="margin-left: 10px" plain @click="handleDelete()">删除</el-button>
<el-button icon="el-icon-search" type="primary" size="mini" style="margin-left: 10px" plain @click="searchTable1()">查询</el-button>
<el-button icon="el-icon-circle-plus-outline" type="warning" size="mini" style="margin-left: 10px" plain @click="handleAdd()">新增</el-button>
<el-button icon="el-icon-edit-outline" type="danger" size="mini" style="margin-left: 10px" plain @click="handleDelete()">删除</el-button>
<el-button icon="el-icon-bottom" type="success" plain size="mini" @click="exportExcel()">导出</el-button>
</el-row>
</el-card>
<el-row>
<el-col style="width: 400px">
<el-col style="width: 400px;">
<el-card>
<el-table :data="tableData4" stripe border size="mini" style="width: 100%" height="300px" highlight-current-row @row-click="searchDetailed">
<el-table-column label="请购单号" show-overflow-tooltip align="center" width="120px">
@@ -273,7 +276,7 @@
{{ scope.row.请购时间 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="107px">
<el-table-column label="备注" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
@@ -287,9 +290,9 @@
</el-table>
</el-card>
</el-col>
<el-col style="width: 920px;margin-left: 10px">
<el-col style="width: 985px;margin-left: 0px">
<el-card>
<el-table :data="tableData6" stripe border size="mini" style="width: 100%" height="300px">
<el-table :data="tableData6" border size="mini" height="300px">
<el-table-column label="序号" type="index" align="center" width="50px"/>
<el-table-column label="零件名称" show-overflow-tooltip align="center" width="90px">
<template slot-scope="scope">
@@ -306,17 +309,17 @@
{{ scope.row.规格或材料 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="50px">
<el-table-column label="数量" show-overflow-tooltip align="center" width="50px">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" width="70px">
<el-table-column label="零件类型" show-overflow-tooltip align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.零件类型 }}
</template>
</el-table-column>
<el-table-column label="交货期" align="center" width="90px">
<el-table-column label="交货期" show-overflow-tooltip align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.物料计划到货时间 }}
</template>
@@ -326,17 +329,17 @@
<!-- {{ scope.row.项目名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="机床编号" align="center" width="90px">
<el-table-column label="机床图号" show-overflow-tooltip align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" width="50px">
<el-table-column label="组号" show-overflow-tooltip align="center" width="50px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="100px">
<el-table-column label="备注" show-overflow-tooltip align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
@@ -672,6 +675,9 @@ export default {
_this.DeliveryTime = ''
}
}
},
groupNumberValue() {
this.searchTable()
}
},
created() {
@@ -679,6 +685,16 @@ export default {
this.fetchData()
},
methods: {
// EXCEL 导出
// 姜福壮
exportExcel() {
if (this.RequisitionList !== '') {
var param = []
param[0] = ['请购单流水号', this.RequisitionList]
var Data = this.CreateData('00', '报表_制造中心-制造_零件分配_查询', param)
this.exportExcel_NPOI(Data)
}
},
fetchData() {
if (Cookie.get('machineValue') !== undefined) {
this.machineNumber = []
@@ -871,6 +887,9 @@ export default {
value: response.data[i].组件流水号
})
}
if (response.data.length > 0) {
this.groupNumberValue = this.groupNumber[0].value
}
})
},
// 三表下达时间查询
@@ -1531,7 +1550,7 @@ export default {
}
.item {
float: right;
margin-top: 10px;
margin-top: 5px;
margin-right: 40px;
}
</style>

225
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -1,8 +1,7 @@
<template>
<div class="app-container">
<div>
<el-card>
<!--<el-button :disabled="isShow" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditData">补录完成日期</el-button>-->
<el-button :disabled="isDisabled" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditConfirmNum">修改完成数量</el-button>
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 185px;" placeholder="机床号" @change="getGroup">
<el-option
v-for="item in Machines"
@@ -23,6 +22,8 @@
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
<el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
<el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
<!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditConfirmNum">修改完成数量</el-button>-->
<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>
</el-card>
<el-row>
<el-col style="width: 37%">
@@ -74,6 +75,7 @@
<el-col style="width: 63%">
<el-card>
<el-table
ref="singleTable"
:data="tableData"
:row-class-name="tableRowClassName"
loading="loading"
@@ -82,11 +84,11 @@
border
height="630"
@row-click="getCurrentRow">
<el-table-column type="index" align="center" label="跟单号" width="140">
<template slot-scope="scope">
<el-radio :label="scope.row.跟单号" v-model="radio"/>
</template>
</el-table-column>
<!--<el-table-column type="index" align="center" label="跟单号" width="140">-->
<!--<template slot-scope="scope">-->
<!--<el-radio :label="scope.row.跟单号" v-model="radio"/>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -231,16 +233,52 @@
<el-button type="primary" @click="submit2('form')" >确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible3" title="修补加工工时" center style="min-height: 300px" width="400px">
<el-form ref="form3" :model="form3" :rules="rules2" label-position="left" label-width="90px" class="demo-ruleForm">
<el-row width="200px">
<el-form-item label="操作员" prop="人员" >
<el-select v-model="form3.人员" filterable style="width: 80%" size="small" placeholder="无">
<el-option
v-for="item in person_Form3"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="完成数量" prop="完成数量" >
<el-input-number v-model="form3.完成数量" :min="0" :max="批次数量" size="small" style="width: 80%"/>
</el-form-item>
<el-form-item label="修补工时" prop="修补工时" >
<el-input v-model="form3.修补工时" placeholder="修补工时" size="small" style="width: 80%" />
</el-form-item>
<el-form-item label="完成日期" prop="完成时间">
<el-date-picker
v-model="form3.完成时间"
style="width: 80%"
size="small"
type="date"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期"/>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible3=false">取消</el-button>
<el-button type="primary" @click="submit3('form3')" >确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getMachines, getGroups, getTable, gettabledata1, getTree, fn, getTable8, submitEdit, getExport, searchWorkTime, submit2 } from '@/api/ManufacturingCenter/ProcessingStatusNew'
import Cookie from 'js-cookie'
import { getMachines, getGroups, getTable, gettabledata1, getTree, fn, getTable8, submitEdit, getExport, searchWorkTime, submit2, submitEdit3, getPerson_Form3 } from '@/api/ManufacturingCenter/ProcessingStatusNew'
export default {
data() {
return {
index: -1,
Machine: '', // 机床号
Machines: [],
Group: '', // 组号
@@ -289,14 +327,117 @@ export default {
数量: ''
},
操作者: [],
max: 0
max: 0,
// new 20200213修补加工工时↓
dialogFormVisible3: false,
person_Form3: [],
form3: {
人员: '',
完成数量: '',
修补工时: '',
完成时间: ''
},
rules2: {
人员: [{ required: true, message: '请选择操作员', trigger: 'change' }],
完成时间: [{ required: true, message: '请选择实际完成时间', trigger: 'change' }],
修补工时: [{ required: true, message: '请输入修补工时', trigger: 'blur' }],
完成数量: [{ required: true, message: '请输入完成数量', trigger: 'blur' }]
},
批次数量: 0
}
},
created() {
this.getMachine()
this.getTable9()
var _this = this
document.onkeydown = function(e) {
if (event.keyCode === 37 || event.keyCode === 38) {
_this.click_Up()
}
if (event.keyCode === 39 || event.keyCode === 40) {
_this.click_Down()
}
}
},
methods: {
click_Up() {
if (this.index === -1) {
console.log(-1)
} else {
this.index = this.index - 1
console.log(this.index)
this.$refs.singleTable.setCurrentRow(this.tableData[this.index])
this.批次数量 = this.tableData[this.index].批次数量
this.getCurrentRow_Click(this.tableData[this.index].工艺计划流水号)
}
},
click_Down() {
if (this.index === -1) {
console.log(-1)
} else {
this.index = this.index + 1
console.log(this.index)
this.$refs.singleTable.setCurrentRow(this.tableData[this.index])
this.批次数量 = this.tableData[this.index].批次数量
this.getCurrentRow_Click(this.tableData[this.index].工艺计划流水号)
}
},
getCurrentRow_Click(row) {
this.isDisabled = true
this.completeTime = ''
this.dateOfProduction = ''
this.processSerialNumber = ''
this.tableData1 = []
gettabledata1(row).then(response => {
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.tableData1.push({
工艺名称: response.data[i].工艺名称,
序间质检: response.data[i].质检结果,
排产日期: response.data[i].排产时间 ? response.data[i].排产时间.split(' ')[0] : '',
完成日期: response.data[i].工序完成日期 ? response.data[i].工序完成日期.split(' ')[0] : '',
操作者: response.data[i].操作者,
不合格数量: response.data[i].不合格数量,
质检数量: response.data[i].数量,
工序流水号: response.data[i].工序流水号,
工序状态: response.data[i].工序状态,
完成数量: response.data[i].完成数量
})
}
}
})
},
EditWorkingHours() {
if (this.$refs['form3'] !== undefined) {
this.$refs['form3'].resetFields()
}
this.getPerson_Form3()
this.dialogFormVisible3 = true
},
getPerson_Form3() {
this.person_Form3 = []
getPerson_Form3().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.person_Form3.push({
label: response.data[i].姓名,
value: response.data[i].人员编号
})
}
}).then(() => {
this.form3.人员 = this.person_Form3[0].value
})
},
submit3() {
submitEdit3(this.processSerialNumber, this.form3.人员, this.form3.完成数量, this.form3.修补工时, this.form3.完成时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('补录成功')
} else {
this.$message.error('补录失败')
}
})
this.dialogFormVisible3 = false
this.getCurrentRow_Click(this.tableData[this.index].工艺计划流水号)
},
EditConfirmNum() {
this.form2.数量 = 0
this.操作者 = []
@@ -345,7 +486,6 @@ export default {
return
}
getExport(this.Machine).then(res => {
console.log(res.data)
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['机床', '组号', '图号及规格', '制品名称', '计划数', '材料', '当前工序名']
const filterVal = ['机床图号', '组号', '零件图号', '零件名称', '投产数量', '材料', '工艺名称']
@@ -362,50 +502,20 @@ export default {
})
},
getMachine() {
if (Cookie.get('machineValue') !== undefined) {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
if (Cookie.get('group') !== undefined) {
this.Machine = parseInt(Cookie.get('machineValue'))
this.getGroup()
this.getTableData()
this.Group = parseInt(Cookie.get('group'))
// this.getTableData()
Cookie.remove('machineValue')
Cookie.remove('group')
} else {
// this.getTableData()
Cookie.remove('machineValue')
Cookie.remove('group')
}
})
} else {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})
this.getTableData()
}
}, // 获取组号
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})
},
getGroup() {
this.Group = ''
this.Groups = []
@@ -464,15 +574,16 @@ export default {
},
// 获取工序表
getCurrentRow(row) {
this.批次数量 = row.批次数量
this.index = row.index
this.row2 = row.工艺计划流水号
this.isDisabled = true
this.completeTime = ''
this.dateOfProduction = ''
this.processSerialNumber = ''
this.radio = true
this.tableData1 = []
this.row2 = row.工艺计划流水号
gettabledata1(this.row2).then(response => {
console.log(response.data)
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.tableData1.push({

147
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -1,87 +1,86 @@
<template>
<div class="app-container">
<el-card>
<span>设备名称:</span>
<el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/>
<el-card style="padding: 3px">
<el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 0px"/>
<!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>-->
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
<el-tooltip effect="dark" content="添加新设备" placement="top">
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
<!--<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>-->
</el-tooltip>
<span style="margin-left: 40px">有效时间：</span>
<el-date-picker
v-model="time"
type="date"
size="small"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
<!--<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>-->
<el-button type="warning" size="small" icon="el-icon-setting" plain style="margin-left:10px" @click="setUp">设定</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
<!--<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>-->
<el-button type="primary" size="small" icon="el-icon-edit-outline" plain style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
</el-tooltip>
<!-- <span style="margin-left: 40px">有效时间：</span>-->
<!-- <el-date-picker-->
<!-- v-model="time"-->
<!-- type="date"-->
<!-- size="small"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择日期"/>-->
<!-- <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
<!-- &lt;!&ndash;<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>&ndash;&gt;-->
<!-- <el-button type="warning" size="small" icon="el-icon-setting" plain style="margin-left:10px" @click="setUp">设定</el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
<!-- &lt;!&ndash;<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>&ndash;&gt;-->
<!-- <el-button type="primary" size="small" icon="el-icon-edit-outline" plain style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
<!-- </el-tooltip>-->
</el-card>
<el-card>
<el-table :data="List" border size="small" stripe highlight-current-row height="700px">
<el-table-column label="设备名称" prop="设备名称" align="center" >
<el-table :data="List" border size="small" stripe highlight-current-row height="700px" style="width: 570px">
<el-table-column label="设备名称" prop="设备名称" align="center" width="120px" >
<template slot-scope="scope">
{{ scope.row.设备名称 }}
</template>
</el-table-column>
<el-table-column label="设备编号" prop="设备编号" align="center" >
<el-table-column label="设备编号" prop="设备编号" align="center" width="120px" >
<template slot-scope="scope">
{{ scope.row.设备编号 }}
</template>
</el-table-column>
<el-table-column label="设备型号" rop="设备型号" align="center" >
<el-table-column label="设备型号" rop="设备型号" align="center" width="120px" >
<template slot-scope="scope">
{{ scope.row.设备型号 }}
</template>
</el-table-column>
<el-table-column label="设备性能指标" align="center" >
<template slot-scope="scope">
{{ scope.row.设备性能指标 }}
</template>
</el-table-column>
<el-table-column label="设备加工能力" align="center" >
<template slot-scope="scope">p
{{ scope.row.设备加工能力工时 }}
</template>
</el-table-column>
<el-table-column label="设备加工工艺" align="center" >
<!-- <el-table-column label="设备性能指标" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备性能指标 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="设备加工能力" align="center" >-->
<!-- <template slot-scope="scope">p-->
<!-- {{ scope.row.设备加工能力工时 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="设备加工工艺" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.工艺属性 }}
</template>
</el-table-column>
<el-table-column label="班次类型" align="center" >
<!-- <el-table-column label="班次类型" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.班次类型 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="设备工时系数" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备工时系数 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="整改工时系数" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.整改工时比例 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="预留工时系数" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备预留工时系数 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.班次类型 }}
</template>
</el-table-column>
<el-table-column label="设备工时系数" align="center" >
<template slot-scope="scope">
{{ scope.row.设备工时系数 }}
</template>
</el-table-column>
<el-table-column label="整改工时系数" align="center" >
<template slot-scope="scope">
{{ scope.row.整改工时比例 }}
</template>
</el-table-column>
<el-table-column label="预留工时系数" align="center">
<template slot-scope="scope">
{{ scope.row.设备预留工时系数 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100px" fixed="right" >
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)"/>
<el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)"/>
<el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:5px" @click="handleEdit(scope.row)"/>
<el-button type="text" size="mini" icon="el-icon-delete" style="margin-left:5px" @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -144,7 +143,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-show="title!=='增加'">
<el-row v-show="false">
<el-col :span = "12">
<el-form-item label="设备加工能力" prop="设备加工能力" >
<el-input v-model="form.设备加工能力" placeholder="设备加工能力" size="small" style="width:200px" clearable />
@@ -156,7 +155,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-show="title!=='增加'">
<el-row v-show="false">
<el-col :span = "12">
<el-form-item label="班次类型" prop="班次类型" >
<el-select v-model="form.班次类型" placeholder="班次类型" size="small" style="width:200px" clearable >
@@ -174,7 +173,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-show="title!=='增加'">
<el-row v-show="false">
<el-col :span = "12">
<el-form-item label="整改工时系数" prop="整改工时系数" >
<el-input v-model="form.整改工时系数" placeholder="整改工时系数" size="small" style="width:200px" clearable />
@@ -296,7 +295,7 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
this.title = row.设备名称
this.title = '编辑'
this.dialogFormVisible = true
this.form.设备名称 = row.设备名称
this.form.设备编号 = row.设备编号
@@ -311,6 +310,7 @@ export default {
this.equipmentSerialNumber = row.设备流水号
},
submit(formName) {
console.log(this.title)
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.title === '增加') {
@@ -343,12 +343,13 @@ export default {
},
ADD() {
this.addForm('form')
this.dialogFormVisible1 = true
this.dialogFormVisible = true
this.form.contractSigningDate = getNowTime()// new Date()
this.temp = 1
this.title = '新增项目'
this.title = '增加'
},
submitEdit() {
console.log(2323)
editTable(this.equipmentSerialNumber, this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备加工能力, this.form.设备工时系数, this.form.班次类型, this.form.设备加工工艺, this.form.整改工时系数, this.form.设备编号, this.form.预留工时系数).then(response => {
if (response.data[0].result === '1') {
this.$notify({
@@ -435,4 +436,20 @@ export default {
/* color: #ff9759;*/
/*}*/
</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>