This commit is contained in:
liushuai
2020-03-23 17:59:00 +08:00
parent cb61a19abe
commit 94e5561fdf
20 changed files with 942 additions and 527 deletions

View File

@@ -171,8 +171,10 @@ export default {
},
// 查询表格数据
searchTable() {
if (this.machineNameValue) {
if (this.machineNameValue || this.partName || this.outTime) {
this.loading = true
let check
this.machineNameValue ? check = 1 : check = 0
if (this.partName !== '' && this.partName !== null) {
this.partNamecheck = true
} else {
@@ -181,13 +183,13 @@ export default {
let check7, check8
this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
this.all === false ? check8 = 0 : check8 = 1
searchtable(this.machineNameValue, this.partNamecheck, this.partName, check7, this.outTime[0], this.outTime[1], check8, this.pageCurrent, this.pageSize).then(response => {
searchtable(check, this.machineNameValue, this.partNamecheck, this.partName, check7, this.outTime[0], this.outTime[1], check8, this.pageCurrent, this.pageSize).then(response => {
this.tableData = response.data.rows
this.total = response.data.total
this.loading = false
})
} else {
this.$message.warning('请先选择机床')
this.$message.warning('请输入筛选条件')
}
},
tableRowClassName({ row }) {