diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagement.js b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
index 3ef4db21..7cc2b39d 100644
--- a/src/api/ManufacturingCenter/ProjectPlanningManagement.js
+++ b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
@@ -6,7 +6,7 @@ export function getProject() {
method: 'post',
data: {
type: '1',
- name: 'PDM_项目名称_查询数据'
+ name: 'PDM_项目名称_查询数据_总计划'
}
})
}
diff --git a/src/api/ManufacturingCenter/ProjectPlanningQuery.js b/src/api/ManufacturingCenter/ProjectPlanningQuery.js
index 4007b0b0..44ebd850 100644
--- a/src/api/ManufacturingCenter/ProjectPlanningQuery.js
+++ b/src/api/ManufacturingCenter/ProjectPlanningQuery.js
@@ -7,7 +7,7 @@ export function initProject() {
method: 'post',
data: {
type: '1',
- name: 'PDM_项目名称_查询数据_按时间排序'
+ name: 'PDM_项目名称_查询数据_总计划'
}
})
}
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 2fd68a08..0c822d1d 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -255,7 +255,10 @@ export default {
this.checkBox = []
this.tableData2 = []
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.工艺计划流水号
if (response.data.length === 0) {
this.loading0 = false
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index fde4c1e2..f63b562b 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -145,21 +145,21 @@
| 单价 |
总价 |
-
-
-
-
-
-
- | 物料名称 |
- 物料规格 |
- 物料型号 |
- 交货期 |
- 备注 |
- 数量 |
- 单价 |
- 总价 |
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -172,7 +172,7 @@
- 以上价格为含税增值税价格，供方开具真实有效的16%增值税发票
+ 以上价格为含税增值税价格，供方开具真实有效的{{ taxRate }}增值税发票
@@ -204,36 +204,36 @@
| 电话 |
|
-
- | 传真 |
- |
- 传真 |
- |
-
-
- | 开户银行 |
- |
- 开户银行 |
- |
-
-
- | 账号 |
- |
- 账号 |
- |
-
-
- | 税号 |
- |
- 税号 |
- |
-
-
- | 邮政编码 |
- |
- 邮政编码 |
- |
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
签订时间：____年__月__日
@@ -449,8 +449,13 @@ export default {
this.contract = row.采购合同编号
this.taxRate = row.税率
this.RMB = row.总金额_文本
- this.TotalAmount = row.总金额
- this.TotalAmount1 = parseInt((row.含税总金额) * 100) / 100
+ if (row.总金额 === '0') {
+ this.TotalAmount = ''
+ this.TotalAmount1 = ''
+ } else {
+ this.TotalAmount = row.总金额
+ this.TotalAmount1 = parseInt((row.含税总金额) * 100) / 100
+ }
this.RMB1 = row.含税总金额_文本
document.getElementById('23').innerText = this.textarea
this.contractValue = parseInt(row.采购合同流水号)
@@ -481,7 +486,7 @@ export default {
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = ' | ' + ' | ' + ' | ' +
' | ' + ' | ' + ' | ' + ' | ' + ' | '
- document.getElementById('tableHead').after(tr[i])
+ $('#tableHead').after(tr[i])
}
for (let j = 0; j < this.returns.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称
@@ -509,9 +514,18 @@ export default {
tr[i].setAttribute('class', 'tableData1')
tr[i].innerHTML = ' | ' + ' | ' + ' | ' +
' | ' + ' | ' + ' | ' + ' | ' + ' | '
- document.getElementById('tableHead1').after(tr[i])
+ $('#tableHead1').after(tr[i])
}
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[1].innerHTML = response.data[j].零件图号
document.getElementsByClassName('tableData1')[j].children[2].innerHTML = response.data[j].材料