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-07-01 09:52:09 +08:00
parent 1ae808895b 595e393bfb
commit 68d1803460
7 changed files with 193 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/api/Assembly/QualityBasicData.js Normal file
View File

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

@@ -35,7 +35,7 @@ export function searchgroup(num) {
})
}
// 质检管理_质量情况_查询数据
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, pageCurrent, pageSize) {
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
@@ -43,7 +43,7 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec
type: '1',
name: '质检管理_质量情况_查询数据',
param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 +
'&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6,
'&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7,
Pagination: pageCurrent + '&' + pageSize
}
})

4
src/api/TechnologyCenter/ImportParts.js
View File

@@ -367,14 +367,14 @@ export function transferWG(groupNum, materialNum, totalNum, remarks, mark, desig
}
})
}
export function transferWG1(groupNum, materialNum, totalNum, remarks, mark, designNum, isTransfer, dataType, No, id, Num) {
export function transferWG1(groupNum, materialNum, totalNum, remarks, mark, designNum, isTransfer, dataType, No, id, Num, num6, num7) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_标准件和外购件_大量导入',
param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注\\=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}`
param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注\\=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}&分类码=${num6}&整改类型=${num7}`
}
})
}

127
src/views/Assembly/QualityBasicData/index.vue Normal file
View File

@@ -0,0 +1,127 @@
<template>
<div class="app-container">
<el-card>
<div style="width: 49.8%; float: left;margin-left: 2px">
<el-card>
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">关键节点记录</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd()">增加</el-button>
<el-table
v-loading="loading"
:data="tableData"
:row-class-name="tableRowClassName"
border
style="width: 100%;max-height: 450px;margin-top: 10px"
height="450px"
highlight-current-row
size="small">
<el-table-column
type="index"
label="序号"
align="center"
width="50"/>
<el-table-column label="关键节点" align="center">
<template slot-scope="scope">
{{ scope.row.关键节点 }}
</template>
</el-table-column>
<el-table-column label="完成情况" align="center" width="100px">
<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" fixed="right" width="200px">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleEdit(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
:total="total"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</div>
<div style="width: 49.8%; float: right; margin-right: 2px">
<el-card>
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">每日工作记录</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd1()">增加</el-button>
<el-table v-loading="loading" :data="tableData1" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small">
<el-table-column
type="index"
label="序号"
align="center"
width="50"/>
<el-table-column label="工作情况" align="center">
<template slot-scope="scope">
{{ scope.row.工作情况 }}
</template>
</el-table-column>
<el-table-column label="工作日期" align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.工作日期 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200px">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleEdit1(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDelete1(scope.row)">删除</el-button>
</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="pageSize1"
:total="total1"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
</el-card>
</div>
</el-card>
</div>
</template>
<script>
</script>
<style scoped>
</style>

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

@@ -21,6 +21,8 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件:</span>
<el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px" size="small" clearable/>
<span>质检类型:</span>
<el-select v-model="QualityTypeValue" filterable placeholder="质检类型" size="small" clearable>
<el-option
@@ -29,8 +31,8 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件:</span>
<el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px" size="small" clearable/>
</el-row>
<el-row style="margin-top: 20px">
<span class="demonstration">时间区间:</span>
<el-date-picker
v-model="startTime"
@@ -47,6 +49,14 @@
style="width: 160px"
type="date"
placeholder="选择日期"/>
<span>质检情况:</span>
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" clearable>
<el-option
v-for="item in qualityInspection"
: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="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
</el-row>
</el-card>
@@ -226,7 +236,7 @@
</el-card>
<el-card>
<h3 align="center">正在加工零件列表</h3>
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="300px">
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table-column label="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -244,7 +254,7 @@
</el-table-column>
<el-table-column label="零件图号" align="center">
<template slot-scope="scope">
{{ scope.row.零件图号_零件工艺计划 }}
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center">
@@ -295,7 +305,7 @@
</el-card>
<el-card>
<h3 align="center">待加工零件列表</h3>
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="300px">
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table-column label="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -363,9 +373,15 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
<el-row>
<span>零件图号:</span>
<el-input v-model="SparePartsNumber" style="width: 200px" size="small"/>
<span>零件名称:</span>
<el-input v-model="SparePartsName" style="width: 200px" size="small"/>
</el-row>
<el-table
:data="tableData5"
style="width: 100%;max-height: 400px;"
style="width: 100%;max-height: 400px;margin-top: 20px"
size="mini"
height="300"
highlight-current-row
@@ -385,6 +401,11 @@
{{ scope.row.工艺要求 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作工">
<template slot-scope="scope">
{{ scope.row.员工姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺是否完成" width="130">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
@@ -428,11 +449,23 @@ export default {
gridData: [],
QualityTypeNumber: [],
QualityTypeValue: '',
qualityInspectionValue: '',
qualityInspection: [
{
value: 1,
label: '合格'
}, {
value: 2,
label: '不合格'
}
],
tableData1: [],
tableData10: [],
tableData20: [],
tableData5: [],
SpareParts: '',
SparePartsNumber: '',
SparePartsName: '',
dialogFormVisible: false,
dialogFormVisible4: false,
loading: false,
@@ -517,7 +550,8 @@ export default {
if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 }
if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 }
selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.pageCurrent, this.pageSize).then(response => {
if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.pageCurrent, this.pageSize).then(response => {
this.tableData1 = response.data.rows
this.loading = false
this.total = response.data.total
@@ -538,6 +572,8 @@ export default {
},
viewProcedures(row) {
this.dialogFormVisible4 = true
this.SparePartsNumber = row.零件图号
this.SparePartsName = row.零件名称
processingStatus(row.工艺计划流水号).then(response => {
this.tableData5 = response.data
})

3
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -647,7 +647,8 @@ export default {
} else {
dataType = 1
}
const resp = await transferWG1(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id)
console.log(data)
const resp = await transferWG1(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id, data.备件数量, data.分类码, data.整改类型)
await sleep(10)
if (resp.data[0].result === '0') {
this.err++

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

@@ -215,6 +215,16 @@
{{ scope.row.标记 }}
</template>
</el-table-column>
<el-table-column align="center" label="分类码" width="150">
<template slot-scope="scope">
{{ scope.row.分类码 }}
</template>
</el-table-column>
<el-table-column align="center" label="整改类型" width="150">
<template slot-scope="scope">
{{ scope.row.整改类型 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
@@ -382,6 +392,13 @@ export default {
this.totalWB = data.total
this.tableDataWB = data.rows.map(item => {
console.log(item)
if (item.整改类型 === '1') {
item.整改类型 = '新增'
} else if (item.整改类型 === '2') {
item.整改类型 = '替换'
} else if (item.整改类型 === '3') {
item.整改类型 = '补充加工'
}
item.零件类型 = item.零件类型 === '2' ? '外购件' : '标准件'
return item
})