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/api/Inventory/PickingList.js
View File

@@ -136,14 +136,14 @@ export function dropListDetail(DetailNumberx) {
}) })
} }
// 增加领料单明细 // 增加领料单明细
export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5) { export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '车间装配管理_领料单_领料单明细增加', name: '车间装配管理_领料单_领料单明细增加',
param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床名称=' + machine + '&组件名称=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6
} }
}) })
} }

12
src/api/ManufacturingCenter/GroupMatching.js
View File

@@ -44,3 +44,15 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou
} }
}) })
} }
export function searchPurchaseTable(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_外购件成组配套_查询数据',
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string',
pagination: pageCurrent + '&' + pageSize
}
})
}

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

@@ -59,12 +59,12 @@
</el-table-column> </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"> <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="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="80">

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

@@ -46,12 +46,12 @@
</el-table-column> </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"> <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="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="80">

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

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

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

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

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

@@ -52,14 +52,14 @@
{{ 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="130">
<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="130">
<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="130">
@@ -168,7 +168,7 @@ export default {
// 出库 // 出库
partOut(row) { partOut(row) {
console.log(row) console.log(row)
if (row.采购合同明细流水号 !== null) { if (row.车间外购 === 1) {
WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => { WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('出库成功') this.$message.success('出库成功')

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

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

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

@@ -46,12 +46,12 @@
</el-table-column> </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"> <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="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="80">

78
src/views/ManufacturingCenter/GroupMatching/index.vue
View File

@@ -52,7 +52,7 @@
v-loading="loading" v-loading="loading"
:data="tableData" :data="tableData"
style="width: 100%;max-height: 600px" style="width: 100%;max-height: 600px"
height="600" height="300"
highlight-current-row highlight-current-row
border> border>
<el-table-column align="center" label="序号" type="index" width="60"/> <el-table-column align="center" label="序号" type="index" width="60"/>
@@ -103,7 +103,70 @@
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>
</div> </div>
</el-card> </el-card>
<el-card>
<el-table
v-loading="listLoading1"
:data="tableDataPurchase"
border
style="width: 100%;"
height="300">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<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="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="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="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>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total1"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px"> <el-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px">
<el-table <el-table
:data="tableData6" :data="tableData6"
@@ -210,7 +273,7 @@
</template> </template>
<script> <script>
import { initProject, searchTable, searchmachine, searchgroup } from '@/api/ManufacturingCenter/GroupMatching' import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTable } from '@/api/ManufacturingCenter/GroupMatching'
export default { export default {
data() { data() {
return { return {
@@ -286,7 +349,8 @@ export default {
}, { }, {
value: 12, value: 12,
label: '12' label: '12'
}] }],
tableDataPurchase: []
} }
}, },
created() { created() {
@@ -339,6 +403,12 @@ export default {
this.total = parseInt(response.data.total) this.total = parseInt(response.data.total)
this.loading = false this.loading = false
}) })
searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
console.log(response)
this.tableDataPurchase = response.data.rows
this.listLoading = false
this.total1 = response.data.total
})
} else { } else {
this.loading = false this.loading = false
this.$message.warning('请先选择项目') this.$message.warning('请先选择项目')