刘璐珈

This commit is contained in:
Vergil
2020-03-12 09:52:18 +08:00
parent 296df85e78
commit f06e221a61
7 changed files with 140 additions and 93 deletions

View File

@@ -3,7 +3,7 @@
<el-card style="width: 100%">
<div slot="header">
<el-row>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable style="width: 120px" @change="machineChange">
<el-select v-show="PartType !== '离线采购件'" v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable style="width: 120px;margin-left: 5px" @change="machineChange">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -13,7 +13,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-select v-model="groupNumberValue" placeholder="组号" size="small" style="width: 120px" clearable>
<el-select v-show="PartType !== '离线采购件'" v-model="groupNumberValue" placeholder="组号" size="small" style="width: 120px" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
@@ -22,11 +22,13 @@
</el-select>
<el-input v-model="Name" placeholder="物料名称、规格、型号" clearable style="width: 200px" size="small"/>
<el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=300;pageCurrent1=1;pageSize1=300;pageCurrent2=1;pageSize2=300;pageCurrent4=1;pageSize4=20;searchTable()">查询</el-button>
<el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchTable()">查询</el-button>
<el-switch
v-model="PickingValue"
active-color="#13ce66"
inactive-color="#ff4949"
style="margin-left: 5px"/>
style="margin-left: 5px"
@change="searchTable()"/>
<span>已领用</span>
</el-row>
</div>
@@ -578,7 +580,13 @@ export default {
},
// 查三表
searchTable() {
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
console.log(this.PartType, this.machineNumberValue)
if (this.PartType === '离线采购件') {
this.machineNumberValue = ''
this.groupNumberValue = ''
this.searchTable4()
}
if ((this.machineNumberValue !== '' && this.machineNumberValue !== null) || this.PartType === '离线采购件') {
this.multipleSelection = []
this.multipleSelection1 = []
if (this.PartType === '标准件') {
@@ -587,8 +595,6 @@ export default {
this.searchTable1()
} else if (this.PartType === '基本件') {
this.searchTable2()
} else if (this.PartType === '离线采购件') {
this.searchTable4()
}
} else {
this.$message.warning('请选择机床后再查询')
@@ -627,16 +633,17 @@ export default {
if (this.PickingValue === false) {
this.loading1 = true
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent1, this.pageSize1, 2).then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
console.log(response, 2)
this.tableData1 = response.data.rows
this.total1 = response.data.total
this.loading1 = false
}).catch(() => {
this.loading1 = false
})
} else {
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent1, this.pageSize1, 2).then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.tableData1 = response.data.rows
this.total1 = response.data.total
})
}
},
@@ -650,16 +657,16 @@ export default {
if (this.PickingValue === false) {
this.loading2 = true
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent2, this.pageSize2, 3).then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.tableData2 = response.data.rows
this.total2 = response.data.total
this.loading2 = false
}).catch(() => {
this.loading2 = false
})
} else {
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent2, this.pageSize2, 3).then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.tableData2 = response.data.rows
this.total2 = response.data.total
})
}
},