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

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

Browse Source
This commit is contained in:
chenjianan
2019-05-31 13:51:55 +08:00
parent c39dcf2fd1 a2cda2c46c
commit 7e2107c098
9 changed files with 332 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/api/Assembly/QualityInspectionInformationInquiry.js
View File

@@ -11,27 +11,38 @@ export function initProject() {
}
})
}
// PDM_机床名称_发货状态_查询数据
export function selecttable(check2, machineNumberValue) {
// 初始化质检类型
export function QualityType() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_发货状态_查询数据',
param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue
name: '质量管理_质检类型_查询数据'
}
})
}
// PDM_机床名称_发货状态_编辑数据
export function updatestate(machineNumberValue, state) {
// 组件查询
export function searchgroup(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_发货状态_编辑数据',
param: '机床流水号=' + machineNumberValue + '&发货状态=' + state
name: 'PDM_组件名称_查询数据',
param: '机床流水号=' + num
}
})
}
// 组件查询
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '质量管理_质量情况_查询数据',
param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4
}
})
}

167
src/api/ManufacturingCenter/CreateIntakeList.js
View File

@@ -1,5 +1,42 @@
import request from '@/utils/request'
// 创建领料单
export function addList(peopleNumber) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_备料管理_领料单增加',
param: '领料人流水号=' + peopleNumber
}
})
}
// 领料单查询
export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_备料管理_查询备料领料单',
param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 删除领料单明细/基本件
export function dropListDetailBasic(...params) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_备料管理_备料领料单明细移除',
param: `备料领料单明细流水号=${params[0]}&是否外购=${params[1]}&工艺计划流水号=${params[2]}`
}
})
}
// 初始化项目
export function initProject() {
return request({
@@ -7,7 +44,7 @@ export function initProject() {
method: 'post',
data: {
type: '1',
name: 'PDM_项目名称_查询数据_按时间排序'
name: '车间生产管理工艺_项目查询'
}
})
}
@@ -35,59 +72,56 @@ export function searchTeam(machineNumber) {
}
})
}
// 外购件、标准件查询
export function searchPurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_外购件出库_零件查询',
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 基本件、通用件查询
// 自家备料零件
export function searchBasicPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_基本件出库_零件查询',
name: '车间生产管理工艺_备料管理_自家备料零件查询',
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 车间采购件查询
export function searchHoursePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
// 外购备料零件
export function searchPurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_车间采购出库_零件查询',
name: '车间生产管理工艺_备料管理_外购备料零件查询',
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 领料单查询
export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
// 自家备料选入
export function addBasicList(listNumber, num1) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间装配管理_领料单_领料单查询',
param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
Pagination: pageCurrent + '&' + pageSize
type: '2',
name: '车间生产管理工艺_备料管理_自家备料选入',
param: '备料领料单流水号=' + listNumber + '&工艺计划流水号=' + num1
}
})
}
// 外购备料选入
export function addPurchaseList(listNumber, num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_备料管理_外购备料选入',
param: '备料领料单流水号=' + listNumber + '&工艺计划流水号=' + num1
}
})
}
// 领料单明细查询
export function searchListDetail(listNumber) {
return request({
@@ -95,20 +129,8 @@ export function searchListDetail(listNumber) {
method: 'post',
data: {
type: '1',
name: '车间装配管理_领料单_领料单明细查询',
param: '领料单流水号=' + listNumber
}
})
}
// 创建领料单
export function addList(peopleNumber) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间装配管理_领料单_领料单增加',
param: '领料人流水号=' + peopleNumber
name: '车间生产管理工艺_备料管理_备料领料单明细查询',
param: '备料领料单流水号=' + listNumber
}
})
}
@@ -119,69 +141,8 @@ export function dropList(PickingListNumberx) {
method: 'post',
data: {
type: '2',
name: '车间装配管理_领料单_领料单删除',
param: '领料单流水号=' + PickingListNumberx
}
})
}
// 删除领料单明细
export function dropListDetail(DetailNumberx, isBacklog) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间装配管理_领料单_领料单明细删除',
param: '领料单明细流水号=' + DetailNumberx + '&是否是滞货=' + isBacklog
}
})
}
// 删除领料单明细/基本件
export function dropListDetailBasic(...params) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间装配管理_领料单_领料单明细删除_基本件',
param: `领料单明细流水号=${params[0]}&收件信息ID=${params[1]}&返还数量=${params[2]}`
}
})
}
// 增加领料单明细
export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, outNumber, partType, Note, data1, data2, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间装配管理_领料单_领料单明细增加',
param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注\\=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&采购合同明细流水号=' + data4 + '&请购单明细流水号=' + data5 + '&货位流水号=' + data6 + '&出库类型=' + data7 + '&物料与货位对照流水号=' + data8 + '&名称=' + data9 + '&物料规格\\=' + data10 + '&物料型号=' + data11 + '&零件图号=' + data12 + '&材料=' + data13
}
})
}
// 查询滞货件
export function searchBacklogPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_滞货件领料_查询数据',
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 领料滞货件
export function submitAddBacklogList(...params) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_领料单明细_滞货件_增加数据',
param: `领料单流水号=${params[0]}&项目流水号=${params[1]}&机床流水号=${params[2]}&组件流水号=${params[3]}&出库数量=${params[4]}&备注\\=${params[5]}&货位流水号=${params[6]}&物料与货位对照流水号=${params[7]}&名称=${params[8]}&物料规格\\=${params[9]}&物料型号=${params[10]}`
name: '车间生产管理工艺_备料管理_备料领料单删除',
param: '备料领料单流水号=' + PickingListNumberx
}
})
}

