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-11-06 17:12:06 +08:00
parent b1f4fd3368
commit 5e184f8d4e
6 changed files with 227 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,10 +212,10 @@
<el-card>
<el-row>
<!-- <span>请购单号：</span>-->
<el-input v-model="PurchaseOrder" size="small" style="width: 150px" placeholder="请购单号" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 15px" @click="handleAdd()">新增</el-button>
<el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 15px" plain @click="handleDelete()">删除</el-button>
<el-input v-model="PurchaseOrder" size="small" style="width: 155px" placeholder="请购单号" clearable/>
<el-button type="primary" size="mini" style="margin-left: 10px" plain @click="searchTable1()">查询</el-button>
<el-button type="warning" size="mini" style="margin-left: 10px" plain @click="handleAdd()">新增</el-button>
<el-button type="danger" size="mini" style="margin-left: 10px" plain @click="handleDelete()">删除</el-button>
</el-row>
</el-card>
<el-row>
@@ -251,22 +251,23 @@
</el-table>
</el-card>
</el-col>
<el-col style="width: 900px">
<el-col style="width: 900px;margin-left: 10px">
<el-card>
<el-table :data="tableData6" border size="mini" style="width: 100%" height="300px">
<el-table-column label="序号" type="index" align="center" width="45px"/>
<el-table-column label="零件名称" show-overflow-tooltip align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" show-overflow-tooltip align="center" width="120px">
<el-table-column label="图号或型号" show-overflow-tooltip align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
{{ scope.row.图号或型号 }}
</template>
</el-table-column>
<el-table-column label="材料" show-overflow-tooltip align="center" width="50px">
<el-table-column label="材料或规格" show-overflow-tooltip align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.材料 }}
{{ scope.row.规格或材料 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="50px">
@@ -289,7 +290,7 @@
<!-- {{ scope.row.项目名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="机床编号" align="center" width="100px">
<el-table-column label="机床编号" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -299,12 +300,12 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="120px">
<el-table-column label="备注" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120px">
<el-table-column label="操作" align="center" width="80px">
<template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
<div style="display: inline-block;margin-right: 10px">
@@ -322,79 +323,6 @@
</el-card>
</el-col>
</el-row>
<el-card>
<el-table :data="tableData5" border size="mini" style="width: 100%" height="300px">
<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">
<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">
<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">
<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">
<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">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
<div style="display: inline-block;margin-right: 10px">
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="新增请购单" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="请购车间" prop="请购车间">
@@ -600,7 +528,7 @@
</template>
<script>
import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum, OutPart } from '@/api/ManufacturingCenter/PartAssignment'
import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum, OutPart } from '@/api/ManufacturingCenter/PartAssignment'
import { mapGetters } from 'vuex'
import Cookie from 'js-cookie'
export default {
@@ -627,7 +555,6 @@ export default {
tableData2: [],
tableData3: [],
tableData4: [],
tableData5: [],
tableData6: [],
loading: false,
title: '',
@@ -985,7 +912,6 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.dialogFormVisible = false
this.tableData5 = []
this.tableData6 = []
this.searchTable1()
} else { this.$message.error('增加失败') }
@@ -1013,7 +939,6 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible = false
this.tableData5 = []
this.tableData6 = []
this.searchTable1()
} else { this.$message.error('编辑失败') }
@@ -1037,7 +962,6 @@ export default {
deleteData(this.RequisitionList).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
this.tableData5 = []
this.tableData6 = []
this.searchTable1()
} else {
@@ -1093,22 +1017,6 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible3 = false
searchDetailed(this.RequisitionList).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
const res = response.data
this.tableData5 = res.map(item => {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
}
return item
})
})
searchDetailed1(this.RequisitionList).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
@@ -1117,7 +1025,11 @@ export default {
}
const res = response.data
this.tableData6 = res.map(item => {
if (item.零件类型 === '3') {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
} else if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
@@ -1171,22 +1083,6 @@ export default {
},
searchDetailed(row) {
this.RequisitionList = row.请购单流水号
searchDetailed(row.请购单流水号).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
const res = response.data
this.tableData5 = res.map(item => {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
}
return item
})
})
searchDetailed1(row.请购单流水号).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
@@ -1195,7 +1091,11 @@ export default {
}
const res = response.data
this.tableData6 = res.map(item => {
if (item.零件类型 === '3') {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
} else if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
@@ -1280,7 +1180,11 @@ export default {
}
const res = response.data
this.tableData6 = res.map(item => {
if (item.零件类型 === '3') {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
} else if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
@@ -1298,18 +1202,20 @@ export default {
searchPart1(this.groupFloatValue, 2).then(response => {
this.tableData2 = response.data
})
searchDetailed(this.RequisitionList).then(response => {
searchDetailed1(this.RequisitionList).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
const res = response.data
this.tableData5 = res.map(item => {
this.tableData6 = res.map(item => {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
} else if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
})
@@ -1326,18 +1232,20 @@ export default {
searchPart1(this.groupFloatValue, 1).then(response => {
this.tableData3 = response.data
})
searchDetailed(this.RequisitionList).then(response => {
searchDetailed1(this.RequisitionList).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
const res = response.data
this.tableData5 = res.map(item => {
this.tableData6 = res.map(item => {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
} else if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
})
@@ -1433,7 +1341,11 @@ export default {
}
const res = response.data
this.tableData6 = res.map(item => {
if (item.零件类型 === '3') {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
} else if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
@@ -1448,13 +1360,24 @@ export default {
searchPart1(this.groupFloatValue, 2).then(response => {
this.tableData2 = response.data
})
searchDetailed(this.RequisitionList).then(response => {
searchDetailed1(this.RequisitionList).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
this.tableData5 = response.data
this.tableData6 = response.data
const res = response.data
this.tableData6 = res.map(item => {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
} else if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
})
})
} else { this.$message.error('移出失败') }
})
@@ -1465,13 +1388,24 @@ export default {
searchPart1(this.groupFloatValue, 1).then(response => {
this.tableData3 = response.data
})
searchDetailed(this.RequisitionList).then(response => {
searchDetailed1(this.RequisitionList).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
this.tableData5 = response.data
this.tableData6 = response.data
const res = response.data
this.tableData6 = res.map(item => {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
} else if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
})
})
} else { this.$message.error('移出失败') }
})