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:
zhangdingyu
2019-03-22 14:00:44 +08:00
parent c0969a4fc3 51f386e77b
commit b16fd0351a
6 changed files with 227 additions and 248 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
} }
}) })
} }

1
src/icons/svg/PurchaseSituationSearch.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1552869793988" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="597" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M798 63.82H226.2a67.55 67.55 0 0 0-67.55 67.55V892a67.55 67.55 0 0 0 67.55 67.55H798A67.55 67.55 0 0 0 865.55 892V131.37A67.55 67.55 0 0 0 798 63.82z m10.16 811.85a26.49 26.49 0 0 1-26.49 26.49H242.54A26.49 26.49 0 0 1 216 875.67v-728a26.49 26.49 0 0 1 26.49-26.49h539.17a26.49 26.49 0 0 1 26.49 26.49z" p-id="598"></path><path d="M347.15 717.73m-35.35 0a35.35 35.35 0 1 0 70.7 0 35.35 35.35 0 1 0-70.7 0Z" p-id="599"></path><path d="M429.62 689.04l282.77 0 0 57.39-282.77 0 0-57.39Z" p-id="600"></path><path d="M683.7 298.17H458.32a28.7 28.7 0 1 0 0 57.39H683.7a28.7 28.7 0 0 0 0-57.39zM336.49 347.89a4.48 4.48 0 0 0 3.51 1.31 4.42 4.42 0 0 0 3.51-1.31L378.14 313a4.56 4.56 0 0 0 0-6.45c-1.71-1.73-4.69-1.73-7.85 0l-31.74 32-12.47-14a4.61 4.61 0 0 0-6.4 0 4.55 4.55 0 0 0 0 6.45z" p-id="601"></path><path d="M395.27 270.3H299a8.83 8.83 0 0 0-8.83 8.83v96.25a8.83 8.83 0 0 0 8.83 8.82h96.25a8.83 8.83 0 0 0 8.83-8.83v-96.24a8.83 8.83 0 0 0-8.81-8.83z m-8.83 96.25h-78.58V288h78.59z" p-id="602"></path><path d="M429.62 493.6l282.77 0 0 57.39-282.77 0 0-57.39Z" p-id="603"></path><path d="M336.49 542.93a4.48 4.48 0 0 0 3.52 1.31 4.42 4.42 0 0 0 3.51-1.31l34.62-34.85a4.56 4.56 0 0 0 0-6.45c-1.71-1.73-4.69-1.73-7.85 0l-31.74 32-12.47-14a4.61 4.61 0 0 0-6.4 0 4.55 4.55 0 0 0 0 6.45z" p-id="604"></path><path d="M395.27 465.35H299a8.83 8.83 0 0 0-8.83 8.83v96.25a8.83 8.83 0 0 0 8.83 8.83h96.25a8.83 8.83 0 0 0 8.83-8.83v-96.25a8.83 8.83 0 0 0-8.81-8.83z m-8.83 96.25h-78.58V483h78.59z" p-id="605"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

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>

254
src/views/Inventory/PickingList/index.vue
View File

