diff --git a/src/api/ManufacturingCenter/ProcessingStatus.js b/src/api/ManufacturingCenter/ProcessingStatus.js
index c3140183..bd59c21e 100644
--- a/src/api/ManufacturingCenter/ProcessingStatus.js
+++ b/src/api/ManufacturingCenter/ProcessingStatus.js
@@ -36,14 +36,14 @@ export function getGroups(stepNumber) {
})
}
-export function getTable(stepNumber, a, b, c, d, e, f, g, i, pageCurrent, pageSize) {
+export function getTable(stepNumber, a, b, c, d, e, f, g, i, j, k, l, m, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程',
- param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=' + i + '=string&考核状态=6=int',
+ param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=' + i + '=string&考核状态=6=int&开始时间_check=' + j + '&开始时间=' + k + '&结束时间_check=' + l + '&结束时间=' + m,
Pagination: pageCurrent + '&' + pageSize
}
})
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 52ddebc1..e1c418f4 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -23,6 +23,22 @@
零件图号:
+ 计划下达时间:
+
+ -
+
查询
@@ -298,6 +314,10 @@ import { getNames, getMachines, getGroups, getTable, getTable2 } from '@/api/Man
export default {
data() {
return {
+ startTime: '',
+ endTime: '',
+ startTime_check: 0,
+ endTime_check: 0,
liushuihao: '',
// value2: null,
radioList: '0',
@@ -428,6 +448,16 @@ export default {
} else {
this.checkbox_number = true
}
+ 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
+ }
this.tableData1 = []
this.零件图号 = []
this.零件名称 = []
@@ -439,7 +469,7 @@ export default {
this.colorCode = [[]]
this.realDate = [[]]
this.length = 0
- getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, 1, this.pageCurrent, this.pageSize).then(response => {
+ getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, 1, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => {
this.length = parseInt(response.data.total)
for (let i = 0; i < response.data.rows.length; i++) { // 声明二维数组
this.零件图号.push(response.data.rows[i].零件图号)