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:
liushuai
2020-01-08 20:04:35 +08:00
parent 9dc1d181af 83071936ce
commit 98ab4e8779
6 changed files with 95 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,11 +24,11 @@
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
</el-card>
<el-row>
<el-col style="width: 550px">
<el-col style="width: 40%">
<el-card>
<el-table
:data="tableData1"
:row-class-name="tableRowClassName"
:row-class-name="tableRowClassName1"
loading="loading"
class="table"
style="max-height: 830px"
@@ -70,7 +70,7 @@
</el-table>
</el-card>
</el-col>
<el-col style="width: 810px">
<el-col style="width: 60%">
<el-card>
<el-table
:data="tableData"
@@ -86,17 +86,17 @@
<el-radio :label="scope.row.序号" v-model="radio"/>
</template>
</el-table-column>
<el-table-column align="center" label="跟单号" width="100">
<el-table-column align="center" label="跟单号" width="80">
<template slot-scope="scope">
{{ scope.row.跟单号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" show-overflow-tooltip width="280">
<el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" show-overflow-tooltip width="200">
<el-table-column align="center" label="零件名称" show-overflow-tooltip width="150">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -399,6 +399,7 @@ export default {
this.tableData1 = []
this.row2 = row
gettabledata1(row.工艺计划流水号).then(response => {
console.log(response, 1212121)
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.tableData1.push({
@@ -409,7 +410,8 @@ export default {
操作者: response.data[i].操作者,
不合格数量: response.data[i].不合格数量,
质检数量: response.data[i].数量,
工序流水号: response.data[i].工序流水号
工序流水号: response.data[i].工序流水号,
工序状态: response.data[i].工序状态
})
}
}
@@ -480,6 +482,12 @@ export default {
if (parseInt(row.考核状态) > 6) {
return 'CompleteColor'
}
}, // 工序状态变色
tableRowClassName1({ row, rowIndex }) {
row.index = rowIndex
if (parseInt(row.工序状态) > 3) {
return 'CompleteColor'
}
}, // 重置表单
callOff(formName) {
this.dialogFormVisible = false