meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合同显示机床组

Browse Source
This commit is contained in:
chenjianan
2019-06-04 17:50:00 +08:00
parent ba5580b3d7
commit 9a4416cdf4
3 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/tool.js
View File

@@ -106,7 +106,7 @@ export function sleep(time) {
})
}
export function groupBy(datas, keys, callBack) {
export function groupBy(datas, keys) {
const list = datas || []
const groups = []
const result = []
@@ -125,8 +125,10 @@ export function groupBy(datas, keys, callBack) {
}
groups.push(group)
}
group.key.数量 = callBack(group.data, v)
group.data = callBack(group.data, v)
group.data1 = group.data1 || 0
group.key.数量 = group.data1 += v.数量
group.data2 = group.data2 || ''
group.key.机床图号_组号 = group.data2 += v.机床图号 + '-' + v.组号.split('组')[0] + ';'
})
groups.map(v => {
result.push(v.key)

8
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -46,7 +46,7 @@
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent11=1;pageSize11=10;total11=0;searchTable11()">查询</el-button>
@click="pageCurrent11=1;pageSize11=150;total11=0;searchTable11()">查询</el-button>
<el-button
type="warning"
size="small"
@@ -224,7 +224,7 @@
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent12=1;pageSize12=10;total12=0;searchTable12()">查询</el-button>
@click="pageCurrent12=1;pageSize12=150;total12=0;searchTable12()">查询</el-button>
<el-button
type="warning"
size="small"
@@ -877,11 +877,11 @@ export default {
tableData11: [], // 外购件列表
total11: 0,
pageCurrent11: 1,
pageSize11: 10,
pageSize11: 150,
tableData12: [], // 基本件列表
total12: 0,
pageCurrent12: 1,
pageSize12: 10,
pageSize12: 150,
remarkFilters: [],
supplierFilters: [],
tableData2: [], // 询价单列表

35
src/views/PurchasingCenter/CreatePurchaseContract/index.vue
View File

@@ -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)