fix bug
This commit is contained in:
@@ -32,17 +32,17 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="计划数量" align="center" min-width="100">
|
<el-table-column label="计划数量" align="center" min-width="100">
|
||||||
<template slot-scope="scope" align="center">
|
<template slot-scope="scope" align="center">
|
||||||
<el-input v-model="tableData[scope.$index].plannumber" readonly size="small"/>
|
{{ tableData[scope.$index].plannumber }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="入库数量" align="center" min-width="100">
|
<el-table-column label="入库数量" align="center" min-width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-model="tableData[scope.$index].innumber" clearable size="small"/>
|
<el-input v-model="tableData[scope.$index].innumber" clearable size="mini"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="仓库" align="center" min-width="100">
|
<el-table-column label="仓库" align="center" min-width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-select v-model="inventoryNumber" filterable clearable size="small" placeholder="仓库名称" @change="Getlocate">
|
<el-select v-model="inventoryNumber" filterable clearable size="mini" placeholder="仓库名称" @change="Getlocate">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in inventoryName"
|
v-for="item in inventoryName"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="货位" align="center" min-width="120">
|
<el-table-column label="货位" align="center" min-width="120">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-select v-model="locateNumber" filterable clearable size="small" placeholder="货位名称">
|
<el-select v-model="locateNumber" filterable clearable size="mini" placeholder="货位名称">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in locateName"
|
v-for="item in locateName"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
@@ -64,7 +64,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="备注" align="center">
|
<el-table-column label="备注" align="center">
|
||||||
<template slot-scope="scope" align="center">
|
<template slot-scope="scope" align="center">
|
||||||
<el-input v-model="tableData[scope.$index].note" clearable size="small"/>
|
<el-input v-model="tableData[scope.$index].note" clearable size="mini"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" min-width="100" align="center">
|
<el-table-column label="操作" min-width="100" align="center">
|
||||||
@@ -79,7 +79,6 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -87,7 +86,6 @@
|
|||||||
import { searchTable, insertOne, getinventory, getlocate, searchPartNumber, CraftNumber } from '@/api/Inventory/Inboundscanning'
|
import { searchTable, insertOne, getinventory, getlocate, searchPartNumber, CraftNumber } from '@/api/Inventory/Inboundscanning'
|
||||||
import { mapGetters } from 'vuex'
|
import { mapGetters } from 'vuex'
|
||||||
import { wsuri, name } from '@/utils/request'
|
import { wsuri, name } from '@/utils/request'
|
||||||
import print from '@/vendor/print'
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@@ -118,6 +116,7 @@ export default {
|
|||||||
this.Getinvent()
|
this.Getinvent()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 移除
|
||||||
handleDelete(index, row) {
|
handleDelete(index, row) {
|
||||||
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
|
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
@@ -139,54 +138,60 @@ export default {
|
|||||||
// 获取人员编号
|
// 获取人员编号
|
||||||
getpeopleid() {
|
getpeopleid() {
|
||||||
this.PeopleNumber = this.id
|
this.PeopleNumber = this.id
|
||||||
const a = this.token
|
|
||||||
console.log(a, 1111)
|
|
||||||
},
|
},
|
||||||
aaa() {
|
// 初始化websocket
|
||||||
print('#print')
|
initWebpack() {
|
||||||
},
|
|
||||||
initWebpack() { // 初始化websocket
|
|
||||||
this.websock = new WebSocket(wsuri)// 这里面的this都指向vue
|
this.websock = new WebSocket(wsuri)// 这里面的this都指向vue
|
||||||
this.websock.onopen = this.websocketopen
|
this.websock.onopen = this.websocketopen
|
||||||
this.websock.onmessage = this.websocketonmessage
|
this.websock.onmessage = this.websocketonmessage
|
||||||
this.websock.onclose = this.websocketclose
|
this.websock.onclose = this.websocketclose
|
||||||
this.websock.onerror = this.websocketerror
|
this.websock.onerror = this.websocketerror
|
||||||
},
|
},
|
||||||
websocketopen() { // 打开
|
// 打开
|
||||||
|
websocketopen() {
|
||||||
console.log('WebSocket连接成功')
|
console.log('WebSocket连接成功')
|
||||||
this.websock.send('{<' + name + '>}')
|
this.websock.send('{<' + name + '>}')
|
||||||
},
|
},
|
||||||
websocketonmessage(msg) { // 数据接收
|
// 数据接收
|
||||||
|
websocketonmessage(msg) {
|
||||||
this.partNumber = msg.data.split('|')[3]
|
this.partNumber = msg.data.split('|')[3]
|
||||||
this.partNumber = this.partNumber.slice(1)
|
this.partNumber = this.partNumber.slice(1)
|
||||||
this.getPaint(this.partNumber)
|
this.getPaint(this.partNumber)
|
||||||
},
|
},
|
||||||
websocketclose() { // 关闭
|
// 关闭
|
||||||
|
websocketclose() {
|
||||||
console.log('WebSocket关闭')
|
console.log('WebSocket关闭')
|
||||||
},
|
},
|
||||||
websocketerror() { // 失败
|
// 失败
|
||||||
|
websocketerror() {
|
||||||
console.log('WebSocket连接失败')
|
console.log('WebSocket连接失败')
|
||||||
},
|
},
|
||||||
|
// 根据图号查流水号并查表1
|
||||||
getCraftNumber() {
|
getCraftNumber() {
|
||||||
|
this.partNumber = ''
|
||||||
CraftNumber(this.Partpaint).then(response => {
|
CraftNumber(this.Partpaint).then(response => {
|
||||||
this.partNumber = response.data[0].工艺计划流水号
|
if (response.data.length > 0 && response.data[0].工艺计划流水号) {
|
||||||
|
this.partNumber = response.data[0].工艺计划流水号
|
||||||
|
}
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.getscantable()
|
this.getscantable()
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
// 扫描并获取图号并查表1
|
||||||
getPaint() {
|
getPaint() {
|
||||||
searchPartNumber(this.partNumber).then(response => {
|
searchPartNumber(this.partNumber).then(response => {
|
||||||
this.Partpaint = response.data[0].零件图号
|
this.Partpaint = response.data[0].零件图号
|
||||||
})
|
})
|
||||||
this.getscantable()
|
this.getscantable()
|
||||||
},
|
},
|
||||||
// 扫描查询
|
// 根据流水号查询
|
||||||
getscantable() {
|
getscantable() {
|
||||||
if (this.partNumber === '' || this.partNumber === null) {
|
if (this.partNumber === '' || this.partNumber === null) {
|
||||||
this.$message.error('请输入零件号')
|
this.$message.error('请输入正确零件号')
|
||||||
} else {
|
} else {
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
searchTable(this.partNumber).then(response => {
|
searchTable(this.partNumber).then(response => {
|
||||||
|
console.log(response.data)
|
||||||
if (response.data.length === 0) {
|
if (response.data.length === 0) {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
this.$message.warning('该零件未加工完成')
|
this.$message.warning('该零件未加工完成')
|
||||||
@@ -234,19 +239,25 @@ export default {
|
|||||||
this.$message.error('请选择货位')
|
this.$message.error('请选择货位')
|
||||||
} else {
|
} else {
|
||||||
for (let i = 0; i < this.tableData.length; i++) {
|
for (let i = 0; i < this.tableData.length; i++) {
|
||||||
if (this.tableData[i].innumber === '0') {
|
if (Number(this.tableData[i].innumber) === 0) {
|
||||||
this.$message.error('请输入正确数量')
|
this.$message.error('请输入正确数量')
|
||||||
} else {
|
} else {
|
||||||
if (this.tableData[i].innumber > this.tableData[i].plannumber) {
|
if (this.tableData[i].innumber > this.tableData[i].plannumber) {
|
||||||
this.tableData[i].innumber = this.tableData[i].plannumber
|
this.tableData[i].innumber = this.tableData[i].plannumber
|
||||||
}
|
}
|
||||||
insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
|
insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
|
||||||
this.$message({
|
if (response.data[0].result === '1') {
|
||||||
type: 'success',
|
this.$message({
|
||||||
message: '零件入库成功!'
|
type: 'success',
|
||||||
})
|
message: '零件入库成功!'
|
||||||
}).then(() => {
|
})
|
||||||
this.Empty()
|
this.Empty()
|
||||||
|
} else {
|
||||||
|
this.$message({
|
||||||
|
type: 'error',
|
||||||
|
message: '零件入库失败!'
|
||||||
|
})
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user