This commit is contained in:
liushuai
2019-10-18 14:09:26 +08:00
25 changed files with 338 additions and 223 deletions

View File

@@ -30,17 +30,17 @@
<el-card>
<el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50px"/>
<el-table-column label="合同编号" width="120px" align="center" show-overflow-tooltip prop="合同编号">
<el-table-column label="合同编号" sortable prop="合同编号" width="120px" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.合同编号 }}
</template>
</el-table-column>
<el-table-column label="名称" width="150px" align="center" show-overflow-tooltip prop="物料名称">
<el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip >
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="规格型号" width="180px" align="center" show-overflow-tooltip>
<el-table-column label="规格型号" sortable prop="规格型号" width="180px" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 ? scope.row.物料规格 : '-' + '&nbsp;' + scope.row.物料型号 ? scope.row.零件图号 : '-' }}
</template>
@@ -317,7 +317,17 @@ export default {
this.$set(v, '本次到货数量', v.数量 - v.到货数量)
return v
})
this.table1 = res.data
// this.table1 = res.data
res.data.map(v => {
this.table1.push({
合同编号: v.合同编号,
物料名称: v.物料名称,
规格型号: v.物料规格 + v.物料型号,
数量: v.数量,
到货数量: v.到货数量,
本次到货数量: v.本次到货数量
})
})
} else if (this.TypeValue === 3) {
if (this.contractValue) { this.contractValue_check = 1 } else { this.contractValue_check = 0 }
const param = {