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

lxtest

Browse Source
This commit is contained in:
lixin
2018-12-25 20:08:03 +08:00
parent 3ee606fc82
commit baf94308ab
13 changed files with 109 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/Inventory/DirectPart/index.vue
View File

@@ -40,6 +40,7 @@
v-loading="listLoading"
:data="tableDataPurchase"
border
size="mini"
style="width: 100%;"
height="200">
<el-table-column
@@ -74,8 +75,8 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="addDirect(scope.row)">直达</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="searchDirect(scope.row)">选择</el-button>
<el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="addDirect(scope.row)">直达</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="searchDirect(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
@@ -95,6 +96,7 @@
v-loading="listLoading1"
:data="directRecord"
border
size="mini"
style="width: 100%;"
height="200">
<el-table-column

3
src/views/Inventory/Inboundscanning/index.vue
View File

@@ -1,7 +1,5 @@
<template>
<div class="app-container">
<el-card>
<span style="margin: 5px">零件图号</span>
<el-input v-model="Partpaint" clearable size="small" style="width:200px" />
@@ -13,6 +11,7 @@
v-loading="listLoading"
:data="tableData"
border
size="mini"
style="width: 100%;height: 650px" >
<el-table-column
label="序号"

28
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -245,7 +245,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @row-click="searchGeneralPartRecord(scope.row)">选择</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @row-click="searchGeneralPartRecord(scope.row)">设置</el-button>
</template>
</el-table-column>
</el-table>
@@ -379,7 +379,8 @@
border
size="mini"
style="width: 100%;"
height="200">
height="200"
@row-click="searchPurchasePartRecord">
<el-table-column
label="序号"
align="center"
@@ -417,7 +418,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button>
<el-button size="small" type="warning" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)">设置</el-button>
</template>
</el-table-column>
</el-table>
@@ -535,7 +536,8 @@
size="mini"
border
style="width: 100%;"
height="200">
height="200"
@row-click="standardselecting">
<el-table-column
label="序号"
align="center"
@@ -578,7 +580,7 @@
</el-table-column>
<el-table-column label="操作" align="center" width="200px">
<template slot-scope="scope" align="center">
<el-button size="mini" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="standardselecting(scope.row)" >选择</el-button>
<el-button size="mini" type="warning" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)" >设置</el-button>
<el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="changesafeAmount(scope.row)">修改</el-button>
</template>
</el-table-column>
@@ -649,7 +651,8 @@
border
size="mini"
style="width: 100%;"
height="200">
height="200"
@row-click="searchPurchasePartRecord">
<el-table-column
label="序号"
align="center"
@@ -687,7 +690,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button>
<el-button size="small" type="warning" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)">设置</el-button>
</template>
</el-table-column>
</el-table>
@@ -863,7 +866,8 @@
border
size="mini"
style="width: 100%;"
height="200">
height="200"
@row-click="HouseBasicRecord">
<el-table-column
label="序号"
align="center"
@@ -906,7 +910,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="80">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="HouseBasicRecord(scope.row)">选择</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="AlterNumber(scope.row)">设置</el-button>
</template>
</el-table-column>
</el-table>
@@ -1021,7 +1025,8 @@
border
size="mini"
style="width: 100%;"
height="200">
height="200"
@row-click="HousePurchaseRecord">
<el-table-column
label="序号"
align="center"
@@ -1069,7 +1074,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="80">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="HousePurchaseRecord(scope.row)">选择</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="AlterNumber(scope.row)">设置</el-button>
</template>
</el-table-column>
</el-table>
@@ -1721,7 +1726,6 @@ export default {
this.dialogFormVisible = true
},
submitChannge() {
console.log(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate)
CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改成功')

8
src/views/Inventory/InventoryManagement/index.vue
View File

@@ -7,6 +7,7 @@
<el-table
:data="tableData"
border
size="mini"
style="width: 100%;max-height: 400px"
height="400"
@row-click="getWarehouse">
@@ -40,7 +41,7 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" min-width="100" align="center" fixed="right">
<el-table-column label="操作" min-width="200" align="center" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
@@ -52,18 +53,17 @@
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加</el-button>
</el-card>
<el-card>
<el-table
v-loading="listLoading"
:data="tableData2"
border
size="mini"
style="width: 100%;max-height: 400px"
height="400">
<el-table-column label="货位名称" align="center" width="200">

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

@@ -64,7 +64,7 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="领用数量" align="center" width="50">
<el-table-column label="领用数量" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.出库数量 }}
</template>
@@ -91,8 +91,8 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="200">
<template slot-scope="scope">
<el-button :disabled="scope.row.是否出库" size="small" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button>
<el-button :disabled="scope.row.是否出库" size="small" 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="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="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
</template>
</el-table-column>
</el-table>
@@ -209,6 +209,7 @@ export default {
data[i].是否出库 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
}
this.tableDataPicking = data
console.log(this.tableDataPicking)
this.listLoading1 = false
})
},
@@ -221,17 +222,16 @@ export default {
},
// 出库
partOut(row) {
console.log(row)
if (row.车间外购 === 1) {
WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (row.出库类型 === 3) {
WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功')
this.searchListDetailt()
} else { this.$message.error('出库失败') }
})
} else if (row.零件类型 === 1 || row.零件类型 === 2) {
PurchasePart(row.组件零件流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
} else if (row.出库类型 === 2) {
PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功')

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

@@ -64,9 +64,9 @@
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">
{{ scope.row.物料名称 }}
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="100">
@@ -182,7 +182,7 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="40">
<el-table-column label="计划数量" align="center" min-width="40">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
@@ -275,7 +275,7 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<el-table-column label="合同数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
@@ -320,6 +320,7 @@
v-loading="listLoadingx"
:data="tableDataHouse"
border
size="mini"
style="width: 100%;"
height="200">
<el-table-column
@@ -357,9 +358,9 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<el-table-column label="合同数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" min-width="80">
@@ -583,13 +584,17 @@ export default {
pickingListDetail: '',
tableDataHouse: [],
listLoadingx: '',
purchaseDetailNum: '',
purchaseDetailNum: '', // 采购合同明细流水号
askPurchaseNumber: '', // 请购单明细流水号
dialogFormVisibleWork: false,
time: [],
materialLocate: '',
enableOut: '',
pickingListNumber_check: 1,
outNumber: ''
outNumber: '',
outType: '',
material: '', // 材料
partPiant: '' // 零件图号
}
},
computed: {
@@ -664,7 +669,6 @@ export default {
}
}
this.tableDataPurchase = response.data.rows
console.log(this.tableDataPurchase, 124124)
this.listLoading = false
this.total1 = response.data.total
})
@@ -813,6 +817,7 @@ export default {
// 增加基本件领料单明细
addBasicListDetailinfor(row) {
this.form = []
this.outType = 1
this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称
this.partMachineNumber = row.机床流水号
@@ -827,11 +832,8 @@ export default {
this.materialName = row.零件名称
this.materialNumber = row.零件图号
this.dialogFormVisible1 = true
this.materialName = row.零件名称
this.materialType = row.零件类型名称
this.materialNumber = row.零件图号
this.enableOut = row.可出库数量
this.purchaseDetailNum = row.采购合同明细流水号
},
addBasicListDetail(formName) {
if (this.pickingListNumberx === '') {
@@ -841,7 +843,7 @@ export default {
} else {
this.$refs[formName].validate((valid) => {
if (valid) {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialNumber, this.materialType, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.materialNumber, this.material).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.searchPartinfo()
@@ -859,6 +861,7 @@ export default {
// 增加外购件领料单明细
addListDetailinfor(row) {
this.form = []
this.outType = 2
this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称
this.partMachineNumber = row.机床流水号
@@ -874,6 +877,8 @@ export default {
this.materialNumber = row.物料型号
this.materialType = row.物料规格
this.dialogFormVisible = true
this.partPiant = row.零件图号
this.material = row.材料
this.purchaseDetailNum = row.采购合同明细流水号
this.materialLocate = row.物料与货位对照流水号
this.enableOut = row.货位存量 - row.待出库数量
@@ -887,7 +892,7 @@ export default {
} else {
this.$refs[formName].validate((valid) => {
if (valid) {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.searchPartinfo()
@@ -905,23 +910,22 @@ export default {
// 增加车间采购领料单明细
addWorkshopDetailinfor(row) {
this.form = []
this.outType = 3
console.log(row)
this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称
this.partMachineNumber = row.机床流水号
this.partMachineName = row.机床图号
this.partGroupNumber = row.组件流水号
this.partGroupName = row.组号
this.partType = row.零件类型
this.receive = row.收件信息ID
this.locatenumber = row.货位流水号
this.dialogFormVisibleWork = true
this.askPurchaseNumber = row.请购单明细流水号
this.materialLocate = row.物料与货位对照流水号
this.enableOut = row.货位存量
this.materialName = row.物料名称
this.materialNumber = row.物料型号
this.materialType = row.物料规格
this.dialogFormVisibleWork = true
this.purchaseDetailNum = row.采购合同明细流水号
this.materialLocate = row.物料与货位对照流水号
this.enableOut = row.货位存量
console.log(this.enableOut)
this.partPiant = row.零件图号
this.material = row.材料
},
addWorkshopListDetail(formName) {
this.$refs[formName].validate((valid) => {
@@ -931,7 +935,7 @@ export default {
} else if (this.form3.OutNumber === '' || this.form3.OutNumber > this.enableOut) {
this.$message.error('请正确输入领用数量')
} else {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1, this.materialLocate).then(response => {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.searchPartinfo()

10
src/views/Inventory/SubPartCome/index.vue
View File

@@ -50,6 +50,16 @@
{{ 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>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="substitutePart(scope.row)">替换件到货</el-button>

36
src/views/Inventory/SubstitutePart/index.vue
View File

@@ -184,13 +184,14 @@
<!--选择替换件-->
<el-dialog :visible.sync="dialogFormVisible2" title="新增替换件" center width="600px">
<el-form :rules="rules" label-position="left">
<el-form-item label="物料名称" prop="ContractNumberValue" label-width="150px" size="small">
<el-input v-model="form.ExchangeNumber" size="small" placeholder="物料名称" style="width: 200px"/>
<el-button type="primary" @click="getSubstituted()">查询</el-button>
<el-form-item label="物料名称" prop="ContractNumberValue" label-width="150px" size="mini">
<el-input v-model="materialName" size="small" placeholder="物料名称" style="width: 200px"/>
<el-button type="primary" size = "mini" @click="getSubstituted()">查询</el-button>
</el-form-item>
<el-table
:data="tableDataSub"
border
size = "mini"
style="width: 100%;"
height="100">
<el-table-column
@@ -208,21 +209,21 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<el-table-column label="货位存量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
{{ scope.row.货位存量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">选择</el-button>
<el-button size="mini" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="chooseSub()">确 定</el-button>
<el-button size = "mini" @click="callOff('form')">取消</el-button>
<el-button size = "mini" type="primary" @click="chooseSub()">确 定</el-button>
</div>
</el-dialog>
</el-card>
@@ -276,8 +277,8 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 0px" @click="dropListinfor(scope.row)">删除</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 0 0px" @click="dropListinfor(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -331,7 +332,9 @@ export default {
listLoading: '',
listLoading1: '',
substituteListNumber: '',
title: ''
title: '',
materialName: '',
materialName_check: 0
}
},
computed: {
@@ -416,7 +419,12 @@ export default {
},
// 被替换件查询
getSubstituted() {
searchSubstituted().then(response => {
if (this.materialName === '') {
this.materialName_check = 0
} else {
this.materialName_check = 1
}
searchSubstituted(this.materialName_check, this.materialName).then(response => {
this.tableDataSub = response.data
})
},
@@ -443,9 +451,9 @@ export default {
chooseSub() {
this.dialogFormVisible2 = false
},
// 增加交换件
// 增加替换件
addListDetailinfor() {
addSubstitutepart(this.tableData2[0].离线合同明细流水号, this.tableData1[0].采购合同明细流水号, this.form.ExchangeNumber, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.picikingPeople, this.form.ExchangeNumberx, this.form.ExchangeNote).then(response => {
addSubstitutepart(this.tableData2[0].离线合同明细流水号, this.tableData1[0].采购合同明细流水号, this.form.ExchangeNumber, this.tableData1[0].物料名称, this.tableData2[0].货位流水号, this.tableData2[0].物料名称, this.picikingPeople, this.form.ExchangeNumberx, this.form.ExchangeNote).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else { this.$message.error('增加失败') }