@@ -8,26 +8,15 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table <el-table v-loading="listLoading2" :data="tableData1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="chooseListinfor">
v-loading="listLoading2" <el-table-column label="序号" align="center" type="index" width="50"/>
:data="tableData1"
border
style="width: 100%;"
size="mini"
height="200"
@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.领料单编号 }}
</template> </template>
</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" value-format="yyyy-MM-dd"> <template slot-scope="scope">
{{ scope.row.领料时间 }} {{ scope.row.领料时间 }}
</template> </template>
</el-table-column> </el-table-column>
@@ -36,13 +25,13 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="200px"> <el-table-column label="操作" align="center" width="100px">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
<el-button size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button> <el-button size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin: 10px 0;">
<el-pagination <el-pagination
:current-page="PageCurrent2" :current-page="PageCurrent2"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
@@ -52,18 +41,8 @@
@size-change="handleSizeChange2" @size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/> @current-change="handleCurrentChange2"/>
</div> </div>
<el-table <el-table v-loading="listLoading3" :data="tableDataPicking" border style="width: 100%;" size="mini" height="300">
v-loading="listLoading3" <el-table-column label="序号" align="center" type="index" width="50"/>
:data="tableDataPicking"
border
style="width: 100%;"
size="mini"
height="200">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<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">
{{ scope.row.名称 }} {{ scope.row.名称 }}
@@ -79,22 +58,22 @@
{{ 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" 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="130"> <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="130"> <el-table-column label="组号" align="center" min-width="70">
<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="50"> <el-table-column label="领用数量" align="center" min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库数量 }} {{ scope.row.出库数量 }}
</template> </template>
@@ -114,10 +93,10 @@
{{ 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="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="scope.row.是否出库" size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 10px 10px" @click="editListDetailx(scope.row)">编辑</el-button> <!--<el-button :disabled="!!scope.row.是否出库" size="mini" type="primary" icon="el-icon-edit" @click="editListDetailx(scope.row)">编辑</el-button>-->
<el-button :disabled="scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 10px 10px" @click="dropListdetail(scope.row)">删除</el-button> <el-button :disabled="!!scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" @click="dropListdetail(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -148,22 +127,13 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPartinfo()">查询</el-button><br> <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPartinfo()">查询</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-table <h4>自制件</h4>
v-loading="listLoading" <el-table v-loading="listLoading" :data="tableDataBasic" border style="width: 100%;" size="mini" height="440">
:data="tableDataBasic" <el-table-column label="序号" align="center" type="index" width="50"/>
border
style="width: 100%;"
size="mini"
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.项目名称 }}
@@ -174,7 +144,7 @@
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center" min-width="80"> <el-table-column label="组号" align="center" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
@@ -184,17 +154,17 @@
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划数量" align="center" min-width="40"> <el-table-column label="计划数量" align="center" width="80">
<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="40"> <el-table-column label="库存数量" align="center" width="80">
<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="40"> <el-table-column label="待出库数量" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.待出库数量 }} {{ scope.row.待出库数量 }}
</template> </template>
@@ -214,18 +184,18 @@
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件类型" align="center" min-width="80"> <el-table-column label="零件类型" align="center" width="80">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
{{ scope.row.零件类型名称 }} {{ scope.row.零件类型名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="80"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
<el-button :disabled="scope.row.是否禁用" size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addBasicListDetailinfor(scope.row)">领料</el-button> <el-button :disabled="scope.row.是否禁用" size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addBasicListDetailinfor(scope.row)">领料</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin: 10px 0;">
<el-pagination <el-pagination
:current-page="PageCurrent" :current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
@@ -235,41 +205,23 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>
</div> </div>
<el-table <hr>
v-loading="listLoading1" <h4>采购部采购件</h4>
:data="tableDataPurchase" <el-table v-loading="listLoading1" :data="tableDataPurchase" highlight-current-row border style="width: 100%;" size="mini" height="440">
border <el-table-column label="序号" align="center" type="index" width="50"/>
style="width: 100%;"
size="mini"
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.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料规格" align="center" min-width="80"> <el-table-column label="规格" align="center" min-width="150">
<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="80"> <el-table-column label="图号或型号" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 || scope.row.零件图号 || '' }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床图号" align="center" min-width="80"> <el-table-column label="机床图号" align="center" min-width="80">
@@ -277,43 +229,53 @@
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center" min-width="80"> <el-table-column label="组号" align="center" width="80">
<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="80"> <el-table-column label="采购数量" align="center" width="80">
<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="80"> <el-table-column label="仓库名称" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column label="货位名称" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.货位名称 }}
</template>
</el-table-column>
<el-table-column label="货位存量" align="center" width="80">
<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="80"> <el-table-column label="待出库数量" align="center" width="90">
<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="80"> <el-table-column label="可出库数量" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备注 }} {{ scope.row.货位存量 - scope.row.待出库数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件类型" align="center" min-width="80"> <el-table-column label="零件类型" align="center" width="80">
<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="80"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
<el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addListDetailinfor(scope.row)">领料</el-button> <el-button size="mini" type="primary" icon="el-icon-edit" @click="addListDetailinfor(scope.row)">领料</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin: 10px 0;">
<el-pagination <el-pagination
:current-page="PageCurrent1" :current-page="PageCurrent1"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
@@ -323,18 +285,10 @@
@size-change="handleSizeChange1" @size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/> @current-change="handleCurrentChange1"/>
</div> </div>
<el-table <hr>
v-loading="listLoadingx" <h4>车间采购件</h4>
:data="tableDataHouse" <el-table v-loading="listLoadingx" :data="tableDataHouse" border size="mini" style="width: 100%;" height="440">
border <el-table-column label="序号" align="center" type="index" width="50"/>
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.物料名称 }}
@@ -360,38 +314,38 @@
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center" min-width="80"> <el-table-column label="组号" align="center" width="80">
<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="80"> <el-table-column label="合同数量" align="center" width="80">
<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="80"> <el-table-column label="零件数量" align="center" width="80">
<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="80"> <el-table-column label="待出库数量" align="center" width="90">
<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="80"> <el-table-column label="零件类型" align="center" width="80">
<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="80"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addWorkshopDetailinfor(scope.row)">领料</el-button> <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addWorkshopDetailinfor(scope.row)">领料</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin: 10px 0;">
<el-pagination <el-pagination
:current-page="PageCurrentx" :current-page="PageCurrentx"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
@@ -420,6 +374,9 @@
<!--外购件领料对话框--> <!--外购件领料对话框-->
<el-dialog :visible.sync="dialogFormVisible" title="外购件标准件领料" center width="380px"> <el-dialog :visible.sync="dialogFormVisible" title="外购件标准件领料" center width="380px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm"> <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
<el-form-item label="领料单号" label-width="100px" size="small">
<el-input v-model="pickingListNumber" size="small" placeholder="空" readonly style="width: 200px"/>
</el-form-item>
<el-form-item label="出库数量" prop="OutNumber" label-width="100px" size="small"> <el-form-item label="出库数量" prop="OutNumber" label-width="100px" size="small">
<el-input v-model="form2.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/> <el-input v-model="form2.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
</el-form-item> </el-form-item>
@@ -538,8 +495,8 @@ export default {
outNote: '' // 出库备注 outNote: '' // 出库备注
}, },
rules2: { // 表单验证规则 rules2: { // 表单验证规则
OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }], OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }]
outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }] // outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
}, },
form3: { // 车间采购出库 form3: { // 车间采购出库
OutNumber: '', // 出库数量 OutNumber: '', // 出库数量
@@ -568,19 +525,19 @@ export default {
listLoading3: false, listLoading3: false,
PageCurrent: 1, PageCurrent: 1,
PageSize: 10, PageSize: 10,
total: null, total: 0,
PageCurrent1: 1, PageCurrent1: 1,
PageSize1: 10, PageSize1: 10,
total1: null, total1: 0,
PageCurrent2: 1, PageCurrent2: 1,
PageSize2: 10, PageSize2: 10,
total2: null, total2: 0,
PageCurrent3: 1, PageCurrent3: 1,
PageSize3: 10, PageSize3: 10,
total3: null, total3: 0,
PageCurrentx: 1, PageCurrentx: 1,
PageSizex: 10, PageSizex: 10,
totalx: null, totalx: 0,
materialName: '', materialName: '',
materialNumber: '', materialNumber: '',
materialType: '', materialType: '',
@@ -612,6 +569,8 @@ export default {
created() { created() {
this.fetchData() this.fetchData()
this.getpeopleid() this.getpeopleid()
this.searchListinfor()
this.searchPartinfo()
}, },
methods: { methods: {
fetchData() { fetchData() {
@@ -621,7 +580,8 @@ export default {
getpeopleid() { getpeopleid() {
this.picikingPeople = this.id this.picikingPeople = this.id
}, },
searchMachine() { // 查询机床 // 查询机床
searchMachine() {
this.MachineValue = '' this.MachineValue = ''
this.Machine = [] this.Machine = []
this.GroupNumValue = '' this.GroupNumValue = ''
@@ -640,7 +600,8 @@ export default {
} }
}) })
}, },
searchGroupList() { // 查询组号 // 查询组号
searchGroupList() {
this.GroupNumValue = '' this.GroupNumValue = ''
this.GroupNum = [] this.GroupNum = []
searchTeam(this.MachineValue).then(response => { searchTeam(this.MachineValue).then(response => {
@@ -652,18 +613,13 @@ export default {
} }
}) })
}, },
// 根据项目机床分组查零件/物料
searchPartinfo() { searchPartinfo() {
this.tableDataPurchase = [] this.tableDataPurchase = []
this.tableDataBasic = [] this.tableDataBasic = []
if (this.ProjectValue !== null && this.ProjectValue !== '') { this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
this.ProjectValue_check = 1 this.MachineValue ? this.MachineValue_check = 1 : this.MachineValue_check = 0
} this.GroupNumValue ? this.GroupNumValue_check = 1 : this.GroupNumValue_check = 0
if (this.MachineValue !== null && this.MachineValue !== '') {
this.MachineValue_check = 1
}
if (this.GroupNumValue !== null && this.GroupNumValue !== '') {
this.GroupNumValue_check = 1
}
this.listLoading = true this.listLoading = true
this.listLoading1 = true this.listLoading1 = true
this.listLoadingx = true this.listLoadingx = true
@@ -697,13 +653,11 @@ export default {
this.tableDataBasic = response.data.rows this.tableDataBasic = response.data.rows
this.listLoading1 = false this.listLoading1 = false
this.total = response.data.total this.total = response.data.total
console.log(response)
}) })
searchHoursePart(this.PageCurrentx, this.PageSizex, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => { searchHoursePart(this.PageCurrentx, this.PageSizex, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataHouse = response.data.rows this.tableDataHouse = response.data.rows
this.listLoadingx = false this.listLoadingx = false
this.totalx = response.data.total this.totalx = response.data.total
console.log(response)
}) })
}, },
handleSizeChange(val) { handleSizeChange(val) {
@@ -746,7 +700,6 @@ export default {
this.tableData1 = response.data.rows this.tableData1 = response.data.rows
this.listLoading2 = false this.listLoading2 = false
this.total2 = response.data.total this.total2 = response.data.total
console.log(response)
}) })
}, },
handleSizeChange2(val) { handleSizeChange2(val) {
@@ -772,13 +725,21 @@ export default {
}, },
// 增加领料单 // 增加领料单
addListinfor() { addListinfor() {
addList(this.picikingPeople).then(response => { this.$confirm('确认创建新的领料单?', '提示', {
if (response.data[0].result === '1') { confirmButtonText: '确定',
this.$message.success('增加成功') cancelButtonText: '取消',
this.searchListinfor() type: 'warning'
} else { }).then(() => {
this.$message.error('增加失败') addList(this.picikingPeople).then(response => {
} if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.searchListinfor()
} else {
this.$message.error('增加失败')
}
})
}).catch(() => {
this.$message('已取消操作')
}) })
}, },
// 删除领料单 // 删除领料单
@@ -816,6 +777,7 @@ export default {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('删除成功') this.$message.success('删除成功')
this.searchListDetailt() this.searchListDetailt()
this.searchPartinfo()
} else { } else {
this.$message.error('数据占用') this.$message.error('数据占用')
} }
@@ -830,6 +792,7 @@ export default {
// 选择领料单 // 选择领料单
chooseListinfor(row) { chooseListinfor(row) {
this.pickingListNumberx = row.领料单流水号 this.pickingListNumberx = row.领料单流水号
this.pickingListNumber = row.领料单编号
this.searchListDetailt() this.searchListDetailt()
}, },
// 增加基本件领料单明细 // 增加基本件领料单明细
@@ -878,7 +841,7 @@ export default {
}, },
// 增加外购件领料单明细 // 增加外购件领料单明细
addListDetailinfor(row) { addListDetailinfor(row) {
this.form2 = [] this.form2 = {}
this.outType = 2 this.outType = 2
this.partProjectNumber = row.项目流水号 this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称 this.partProjectName = row.项目名称
@@ -905,7 +868,6 @@ export default {
if (this.pickingListNumberx === '') { if (this.pickingListNumberx === '') {
this.$message.error('请选择领料单') this.$message.error('请选择领料单')
} else if (this.form2.OutNumber === '' || this.form2.OutNumber > this.enableOut) { } else if (this.form2.OutNumber === '' || this.form2.OutNumber > this.enableOut) {
console.log(this.enableOut)
this.$message.error('请正确输入领用数量') this.$message.error('请正确输入领用数量')
} else { } else {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
@@ -929,7 +891,6 @@ export default {
addWorkshopDetailinfor(row) { addWorkshopDetailinfor(row) {
this.form3 = [] this.form3 = []
this.outType = 3 this.outType = 3
console.log(row)
this.partProjectNumber = row.项目流水号 this.partProjectNumber = row.项目流水号
this.partMachineNumber = row.机床流水号 this.partMachineNumber = row.机床流水号
this.partGroupNumber = row.组件流水号 this.partGroupNumber = row.组件流水号
@@ -1035,5 +996,16 @@ export default {
</script> </script>
<style scoped> <style scoped>
.el-card{
margin-bottom: 15px;
}
.el-select{
width:200px
}
.el-input{
width:200px
}
span{
margin: 10px 0 10px 10px;
}
</style> </style>

3
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -210,6 +210,7 @@ export default {
}, },
created() { created() {
this.fetchData() this.fetchData()
this.searchTable()
}, },
methods: { methods: {
fetchData() { fetchData() {
@@ -267,7 +268,6 @@ export default {
this.searchTable2() this.searchTable2()
}, },
searchTable1() { // 查询标准件和外购件 searchTable1() { // 查询标准件和外购件
this.total1 = 0
let check1, check2 let check1, check2
this.machineNumberValue ? check1 = 1 : check1 = 0 this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0
@@ -277,7 +277,6 @@ export default {
}) })
}, },
searchTable2() { // 查询基本件 searchTable2() { // 查询基本件
this.total2 = 0
let check1, check2 let check1, check2
this.machineNumberValue ? check1 = 1 : check1 = 0 this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0