diff --git a/src/api/Assembly/AssemblyQualityInspection.js b/src/api/Assembly/AssemblyQualityInspection.js
index 7644efc4..b6647b03 100644
--- a/src/api/Assembly/AssemblyQualityInspection.js
+++ b/src/api/Assembly/AssemblyQualityInspection.js
@@ -35,7 +35,7 @@ export function searchgroup(num) {
})
}
// 质检管理_质量情况_查询数据
-export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, pageCurrent, pageSize) {
+export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4) {
return request({
url: '',
method: 'post',
@@ -43,8 +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,
- Pagination: pageCurrent + '&' + pageSize
+ '&质检情况_check=' + check4 + '&质检情况=' + value4
}
})
}
diff --git a/src/api/Outsourcing/OutsourcingQCSearch.js b/src/api/Outsourcing/OutsourcingQCSearch.js
index 53d65092..762e3e5b 100644
--- a/src/api/Outsourcing/OutsourcingQCSearch.js
+++ b/src/api/Outsourcing/OutsourcingQCSearch.js
@@ -8,8 +8,7 @@ export function searchTable1(...params) {
data: {
type: '1',
name: '车间生产管理_外协到货单_查询数据',
- param: `外协到货单号_check=${params[2]}&外协到货单号=${params[3]}&外协厂家_check=${params[4]}&外协厂家=${params[5]}`,
- Pagination: params[0] + '&' + params[1]
+ param: `外协到货单号_check=${params[0]}&外协到货单号=${params[1]}&外协厂家_check=${params[2]}&外协厂家=${params[3]}`
}
})
}
diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index 66f033bf..50c4c7f8 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -2,7 +2,7 @@
-
+
-
+
-
+
-
+
未检验
@@ -84,16 +84,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -119,10 +119,10 @@ export default {
label: '不合格'
}
],
- tableData1: [],
- total: 0, // 总条数
- pageSize: 10, // 每页显示条数
- pageCurrent: 1 // 后台获取页
+ tableData1: []
+ // total: 0, // 总条数
+ // pageSize: 10, // 每页显示条数
+ // pageCurrent: 1 // 后台获取页
}
},
created() {
@@ -198,23 +198,20 @@ export default {
if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
if (this.TestValue !== '' && this.TestValue !== null) { this.check3 = 1 } else { this.check3 = 0 }
if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
- selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue, this.pageCurrent, this.pageSize).then(response => {
- console.log(response.data.rows, 111)
- this.tableData1 = response.data.rows
- this.total = response.data.total
- console.log(this.tableData1)
+ selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => {
+ this.tableData1 = response.data
})
- },
- // 分页
- handleSizeChange(val) {
- this.pageCurrent = 1
- this.pageSize = val
- this.selecttable()
- },
- handleCurrentChange(val) {
- this.pageCurrent = val
- this.selecttable()
}
+ // 分页
+ // handleSizeChange(val) {
+ // this.pageCurrent = 1
+ // this.pageSize = val
+ // this.selecttable()
+ // },
+ // handleCurrentChange(val) {
+ // this.pageCurrent = val
+ // this.selecttable()
+ // }
}
}
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 530cbc17..442fb7c0 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -2,8 +2,8 @@
- 机床编号:
-
+
+
{{ item.name }}
- 组号:
-
+
+
- 制造部采购
+ 制造部采购
- 采购部门采购
+ 采购部门采购
- 车间生产
+ 车间生产
diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
index fefbaab7..e6caf6e8 100644
--- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue
+++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
@@ -2,9 +2,9 @@
-
+
-
+
查询
@@ -24,18 +24,18 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -171,9 +171,9 @@ export default {
orderNumber: '',
outsourcingSupplier: '',
tableData1: [],
- pageCurrent1: 1,
- pageSize1: 10,
- total1: 0,
+ // pageCurrent1: 1,
+ // pageSize1: 10,
+ // total1: 0,
tableData2: [],
pageCurrent2: 1,
pageSize2: 10,
@@ -248,20 +248,20 @@ export default {
let check1, check2
this.orderNumber ? check1 = 1 : check1 = 0
this.outsourcingSupplier ? check2 = 1 : check2 = 0
- searchTable1(this.pageCurrent1, this.pageSize1, check1, this.orderNumber, check2, this.outsourcingSupplier).then(response => {
- this.tableData1 = response.data.rows
+ searchTable1(check1, this.orderNumber, check2, this.outsourcingSupplier).then(response => {
+ this.tableData1 = response.data
this.total1 = response.data.total
})
},
- handleSizeChange1(val) {
- this.pageSize1 = val
- this.pageCurrent1 = 1
- this.searchTable1()
- },
- handleCurrentChange1(val) {
- this.pageCurrent1 = val
- this.searchTable1()
- },
+ // handleSizeChange1(val) {
+ // this.pageSize1 = val
+ // this.pageCurrent1 = 1
+ // this.searchTable1()
+ // },
+ // handleCurrentChange1(val) {
+ // this.pageCurrent1 = val
+ // this.searchTable1()
+ // },
searchTable2(row) {
searchTable2(row.外协到货单流水号).then(response => {
this.tableData2 = response.data