加工进度修改增加时间段查询

This commit is contained in:
caoxinyu
2019-03-12 15:45:46 +08:00
parent fa7067b93f
commit 5759ace0e4
2 changed files with 33 additions and 3 deletions

View File

@@ -34,14 +34,14 @@ export function getGroups(stepNumber) {
})
}
export function getTable(stepNumber, a, b, c, d, e, f, g, pageCurrent, pageSize) {
export function getTable(stepNumber, a, b, c, d, e, f, g, h, i, j, k, 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&单件是否外协=0',
param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0&开始时间_check=' + h + '&开始时间=' + i + '&结束时间_check=' + j + '&结束时间=' + k,
Pagination: pageCurrent + '&' + pageSize
}
})

View File

@@ -24,6 +24,22 @@
</el-select>
<span>零件号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
<span class="demonstration">计划下达时间:</span>
<el-date-picker
v-model="startTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 160px"
type="date"
placeholder="选择日期"/>
<span class="demonstration">-</span>
<el-date-picker
v-model="endTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 160px"
type="date"
placeholder="选择日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
</el-row>
</el-card>
@@ -366,6 +382,10 @@ export default {
person: '',
title: '',
Num: '',
startTime: '',
endTime: '',
startTime_check: 0,
endTime_check: 0,
form: {
人员: '',
考勤编号: '',
@@ -525,6 +545,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.零件名称 = []
@@ -538,7 +568,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, 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, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => {
if (response.data.rows.length === 0) {
this.listLoading1 = false
} else {