+
+
+
+
+
+
+
+
+
+
+ 分总成编号：
+
-
-
- 测量位置：
-
-
-
- 订单号：
-
+ 零件名称：
+
@@ -80,37 +71,21 @@
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"
- @change="getOrderNumber();getTraceabilityCode();getBatchBarcode();getAssemblyNumber()"/>
+ @change="getTraceabilityCode();getBatchBarcode();getAssemblyNumber()"/>
批次条码：
-
-
-
- 是否合格：
-
-
-
- 测量项目：
-
-
-
+
+
+
+
+
+
+
+
+
+
- 查询
+ 查询
Excel
-
+
{{ scope.row.发动机号 }}
@@ -155,49 +130,44 @@
{{ scope.row.工序名称 }}
-
+
- {{ scope.row.测量位置 }}
+ {{ scope.row.零件数量 }}
-
+
- {{ scope.row.测量项目 }}
+ {{ scope.row.零件名称 }}
-
+
- {{ scope.row.测量值 }}
+ {{ scope.row.零件图号 }}
-
+
- {{ scope.row.测量单位 }}
+ {{ scope.row.物料号 }}
-
+
- {{ scope.row.理论值 }}
+ {{ scope.row.生产厂家 }}
-
+
- {{ scope.row.上限值 }}
+ {{ scope.row.物料条码 }}
-
+
- {{ scope.row.下限值 }}
+ {{ scope.row.物料条码批次 }}
-
+
- {{ scope.row.生产日期 }}
-
-
-
-
- {{ scope.row.合格标志 }}
+ {{ scope.row.操作时间 }}
@@ -237,19 +207,21 @@ export default {
engineType: [], // 机型
batchBarcode: [], // 批次条码
batchBarcodeValue: '', // 批次条码
+ partName: [], // 零件名称
+ partNameValue: '', // 零件名称
isQualified: [
{
label: '合格',
value: 1
}, {
label: '不合格',
- value: 0
+ value: 2
}, {
label: '全部',
- value: 2
+ value: 0
}
], // 是否合格
- isQualifiedValue: 2, // 是否合格
+ isQualifiedValue: 1, // 是否合格
dateTime: '', // 时间
loading: false, // 时间
tableData: [], // 时间
@@ -274,9 +246,9 @@ export default {
this.getEngineType()
},
mounted() {
- this.getOrderNumber()
this.getTraceabilityCode()
this.getAssemblyNumber()
+ setTimeout(() => { this.getPartName() }, 200)
},
methods: {
// 表格颜色变化
@@ -294,7 +266,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
this.ExecDatabase(Data).then(response => {
- if (response.data.length) { this.stationNumberValue = response.data[0].工位号 }
for (let i = 0; i < response.data.length; i++) {
this.stationNumber.push({
label: response.data[i].工位号,
@@ -303,7 +274,6 @@ export default {
}
}).then(() => {
this.getBatchBarcode()
- this.getMeasuringPosition()
})
},
// 机型
@@ -312,7 +282,6 @@ export default {
var param = []
var Data = this.CreateData('11', 'MES_基本变量_机型代码_查询 ', param)
this.ExecDatabase(Data).then(response => {
- if (response.data.length) { this.engineTypeValue = response.data[0].发动机型号 }
for (let i = 0; i < response.data.length; i++) {
this.engineType.push({
label: response.data[i].发动机型号,
@@ -321,21 +290,19 @@ export default {
}
})
},
- // 订单号
- getOrderNumber() {
- this.orderNumber = []
+ // 零件名称
+ getPartName() {
+ this.partName = []
var param = []
- param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
- param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
- // param[0] = ['开始时间', this.dateTime[0]]
- // param[1] = ['结束时间', this.dateTime[1]]
- var Data = this.CreateData('11', '测量数据发动机在线状态_订单号_查询 ', param)
+ param[0] = ['发动机型号', this.engineTypeValue]
+ param[1] = ['工位号', this.stationNumberValue]
+ var Data = this.CreateData('11', '电子看板装配零件_零件名称_初始化查询 ', param)
this.ExecDatabase(Data).then(response => {
- if (response.data.length) { this.orderNumberValue = response.data[0].订单号 }
for (let i = 0; i < response.data.length; i++) {
- this.orderNumber.push({
- label: response.data[i].订单号,
- value: response.data[i].订单号
+ this.partName.push({
+ label: response.data[i].零件名称,
+ value: response.data[i].零件名称,
+ ID: response.data[i].ID
})
}
})
@@ -358,7 +325,6 @@ export default {
param[6] = ['分线总线', 2]
var Data = this.CreateData('11', '初始化二维码_查询 ', param)
this.ExecDatabase(Data).then(response => {
- if (response.data.length) { this.traceabilityCode = response.data[0].物料条码 }
for (let i = 0; i < response.data.length; i++) {
this.traceabilityCodeArr.push({
label: response.data[i].物料条码,
@@ -385,7 +351,6 @@ export default {
param[6] = ['分线总线', 2]
var Data = this.CreateData('11', '测量数据合格索引_发动机号_发动机型号_查询 ', param)
this.ExecDatabase(Data).then(response => {
- if (response.data.length) { this.assemblyNumberValue = response.data[0].发动机号 }
for (let i = 0; i < response.data.length; i++) {
this.assemblyNumber.push({
label: response.data[i].发动机号,
@@ -402,34 +367,17 @@ export default {
// param[0] = ['开始时间', this.dateTime[0]]
// param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['工位号', this.stationNumberValue]
+ console.log(param, 'param')
var Data = this.CreateData('11', '物料数据分线_视图_物料条码批次号_查询 ', param)
this.ExecDatabase(Data).then(response => {
- if (response.data.length) { this.batchBarcodeValue = response.data[0].物料条码批次 }
for (let i = 0; i < response.data.length; i++) {
this.batchBarcode.push({
- label: response.data[i].物料条码批次,
- value: response.data[i].物料条码批次
+ label: response.data[i].物料条码,
+ value: response.data[i].物料条码
})
}
})
},
- getMeasuringPosition() {
- this.measuringPosition = []
- var param = []
- param[0] = ['工位号', this.stationNumberValue]
- var Data = this.CreateData('11', '质量数据查询_测量位置 ', param)
- this.ExecDatabase(Data).then(response => {
- if (response.data.length) { this.measuringPositionValue = response.data[0].测量位置 }
- for (let i = 0; i < response.data.length; i++) {
- this.measuringPosition.push({
- label: response.data[i].测量位置,
- value: response.data[i].测量位置
- })
- }
- }).then(() => {
- this.getMeasuringProject()
- })
- },
getMeasuringProject() {
this.measuringProject = []
var param = []
@@ -437,7 +385,6 @@ export default {
param[1] = ['测量位置', this.measuringPositionValue]
var Data = this.CreateData('11', '质量数据查询_测量项目 ', param)
this.ExecDatabase(Data).then(response => {
- if (response.data.length) { this.measuringProjectValue = response.data[0].测量项目 }
for (let i = 0; i < response.data.length; i++) {
this.measuringProject.push({
label: response.data[i].测量项目,
@@ -448,14 +395,13 @@ export default {
},
selectDate() {
this.tableData = []
- let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, measuringPositionValue_check, measuringProjectValue_check, traceabilityCode_check, orderNumberValue_check
+ let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, partNameValue_check, traceabilityCode_check, batchBarcodeValue_check
this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
this.assemblyNumberValue ? assemblyNumberValue_check = 1 : (assemblyNumberValue_check = 0, this.assemblyNumberValue = '')
this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
- this.measuringPositionValue ? measuringPositionValue_check = 1 : (measuringPositionValue_check = 0, this.measuringPositionValue = '')
- this.measuringProjectValue ? measuringProjectValue_check = 1 : (measuringProjectValue_check = 0, this.measuringProjectValue = '')
+ this.partNameValue ? partNameValue_check = 1 : (partNameValue_check = 0, this.partNameValue = '')
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
- this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
+ this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
var param = []
param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
@@ -467,20 +413,17 @@ export default {
param[5] = ['发动机号', this.assemblyNumberValue]
param[6] = ['工位号_ischeck', stationNumberValue_check]
param[7] = ['工位号', this.stationNumberValue]
- param[8] = ['测量位置_ischeck', measuringPositionValue_check]
- param[9] = ['测量位置', this.measuringPositionValue]
- param[10] = ['测量项目_ischeck', measuringProjectValue_check]
- param[11] = ['测量项目', this.measuringProjectValue]
- param[12] = ['订单号_ischeck', orderNumberValue_check]
- param[13] = ['订单号', this.orderNumberValue]
- param[14] = ['批次条码_ischeck', traceabilityCode_check]
- param[15] = ['批次条码', this.traceabilityCode]
- param[16] = ['合格标志', this.isQualifiedValue]
- param[17] = ['PageCurrent', this.pageCurrent]
- param[18] = ['PageSize', this.pageSize]
- param[19] = ['PageCount', '1111', 'int', '1']
- param[20] = ['ItemCount', '1111', 'int', '1']
- var Data = this.CreateData('11', '质量数据_发动机分线质量数据_综合查询', param)
+ param[8] = ['零件名称_ischeck', partNameValue_check]
+ param[9] = ['零件名称', this.partNameValue]
+ param[10] = ['二维码_ischeck', traceabilityCode_check]
+ param[11] = ['二维码', this.traceabilityCode]
+ param[12] = ['物料条码批次_ischeck', batchBarcodeValue_check]
+ param[13] = ['物料条码批次', this.batchBarcodeValue]
+ param[14] = ['PageCurrent', this.pageCurrent]
+ param[15] = ['PageSize', this.pageSize]
+ param[16] = ['PageCount', '1111', 'int', '1']
+ param[17] = ['ItemCount', '1111', 'int', '1']
+ var Data = this.CreateData('11', '物料数据分线_视图_查询', param)
this.ExecDatabase(Data).then(response => {
console.log(response, 66)
if (response.data.result.length !== 0) {
@@ -492,14 +435,13 @@ export default {
},
exportExcel() {
if (this.tableData.length !== 0) {
- let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, measuringPositionValue_check, measuringProjectValue_check, traceabilityCode_check, orderNumberValue_check
+ let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, partNameValue_check, traceabilityCode_check, batchBarcodeValue_check
this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
this.assemblyNumberValue ? assemblyNumberValue_check = 1 : (assemblyNumberValue_check = 0, this.assemblyNumberValue = '')
this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
- this.measuringPositionValue ? measuringPositionValue_check = 1 : (measuringPositionValue_check = 0, this.measuringPositionValue = '')
- this.measuringProjectValue ? measuringProjectValue_check = 1 : (measuringProjectValue_check = 0, this.measuringProjectValue = '')
+ this.partNameValue ? partNameValue_check = 1 : (partNameValue_check = 0, this.partNameValue = '')
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
- this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
+ this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
var param = []
param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
@@ -511,16 +453,13 @@ export default {
param[5] = ['发动机号', this.assemblyNumberValue]
param[6] = ['工位号_ischeck', stationNumberValue_check]
param[7] = ['工位号', this.stationNumberValue]
- param[8] = ['测量位置_ischeck', measuringPositionValue_check]
- param[9] = ['测量位置', this.measuringPositionValue]
- param[10] = ['测量项目_ischeck', measuringProjectValue_check]
- param[11] = ['测量项目', this.measuringProjectValue]
- param[12] = ['订单号_ischeck', orderNumberValue_check]
- param[13] = ['订单号', this.orderNumberValue]
- param[14] = ['批次条码_ischeck', traceabilityCode_check]
- param[15] = ['批次条码', this.traceabilityCode]
- param[16] = ['合格标志', this.isQualifiedValue]
- var Data = this.CreateData('2001', '质量数据分线_导出新', param)
+ param[8] = ['零件名称_ischeck', partNameValue_check]
+ param[9] = ['零件名称', this.partNameValue]
+ param[10] = ['二维码_ischeck', traceabilityCode_check]
+ param[11] = ['二维码', this.traceabilityCode]
+ param[12] = ['物料条码批次_ischeck', batchBarcodeValue_check]
+ param[13] = ['物料条码批次', this.batchBarcodeValue]
+ var Data = this.CreateData('2001', '物料数据分线查询_报表新', param)
this.exportExcel_NPOI(Data)
} else {
this.$message.warning('暂无数据')
diff --git a/src/views/QualityAssurance/MaterialDataQuery/index.vue b/src/views/QualityAssurance/MaterialDataQuery/index.vue
index 5cdc8d2..74269ba 100644
--- a/src/views/QualityAssurance/MaterialDataQuery/index.vue
+++ b/src/views/QualityAssurance/MaterialDataQuery/index.vue
@@ -22,14 +22,15 @@
size="mini"/>