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

lx

Browse Source
This commit is contained in:
lixin
2018-11-19 17:19:41 +08:00
parent 4cc6783700
commit 9b52cb0127
10 changed files with 210 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,12 +59,12 @@
</el-table-column>
<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">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">

4
src/views/Inventory/ExchangePart/index.vue
View File

@@ -46,12 +46,12 @@
</el-table-column>
<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">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="80">

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

@@ -45,14 +45,14 @@
{{ 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">
<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">
@@ -205,14 +205,14 @@
{{ 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">
<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">
@@ -358,14 +358,14 @@
{{ 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">
<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">
@@ -513,14 +513,14 @@
{{ 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">
<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">

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

@@ -113,14 +113,14 @@
{{ 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">
<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">
@@ -243,6 +243,7 @@ export default {
},
// 打开表单
parOut(row) {
console.log(row)
this.form = []
this.MachineValue = ''
this.GroupNumValue = ''

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

@@ -52,14 +52,14 @@
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" min-width="130">
<el-table-column label="机床图号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组件名称" align="center" min-width="130">
<el-table-column label="组号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="领用数量" align="center" min-width="130">
@@ -168,7 +168,7 @@ export default {
// 出库
partOut(row) {
console.log(row)
if (row.采购合同明细流水号 !== null) {
if (row.车间外购 === 1) {
WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')

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

@@ -81,14 +81,14 @@
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" min-width="130">
<el-table-column label="机床图号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组件名称" align="center" min-width="130">
<el-table-column label="组号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="领用数量" align="center" min-width="50">
@@ -153,14 +153,14 @@
{{ 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">
<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">
@@ -230,14 +230,14 @@
{{ 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">
<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">
@@ -297,12 +297,12 @@
{{ 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>
</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>
@@ -314,7 +314,7 @@
</el-table-column>
<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">
@@ -346,51 +346,51 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="addBasicListDetail(form)">确 定</el-button>
<el-button type="primary" @click="addBasicListDetail('form')">确 定</el-button>
</div>
</el-dialog>
<!--外购件领料对话框-->
<el-dialog :visible.sync="dialogFormVisible" title="外购件标准件领料" center width="380px">
<el-form ref="form" :model="form" :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="出库数量" prop="OutNumber" label-width="100px" size="small">
<el-input v-model="form.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="出库备注" prop="outNote" label-width="100px">
<el-input v-model="form.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="execaddListDetail(form)">确 定</el-button>
</div>
</el-dialog>
<!--车间采购件领料对话框-->
<el-dialog :visible.sync="dialogFormVisibleWork" title="车间采购件领料" center width="380px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" class="demo-ruleForm">
<el-form-item label="出库数量" prop="ContractNumberValue" label-width="100px" size="small">
<el-input v-model="form.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="出库备注" prop="TotalContractAmount" label-width="100px">
<el-input v-model="form.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="addWorkshopListDetail()">确 定</el-button>
</div>
</el-dialog>
<!--编辑领料明细对话框-->
<el-dialog :visible.sync="dialogFormVisible2" title="领料单明细" center width="380px">
<el-form ref="form2" :model="form2" :rules="rules3" label-position="left" class="demo-ruleForm">
<el-form-item label="出库数量" prop="ContractNumberValue" label-width="100px" size="small">
<el-input v-model="form2.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="出库备注" prop="TotalContractAmount" label-width="100px">
<el-form-item label="出库备注" prop="outNote" label-width="100px">
<el-input v-model="form2.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form2')">取消</el-button>
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="execaddListDetail('form2')">确 定</el-button>
</div>
</el-dialog>
<!--车间采购件领料对话框-->
<el-dialog :visible.sync="dialogFormVisibleWork" title="车间采购件领料" center width="380px">
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" class="demo-ruleForm">
<el-form-item label="出库数量" prop="OutNumber" label-width="100px" size="small">
<el-input v-model="form3.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="出库备注" prop="outNote" label-width="100px">
<el-input v-model="form3.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="addWorkshopListDetail('form3')">确 定</el-button>
</div>
</el-dialog>
<!--编辑领料明细对话框-->
<el-dialog :visible.sync="dialogFormVisible2" title="领料单明细" center width="380px">
<el-form ref="form4" :model="form4" :rules="rules4" label-position="left" class="demo-ruleForm">
<el-form-item label="出库数量" prop="OutNumber" label-width="100px" size="small">
<el-input v-model="form4.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="出库备注" prop="outNote" label-width="100px">
<el-input v-model="form4.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form4')">取消</el-button>
<el-button type="primary" @click="submitChannge()">确 定</el-button>
</div>
</el-dialog>
@@ -473,6 +473,22 @@ export default {
OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
},
form3: {
OutNumber: '', // 出库数量
outNote: '' // 出库备注
},
rules3: { // 表单验证规则
OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
},
form4: {
OutNumber: '', // 出库数量
outNote: '' // 出库备注
},
rules4: { // 表单验证规则
OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
},
partType: '', // 零件类型
craftplannumber: '', // 工艺计划流水号
receive: '', // 收件信息ID
@@ -712,9 +728,9 @@ export default {
this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称
this.partMachineNumber = row.机床流水号
this.partMachineName = row.机床名称
this.partMachineName = row.机床图号
this.partGroupNumber = row.组件流水号
this.partGroupName = row.组件名称
this.partGroupName = row.组号
this.partType = row.零件类型
this.craftplannumber = row.工艺计划流水号
this.receive = row.收件信息id
@@ -726,7 +742,6 @@ export default {
this.materialName = row.零件名称
this.materialType = row.零件类型名称
this.materialNumber = row.零件图号
console.log(this.receive, 41645)
},
addBasicListDetail(formName) {
if (this.pickingListNumberx === '') {
@@ -736,7 +751,7 @@ export default {
}
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.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber).then(response => {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber, 0).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else {
@@ -754,9 +769,9 @@ export default {
this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称
this.partMachineNumber = row.机床流水号
this.partMachineName = row.机床名称
this.partMachineName = row.机床图号
this.partGroupNumber = row.组件流水号
this.partGroupName = row.组件名称
this.partGroupName = row.组号
this.partType = row.零件类型代码
this.craftplannumber = row.工艺计划流水号
this.receive = row.收件信息ID
@@ -776,7 +791,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.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber).then(response => {
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.locatenumber, 0).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else {
@@ -795,9 +810,9 @@ export default {
this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称
this.partMachineNumber = row.机床流水号
this.partMachineName = row.机床名称
this.partMachineName = row.机床图号
this.partGroupNumber = row.组件流水号
this.partGroupName = row.组件名称
this.partGroupName = row.组号
this.partType = row.零件类型
this.receive = row.收件信息ID
this.locatenumber = row.货位流水号
@@ -807,20 +822,24 @@ export default {
this.dialogFormVisibleWork = true
this.purchaseDetailNum = row.采购合同明细流水号
},
addWorkshopListDetail() {
if (this.pickingListNumberx === '') {
this.$message.error('请选择领料单')
} else if (this.OutNumber === '') {
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.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
addWorkshopListDetail(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.pickingListNumberx === '') {
this.$message.error('请选择领料单')
} else if (this.OutNumber === '') {
this.$message.error('请输入领用数量')
} else {
this.$message.error('增加失败')
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).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
}
})
}
}
})
this.dialogFormVisibleWork = false
this.searchListinfor()
},
@@ -830,7 +849,7 @@ export default {
this.pickingListDetail = row.领料单明细流水号
},
submitChannge() {
editListDetail(this.pickingListDetail, this.form2.OutNumber, this.form2.outNote).then(response => {
editListDetail(this.pickingListDetail, this.form4.OutNumber, this.form4.outNote).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改成功')
} else {

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

@@ -46,12 +46,12 @@
</el-table-column>
<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">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="80">