Commit 89576c5b authored by 高宇's avatar 高宇

修改出库,再利用逻辑

parent 8475e486
...@@ -41,8 +41,8 @@ export function performOutbound(params) { ...@@ -41,8 +41,8 @@ export function performOutbound(params) {
method: 'post', method: 'post',
params, params,
headers: { headers: {
'Content-Type': 'application/json;charset=UTF-8', 'Content-Type': 'application/json;charset=UTF-8'
},
});
} }
})
}
...@@ -35,10 +35,18 @@ export function exportInventoryRecord(params) { ...@@ -35,10 +35,18 @@ export function exportInventoryRecord(params) {
}) })
} }
// 测试导出数据 // 测试导出数据
export function exportTest(){ export function exportTest() {
return request({ return request({
url: '/wbapply/exportTest', url: '/wbapply/exportTest',
method: 'get', method: 'get',
responseType: 'blob' responseType: 'blob'
}) })
} }
// WbWarehouseByLot
export function getWbWarehouseByLot(params) {
return request({
url: '/wbwarehouse/selectWbWarehouseByLot',
method: 'get',
params
})
}
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 表单区域--> <!-- 表单区域-->
<el-form ref="form" :model="form" :rules="rule" label-width="80px"> <el-form ref="form" :model="form" :rules="rule" label-width="80px" :inline="true">
<!-- 标题--> <!-- 标题-->
<div class="info"><span class="title">再利用</span></div> <div class="info"><span class="title">再利用</span></div>
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;"> <el-col :span="12" style="padding-left: 10%;">
<el-form-item label="pn:" style="flex-basis: 50%;" prop="pn"> <el-form-item label="lot:" style="flex-basis: 50%;" prop="lot">
<el-input ref="input1" v-model="form.pn" placeholder="请输入pn" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" /> <el-input ref="input2" v-model="form.lot" placeholder="请输入lot" clearable style="width: 400px" :maxlength="100" @blur="handleBlur" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="lot:" style="flex-basis: 50%;" prop="lot"> <el-form-item label="pn:" style="flex-basis: 50%;" prop="pn">
<el-input ref="input2" v-model="form.lot" placeholder="请输入lot" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(2,$event)" /> <span>{{ form.pn }}</span>
<!-- <el-input ref="input1" v-model="form.pn" placeholder="请输入pn" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" />-->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -34,10 +35,20 @@ ...@@ -34,10 +35,20 @@
<el-input ref="input5" v-model="form.psm" placeholder="请输入psm" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(5,$event)" /> <el-input ref="input5" v-model="form.psm" placeholder="请输入psm" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">-->
<!-- <el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl">-->
<!-- <el-input ref="input6" v-model="form.pzl" placeholder="请输入pzl" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(6,$event)" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="24" style="padding-left: 9%;">
<el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl"> <el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl">
<el-input ref="input6" v-model="form.pzl" placeholder="请输入pzl" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(6,$event)" /> <el-input ref="input6" v-model="form.pzl" placeholder="请输入pzl" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="当前pzl:">
<span>{{ form.currentPzl }}</span>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="40"> <el-row :gutter="40">
...@@ -68,6 +79,7 @@ ...@@ -68,6 +79,7 @@
<script> <script>
import { recycle } from '@/api/magnagement' import { recycle } from '@/api/magnagement'
import { getWbWarehouseByLot } from '@/api/processMangement/InventoryRecord'
export default { export default {
name: 'Role', name: 'Role',
...@@ -78,10 +90,11 @@ export default { ...@@ -78,10 +90,11 @@ export default {
form: { form: {
pn: '', pn: '',
lot: '', lot: '',
plocation: '', plocation: '工序网板库',
phd: '', phd: '',
psm: '', psm: '',
pzl: '', pzl: '',
currentPzl: '',
prank: '', prank: '',
fq_ys: '', fq_ys: '',
flag: 1, flag: 1,
...@@ -135,17 +148,31 @@ export default { ...@@ -135,17 +148,31 @@ export default {
} }
}, },
methods: { methods: {
handleBlur() {
if (this.form.lot !== null && this.form.lot !== '' && this.form.lot !== undefined) {
const obj = {
lot: this.form.lot
}
getWbWarehouseByLot(obj).then(res => {
console.log('res', res)
this.form.pn = res.data.pn
this.form.plocation = '工序网板库'
this.form.currentPzl = res.data.pzl
})
}
},
resetQuery() { resetQuery() {
this.form = { this.form = {
pn: '', pn: '',
lot: '', lot: '',
plocation: '', plocation: '工序网板库',
phd: '', phd: '',
psm: '', psm: '',
pzl: '', pzl: '',
prank: '', prank: '',
flag: 1, flag: 1,
ptype: '', ptype: '',
currentPzl: '',
pstatus: 0 pstatus: 0
} }
sessionStorage.setItem('recycleform', JSON.stringify(this.form)) sessionStorage.setItem('recycleform', JSON.stringify(this.form))
......
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
</template> </template>
<script> <script>
import { listdevice, performOutbound} from '@/api/outbound' import { listdevice, performOutbound } from '@/api/outbound'
import { listLog } from '@/api/sample/inventoryRecord' import { listLog } from '@/api/sample/inventoryRecord'
export default { export default {
name: 'Role', name: 'Role',
...@@ -400,7 +400,7 @@ export default { ...@@ -400,7 +400,7 @@ export default {
}, },
/** 出库按钮操作 */ /** 出库按钮操作 */
handleDelete(row) { handleDelete(row) {
console.log('row',row); console.log('row', row)
const obj = { const obj = {
id: row.businessId id: row.businessId
} }
...@@ -408,26 +408,26 @@ export default { ...@@ -408,26 +408,26 @@ export default {
this.$confirm('是否确认操作?', '提示', { this.$confirm('是否确认操作?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}).then(() => { }).then(() => {
// 调用 performOutbound 函数执行出库操作 // 调用 performOutbound 函数执行出库操作
performOutbound(obj) performOutbound(obj)
.then(response => { .then(response => {
console.log('response',response); console.log('response', response)
if (response.code === 200) { if (response.code === 200) {
this.$message.success('操作成功'); this.$message.success('操作成功')
this.getList() this.getList()
} else { } else {
this.$message.error('操作失败'); this.$message.error('操作失败')
} }
}) })
.catch(error => { .catch(error => {
console.error('请求出错', error); console.error('请求出错', error)
this.$message.error('操作失败'); this.$message.error('操作失败')
}); })
}).catch(() => { }).catch(() => {
this.$message.info('已取消操作'); this.$message.info('已取消操作')
}); })
} }
} }
...@@ -472,4 +472,3 @@ export default { ...@@ -472,4 +472,3 @@ export default {
width: 4px; width: 4px;
} }
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment