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

车间排产

Browse Source
This commit is contained in:
zhangdingyu
2019-10-26 18:23:40 +08:00
parent ac3477bf77
commit a398554f26
3 changed files with 61 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/icons/svg/ShopScheduling.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978842550" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1498" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 1024C229.248 1024 0 794.752 0 512 0 229.205333 229.248 0 512 0s512 229.205333 512 512c0 282.752-229.248 512-512 512z m0-938.666667C276.352 85.333333 85.333333 276.352 85.333333 512s191.018667 426.666667 426.666667 426.666667 426.666667-191.018667 426.666667-426.666667S747.648 85.333333 512 85.333333z m213.333333 640h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z m0-170.666666h-42.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333334h298.666666a42.666667 42.666667 0 0 1 85.333334 0h42.666666a42.666667 42.666667 0 0 1 0 85.333334z m0-170.666667h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z" p-id="1499"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

11
src/styles/element-ui.scss
View File

@@ -48,11 +48,12 @@
.hover-row td{ .hover-row td{
background: RGB(236 245 255)!important; background: RGB(236 245 255)!important;
} }
.el-table td, .is-leaf{ //表格行颜色9745
background-color: rgb(255, 255, 255); //.el-table td, .is-leaf{
color: black; // background-color: rgb(255, 255, 255);
font-weight:400 // color: black;
} // font-weight:400
//}
.el-table--striped .el-table__body tr.el-table__row--striped td{ .el-table--striped .el-table__body tr.el-table__row--striped td{
background-color: #d8dde6;/*修改斑马线表格背景*/ background-color: #d8dde6;/*修改斑马线表格背景*/
} }

99
src/views/ManufacturingCenter/ShopScheduling/index.vue
View File

@@ -4,7 +4,7 @@
<el-col style="width: 650px"> <el-col style="width: 650px">
<el-card style="height: 800px"> <el-card style="height: 800px">
<el-row style="margin-top: 5px"> <el-row style="margin-top: 5px">
<el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px" @change="searchTableData2"> <el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px;float: right" @change="searchTableData2">
<el-option <el-option
v-for="item in Person" v-for="item in Person"
:key="item.value" :key="item.value"
@@ -14,13 +14,13 @@
<!--<el-button size="small" type="danger" style="float: right;">移除</el-button>--> <!--<el-button size="small" type="danger" style="float: right;">移除</el-button>-->
<!--<el-button size="small" type="success" style="float: right;margin-right: 5px">添加</el-button>--> <!--<el-button size="small" type="success" style="float: right;margin-right: 5px">添加</el-button>-->
</el-row> </el-row>
<el-table v-loading="loading1" :data="tableData1" height="710" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu"> <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="710" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
align="center" align="center"
width="50"/> width="50"/>
<el-table-column label="图号及规格" align="center" width="180px"> <el-table-column label="图号及规格" align="center" width="190px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.图号及规格 }} {{ scope.row.图号及规格 }}
</template> </template>
@@ -30,7 +30,7 @@
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" width="80px"> <el-table-column label="数量" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.投产数量 }} {{ scope.row.投产数量 }}
</template> </template>
@@ -62,12 +62,7 @@
<el-col style="width: 650px"> <el-col style="width: 650px">
<el-card style="height: 800px"> <el-card style="height: 800px">
<el-table v-loading="loading2" :data="tableData2" height="380" highlight-current-row size="mini" style="width: 100%" border stripe @row-dblclick="XuanChu"> <el-table v-loading="loading2" :data="tableData2" height="380" highlight-current-row size="mini" style="width: 100%" border stripe @row-dblclick="XuanChu">
<el-table-column label="操作者" align="center"> <el-table-column label="零件图号" align="center" width="190px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
@@ -77,19 +72,24 @@
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工序名" align="center"> <el-table-column label="工序名" align="center" width="100px">
<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"> <el-table-column label="数量" align="center" width="70px">
<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="70px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
</el-table> </el-table>
<el-table v-loading="loading3" :data="tableData3" :row-class-name="tableRowClassName" height="393" size="mini" style="width: 100%" border @row-dblclick="XuanRu"> <el-table v-loading="loading3" :data="tableData3" :row-class-name="tableData3ClassName" height="393" size="mini" style="width: 100%" border @row-dblclick="XuanRu">
<el-table-column label="序号" align="center"> <el-table-column label="序号" align="center" width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工序顺序 }} {{ scope.row.工序顺序 }}
</template> </template>
@@ -99,17 +99,17 @@
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作者" align="center"> <el-table-column label="操作者" align="center" width="90px">
<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"> <el-table-column label="排产时间" align="center" width="120px">
<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"> <el-table-column label="完成日期" align="center" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.完成日期 }} {{ scope.row.完成日期 }}
</template> </template>
@@ -169,7 +169,8 @@ export default {
零件名称: v.零件名称, 零件名称: v.零件名称,
投产数量: v.投产数量, 投产数量: v.投产数量,
计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '', 计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '',
计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '' 计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '',
状态: v.状态
}) })
}) })
this.total = response.data.total this.total = response.data.total
@@ -196,11 +197,14 @@ export default {
this.loading3 = false this.loading3 = false
}) })
}, },
// ?? tableData1ClassName({ row, rowIndex }) {
tableRowClassName({ row, rowIndex }) { if (row.状态 === '1') {
return 'CJPClingjianjinxing'
}
},
tableData3ClassName({ row, rowIndex }) {
if (row.工序状态 === 4) { if (row.工序状态 === 4) {
console.log(row.工序状态) return 'CJPCgongxuwancheng'
return 'successsss'
} }
}, },
searchTableData2() { searchTableData2() {
@@ -212,29 +216,31 @@ export default {
}) })
}, },
XuanRu(row) { XuanRu(row) {
XuanRu(this.PersonValue, row.工序流水号).then(response => { if (row.工序状态 !== 4) {
if (response.data[0].result === '1') { XuanRu(this.PersonValue, row.工序流水号).then(response => {
this.getParts() if (response.data[0].result === '1') {
this.loading3 = true this.getParts()
this.tableData3 = [] this.loading3 = true
getGongxu(this.工艺计划流水号).then(response => { this.tableData3 = []
response.data.map(v => { getGongxu(this.工艺计划流水号).then(response => {
this.tableData3.push({ response.data.map(v => {
工序流水号: v.工序流水号, this.tableData3.push({
工序状态: v.工序状态, 工序流水号: v.工序流水号,
工序顺序: v.工序顺序, 工序状态: v.工序状态,
工艺名称: v.工艺名称, 工序顺序: v.工序顺序,
排产人员: v.排产人员, 工艺名称: v.工艺名称,
姓名: v.姓名, 排产人员: v.排产人员,
排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '', 姓名: v.姓名,
完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '' 排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : ''
})
}) })
this.loading3 = false
}) })
this.loading3 = false this.searchTableData2()
}) }
this.searchTableData2() })
} }
})
}, },
XuanChu(row) { XuanChu(row) {
XuanChu(row.工序流水号).then(response => { XuanChu(row.工序流水号).then(response => {
@@ -274,7 +280,10 @@ export default {
</script> </script>
<style> <style>
.successsss{ .CJPCgongxuwancheng{
background: yellowgreen !important; background: #d8e5f6 !important;
}
.CJPClingjianjinxing{
background: #9bd7fc !important;
} }
</style> </style>