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

物料出库

Browse Source
This commit is contained in:
chenjianan
2019-06-03 14:58:28 +08:00
parent 8091c16cf3
commit 93f93e6df2
3 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -282,6 +282,11 @@
{{ scope.row.备件数量 }}
</template>
</el-table-column>
<el-table-column label="已领数量" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.出库数量 }}
</template>
</el-table-column>
<el-table-column v-if="true" label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button :disabled="!!scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" @click="dropListDetail(scope.row)">删除</el-button>
@@ -612,7 +617,7 @@ export default {
this.$message.success('删除成功')
this.clickList()
} else {
this.$message.error('已确认领回，不可删除')
this.$message.error('已领取，不可删除')
}
})
}).catch(() => {

53
src/views/Inventory/MaterialOut/index.vue
View File

@@ -89,6 +89,11 @@
{{ scope.row.出库数量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button size="mini" icon="el-icon-back" type="primary" disabled>归还</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
@@ -180,9 +185,6 @@
:value="item.value"/>
</el-select>
</el-form-item>
<!--<el-form-item label="领料人" prop="DirectNote" label-width="100px">-->
<!--<el-input v-model="form1.DirectNote" size="small" placeholder="请输入领料人" style="width: 200px"/>-->
<!--</el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible1=false">取消</el-button>
@@ -228,8 +230,7 @@ export default {
machineValue: '',
groupNumValue: '',
outNumber: '',
personValue: '',
DirectNote: ''
personValue: ''
},
form2: {
errorNumber: '',
@@ -243,8 +244,7 @@ export default {
machineValue: [{ required: true, message: '请选择' }],
groupNumValue: [{ required: true, message: '请选择' }],
outNumber: [{ required: true, message: '请输入' }],
personValue: [{ required: true, message: '请输入' }],
DirectNote: [{ required: true, message: '请输入' }]
personValue: [{ required: true, message: '请输入' }]
},
rules2: {
errorNumber: [{ required: true, message: '请输入' }],
@@ -253,12 +253,13 @@ export default {
machine: [],
group: [],
person: [],
materialNum: '', // 中间变量
machineValue: '', // 中间变量
groupNumValue: '', // 中间变量
basePartNum: '', // 中间变量
parchasePartNum: '', // 中间变量
outNumber: 0 // 中间变量
materialNum: '', // 中间变量物料流水号
machineValue: '', // 中间变量机床流水号
groupNumValue: '', // 中间变量组件流水号
basePartNum: '', // 中间变量基本件流水u和
parchasePartNum: '', // 中间变量标准件和外购件流水号
locationNum: '', // 中间变量货位流水号
outNumber: 0 // 中间变量出库数量
}
},
computed: {
@@ -326,21 +327,20 @@ export default {
},
// 查看领料单明细
clickList(row) {
row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
row && row.领料单流水号 ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
row && row.领料单编号 ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
searchListDetail(this.pickingListNum).then(res => {
this.pickListTable2 = res.data
})
},
// 查看领料单明细相关的物料货位数量
clickListDetail(row) {
console.log(row)
row.基本件流水号 ? (this.basePartNum = row.基本件流水号, this.materialNum = '', this.parchasePartNum = '') : this.basePartNum
row.物料流水号 ? (this.materialNum = row.物料流水号, this.basePartNum = '') : this.materialNum
row.标准件和外购件流水号 ? (this.parchasePartNum = row.标准件和外购件流水号, this.basePartNum = '') : this.parchasePartNum
this.machineValue = row.机床流水号
this.groupNumValue = row.组件流水号
this.outNumber = row.总数量
row && row.基本件流水号 ? (this.basePartNum = row.基本件流水号, this.materialNum = '', this.parchasePartNum = '') : this.basePartNum
row && row.物料流水号 ? (this.materialNum = row.物料流水号, this.basePartNum = '') : this.materialNum
row && row.标准件和外购件流水号 ? (this.parchasePartNum = row.标准件和外购件流水号, this.basePartNum = '') : this.parchasePartNum
row && row.机床流水号 ? this.machineValue = row.机床流水号 : this.machineValue
row && row.组件流水号 ? this.groupNumValue = row.组件流水号 : this.groupNumValue
row && row.总数量 ? this.outNumber = row.总数量 : this.outNumber
if (this.materialNum) {
searchStockNumber(this.materialNum).then(res => {
this.StockNumberTable = res.data
@@ -356,6 +356,9 @@ export default {
this.$refs['form1'].resetFields()
}
this.form1.machineValue = this.machineValue
this.locationNum = row.货位流水号
this.form1.outNumber = this.outNumber
this.form1.personValue = Number(this.id)
this.group = []
this.form1.groupNumValue = ''
searchgroup(this.form1.machineValue).then(response => {
@@ -367,8 +370,6 @@ export default {
}
}).then(() => {
this.form1.groupNumValue = this.groupNumValue
this.form1.outNumber = this.outNumber
this.form1.personValue = Number(this.id)
this.dialogFormVisible1 = true
})
},
@@ -377,7 +378,9 @@ export default {
this.$refs['form1'].validate((valid) => {
if (valid) {
// 出库数量，出库人，基本件流水号/标准件和外购件流水号 => 记录到一个新表
submitOutStore(this.form1.outNumber, this.form1.personValue, this.basePartNum, this.parchasePartNum).then(response => {
// 物料流水号，货位流水号，出库数量 => 剪掉货位物料数
console.log(this.materialNum, this.locationNum)
submitOutStore(this.materialNum, this.locationNum, this.form1.outNumber, this.form1.personValue, this.basePartNum, this.parchasePartNum).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.dialogFormVisible1 = false