合同显示机床组
This commit is contained in:
@@ -518,11 +518,10 @@ export default {
|
||||
<tbody id="tbody">
|
||||
<tr id="tableHead">
|
||||
<td>序号</td>
|
||||
<td>产品名称</td>
|
||||
<td>产品规格型号</td>
|
||||
<td>图号</td>
|
||||
<td>机床号-组号</td>
|
||||
<td>名称</td>
|
||||
<td>规格型号</td>
|
||||
<td>图号或型号</td>
|
||||
<td>规格</td>
|
||||
<td>数量</td>
|
||||
<td>单位</td>
|
||||
<td>单价</td>
|
||||
@@ -572,6 +571,8 @@ export default {
|
||||
const merge = []
|
||||
this.tableData1.map(v => {
|
||||
merge.push({
|
||||
机床图号: v.机床图号,
|
||||
组号: v.组号,
|
||||
图号: v.图号,
|
||||
名称: v.名称,
|
||||
规格: v.规格,
|
||||
@@ -584,18 +585,13 @@ export default {
|
||||
})
|
||||
})
|
||||
let mergeData = []
|
||||
mergeData = groupBy(merge, ['图号', '名称', '规格', '计量单位', '单价', '合计', '交货期', '备注'], (mergeData, v) => {
|
||||
mergeData = mergeData || 0
|
||||
mergeData += v.数量
|
||||
return mergeData
|
||||
})
|
||||
console.log(mergeData)
|
||||
mergeData = groupBy(merge, ['图号', '名称', '规格', '计量单位', '单价', '合计', '交货期', '备注'])
|
||||
// 放入新数据
|
||||
const tr = []
|
||||
for (let i = 0; i < mergeData.length; i++) {
|
||||
tr[i] = document.createElement('tr')
|
||||
tr[i].setAttribute('class', 'tableData')
|
||||
tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
|
||||
tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
|
||||
const tableHead = $('#tableHead')
|
||||
tableHead ? tableHead.after(tr[i]) : ''
|
||||
}
|
||||
@@ -610,15 +606,16 @@ export default {
|
||||
for (let j = 0; j < mergeData.length; j++) {
|
||||
if (document.getElementsByClassName('tableData')[j]) {
|
||||
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
|
||||
document.getElementsByClassName('tableData')[j].children[1].innerHTML = mergeData[j].机床图号_组号
|
||||
document.getElementsByClassName('tableData')[j].children[2].innerHTML = mergeData[j].名称
|
||||
document.getElementsByClassName('tableData')[j].children[3].innerHTML = mergeData[j].图号
|
||||
document.getElementsByClassName('tableData')[j].children[4].innerHTML = mergeData[j].名称
|
||||
document.getElementsByClassName('tableData')[j].children[5].innerHTML = mergeData[j].规格
|
||||
document.getElementsByClassName('tableData')[j].children[6].innerHTML = mergeData[j].数量
|
||||
document.getElementsByClassName('tableData')[j].children[7].innerHTML = mergeData[j].计量单位
|
||||
document.getElementsByClassName('tableData')[j].children[8].innerHTML = mergeData[j].单价
|
||||
document.getElementsByClassName('tableData')[j].children[9].innerHTML = (Number(mergeData[j].数量) * Number(mergeData[j].单价)).toFixed(2)
|
||||
document.getElementsByClassName('tableData')[j].children[10].innerHTML = mergeData[j].交货期
|
||||
document.getElementsByClassName('tableData')[j].children[11].innerHTML = mergeData[j].备注
|
||||
document.getElementsByClassName('tableData')[j].children[4].innerHTML = mergeData[j].规格
|
||||
document.getElementsByClassName('tableData')[j].children[5].innerHTML = mergeData[j].数量
|
||||
document.getElementsByClassName('tableData')[j].children[6].innerHTML = mergeData[j].计量单位
|
||||
document.getElementsByClassName('tableData')[j].children[7].innerHTML = mergeData[j].单价
|
||||
document.getElementsByClassName('tableData')[j].children[8].innerHTML = (Number(mergeData[j].数量) * Number(mergeData[j].单价)).toFixed(2)
|
||||
document.getElementsByClassName('tableData')[j].children[9].innerHTML = mergeData[j].交货期
|
||||
document.getElementsByClassName('tableData')[j].children[10].innerHTML = mergeData[j].备注
|
||||
}
|
||||
}
|
||||
this.actualTotal = this.actualTotal.toFixed(2)
|
||||
|
||||
Reference in New Issue
Block a user