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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-04-02 18:25:34 +08:00
parent 3397357a3e 366012efde
commit 50c1d02c6c
12 changed files with 157 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,7 +224,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible3=false">取消</el-button>
<el-button type="primary" @click="pickConfirm1()">确 定</el-button>
<el-button :disabled="dialogFormVisible3" type="primary" @click="pickConfirm1()">确 定</el-button>
</div>
</el-dialog>
@@ -268,6 +268,7 @@ export default {
name: 'MaterialOut',
data() {
return {
buttonDisable: false,
dateRange: '',
multipleSelection1: [],
multipleSelection: [],
@@ -447,7 +448,6 @@ export default {
// 提交归还
submitSendBack() {
sendBack(this.form4.货位流水号, this.物料流水号, this.form4.归还数量, this.id, this.基本件流水号, this.标准件和外购件流水号, this.请购单明细流水号, this.form4.仓库流水号, this.领料单流水号).then(res => {
console.log(res)
if (res.data[0].result === '1') {
this.$message.success('操作成功')
this.dialogFormVisible4 = false
@@ -493,10 +493,10 @@ export default {
this.form3.password = ''
this.selectDepartment()
this.departments = []
this.buttonDisable = false
this.dialogFormVisible3 = true
},
selectable(row, index) { // 控制某行是否可选
console.log(row)
return ((Number(row.总数量) <= Number(row.出库数量1))) === false
},
// 初始化数据
@@ -608,6 +608,7 @@ export default {
},
// 提交领料确认
pickConfirm1() {
this.buttonDisable = true
for (let i = 0; i < this.pickListTable2.length; i++) {
if (this.pickListTable2[i].出库数量 !== 0) {
this.multipleSelection.push(this.pickListTable2[i].领料单明细流水号)

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

@@ -199,7 +199,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="addDirectPartm()">确定</el-button>
<el-button :disabled="buttonDisable" type="primary" @click="addDirectPartm()">确定</el-button>
</div>
</el-dialog>
</div>
@@ -218,6 +218,7 @@ export default {
}
}
return {
buttonDisable: false,
Project: [],
Machine: [],
GroupNum: [],
@@ -405,6 +406,7 @@ export default {
this.DirectNotes = []
this.selectLeaders()
this.selectDepartment()
this.buttonDisable = false
this.dialogFormVisible = true
},
// 重置表单
@@ -425,46 +427,48 @@ export default {
},
// 离线外购件出库
addDirectPartm() {
if (Number(this.partnumber) < Number(this.form.DirectNumber)) {
this.$message.error('库存不够，重输领料数量')
} else {
this.$refs['form'].validate((valid) => {
if (valid) {
if (Number(this.form.DirectNoteCode) === Number(this.form.DirectNote)) {
for (let i = 0; i < this.departments.length; i++) {
if (this.form.department === this.departments[i].value) {
this.department111 = this.departments[i].label
if (!this.buttonDisable) {
if (Number(this.partnumber) < Number(this.form.DirectNumber)) {
this.$message.error('库存不够，重输领料数量')
} else {
this.$refs['form'].validate((valid) => {
if (valid) {
if (Number(this.form.DirectNoteCode) === Number(this.form.DirectNote)) {
this.buttonDisable = true
for (let i = 0; i < this.departments.length; i++) {
if (this.form.department === this.departments[i].value) {
this.department111 = this.departments[i].label
}
}
for (let i = 0; i < this.DirectNotes.length; i++) {
if (this.form.DirectNote === this.DirectNotes[i].value) {
this.DirectNote111 = this.DirectNotes[i].label
}
}
outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.DirectNote111, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.department111).then(response => {
if (response.data[0].result === '1') {
this.$message.success('零件出库成功')
this.dialogFormVisible = false
this.searchTable1()
// 物料流水号查
outRecord(this.materialNumber, this.pageCurrent2, this.pageSize2).then(response => {
this.tableDataOut = response.data.rows
this.total2 = response.data.total
this.listLoading1 = false
})
} else {
this.$message.error('零件出库失败')
}
})
} else {
this.$message.error('人员编号错误')
}
for (let i = 0; i < this.DirectNotes.length; i++) {
if (this.form.DirectNote === this.DirectNotes[i].value) {
this.DirectNote111 = this.DirectNotes[i].label
}
}
console.log(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.DirectNote111, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.department111, 121221)
outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.DirectNote111, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.department111).then(response => {
if (response.data[0].result === '1') {
this.$message.success('零件出库成功')
this.dialogFormVisible = false
this.searchTable1()
// 物料流水号查
outRecord(this.materialNumber, this.pageCurrent2, this.pageSize2).then(response => {
this.tableDataOut = response.data.rows
this.total2 = response.data.total
this.listLoading1 = false
})
} else {
this.$message.error('零件出库失败')
}
})
} else {
this.$message.error('人员编号错误')
console.log('error submit!!')
return false
}
} else {
console.log('error submit!!')
return false
}
})
})
}
}
}
}