a
This commit is contained in:
@@ -27,7 +27,6 @@
|
|||||||
:label="item.label"
|
:label="item.label"
|
||||||
:value="item.value"/>
|
:value="item.value"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
<!--<span class="demonstration">时间区间:</span>-->
|
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="startTime"
|
v-model="startTime"
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd"
|
||||||
@@ -43,7 +42,6 @@
|
|||||||
style="width: 160px"
|
style="width: 160px"
|
||||||
type="date"
|
type="date"
|
||||||
placeholder="选择结束日期"/>
|
placeholder="选择结束日期"/>
|
||||||
<!--<span>质检情况:</span>-->
|
|
||||||
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" style="width: 100px;margin-left: 10px" clearable>
|
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" style="width: 100px;margin-left: 10px" clearable>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in qualityInspection"
|
v-for="item in qualityInspection"
|
||||||
@@ -51,7 +49,6 @@
|
|||||||
:label="item.label"
|
:label="item.label"
|
||||||
:value="item.value"/>
|
:value="item.value"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
<!--<span>质检人员:</span>-->
|
|
||||||
<el-select v-model="personNum" filterable placeholder="质检人员" size="small" style="width: 130px;margin-left: 10px" clearable>
|
<el-select v-model="personNum" filterable placeholder="质检人员" size="small" style="width: 130px;margin-left: 10px" clearable>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in person"
|
v-for="item in person"
|
||||||
@@ -376,7 +373,7 @@
|
|||||||
</el-table-column>
|
</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="工序名称" prop="工艺名称" align="center">
|
<el-table-column label="工序名称" prop="工艺名称" align="center">
|
||||||
@@ -446,7 +443,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="零件数量" align="center" width="70px">
|
<el-table-column label="零件数量" align="center" width="70px">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.批次数量 }}
|
{{ scope.row.投产数 }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="工序名称" prop="工艺名称" align="center">
|
<el-table-column label="工序名称" prop="工艺名称" align="center">
|
||||||
@@ -770,8 +767,6 @@ export default {
|
|||||||
'id' // 人员编号
|
'id' // 人员编号
|
||||||
])
|
])
|
||||||
},
|
},
|
||||||
created() {
|
|
||||||
},
|
|
||||||
mounted() {
|
mounted() {
|
||||||
this.initProject()
|
this.initProject()
|
||||||
this.QualityType()
|
this.QualityType()
|
||||||
@@ -782,7 +777,6 @@ export default {
|
|||||||
// 表内编辑取消
|
// 表内编辑取消
|
||||||
cancel(row) {
|
cancel(row) {
|
||||||
row.edit = !row.edit
|
row.edit = !row.edit
|
||||||
console.log(row, 8888)
|
|
||||||
row.备注 = row.备注_原
|
row.备注 = row.备注_原
|
||||||
row.不合格数量 = row.不合格数量_原
|
row.不合格数量 = row.不合格数量_原
|
||||||
row.是否合格 = row.是否合格_原
|
row.是否合格 = row.是否合格_原
|
||||||
@@ -792,7 +786,6 @@ export default {
|
|||||||
},
|
},
|
||||||
// 表内编辑确定
|
// 表内编辑确定
|
||||||
confirmEdit(row) {
|
confirmEdit(row) {
|
||||||
console.log(this.$store.state.user.id, 787878)
|
|
||||||
confirmEdit(row.质检流水号, row.质检类型代码, row.零部件流水号, row.是否合格, row.数量, row.不合格数量, row.不合格原因, row.处理结果, row.备注, this.$store.state.user.id).then(response => {
|
confirmEdit(row.质检流水号, row.质检类型代码, row.零部件流水号, row.是否合格, row.数量, row.不合格数量, row.不合格原因, row.处理结果, row.备注, this.$store.state.user.id).then(response => {
|
||||||
if (response.data[0].result === '1') {
|
if (response.data[0].result === '1') {
|
||||||
this.$message.success('编辑成功')
|
this.$message.success('编辑成功')
|
||||||
@@ -805,8 +798,6 @@ export default {
|
|||||||
},
|
},
|
||||||
// 删除质检
|
// 删除质检
|
||||||
deleterow(row) {
|
deleterow(row) {
|
||||||
// this.plan = row.计划流水号
|
|
||||||
console.log(row, 4545)
|
|
||||||
this.$confirm('是否删除该质检记录?', '提示', {
|
this.$confirm('是否删除该质检记录?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
cancelButtonText: '取消',
|
cancelButtonText: '取消',
|
||||||
@@ -949,31 +940,6 @@ export default {
|
|||||||
var Data = this.CreateData('2001', '报表_质检管理_质量情况_查询数据', param)
|
var Data = this.CreateData('2001', '报表_质检管理_质量情况_查询数据', param)
|
||||||
this.exportExcel_NPOI(Data)
|
this.exportExcel_NPOI(Data)
|
||||||
},
|
},
|
||||||
// exportExcel1() {
|
|
||||||
// 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 }
|
|
||||||
// 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 }
|
|
||||||
// if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
|
|
||||||
// if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
|
|
||||||
// selecttable22(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.check8, this.personNum).then(response => {
|
|
||||||
// import('@/vendor/Export2Excel').then(excel => {
|
|
||||||
// const tHeader = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工序名称', '质检类型', '检验数量', '不合格数量', '不合格原因', '处理结果', '质检时间', '备注']
|
|
||||||
// const filterVal = ['禁用情况', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注']
|
|
||||||
// const list = response.data
|
|
||||||
// const data = this.formatJson(filterVal, list)
|
|
||||||
// excel.export_json_to_excel({
|
|
||||||
// header: tHeader,
|
|
||||||
// data,
|
|
||||||
// filename: '质检情况表',
|
|
||||||
// autoWidth: true,
|
|
||||||
// bookType: 'xlsx'
|
|
||||||
// })
|
|
||||||
// })
|
|
||||||
// })
|
|
||||||
// },
|
|
||||||
fetchData() {
|
fetchData() {
|
||||||
searchData().then(response => {
|
searchData().then(response => {
|
||||||
this.tableData10 = response.data
|
this.tableData10 = response.data
|
||||||
@@ -982,7 +948,6 @@ export default {
|
|||||||
},
|
},
|
||||||
fetchData1() {
|
fetchData1() {
|
||||||
searchData1().then(response => {
|
searchData1().then(response => {
|
||||||
console.log(response)
|
|
||||||
this.tableData20 = response.data
|
this.tableData20 = response.data
|
||||||
this.total2 = response.data.total
|
this.total2 = response.data.total
|
||||||
})
|
})
|
||||||
@@ -1070,7 +1035,6 @@ export default {
|
|||||||
searchTableDetail(type, num).then(response => {
|
searchTableDetail(type, num).then(response => {
|
||||||
this.gridData = response.data
|
this.gridData = response.data
|
||||||
})
|
})
|
||||||
console.log(type)
|
|
||||||
},
|
},
|
||||||
selecttable() {
|
selecttable() {
|
||||||
this.loading = true
|
this.loading = true
|
||||||
@@ -1094,7 +1058,6 @@ export default {
|
|||||||
this.$set(v, '不合格原因文本_原', v.不合格原因文本)
|
this.$set(v, '不合格原因文本_原', v.不合格原因文本)
|
||||||
this.$set(v, '不合格处理文本_原', v.不合格处理文本)
|
this.$set(v, '不合格处理文本_原', v.不合格处理文本)
|
||||||
})
|
})
|
||||||
console.log(this.tableData1, 8979)
|
|
||||||
this.loading = false
|
this.loading = false
|
||||||
this.total = parseInt(response.data.output[0].ItemCount)
|
this.total = parseInt(response.data.output[0].ItemCount)
|
||||||
})
|
})
|
||||||
@@ -1103,10 +1066,8 @@ export default {
|
|||||||
this.dialogFormVisible = true
|
this.dialogFormVisible = true
|
||||||
this.urls = []
|
this.urls = []
|
||||||
searchPic(row.质检流水号).then(response => {
|
searchPic(row.质检流水号).then(response => {
|
||||||
// this.URL = readFile + response.data[0].文件标识 + '.' + response.data[0].文件后缀
|
|
||||||
for (let i = 0; i < response.data.length; i++) {
|
for (let i = 0; i < response.data.length; i++) {
|
||||||
if (response.data[i].文件内容 !== null) {
|
if (response.data[i].文件内容 !== null) {
|
||||||
// this.urls.push(readFile + response.data[i].文件标识 + '.' + response.data[i].文件后缀)
|
|
||||||
this.urls.push('data:image/png;base64,' + response.data[i].文件内容)
|
this.urls.push('data:image/png;base64,' + response.data[i].文件内容)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1130,24 +1091,6 @@ export default {
|
|||||||
this.pageCurrent = val
|
this.pageCurrent = val
|
||||||
this.selecttable()
|
this.selecttable()
|
||||||
}
|
}
|
||||||
// handleSizeChange1(val) {
|
|
||||||
// this.pageCurrent1 = 1
|
|
||||||
// this.pageSize1 = val
|
|
||||||
// this.fetchData()
|
|
||||||
// },
|
|
||||||
// handleCurrentChange1(val) {
|
|
||||||
// this.pageCurrent1 = val
|
|
||||||
// this.fetchData()
|
|
||||||
// },
|
|
||||||
// handleSizeChange2(val) {
|
|
||||||
// this.pageCurrent2 = 1
|
|
||||||
// this.pageSize2 = val
|
|
||||||
// this.fetchData1()
|
|
||||||
// },
|
|
||||||
// handleCurrentChange2(val) {
|
|
||||||
// this.pageCurrent2 = val
|
|
||||||
// this.fetchData1()
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user