diff --git a/src/api/Assembly/SparePartsOutStockRecord.js b/src/api/Assembly/SparePartsOutStockRecord.js
index 09a480be..535fd937 100644
--- a/src/api/Assembly/SparePartsOutStockRecord.js
+++ b/src/api/Assembly/SparePartsOutStockRecord.js
@@ -24,14 +24,14 @@ export function searchgroup(num) {
})
}
// 车间生产管理工艺_备料管理_备料出库记录_视图_查询数据
-export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, pageCurrent, pageSize) {
+export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, pageCurrent, pageSize, ordername, order) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_备料管理_备料出库记录_视图_查询数据',
- param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5,
+ param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5 + '&排序名称=' + ordername + '&排序方式=' + order,
Pagination: pageCurrent + '&' + pageSize
}
})
diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue
index 19e20790..63e5c46a 100644
--- a/src/views/Assembly/SparePartsOutStockRecord/index.vue
+++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue
@@ -40,33 +40,33 @@
type="date"
placeholder="选择日期"/>
- 查询
+ 查询
-
-
-
- {{ scope.row.项目名称 }}
-
-
+
+
+
+
+
+
{{ scope.row.机床图号 }}
-
+
{{ scope.row.零件图号 }}
-
+
{{ scope.row.零件名称 }}
-
+
{{ scope.row.出库时间 | formatTime }}
@@ -105,7 +105,7 @@ export default {
tableData1: [],
loading: false,
total: null, // 总条数
- pageSize: 20, // 每页显示条数
+ pageSize: 40, // 每页显示条数
pageCurrent: 1 // 后台获取页
}
},
@@ -116,6 +116,25 @@ export default {
this.initProject()
},
methods: {
+ sortChange(column) {
+ console.log(column + '-' + column.prop + '-' + column.order, 11111)
+ if (column.prop === '零件名称') {
+ this.ordername = 1
+ } else if (column.prop === '零件图号') {
+ this.ordername = 2
+ } else if (column.prop === '出库时间') {
+ this.ordername = 3
+ } else {
+ this.ordername = ''
+ }
+ console.log(this.ordername, 9990999)
+ if (column.order === 'ascending') {
+ this.order = 1
+ } else if (column.order === 'descending') { this.order = 2 } else {
+ this.order = ''
+ }
+ this.selecttable()
+ },
initProject() {
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -146,7 +165,7 @@ export default {
if (this.PartDrawingNumber !== '' && this.PartDrawingNumber !== null) { this.check3 = 1 } else { this.check3 = 0 }
if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
- selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => {
+ selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => {
this.tableData1 = response.data.rows
this.loading = false
this.total = response.data.total
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 595f97a0..ba2627e9 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -20,7 +20,6 @@
导出
- 导出
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 4201b2bf..38df33ef 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -43,7 +43,7 @@
新增
-
+
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 58c26498..0790b283 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -192,7 +192,6 @@
-