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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
chenjianan
2019-04-09 19:23:26 +08:00
parent 7bde7516be 1125c5add9
commit a8e6db24de
4 changed files with 70 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/ManufacturingCenter/ProjectPlanningManagement.js
View File

@@ -6,7 +6,7 @@ export function getProject() {
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: 'PDM_项目名称_查询数据' name: 'PDM_项目名称_查询数据_总计划'
} }
}) })
} }

2
src/api/ManufacturingCenter/ProjectPlanningQuery.js
View File

@@ -7,7 +7,7 @@ export function initProject() {
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: 'PDM_项目名称_查询数据_按时间排序' name: 'PDM_项目名称_查询数据_总计划'
} }
}) })
} }

5
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -255,7 +255,10 @@ export default {
this.checkBox = [] this.checkBox = []
this.tableData2 = [] this.tableData2 = []
searchTable2(row.工艺计划流水号).then(response => { searchTable2(row.工艺计划流水号).then(response => {
console.log(response.data) for (let i = 0; i < response.data.length; i++) {
console.log(response.data[i].工序顺序)
}
console.log(response.data, 1111111)
this.num1 = row.工艺计划流水号 this.num1 = row.工艺计划流水号
if (response.data.length === 0) { if (response.data.length === 0) {
this.loading0 = false this.loading0 = false

114
src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
View File

@@ -145,21 +145,21 @@
<td colspan="1" align="center">单价</td> <td colspan="1" align="center">单价</td>
<td colspan="1" align="center">总价</td> <td colspan="1" align="center">总价</td>
</tr> </tr>
</tbody> <!--</tbody>-->
</table> <!--</table>-->
<hr> <!--<hr>-->
<table id="2" cellspacing="0px" align="center" border width="100%" style=""> <!--<table id="2" cellspacing="0px" align="center" border width="100%" style="">-->
<tbody id="4"> <!--&lt;!&ndash;<tbody id="4">&ndash;&gt;-->
<tr id="tableHead" style="height: 40px"> <!--&lt;!&ndash;<tr id="tableHead" style="height: 40px">&ndash;&gt;-->
<td colspan="1" align="center">物料名称</td> <!--&lt;!&ndash;<td colspan="1" align="center">物料名称</td>&ndash;&gt;-->
<td colspan="1" align="center">物料规格</td> <!--&lt;!&ndash;<td colspan="1" align="center">物料规格</td>&ndash;&gt;-->
<td colspan="1" align="center">物料型号</td> <!--&lt;!&ndash;<td colspan="1" align="center">物料型号</td>&ndash;&gt;-->
<td colspan="1" align="center">交货期</td> <!--&lt;!&ndash;<td colspan="1" align="center">交货期</td>&ndash;&gt;-->
<td colspan="1" align="center">备注</td> <!--&lt;!&ndash;<td colspan="1" align="center">备注</td>&ndash;&gt;-->
<td colspan="1" align="center">数量</td> <!--&lt;!&ndash;<td colspan="1" align="center">数量</td>&ndash;&gt;-->
<td colspan="1" align="center">单价</td> <!--&lt;!&ndash;<td colspan="1" align="center">单价</td>&ndash;&gt;-->
<td colspan="1" align="center">总价</td> <!--&lt;!&ndash;<td colspan="1" align="center">总价</td>&ndash;&gt;-->
</tr> <!--&lt;!&ndash;</tr>&ndash;&gt;-->
</tbody> </tbody>
<tfoot> <tfoot>
<tr style="height: 40px"> <tr style="height: 40px">
@@ -172,7 +172,7 @@
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
<div style="line-height: 30px">以上价格为含税增值税价格，供方开具真实有效的16%增值税发票</div> <div style="line-height: 30px">以上价格为含税增值税价格，供方开具真实有效的{{ taxRate }}增值税发票</div>
<div id="23" style="line-height: 30px"/> <div id="23" style="line-height: 30px"/>
<table id="66" cellspacing="0px" align="center" border width="100%" style="margin-top: 30px"> <table id="66" cellspacing="0px" align="center" border width="100%" style="margin-top: 30px">
<tbody id="67"> <tbody id="67">
@@ -204,36 +204,36 @@
<th style="width: 15%">电话</th> <th style="width: 15%">电话</th>
<td style="width: 35%" colspan="3" align="center"/> <td style="width: 35%" colspan="3" align="center"/>
</tr> </tr>
<tr style="height: 35px"> <!--<tr style="height: 35px">-->
<th style="width: 15%">传真</th> <!--<th style="width: 15%">传真</th>-->
<td style="width: 35%" colspan="3" align="center"/> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<th style="width: 15%">传真</th> <!--<th style="width: 15%">传真</th>-->
<td style="width: 35%" colspan="3" align="center"/> <!--<td style="width: 35%" colspan="3" align="center"/>-->
</tr> <!--</tr>-->
<tr style="height: 35px"> <!--<tr style="height: 35px">-->
<th style="width: 15%">开户银行</th> <!--<th style="width: 15%">开户银行</th>-->
<td style="width: 35%" colspan="3" align="center"/> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<th style="width: 15%">开户银行</th> <!--<th style="width: 15%">开户银行</th>-->
<td style="width: 35%" colspan="3" align="center"/> <!--<td style="width: 35%" colspan="3" align="center"/>-->
</tr> <!--</tr>-->
<tr style="height: 35px"> <!--<tr style="height: 35px">-->
<th style="width: 15%">账号</th> <!--<th style="width: 15%">账号</th>-->
<td style="width: 35%" colspan="3" align="center"/> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<th style="width: 15%">账号</th> <!--<th style="width: 15%">账号</th>-->
<td style="width: 35%" colspan="3" align="center"/> <!--<td style="width: 35%" colspan="3" align="center"/>-->
</tr> <!--</tr>-->
<tr style="height: 35px"> <!--<tr style="height: 35px">-->
<th style="width: 15%">税号</th> <!--<th style="width: 15%">税号</th>-->
<td style="width: 35%" colspan="3" align="center"/> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<th style="width: 15%">税号</th> <!--<th style="width: 15%">税号</th>-->
<td style="width: 35%" colspan="3" align="center"/> <!--<td style="width: 35%" colspan="3" align="center"/>-->
</tr> <!--</tr>-->
<tr style="height: 35px"> <!--<tr style="height: 35px">-->
<th style="width: 15%">邮政编码</th> <!--<th style="width: 15%">邮政编码</th>-->
<td style="width: 35%" colspan="3" align="center"/> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<th style="width: 15%">邮政编码</th> <!--<th style="width: 15%">邮政编码</th>-->
<td style="width: 35%" colspan="3" align="center"/> <!--<td style="width: 35%" colspan="3" align="center"/>-->
</tr> <!--</tr>-->
</tbody> </tbody>
</table> </table>
<div style="line-height: 25px;margin-top: 10px">签订时间：____年__月__日</div> <div style="line-height: 25px;margin-top: 10px">签订时间：____年__月__日</div>
@@ -449,8 +449,13 @@ export default {
this.contract = row.采购合同编号 this.contract = row.采购合同编号
this.taxRate = row.税率 this.taxRate = row.税率
this.RMB = row.总金额_文本 this.RMB = row.总金额_文本
this.TotalAmount = row.总金额 if (row.总金额 === '0') {
this.TotalAmount1 = parseInt((row.含税总金额) * 100) / 100 this.TotalAmount = ''
this.TotalAmount1 = ''
} else {
this.TotalAmount = row.总金额
this.TotalAmount1 = parseInt((row.含税总金额) * 100) / 100
}
this.RMB1 = row.含税总金额_文本 this.RMB1 = row.含税总金额_文本
document.getElementById('23').innerText = this.textarea document.getElementById('23').innerText = this.textarea
this.contractValue = parseInt(row.采购合同流水号) this.contractValue = parseInt(row.采购合同流水号)
@@ -481,7 +486,7 @@ export default {
tr[i].setAttribute('class', 'tableData') tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
'<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
document.getElementById('tableHead').after(tr[i]) $('#tableHead').after(tr[i])
} }
for (let j = 0; j < this.returns.length; j++) { for (let j = 0; j < this.returns.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称 document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称
@@ -509,9 +514,18 @@ export default {
tr[i].setAttribute('class', 'tableData1') tr[i].setAttribute('class', 'tableData1')
tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
'<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
document.getElementById('tableHead1').after(tr[i]) $('#tableHead1').after(tr[i])
} }
for (let j = 0; j < this.returns1.length; j++) { for (let j = 0; j < this.returns1.length; j++) {
if (response.data[j].备注 === null) {
response.data[j].备注 = ''
}
if (response.data[j].单价 === 0) {
response.data[j].单价 = ''
}
if (response.data[j].金额 === 0) {
response.data[j].金额 = ''
}
document.getElementsByClassName('tableData1')[j].children[0].innerHTML = response.data[j].物料名称 document.getElementsByClassName('tableData1')[j].children[0].innerHTML = response.data[j].物料名称
document.getElementsByClassName('tableData1')[j].children[1].innerHTML = response.data[j].零件图号 document.getElementsByClassName('tableData1')[j].children[1].innerHTML = response.data[j].零件图号
document.getElementsByClassName('tableData1')[j].children[2].innerHTML = response.data[j].材料 document.getElementsByClassName('tableData1')[j].children[2].innerHTML = response.data[j].材料