This commit is contained in:
chenjianan
2019-05-21 20:13:19 +08:00
parent 8aded86549
commit bbbc1d04ee
4 changed files with 140 additions and 26 deletions

View File

@@ -69,9 +69,9 @@
<el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template>
</el-table-column>
<el-table-column label="计划到货时间" align="center" min-width="100">
<el-table-column label="任务分配时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料计划到货时间.split(' ')[0] }}
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
</el-table-column>
<!--<el-table-column label="项目名称" align="center" min-width="100">-->
@@ -144,12 +144,12 @@
{{ Number(scope.row.滞货数量) }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="100">
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="supplier">
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="供货商">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
@@ -159,7 +159,7 @@
<div class="block">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 50, 100, 150]"
:page-size="pageSize11"
:total="total11"
style="display:inline-block;width:50%"
@@ -236,9 +236,9 @@
<el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template>
</el-table-column>
<el-table-column label="计划到货时间" align="center" min-width="100">
<el-table-column label="任务分配时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料计划到货时间.split(' ')[0] }}
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="100">
@@ -281,12 +281,12 @@
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="100">
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="supplier">
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="供货商">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
@@ -296,7 +296,7 @@
<div class="block">
<el-pagination
:current-page="pageCurrent12"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 50, 100, 150]"
:page-size="pageSize12"
:total="total12"
style="display:inline-block;width:50%"
@@ -806,7 +806,8 @@ export default {
total12: 0,
pageCurrent12: 1,
pageSize12: 10,
supplierFilters: [{ text: '', value: '' }],
remarkFilters: [],
supplierFilters: [],
tableData2: [], // 询价单列表
total2: 0,
pageCurrent2: 1,
@@ -1026,6 +1027,9 @@ export default {
selectable(row, index) { // 控制某行是否可选
return (parseInt(row.询价状态编号) === 1 && parseInt(row.采购状态编号) === 1 && parseInt(row.是否确认) === 1) // 未询价&&未采购&&确认物料修改
},
filterHandler0(value, row) { // 筛选备注
return row['备注'] === value
},
filterHandler(value, row) { // 筛选供货商
return row['供货商'] === value
},
@@ -1040,6 +1044,18 @@ export default {
searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => {
this.tableData11 = response.data.rows
this.total11 = response.data.total
const remark = []
const supplier = []
this.remarkFilters = []
this.supplierFilters = []
response.data.rows.map(v => {
if (!remark.includes(v.备注)) {
remark.push(v.备注)
supplier.push(v.供货商)
this.remarkFilters.push({ text: v.备注, value: v.备注 })
this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
}
})
})
},
handleSizeChange11(val) { // 标准件和外购件列表分页
@@ -1062,6 +1078,18 @@ export default {
searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []
const supplier = []
this.remarkFilters = []
this.supplierFilters = []
response.data.rows.map(v => {
if (!remark.includes(v.备注)) {
remark.push(v.备注)
supplier.push(v.供货商)
this.remarkFilters.push({ text: v.备注, value: v.备注 })
this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
}
})
})
},
handleSizeChange12(val) { // 基本件列表分页