质检修改——20190602
This commit is contained in:
jiangfuzhuang
@@ -18,7 +18,7 @@ export function QualityType() {
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '质量管理_质检类型_查询数据'
|
||||
name: '质检管理_质检类型_查询数据'
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -41,7 +41,7 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '质量管理_质量情况_查询数据',
|
||||
name: '质检管理_质量情况_查询数据',
|
||||
param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4,
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
|
||||
38
src/api/Assembly/ShipmentApproval.js
Normal file
38
src/api/Assembly/ShipmentApproval.js
Normal file
@@ -0,0 +1,38 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 初始化机床项目
|
||||
export function initProject() {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: 'PDM_项目名称_查询数据'
|
||||
}
|
||||
})
|
||||
}
|
||||
// PDM_机床名称_发货状态_查询数据
|
||||
export function selecttable(check2, machineNumberValue) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: 'PDM_机床名称_发货状态_查询数据',
|
||||
param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue
|
||||
}
|
||||
})
|
||||
}
|
||||
// PDM_机床名称_发货状态_编辑数据
|
||||
export function updatestate(machineNumberValue, state, attention) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: 'PDM_机床名称_发货审批_编辑数据',
|
||||
param: '机床流水号=' + machineNumberValue + '&发货状态=' + state + '&注意事项=' + attention
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
1
src/icons/svg/ShipmentApproval.svg
Normal file
1
src/icons/svg/ShipmentApproval.svg
Normal file
@@ -0,0 +1 @@
|
||||
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559440242177" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4969" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M648 288c0-17.7-14.3-32-32-32H232.6c-17.6 0-32 14.3-32 32s14.3 32 32 32H616c17.7 0 32-14.3 32-32zM648 480c0-17.7-14.3-32-32-32H232.6c-17.6 0-32 14.3-32 32s14.3 32 32 32H616c17.7 0 32-14.3 32-32zM232.6 640c-17.6 0-32 14.3-32 32s14.3 32 32 32h191.7c17.6 0 32-14.3 32-32s-14.3-32-32-32H232.6z" p-id="4970" fill="#ffffff"></path><path d="M488.4 864H166.7c-17.6 0-31.9-14.3-31.9-32V192c0-17.7 14.3-32 31.9-32h513.6c17.6 0 31.9 14.3 31.9 32v256c0 17.7 14.3 32 31.9 32 17.6 0 31.9-14.3 31.9-32V160c0-35.3-28.6-64-63.8-64H134.8C99.6 96 71 124.7 71 160v704c0 35.3 28.6 64 63.8 64h353.6c17.6 0 31.9-14.3 31.9-32s-14.3-32-31.9-32z" p-id="4971" fill="#ffffff"></path><path d="M943.6 840.3L830.5 727.2l47.7-47.7c11.1-11.1 11.1-29.1 0-40.3l-95.5-95.5c-11.1-11.1-29.1-11.1-40.3 0L601.8 684.5c-11.1 11.1-11.1 29.1 0 40.3l95.5 95.5c11.1 11.1 29.1 11.1 40.3 0l47.7-47.7 113.1 113.1c12.5 12.5 32.8 12.5 45.2 0 12.5-12.6 12.5-32.9 0-45.4zM785.3 682L740 727.2l-22.6 22.6-45.2-45.2 90.5-90.5 45.2 45.2-22.6 22.7zM707.9 861.8h-128c-17.7 0-32 14.3-32 32s14.3 32 32 32h128c17.7 0 32-14.3 32-32s-14.3-32-32-32z" p-id="4972" fill="#ffffff"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
@@ -26,7 +26,7 @@
|
||||
</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="100px">
|
||||
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
|
||||
<el-table-column label="项目名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
@@ -150,7 +150,7 @@ export default {
|
||||
},
|
||||
searchTable1() {
|
||||
this.tableData1 = []
|
||||
if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
|
||||
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
|
||||
searchTable1(this.machineNumberValue, this.check2).then(response => {
|
||||
this.tableData1 = response.data
|
||||
console.log(response.data, 1111)
|
||||
@@ -158,8 +158,8 @@ export default {
|
||||
},
|
||||
searchTable2() {
|
||||
this.tableData2 = []
|
||||
if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
|
||||
if (this.groupNumberValue !== '') { this.check3 = 1 } else { this.check3 = 0 }
|
||||
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
|
||||
if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check3 = 1 } else { this.check3 = 0 }
|
||||
searchTable2(this.machineNumberValue, this.check2).then(response => {
|
||||
console.log(response.data, 222)
|
||||
this.tableData2 = response.data
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
<el-table-column label="操作" align="center" width="250px" fixed="right">
|
||||
<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-if="scope.row.发货状态===1" disabled="true" type="danger" size="small">待审批</el-button>
|
||||
<el-button v-else type="info" size="small" >已审批</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -89,7 +89,7 @@ export default {
|
||||
},
|
||||
selecttable() {
|
||||
this.tableData1 = []
|
||||
if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
|
||||
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
|
||||
selecttable(this.check2, this.machineNumberValue).then(response => {
|
||||
this.tableData1 = response.data
|
||||
console.log(response.data)
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
</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-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>
|
||||
<el-card>
|
||||
@@ -56,7 +56,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>
|
||||
@@ -66,6 +66,11 @@
|
||||
{{ 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.质检类型 }}
|
||||
@@ -83,12 +88,17 @@
|
||||
</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">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.处理结果 }}
|
||||
{{ 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">
|
||||
|
||||
125
src/views/Assembly/ShipmentApproval/index.vue
Normal file
125
src/views/Assembly/ShipmentApproval/index.vue
Normal file
@@ -0,0 +1,125 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<el-row>
|
||||
<span>机床编号:</span>
|
||||
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="selecttable()">
|
||||
<el-option
|
||||
v-for="item in machineNumber"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
<div style="float: left">{{ item.label }}</div>
|
||||
<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-row>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="600px">
|
||||
<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">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.注意事项" style="width:100px;margin-right:3px" size="mini" width="120"/>
|
||||
</template>
|
||||
<span v-else>{{ scope.row.注意事项 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="250px" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button v-if="!scope.row.edit && scope.row.发货状态===1" type="success" size="mini" icon="el-icon-circle-check-outline" @click="scope.row.edit=!scope.row.edit" >确认审批</el-button>
|
||||
<el-button v-else-if="!scope.row.edit && scope.row.发货状态===2" disabled="true" type="danger" size="mini" icon="el-icon-circle-check-outline" >已审批</el-button>
|
||||
<el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="primary" @click="confirmEdit(scope.row)">确认</el-button>
|
||||
<el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="danger" @click="cancelEdit(scope.row)">取消</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { initProject, selecttable, updatestate } from '@/api/Assembly/ShipmentApproval'
|
||||
// import { mapGetters } from 'vuex'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
machineNumberValue: '',
|
||||
machineNumber: [],
|
||||
groupNumberValue: '',
|
||||
groupNumber: [],
|
||||
tableData1: [],
|
||||
tableData2: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
||||
},
|
||||
mounted() {
|
||||
this.initProject()
|
||||
},
|
||||
methods: {
|
||||
initProject() {
|
||||
initProject().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.machineNumber.push({
|
||||
label: response.data[i].机床图号,
|
||||
name: response.data[i].项目名称,
|
||||
value: response.data[i].机床流水号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
selecttable() {
|
||||
this.tableData1 = []
|
||||
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
|
||||
selecttable(this.check2, this.machineNumberValue).then(response => {
|
||||
response.data.map(v => {
|
||||
this.$set(v, 'edit', false)
|
||||
v.原注意事项 = v.注意事项
|
||||
return v
|
||||
})
|
||||
this.tableData1 = response.data
|
||||
this.edit = false
|
||||
console.log(response.data)
|
||||
})
|
||||
},
|
||||
cancelEdit(row) {
|
||||
row.注意事项 = row.原注意事项
|
||||
row.edit = false
|
||||
this.$message('取消修改')
|
||||
},
|
||||
confirmEdit(row) {
|
||||
updatestate(row.机床流水号, 2, row.注意事项).then(response => {
|
||||
this.selecttable()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -231,7 +231,11 @@ export default {
|
||||
methods: {
|
||||
// 导出
|
||||
exportUninquirySheet3() {
|
||||
if (this.machineNumberValue === null) {
|
||||
this.machineNumberValue = ''
|
||||
}
|
||||
searchtable55(this.machineNumberValue).then(res1 => {
|
||||
console.log(res1.data)
|
||||
if (res1.data.length === 0) {
|
||||
this.$message.error('请选择机床')
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user