2
src/api/ManufacturingCenter/ProcessingStatus.js
View File

@@ -66,7 +66,7 @@ export function getExport(num) {
method: 'post',
data: {
type: '3',
name: `select 机床流水号,组件流水号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料
name: `select 机床流水号,机床图号,组件流水号,组号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料
from ( select 工艺计划流水号,min(工序顺序) as 待加工工序顺序
from 车间生产管理工艺_零件工序_视图
where 完成日期_短 is null and 考核状态 = 6

24
src/views/Assembly/AssemblyExecution/index.vue
View File

@@ -3,7 +3,7 @@
<el-card>
<el-row>
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange();searchTable1()">
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();searchTable2()">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -13,20 +13,20 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable @change="searchTable2()">
<el-option
v-for="item in groupNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1();searchTable2()">查询</el-button>
<!-- <span>组号:</span>-->
<!-- <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable @change="searchTable2()">-->
<!-- <el-option-->
<!-- v-for="item in groupNumber"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"/>-->
<!-- </el-select>-->
<!-- <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1();searchTable2()">查询</el-button>-->
</el-row>
</el-card>
<el-card>
<h3 style="text-align: center;">总装调试</h3>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="280px">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="100px">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -61,7 +61,7 @@
</el-card>
<el-card>
<h3 style="text-align: center;">部装</h3>
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="280px">
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}

2
src/views/Assembly/DeliveryApplication/index.vue
View File

@@ -13,7 +13,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
<!-- <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>-->
</el-row>
</el-card>
<el-card>

110
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -3,7 +3,7 @@
<el-card>
<el-row>
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="selecttable()">
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -13,6 +13,24 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>质检类型:</span>
<el-select v-model="QualityTypeValue" filterable placeholder="质检类型" size="small" clearable>
<el-option
v-for="item in QualityTypeNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件:</span>
<el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px" size="small" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
</el-row>
</el-card>
@@ -23,7 +41,7 @@
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床编号" align="center">
<el-table-column label="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -33,21 +51,49 @@
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="机床数量" align="center">
<el-table-column label="组号" align="center">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="注意事项" align="center">
<el-table-column label="零件图号" align="center">
<template slot-scope="scope">
{{ scope.row.注意事项 }}
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<el-table-column label="零件名称" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.发货状态===null || scope.row.发货状态===0" type="success" size="small" @click="handlconfirm(scope.row)">确认发货</el-button>
<el-button v-else-if="scope.row.发货状态===1" type="danger" size="small">待 审批</el-button>
<el-button v-else type="info" size="small" >已审批</el-button>
{{ 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>
@@ -56,7 +102,7 @@
</template>
<script>
import { initProject, selecttable, updatestate } from '@/api/Assembly/QualityInspectionInformationInquiry'
import { initProject, searchgroup, selecttable, QualityType } from '@/api/Assembly/QualityInspectionInformationInquiry'
// import { mapGetters } from 'vuex'
export default {
data() {
@@ -65,8 +111,10 @@ export default {
machineNumber: [],
groupNumberValue: '',
groupNumber: [],
QualityTypeNumber: [],
QualityTypeValue: '',
tableData1: [],
tableData2: []
SpareParts: ''
}
},
created() {
@@ -74,6 +122,7 @@ export default {
},
mounted() {
this.initProject()
this.QualityType()
},
methods: {
initProject() {
@@ -87,17 +136,38 @@ export default {
}
})
},
selecttable() {
this.tableData1 = []
if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
selecttable(this.check2, this.machineNumberValue).then(response => {
this.tableData1 = response.data
QualityType() {
QualityType().then(response => {
console.log(response.data)
for (let i = 0; i < response.data.length; i++) {
this.QualityTypeNumber.push({
label: response.data[i].质检类型,
value: response.data[i].质检类型代码
})
}
})
},
handlconfirm(row) {
updatestate(row.机床流水号, 1).then(response => {
this.selecttable()
machineChange() {
this.groupNumberValue = ''
this.groupNumber = []
searchgroup(this.machineNumberValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNumber.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
},
selecttable() {
this.tableData1 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue).then(response => {
this.tableData1 = response.data
console.log(response.data, 1111)
})
}
}

908
src/views/ManufacturingCenter/CreateIntakeList/index.vue
View File

File diff suppressed because it is too large Load Diff

4
src/views/ManufacturingCenter/ProcessingStatus/index.vue
View File

@@ -398,8 +398,8 @@ export default {
getExport(this.Group).then(res => {
console.log(res.data)
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['图号及规格', '制品名称', '计划数', '材料', '当前工序名']
const filterVal = ['零件图号_零件工艺计划', '零件名称', '批次数量', '材料', '工艺名称']
const tHeader = ['机床', '组号', '图号及规格', '制品名称', '计划数', '材料', '当前工序名']
const filterVal = ['机床图号', '组号', '零件图号_零件工艺计划', '零件名称', '批次数量', '材料', '工艺名称']
const list = res.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({

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

@@ -176,7 +176,7 @@
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="100px">
<el-table-column label="计划开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务开始时间 }}
</template>
@@ -216,7 +216,7 @@
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="100px">
<el-table-column label="计划开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务开始时间 }}
</template>
@@ -261,7 +261,7 @@
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="100px">
<el-table-column label="计划开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务开始时间 }}
</template>
@@ -306,7 +306,7 @@
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="100px">
<el-table-column label="计划开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务开始时间 }}
</template>
@@ -351,7 +351,7 @@
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="100px">
<el-table-column label="计划开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务开始时间 }}
</template>