diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js
index a3e503c1..56a81486 100644
--- a/src/api/PurchasingCenter/CreatePurchaseContract.js
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -19,7 +19,7 @@ export function searchSheetContract(num1) {
method: 'post',
data: {
type: '1',
- name: '采购管理_询价单明细_查询数据_根据询价单',
+ name: '采购管理_询价单明细_查询数据',
param: '询价单流水号=' + num1
}
})
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index cd3abe56..a22d3519 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -68,10 +68,10 @@
-
+
-
+
- {{ scope.row.物料名称 }}
+ {{ scope.row.图号 }}
-
+
- {{ scope.row.物料规格 }}
+ {{ scope.row.名称 }}
-
+
- {{ scope.row.订货数量 }}
+ {{ scope.row.规格 }}
+
+
+
+
+ {{ scope.row.数量 }}
@@ -108,12 +113,12 @@
- {{ haTtax==='未税' ? scope.row.未税总额 = (Number(scope.row.订货数量) * Number(scope.row.未税单价)).toFixed(2) : scope.row.未税总额 = (scope.row.含税总额 / (1+taxRate)).toFixed(2) }}
+ {{ haTtax==='未税' ? scope.row.未税总额 = (Number(scope.row.数量) * Number(scope.row.未税单价)).toFixed(2) : scope.row.未税总额 = (scope.row.含税总额 / (1+taxRate)).toFixed(2) }}
- {{ haTtax==='含税' ? scope.row.含税总额 = (Number(scope.row.订货数量) * Number(scope.row.含税单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }}
+ {{ haTtax==='含税' ? scope.row.含税总额 = (Number(scope.row.数量) * Number(scope.row.含税单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }}
@@ -222,13 +227,14 @@ export default {
searchContractDetail() { // 查询合同明细
this.tableData1 = []
searchSheetContract(this.contractNumValue).then(response => {
- console.log(response.data)
+ console.log(response.data, 111)
for (let i = 0; i < response.data.length; i++) {
- this.tableData1.push({
- 物料计划到货时间: response.data[i].物料计划到货时间,
- 物料名称: response.data[i].物料名称,
- 物料规格: response.data[i].物料规格,
- 订货数量: response.data[i].订货数量,
+ this.tableData1.push({ // 组件零件流水号
+ 交货期: 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,
@@ -236,7 +242,7 @@ export default {
})
}
})
- console.log(this.tableData1)
+ console.log(this.tableData1, 222)
},
demoChange() { // 模板change
switch (this.demoRadio) {
@@ -270,14 +276,14 @@ export default {
合同名称：
|
- |
- ![]() |
+ |
+ ![]() |
合同编号：
|
- |
+ |
@@ -467,20 +473,20 @@ export default {
this.taxTotal += Number(this.tableData1[j].含税总额)
if (document.getElementsByClassName('tableData')[j]) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
- document.getElementsByClassName('tableData')[j].children[1].innerHTML = `图号` + j
- document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.tableData1[j].物料名称
- document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.tableData1[j].物料规格
- document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.tableData1[j].订货数量
+ document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.tableData1[j].图号
+ document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.tableData1[j].名称
+ document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.tableData1[j].规格
+ document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.tableData1[j].数量
this.haTtax === '含税' ? document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.tableData1[j].含税单价 : document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.tableData1[j].未税单价
- document.getElementsByClassName('tableData')[j].children[6].innerHTML = Number(document.getElementsByClassName('tableData')[j].children[5].innerHTML) * Number(this.tableData1[j].订货数量)
- this.tableData1[j].物料计划到货时间 ? document.getElementsByClassName('tableData')[j].children[7].innerHTML = this.tableData1[j].物料计划到货时间.split(' ')[0] : document.getElementsByClassName('tableData')[j].children[7].innerHTML = ''
+ document.getElementsByClassName('tableData')[j].children[6].innerHTML = Number(document.getElementsByClassName('tableData')[j].children[5].innerHTML) * Number(this.tableData1[j].数量)
+ this.tableData1[j].交货期 ? document.getElementsByClassName('tableData')[j].children[7].innerHTML = this.tableData1[j].交货期.split(' ')[0] : document.getElementsByClassName('tableData')[j].children[7].innerHTML = ''
document.getElementsByClassName('tableData')[j].children[8].innerHTML = `备注` + j
}
}
this.actualTotal = this.actualTotal.toFixed(2)
this.actualTotal = this.untaxTotal.toFixed(2)
this.actualTotal = this.taxTotal.toFixed(2)
- this.tax = this.taxTotal - this.untaxTotal
+ this.tax = (this.taxTotal - this.untaxTotal).toFixed(2)
document.getElementById('untaxTotal') ? document.getElementById('untaxTotal').innerHTML = this.untaxTotal : ''
document.getElementById('tax') ? document.getElementById('tax').innerHTML = this.tax : ''
document.getElementById('taxTotal') ? document.getElementById('taxTotal').innerHTML = this.taxTotal : ''