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

装配

Browse Source
This commit is contained in:
chenjianan
2019-06-18 17:03:59 +08:00
parent 6c5dd96d7b
commit 270cf138fc
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/Assembly/AssemblyExecution/index.vue
View File

@@ -94,8 +94,8 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right"> <el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.组件是否完成===null || scope.row.组件是否完成===0" type="success" size="small" @click="handlestart_3(scope.row)">开始装配</el-button> <el-button v-if="scope.row.buttonStatus === 1" type="success" size="small" @click="handlestart_3(scope.row)">开始装配</el-button>
<el-button v-else-if="scope.row.组件是否完成===1" type="danger" size="small" @click="handleend_3(scope.row)">结束装配</el-button> <el-button v-else-if="scope.row.buttonStatus === 2" type="danger" size="small" @click="handleend_3(scope.row)">结束装配</el-button>
<el-button v-else type="info" size="small" >装配完成</el-button> <el-button v-else type="info" size="small" >装配完成</el-button>
</template> </template>
</el-table-column> </el-table-column>
@@ -163,6 +163,16 @@ export default {
searchTable2(this.machineNumberValue, this.check2).then(response => { searchTable2(this.machineNumberValue, this.check2).then(response => {
console.log(response.data, 222) console.log(response.data, 222)
this.tableData2 = response.data this.tableData2 = response.data
this.tableData2.map(v => {
if (v.组件是否完成 === null || v.组件是否完成 === 0) {
this.$set(v, 'buttonStatus', 1)
} else if (v.组件是否完成 === 1) {
this.$set(v, 'buttonStatus', 2)
} else {
this.$set(v, 'buttonStatus', 3)
}
return v
})
}) })
}, },
// 总装开始装配 // 总装开始装配
@@ -207,7 +217,8 @@ export default {
ComponentStateUpdate(row.组件流水号, 1).then(response => { ComponentStateUpdate(row.组件流水号, 1).then(response => {
console.log(response.data) console.log(response.data)
this.searchTable1() this.searchTable1()
this.searchTable2() row.buttonStatus = 2
// this.searchTable2()
}) })
}, },
// 部装结束装配 // 部装结束装配
@@ -216,7 +227,8 @@ export default {
ComponentStateUpdate(row.组件流水号, 2).then(response => { ComponentStateUpdate(row.组件流水号, 2).then(response => {
console.log(response.data) console.log(response.data)
this.searchTable1() this.searchTable1()
this.searchTable2() row.buttonStatus = 3
// this.searchTable2()
}) })
} }
} }

2
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -233,7 +233,7 @@
<el-tag v-else type="success">已确认</el-tag> <el-tag v-else type="success">已确认</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="200px"> <el-table-column label="操作" align="center" width="220px">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
<el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="primary" icon="el-icon-check" @click="checkList(scope.row)">确认</el-button> <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="primary" icon="el-icon-check" @click="checkList(scope.row)">确认</el-button>
<el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button> <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button>