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-05-31 20:26:44 +08:00
parent 3c3d0d1b99
commit 3c701067d7
3 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,6 +457,11 @@
<el-input v-model="scope.row.数量" size="mini" style="width:100%"/> <el-input v-model="scope.row.数量" size="mini" style="width:100%"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单位" align="center" width="60">
<template slot-scope="scope">
{{ scope.row.计量单位 }}
</template>
</el-table-column>
<el-table-column label="询价备注" align="center" min-width="120"> <el-table-column label="询价备注" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.备注" size="mini" style="width:100%"/> <el-input v-model="scope.row.备注" size="mini" style="width:100%"/>
@@ -503,7 +508,8 @@
<td width="16.6%" colspan="2">图号</td> <td width="16.6%" colspan="2">图号</td>
<td width="16.6%" colspan="2">名称</td> <td width="16.6%" colspan="2">名称</td>
<td width="16.6%" colspan="2">规格</td> <td width="16.6%" colspan="2">规格</td>
<td width="16.6%" colspan="2">数量</td> <td width="8.3%">数量</td>
<td width="8.3%">单位</td>
<td width="16.6%" colspan="2">单价</td> <td width="16.6%" colspan="2">单价</td>
<td colspan="3">备注</td> <td colspan="3">备注</td>
</tr> </tr>
@@ -1364,7 +1370,7 @@ export default {
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
tr[i] = document.createElement('tr') tr[i] = document.createElement('tr')
tr[i].setAttribute('class', 'tableData') tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>` tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
$('#tablehead').after(tr[i]) $('#tablehead').after(tr[i])
} }
for (let j = 0; j < res.data.length; j++) { for (let j = 0; j < res.data.length; j++) {
@@ -1373,7 +1379,8 @@ export default {
document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称 document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格 document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量 document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
document.getElementsByClassName('tableData')[j].children[6].innerHTML = res.data[j].备注 document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
} }
document.getElementById('inquirySheetNum').innerHTML = this.orderExport document.getElementById('inquirySheetNum').innerHTML = this.orderExport
document.getElementById('supplier').innerHTML = '' document.getElementById('supplier').innerHTML = ''
@@ -1422,7 +1429,7 @@ export default {
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
tr[i] = document.createElement('tr') tr[i] = document.createElement('tr')
tr[i].setAttribute('class', 'tableData') tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>` tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
$('#tablehead').after(tr[i]) $('#tablehead').after(tr[i])
} }
for (let j = 0; j < res.data.length; j++) { for (let j = 0; j < res.data.length; j++) {
@@ -1431,7 +1438,8 @@ export default {
document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称 document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格 document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量 document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
document.getElementsByClassName('tableData')[j].children[6].innerHTML = res.data[j].备注 document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
} }
document.getElementById('inquirySheetNum').innerHTML = this.orderExport document.getElementById('inquirySheetNum').innerHTML = this.orderExport
document.getElementById('supplier').innerHTML = '' document.getElementById('supplier').innerHTML = ''

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

@@ -122,6 +122,11 @@
{{ scope.row.数量 }} {{ scope.row.数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单位" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.计量单位 }}
</template>
</el-table-column>
<el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" width="120"> <el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-show="hasTax==='未税'" v-model="scope.row.未税单价" size="mini" style="width:100%"/> <el-input v-show="hasTax==='未税'" v-model="scope.row.未税单价" size="mini" style="width:100%"/>
@@ -361,6 +366,7 @@ export default {
名称: response.data[i].组件零件流水号 ? response.data[i].物料名称 : response.data[i].零件名称, 名称: response.data[i].组件零件流水号 ? response.data[i].物料名称 : response.data[i].零件名称,
规格: response.data[i].组件零件流水号 ? response.data[i].物料规格 : response.data[i].规格, 规格: response.data[i].组件零件流水号 ? response.data[i].物料规格 : response.data[i].规格,
数量: response.data[i].数量, 数量: response.data[i].数量,
计量单位: response.data[i].计量单位,
未税单价: 0, 未税单价: 0,
未税总额: 0, 未税总额: 0,
含税单价: 0, 含税单价: 0,
@@ -518,7 +524,8 @@ export default {
<td>名称</td> <td>名称</td>
<td>规格型号</td> <td>规格型号</td>
<td>数量</td> <td>数量</td>
<td >单价</td> <td>单位</td>
<td>单价</td>
<td>合计</td> <td>合计</td>
<td>交货时间</td> <td>交货时间</td>
<td>备注</td> <td>备注</td>
@@ -569,6 +576,7 @@ export default {
名称: v.名称, 名称: v.名称,
规格: v.规格, 规格: v.规格,
数量: Number(v.数量), 数量: Number(v.数量),
计量单位: v.计量单位,
单价: this.hasTax === '含税' ? v.含税单价 : v.未税单价, 单价: this.hasTax === '含税' ? v.含税单价 : v.未税单价,
合计: (Number(v.数量) * (this.hasTax === '含税' ? Number(v.含税单价) : Number(v.未税单价))).toFixed(2), 合计: (Number(v.数量) * (this.hasTax === '含税' ? Number(v.含税单价) : Number(v.未税单价))).toFixed(2),
交货期: v.交货期 ? v.交货期.split(' ')[0] : '', 交货期: v.交货期 ? v.交货期.split(' ')[0] : '',
@@ -576,7 +584,7 @@ export default {
}) })
}) })
let mergeData = [] let mergeData = []
mergeData = groupBy(merge, ['图号', '名称', '规格', '单价', '合计', '交货期', '备注'], (mergeData, v) => { mergeData = groupBy(merge, ['图号', '名称', '规格', '计量单位', '单价', '合计', '交货期', '备注'], (mergeData, v) => {
mergeData = mergeData || 0 mergeData = mergeData || 0
mergeData += v.数量 mergeData += v.数量
return mergeData return mergeData
@@ -587,7 +595,7 @@ export default {
for (let i = 0; i < mergeData.length; i++) { for (let i = 0; i < mergeData.length; i++) {
tr[i] = document.createElement('tr') tr[i] = document.createElement('tr')
tr[i].setAttribute('class', 'tableData') 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>' 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>'
const tableHead = $('#tableHead') const tableHead = $('#tableHead')
tableHead ? tableHead.after(tr[i]) : '' tableHead ? tableHead.after(tr[i]) : ''
} }
@@ -606,10 +614,11 @@ export default {
document.getElementsByClassName('tableData')[j].children[4].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[5].innerHTML = mergeData[j].规格
document.getElementsByClassName('tableData')[j].children[6].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[7].innerHTML = mergeData[j].计量单位
document.getElementsByClassName('tableData')[j].children[8].innerHTML = (Number(mergeData[j].数量) * Number(mergeData[j].单价)).toFixed(2) document.getElementsByClassName('tableData')[j].children[8].innerHTML = mergeData[j].单价
document.getElementsByClassName('tableData')[j].children[9].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[10].innerHTML = mergeData[j].交货期
document.getElementsByClassName('tableData')[j].children[11].innerHTML = mergeData[j].备注
} }
} }
this.actualTotal = this.actualTotal.toFixed(2) this.actualTotal = this.actualTotal.toFixed(2)

9
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -371,6 +371,11 @@
<el-input v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/> <el-input v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单位" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.计量单位 }}
</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"> <template slot-scope="scope">
{{ scope.row.参考价格 }} {{ scope.row.参考价格 }}
@@ -383,7 +388,7 @@
</el-table-column> </el-table-column>
<el-table-column label="合计" align="center" min-width="100" prop="合计"> <el-table-column label="合计" align="center" min-width="100" prop="合计">
<template slot-scope="scope"> <template slot-scope="scope">
{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }} {{ (Number(scope.row.单价||0) * Number(scope.row.数量||0)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求"> <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
@@ -1130,7 +1135,7 @@ export default {
if (index === 0) { if (index === 0) {
sums[index] = '总价' sums[index] = '总价'
} else if (index === 7) { } else if (index === 7) {
const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量']))) const values = data.map(item => Number(Number(item['单价']) * Number(item['数量'])))
if (!values.every(value => isNaN(value))) { if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)