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

更新

Browse Source
This commit is contained in:
liushuai
2019-04-01 10:39:53 +08:00
parent b314703e23
commit 2768593935
4 changed files with 33 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/ManufacturingCenter/PartAssignment.js
View File

@@ -188,14 +188,14 @@ export function PurchasingDepartment(num, num1, time, MaterialNum, NumberOfParts
} }
}) })
} }
export function Production(num, MaterialNum, projectFloatValue, machineFloatValue) { export function Production(num, MaterialNum, Number, projectFloatValue, machineFloatValue) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '车间管理_车间采购_基本件_传递数据', name: '车间管理_车间采购_基本件_传递数据',
param: `组件流水号=${num}&基本件流水号组=${MaterialNum}&项目流水号=${projectFloatValue}&机床流水号=${machineFloatValue}` param: `组件流水号=${num}&基本件流水号组=${MaterialNum}&零件数量组=${Number}&项目流水号=${projectFloatValue}&机床流水号=${machineFloatValue}`
} }
}) })
} }

67
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -89,26 +89,16 @@
{{ scope.row.零件数量 }} {{ scope.row.零件数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床数量" align="center">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center"> <el-table-column label="备注" align="center">
<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">
<template slot-scope="scope">
{{ scope.row.库存数量 }}
</template>
</el-table-column>
<el-table-column label="需求数量" align="center">
<template slot-scope="scope">
{{ scope.row.需求数量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120px" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">使用</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="外购件"> <el-tab-pane label="外购件">
@@ -139,26 +129,16 @@
{{ scope.row.零件数量 }} {{ scope.row.零件数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床数量" align="center">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center"> <el-table-column label="备注" align="center">
<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">
<template slot-scope="scope">
{{ scope.row.安全库存量 }}
</template>
</el-table-column>
<el-table-column label="需求数量" align="center">
<template slot-scope="scope">
{{ scope.row.需求数量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120px" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit2(scope.row)">使用</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="标准件"> <el-tab-pane label="标准件">
@@ -189,26 +169,16 @@
{{ scope.row.零件数量 }} {{ scope.row.零件数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床数量" align="center">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center"> <el-table-column label="备注" align="center">
<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">
<template slot-scope="scope">
{{ scope.row.安全库存量 }}
</template>
</el-table-column>
<el-table-column label="需求数量" align="center">
<template slot-scope="scope">
{{ scope.row.需求数量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120px" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit2(scope.row)">使用</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@@ -1103,6 +1073,7 @@ export default {
this.NumberOfParts[i] = val[i].零件数量 this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].零件备注 this.ReMarks[i] = val[i].零件备注
} }
console.log(this.NumberOfParts, 1111)
} else if (this.PartType === '外购件') { } else if (this.PartType === '外购件') {
this.MaterialNum = [] this.MaterialNum = []
this.MaterialCode = [] this.MaterialCode = []
@@ -1118,7 +1089,7 @@ export default {
this.MaterialName[i] = val[i].物料名称 this.MaterialName[i] = val[i].物料名称
this.MaterialSpecification[i] = val[i].物料规格 this.MaterialSpecification[i] = val[i].物料规格
this.MaterialModel[i] = val[i].物料型号 this.MaterialModel[i] = val[i].物料型号
this.NumberOfParts[i] = val[i].需求数量 this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].备注 this.ReMarks[i] = val[i].备注
} }
} else if (this.PartType === '标准件') { } else if (this.PartType === '标准件') {
@@ -1136,7 +1107,7 @@ export default {
this.MaterialName[i] = val[i].物料名称 this.MaterialName[i] = val[i].物料名称
this.MaterialSpecification[i] = val[i].物料规格 this.MaterialSpecification[i] = val[i].物料规格
this.MaterialModel[i] = val[i].物料型号 this.MaterialModel[i] = val[i].物料型号
this.NumberOfParts[i] = val[i].需求数量 this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].备注 this.ReMarks[i] = val[i].备注
} }
} }
@@ -1259,7 +1230,7 @@ export default {
}, },
Production() { Production() {
if (this.PartType === '基本件' && this.BasicPartsNumber.length !== 0) { if (this.PartType === '基本件' && this.BasicPartsNumber.length !== 0) {
Production(this.groupFloatValue, this.BasicPartsNumber, this.projectFloatValue, this.machineFloatValue).then(response => { Production(this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
if (response.data[0].result !== '0') { if (response.data[0].result !== '0') {
this.$message.success('投产成功') this.$message.success('投产成功')
searchPart(this.groupFloatValue).then(response => { searchPart(this.groupFloatValue).then(response => {

1
src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
View File

@@ -298,6 +298,7 @@ export default {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'project') this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
}, },
searchMachine() { searchMachine() {
this.machineValue = ''
this.machine = [] this.machine = []
initMachine(this.projectValue).then(response => { initMachine(this.projectValue).then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {

12
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -69,10 +69,15 @@
<template slot-scope="scope">{{ scope.row.组号 }}</template> <template slot-scope="scope">{{ scope.row.组号 }}</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="需求数量" label="零件数量"
align="center"> align="center">
<template slot-scope="scope">{{ scope.row.零件数量 }}</template> <template slot-scope="scope">{{ scope.row.零件数量 }}</template>
</el-table-column> </el-table-column>
<el-table-column label="机床数量" align="center">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column <el-table-column
label="材料" label="材料"
align="center"> align="center">
@@ -159,6 +164,11 @@
{{ scope.row.零件数量 }} {{ scope.row.零件数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床数量" align="center">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件类型"> <el-table-column align="center" label="零件类型">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件类型 }} {{ scope.row.零件类型 }}