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

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

Browse Source
This commit is contained in:
chenjianan
2019-03-08 11:28:39 +08:00
parent 2ef6915285 bc48a04198
commit 32a23fc4d5
3 changed files with 321 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
View File

@@ -57,3 +57,15 @@ export function JurisdictionControl(num1, num2) {
} }
}) })
} }
// 所有工序
export function getTable2(stepNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序',
param: '项目流水号_check=0&项目流水号=0&机床流水号_check=0&机床流水号=0&组件流水号_check=0&组件流水号=0&零件图号_check=1=string&零件图号=' + stepNumber + '=string&是否查询全部数据=1=string&单件是否外协=1&考核状态=6=int'
}
})
}

326
src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
View File

@@ -21,18 +21,231 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading0" :data="tableData" height="650" style="width: 100%;" border> <el-table v-loading="loading0" :data="tableData" height="650" style="width: 100%;" border @expand-change="searchTable2">
<el-table-column <el-table-column type="expand">
label=" " <template slot-scope="scope">
align="center" <el-table :data="tableData2" border style="text-align: center" size="mini">
type="index" <el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
width="50"/> <el-table-column label="[1]" align="center" width="120px">
<el-table-column label="零件名称" align="center" width="310px"> <template slot-scope="scope">
<div :class="colorCode[0]">
<h4>{{ process[0] }}</h4><h4>{{ planDate[0] }} </h4><h4> {{ realDate[0] }}</h4><h4> {{ worker[0] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[2]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[1]">
<h4>{{ process[1] }}</h4><h4>{{ planDate[1] }} </h4><h4> {{ realDate[1] }}</h4><h4> {{ worker[1] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[3]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[2]">
<h4>{{ process[2] }}</h4><h4>{{ planDate[2] }} </h4><h4> {{ realDate[2] }}</h4><h4> {{ worker[2] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[4]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[3]">
<h4>{{ process[3] }}</h4><h4>{{ planDate[3] }} </h4><h4> {{ realDate[3] }}</h4><h4> {{ worker[3] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[5]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[4]">
<h4>{{ process[4] }}</h4><h4>{{ planDate[4] }} </h4><h4> {{ realDate[4] }}</h4><h4> {{ worker[4] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[6]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[5]">
<h4>{{ process[5] }}</h4><h4>{{ planDate[5] }} </h4><h4> {{ realDate[5] }}</h4><h4> {{ worker[5] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[7]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[6]">
<h4>{{ process[6] }}</h4><h4>{{ planDate[6] }} </h4><h4> {{ realDate[6] }}</h4><h4> {{ worker[6] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[8]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[7]">
<h4>{{ process[7] }}</h4><h4>{{ planDate[7] }} </h4><h4> {{ realDate[7] }}</h4><h4> {{ worker[7] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[9]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[8]">
<h4>{{ process[8] }}</h4><h4>{{ planDate[8] }} </h4><h4> {{ realDate[8] }}</h4><h4> {{ worker[8] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[10]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[9]">
<h4>{{ process[9] }}</h4><h4>{{ planDate[9] }} </h4><h4> {{ realDate[9] }}</h4><h4> {{ worker[9] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[11]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[10]">
<h4>{{ process[10] }}</h4><h4>{{ planDate[10] }} </h4><h4> {{ realDate[10] }}</h4><h4> {{ worker[10] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[12]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[11]">
<h4>{{ process[11] }}</h4><h4>{{ planDate[11] }} </h4><h4> {{ realDate[11] }}</h4><h4> {{ worker[11] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[13]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[12]">
<h4>{{ process[12] }}</h4><h4>{{ planDate[12] }} </h4><h4> {{ realDate[12] }}</h4><h4> {{ worker[12] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[14]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[13]">
<h4>{{ process[13] }}</h4><h4>{{ planDate[13] }} </h4><h4> {{ realDate[13] }}</h4><h4> {{ worker[13] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[15]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[14]">
<h4>{{ process[14] }}</h4><h4>{{ planDate[14] }} </h4><h4> {{ realDate[14] }}</h4><h4> {{ worker[14] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[16]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[15]">
<h4>{{ process[15] }}</h4><h4>{{ planDate[15] }} </h4><h4> {{ realDate[15] }}</h4><h4> {{ worker[15] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[17]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[16]">
<h4>{{ process[16] }}</h4><h4>{{ planDate[16] }} </h4><h4> {{ realDate[16] }}</h4><h4> {{ worker[16] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[18]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[17]">
<h4>{{ process[17] }}</h4><h4>{{ planDate[17] }} </h4><h4> {{ realDate[17] }}</h4><h4> {{ worker[17] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[19]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[18]">
<h4>{{ process[18] }}</h4><h4>{{ planDate[18] }} </h4><h4> {{ realDate[18] }}</h4><h4> {{ worker[18] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[20]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[19]">
<h4>{{ process[19] }}</h4><h4>{{ planDate[19] }} </h4><h4> {{ realDate[19] }}</h4><h4> {{ worker[19] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[21]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[20]">
<h4>{{ process[20] }}</h4><h4>{{ planDate[20] }} </h4><h4> {{ realDate[20] }}</h4><h4> {{ worker[20] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[22]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[21]">
<h4>{{ process[21] }}</h4><h4>{{ planDate[21] }} </h4><h4> {{ realDate[21] }}</h4><h4> {{ worker[21] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[23]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[22]">
<h4>{{ process[22] }}</h4><h4>{{ planDate[22] }} </h4><h4> {{ realDate[22] }}</h4><h4> {{ worker[22] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[24]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[23]">
<h4>{{ process[23] }}</h4><h4>{{ planDate[23] }} </h4><h4> {{ realDate[23] }}</h4><h4> {{ worker[23] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[25]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[24]">
<h4>{{ process[24] }}</h4><h4>{{ planDate[24] }} </h4><h4> {{ realDate[24] }}</h4><h4> {{ worker[24] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[26]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[25]">
<h4>{{ process[25] }}</h4><h4>{{ planDate[25] }} </h4><h4> {{ realDate[25] }}</h4><h4> {{ worker[25] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[27]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[26]">
<h4>{{ process[26] }}</h4><h4>{{ planDate[26] }} </h4><h4> {{ realDate[26] }}</h4><h4> {{ worker[26] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[28]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[27]">
<h4>{{ process[27] }}</h4><h4>{{ planDate[27] }} </h4><h4> {{ realDate[27] }}</h4><h4> {{ worker[27] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[29]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[28]">
<h4>{{ process[28] }}</h4><h4>{{ planDate[28] }} </h4><h4> {{ realDate[28] }}</h4><h4> {{ worker[28] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[30]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[29]">
<h4>{{ process[29] }}</h4><h4>{{ planDate[29] }} </h4><h4> {{ realDate[29] }}</h4><h4> {{ worker[29] }}</h4>
</div>
</template>
</el-table-column>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="220px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center" width="330px"> <el-table-column label="零件图号" align="center" width="270px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号_短 }} {{ scope.row.零件图号_短 }}
</template> </template>
@@ -42,7 +255,7 @@
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="300" align="center" fixed="right"> <el-table-column label="操作" width="300" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<el-button <el-button
@@ -116,7 +329,7 @@
</template> </template>
<script> <script>
import { getMachine, getMachine2, searchtable, Order, JurisdictionControl } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment' import { getMachine, getMachine2, searchtable, getTable2, Order, JurisdictionControl } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
export default { export default {
data() { data() {
return { return {
@@ -127,6 +340,14 @@ export default {
Machine: [], Machine: [],
MachineValue: '', MachineValue: '',
loading0: false, loading0: false,
tableData2: [], // 工艺数据
process: [],
planDate: [],
worker: [],
colorCode: [],
realDate: [],
result: [],
零件图号: [],
tableData: [], // 表格数据 tableData: [], // 表格数据
pageSize: 10, pageSize: 10,
pageCurrent: 1, pageCurrent: 1,
@@ -165,13 +386,46 @@ export default {
searchtable(this.MachineValue, this.pageCurrent, this.pageSize).then(response => { searchtable(this.MachineValue, this.pageCurrent, this.pageSize).then(response => {
this.tableData = response.data.rows this.tableData = response.data.rows
this.total = response.data.total this.total = response.data.total
}).then(() => {
this.loading0 = false this.loading0 = false
}) })
} else { } else {
this.$message.error('请选择工位') this.$message.error('请选择工位')
} }
}, },
searchTable2(row) {
this.process = []
this.planDate = []
this.worker = []
this.colorCode = []
this.realDate = []
this.tableData2 = []
getTable2(row.零件图号).then(response => {
for (let k = 0; k < response.data.length; k++) {
this.process[k] = response.data[k].工艺名称简称
this.planDate[k] = response.data[k].计划日期_短
this.realDate[k] = response.data[k].完成日期_短
if (response.data[k].工艺编号 === 29) {
response.data[k].员工姓名 = '备料'
}
if (response.data[k].工序间是否外协 === 2) {
response.data[k].员工姓名 = '外协'
}
if (response.data[k].员工姓名 === '超级管理员') {
response.data[k].员工姓名 = '无'
}
this.worker[k] = response.data[k].员工姓名
if (response.data[k].工序状态 === 5) { // 灰色是已经完成 未入库
this.colorCode[k] = 'grey'
} else {
this.colorCode[k] = response.data[k].进度颜色
}
if (response.data[k].工序间是否外协 === 2) {
this.colorCode[k] = 'lightblue'
}
}
this.tableData2.push(response.data[0])
})
},
Jurisdiction() { Jurisdiction() {
this.count = 0 this.count = 0
getMachine2().then(response => { getMachine2().then(response => {
@@ -231,15 +485,53 @@ export default {
</script> </script>
<style scoped> <style scoped>
.el-card{
margin-bottom: 15px;
}
.el-input{
width: 210px;
}
.item { .item {
float: right; float: right;
margin-top: 10px; margin-top: 10px;
margin-right: 40px; margin-right: 40px;
} }
.el-form-item{
margin-bottom: 22px;
}
.el-card{
margin-bottom: 15px;
}
span{
margin: 10px 0 10px 10px;
}
h4{
border: 1px solid transparent;
margin: 0;
font-weight: normal;
width: 100px;
height: 24px;
}
.white{
background-color: ghostwhite;
border: 1px solid #1f2d3d;
}
.grey{
background-color: grey;
border: 1px solid #1f2d3d;
}
.red{
background-color: orangered;
border: 1px solid #1f2d3d;
}
.lightblue{
background-color: deepskyblue;
border: 1px solid #1f2d3d;
}
.yellow{
background-color: yellow;
border: 1px solid #1f2d3d;
}
.blank{
background-color: transparent;
border: 0px solid white;
}
.lightgreen{
background-color: lightgreen;
border: 1px solid #1f2d3d;
}
</style> </style>

50
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -295,61 +295,11 @@ export default {
edit2(row.工序流水号, row.工艺计划流水号, 1).then(response => { edit2(row.工序流水号, row.工艺计划流水号, 1).then(response => {
this.$message.success('工序外协状态更改成功') this.$message.success('工序外协状态更改成功')
}) })
}).then(() => {
this.loading2 = true
this.checkBox = []
this.tableData2 = []
searchTable2(this.num1).then(response => {
if (response.data.length === 0) {
this.loading0 = false
} else {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].工序间是否外协 === 1) {
this.checkBox.push(false)
} else {
this.checkBox.push(true)
}
}
for (let i = 0; i < response.data.length; i++) {
response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
}
this.tableData2 = response.data
}
}).then(() => {
this.loading2 = false
})
}) })
} else { } else {
this.InOut = 1 this.InOut = 1
edit(row.工序流水号, this.InOut).then(response => { edit(row.工序流水号, this.InOut).then(response => {
this.$message.success('工序外协状态更改成功') this.$message.success('工序外协状态更改成功')
}).then(() => {
this.loading2 = true
this.checkBox = []
this.tableData2 = []
searchTable2(this.num1).then(response => {
if (response.data.length === 0) {
this.loading0 = false
} else {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].工序间是否外协 === 1) {
this.checkBox.push(false)
} else {
this.checkBox.push(true)
}
}
for (let i = 0; i < response.data.length; i++) {
response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
}
this.tableData2 = response.data
}
}).then(() => {
this.loading2 = false
})
}) })
} }
}, },