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

fix bug

Browse Source
This commit is contained in:
chenjianan
2019-03-21 11:09:29 +08:00
parent 68da683c1e
commit 51f386e77b
3 changed files with 112 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/Inventory/PartOut.js
View File

@@ -1,14 +1,15 @@
import request from '@/utils/request' import request from '@/utils/request'
// 领料单查询 // 领料单查询
export function searchList(listNumber_check, listNumber) { export function searchList(listNumber_check, listNumber, pageCurrent, pageSize) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '车间装配管理_领料单_领料单查询', name: '车间装配管理_领料单_领料单查询',
param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
Pagination: pageCurrent + '&' + pageSize
} }
}) })
} }

23
src/views/Inventory/OfflinePartOut/index.vue
View File

@@ -6,20 +6,8 @@
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPurchasePartinfo()">查询</el-button> <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPurchasePartinfo()">查询</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-table <el-table v-loading="listLoading" :data="tableDataBasic" size="mini" border style="width: 100%;" height="200" @row-click="searchoutRecord">
v-loading="listLoading" <el-table-column label="序号" align="center" type="index" width="50"/>
:data="tableDataBasic"
size="mini"
border
style="width: 100%;"
height="200"
@row-click = "searchoutRecord"
>
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="离线合同编号" align="center" min-width="80"> <el-table-column label="离线合同编号" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.离线合同编号 }} {{ scope.row.离线合同编号 }}
@@ -311,5 +299,10 @@ export default {
</script> </script>
<style scoped> <style scoped>
.el-card{
margin-bottom: 15px;
}
span{
margin: 10px 0 10px 10px;
}
</style> </style>

189
src/views/Inventory/PartOut/index.vue
View File

@@ -1,22 +1,14 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<span style="margin: 5px">领料单编号</span> <span>领料单编号:</span>
<el-input v-model="pickingListNumber" clearable size="small" style="width:200px" /> <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchListinfor()">查询</el-button> <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchListinfor()">查询</el-button>
<el-table </el-card>
v-loading="listLoading"
:data="tableData1" <el-card>
border <el-table v-loading="listLoading" :data="tableData1" highlight-current-row border size="mini" style="width: 100%;" height="300" @row-click = "chooseListinfor">
size="mini" <el-table-column label="序号" align="center" type="index" width="50"/>
style="width: 100%;"
height="300"
@row-click = "chooseListinfor">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="领料单编号" align="center" min-width="200"> <el-table-column label="领料单编号" align="center" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料单编号 }} {{ scope.row.领料单编号 }}
@@ -24,7 +16,7 @@
</el-table-column> </el-table-column>
<el-table-column label="领料时间" align="center" min-width="200"> <el-table-column label="领料时间" align="center" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料时间 }} {{ scope.row.领料时间 ? scope.row.领料时间.split(' ')[0] : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领料人" align="center" min-width="130"> <el-table-column label="领料人" align="center" min-width="130">
@@ -33,34 +25,44 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table <div class="block" style="margin: 10px 0;">
v-loading="listLoading1" <el-pagination
:data="tableDataPicking" :current-page="pageCurrent1"
size="mini" :page-sizes="[10, 20, 30, 40]"
border :page-size="pageSize1"
style="width: 100%;" :total="total1"
height="400"> layout="total, sizes, prev, pager, next, jumper"
<el-table-column @size-change="handleSizeChange1"
label="序号" @current-change="handleCurrentChange1"/>
align="center" </div>
type="index" <el-table v-loading="listLoading1" :data="tableDataPicking" size="mini" border style="width: 100%;" height="400">
width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="零件图号" align="center" min-width="200"> <el-table-column label="名称" align="center" min-width="100">
<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" min-width="100"> <el-table-column label="图号或型号" align="center" min-width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 || scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" min-width="200">
<template slot-scope="scope">
{{ scope.row.规格 || scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" width="100">
<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" min-width="100"> <el-table-column label="机床图号" align="center" width="100">
<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" min-width="130"> <el-table-column label="组号" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
@@ -70,12 +72,12 @@
{{ scope.row.出库数量 }} {{ scope.row.出库数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="仓库" align="center" min-width="100"> <el-table-column label="仓库" align="center" width="100">
<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" min-width="100"> <el-table-column label="货位" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.货位名称 }} {{ scope.row.货位名称 }}
</template> </template>
@@ -85,32 +87,23 @@
{{ scope.row.备注 }} {{ scope.row.备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件类型" align="center" min-width="130"> <el-table-column label="零件类型" align="center" width="100">
<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" min-width="200"> <el-table-column label="操作" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="parseInt(scope.row.是否出库)" size="mini" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button> <el-button :disabled="!!scope.row.是否出库" size="mini" type="danger" icon="el-icon-back" @click="ErrorpartOut(scope.row)">异常</el-button>
<el-button :disabled="parseInt(scope.row.是否出库)" size="mini" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button> <el-button :disabled="!!scope.row.是否出库" size="mini" type="primary" icon="el-icon-back" @click="partOut(scope.row)">出库</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-card> <el-card>
<el-table <el-table v-loading="listLoading1" :data="tableDataExchange" border size="mini" style="width: 100%;" height="200">
v-loading="listLoading1" <el-table-column label="序号" align="center" type="index" width="50"/>
:data="tableDataExchange"
border
size="mini"
style="width: 100%;"
height="200">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="交换单编号" align="center" min-width="80"> <el-table-column label="交换单编号" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.交换单编号 }} {{ scope.row.交换单编号 }}
@@ -212,6 +205,9 @@ import { mapGetters } from 'vuex'
export default { export default {
data() { data() {
return { return {
pageCurrent1: 1,
pageSize1: 10,
total1: 0,
ProjectValue: ' ', ProjectValue: ' ',
Project: [], Project: [],
ProjectValue_check: 1, ProjectValue_check: 1,
@@ -271,23 +267,29 @@ export default {
}, },
created() { created() {
this.getpeopleid() this.getpeopleid()
this.searchListinfor()
}, },
methods: { methods: {
handleSizeChange1(val) {
this.pageCurrent1 = 1
this.pageSize1 = val
this.searchListinfor()
},
handleCurrentChange1(val) {
this.pageCurrent1 = val
this.searchListinfor()
},
// 获取人员编号 // 获取人员编号
getpeopleid() { getpeopleid() {
this.picikingPeople = this.id this.picikingPeople = this.id
}, },
// 查询领料单 // 查询领料单
searchListinfor() { searchListinfor() {
if (this.pickingListNumber === null) { this.pickingListNumber ? this.pickingListNumber_check = 1 : this.pickingListNumber_check = 0
this.pickingListNumber_check = 0
}
this.listLoading = true this.listLoading = true
searchList(this.pickingListNumber_check, this.pickingListNumber).then(response => { searchList(this.pickingListNumber_check, this.pickingListNumber, this.pageCurrent1, this.pageSize1).then(response => {
for (let i = 0; i < response.data.length; i++) { this.tableData1 = response.data.rows
response.data[i].领料时间 = response.data[i].领料时间.substring(0, response.data[i].领料时间.length - 8) this.total1 = response.data.total
}
this.tableData1 = response.data
this.listLoading = false this.listLoading = false
}) })
}, },
@@ -295,7 +297,6 @@ export default {
chooseListinfor(row) { chooseListinfor(row) {
this.pickingListNumberx = row.领料单流水号 this.pickingListNumberx = row.领料单流水号
this.getpicikingPeople = row.领料人流水号 this.getpicikingPeople = row.领料人流水号
console.log(this.pickingListNumberx, 223344)
this.searchListDetailt() this.searchListDetailt()
this.searchExchange() this.searchExchange()
}, },
@@ -324,34 +325,41 @@ export default {
}, },
// 出库 // 出库
partOut(row) { partOut(row) {
if (row.出库类型 === 3) { this.$confirm('确认出库?', '提示', {
WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => { confirmButtonText: '确定',
if (response.data[0].result === '1') { cancelButtonText: '取消',
ListDetailOut(row.领料单明细流水号) type: 'warning'
this.$message.success('出库成功') }).then(() => {
this.searchListDetailt() if (row.出库类型 === 3) {
} else { this.$message.error('出库失败') } WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
}) if (response.data[0].result === '1') {
} else if (row.出库类型 === 2) { ListDetailOut(row.领料单明细流水号)
PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => { this.$message.success('出库成功')
if (response.data[0].result === '1') { this.searchListDetailt()
ListDetailOut(row.领料单明细流水号) } else { this.$message.error('出库失败') }
this.$message.success('出库成功') })
this.searchListDetailt() } else if (row.出库类型 === 2) {
} else { this.$message.error('出库失败') } PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
}) if (response.data[0].result === '1') {
} else { ListDetailOut(row.领料单明细流水号)
BasicPart(row.工艺计划流水号, row.出库数量, row.收件信息ID, this.getpicikingPeople, row.备注).then(response => { this.$message.success('出库成功')
if (response.data[0].result === '1') { this.searchListDetailt()
this.$message.success('出库成功') } else { this.$message.error('出库失败') }
ListDetailOut(row.领料单明细流水号) })
this.searchListDetailt() } else {
} else { this.$message.error('增加失败') } BasicPart(row.工艺计划流水号, row.出库数量, row.收件信息ID, this.getpicikingPeople, row.备注).then(response => {
}) if (response.data[0].result === '1') {
} this.$message.success('出库成功')
ListDetailOut(row.领料单明细流水号)
this.searchListDetailt()
} else { this.$message.error('增加失败') }
})
}
}).catch(() => {
this.$message('已取消操作')
})
}, },
ErrorpartOut(row) { ErrorpartOut(row) {
console.log(row, 1111)
this.dialogFormVisible = true this.dialogFormVisible = true
this.projectnumber = row.项目流水号 this.projectnumber = row.项目流水号
this.machinenumber = row.机床流水号 this.machinenumber = row.机床流水号
@@ -363,7 +371,7 @@ export default {
this.partType = row.零件类型 this.partType = row.零件类型
this.partName = row.名称 this.partName = row.名称
}, },
callOff(form) { callOff() {
this.form = [] this.form = []
this.dialogFormVisible = false this.dialogFormVisible = false
}, },
@@ -394,5 +402,10 @@ export default {
</script> </script>
<style scoped> <style scoped>
.el-card{
margin-bottom: 15px;
}
span{
margin: 10px 0 10px 10px;
}
</style> </style>