diff --git a/src/api/WorkshopProcurement/ArrivalStateSearch.js b/src/api/WorkshopProcurement/ArrivalStateSearch.js
index 75474521..29211ee2 100644
--- a/src/api/WorkshopProcurement/ArrivalStateSearch.js
+++ b/src/api/WorkshopProcurement/ArrivalStateSearch.js
@@ -11,7 +11,7 @@ export function initArrivalStateContact() {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
- name: '车间管理_到货情况_查询数据_新1'
+ name: '车间管理_到货情况合同号_查询数据'
}
})
}
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 9e12e237..c9e2591b 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -154,11 +154,11 @@
-
+ {{ content }}
-
-
-
+
+
+
@@ -474,7 +474,7 @@ export default {
},
submitTotal() { // 确定合同总额
// this.$refs.tinymce.destroyTinymce()
- // this.$refs.tinymce.initTinymce()
+ this.$refs.tinymce.initTinymce()
document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
@@ -832,11 +832,11 @@ export default {
document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
- // this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
- // this.$refs.tinymce.initTinymce()
+ this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
+ this.$refs.tinymce.initTinymce()
setTimeout(() => {
this.submitTotal()
- // this.$refs.tinymce.setContent(this.contentNew)
+ this.$refs.tinymce.setContent(this.contentNew)
}, 1000)
} else {
this.$message.warning('请先选择合同模板，再预览')
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 9781cde0..687b28a9 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -1460,16 +1460,17 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('离线合同生成成功')
this.searchTable2()
- searchMateriel(this.offlineContractNum).then(response => {
- this.tableData3 = response.data
- this.tableData3.map(v => {
- this.$set(v, '未税总额', 0)
- this.$set(v, '含税总额', 0)
- !v.单价 ? v.单价 = v.参考价格 : v.单价
- this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
- })
- this.disable = true // 是否为编辑模式
- })
+ this.tableData3 = []
+ // searchMateriel(this.offlineContractNum).then(response => {
+ // this.tableData3 = response.data
+ // this.tableData3.map(v => {
+ // this.$set(v, '未税总额', 0)
+ // this.$set(v, '含税总额', 0)
+ // !v.单价 ? v.单价 = v.参考价格 : v.单价
+ // this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
+ // })
+ // this.disable = true // 是否为编辑模式
+ // })
} else { this.$message.error('离线合同生成失败') }
})
}).catch(() => {
diff --git a/src/views/WorkshopProcurement/AccountingPrice/index.vue b/src/views/WorkshopProcurement/AccountingPrice/index.vue
index d5fead19..1703019f 100644
--- a/src/views/WorkshopProcurement/AccountingPrice/index.vue
+++ b/src/views/WorkshopProcurement/AccountingPrice/index.vue
@@ -52,7 +52,7 @@
-
+
@@ -132,6 +132,7 @@ export default {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData.push({
采购合同编号: response.data.rows[i].采购合同编号,
+ 采购合同明细流水号: response.data.rows[i].采购合同明细流水号,
供应商名称: response.data.rows[i].供应商名称,
物料型号: response.data.rows[i].物料型号,
物料名称: response.data.rows[i].物料名称,
@@ -141,12 +142,12 @@ export default {
})
}
}
- console.log(this.tableData)
+ console.log(response, 90)
this.total = response.data.total
})
},
update(row) {
- console.log(row)
+ console.log(row, 12)
Preservation(row.采购合同明细流水号, row.单价).then(response => {
console.log(response, 1111)
if (response.data[0].result === '1') {
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index d9ad1e0d..6bd354dd 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -61,7 +61,7 @@
-
+
@@ -499,6 +499,7 @@ export default {
submitGroup(this.contractNumValue, this.form3.groupNumValue).then(response => {
if (response.data[0].result === '1') {
this.contractNumType = 1
+ this.contractValue = 4
this.dialogVisible2 = false
this.contractNum = []
initPurchaseOrder().then(response => {
@@ -527,6 +528,7 @@ export default {
unLinkGroup(this.contractNumValue).then(response => {
if (response.data[0].result === '1') {
this.contractNumType = 0
+ this.contractValue = 1
this.$message.success('转换成功')
} else {
this.$message.success('转换失败')
@@ -788,17 +790,21 @@ export default {
} else { this.$message.error('生成合同失败') }
})
} else {
- for (let i = 0; i < this.contractNum.length; i++) {
- if (this.contractNum[i].value === this.contractNumValue) {
- this.RequisitionNumber = this.contractNum[i].label
+ if (this.contractValue === 4) {
+ for (let i = 0; i < this.contractNum.length; i++) {
+ if (this.contractNum[i].value === this.contractNumValue) {
+ this.RequisitionNumber = this.contractNum[i].label
+ }
}
+ doneContract1(this.contractNumValue, this.RequisitionNumber, this.contractName, this.stipulateArrivalTime, this.form3.groupNumValue, this.id, this.supplierValue, this.textArea, this.contractValue, this.freight, this.AdvanceCharge, this.tableData5[0].数量, this.tableData5[0].单价, this.taxRate, this.currencyValue, this.tableData5[0].备注).then(response => {
+ if (response.data[0].result === '1') {
+ this.$message.success('生成合同成功')
+ this.reload()
+ } else { this.$message.error('生成合同失败') }
+ })
+ } else {
+ this.$message.warning('请将模板类型选择为成组采购')
}
- doneContract1(this.contractNumValue, this.RequisitionNumber, this.contractName, this.stipulateArrivalTime, this.form3.groupNumValue, this.id, this.supplierValue, this.textArea, this.contractValue, this.freight, this.AdvanceCharge, this.tableData5[0].数量, this.tableData5[0].单价, this.taxRate, this.currencyValue, this.tableData5[0].备注).then(response => {
- if (response.data[0].result === '1') {
- this.$message.success('生成合同成功')
- this.reload()
- } else { this.$message.error('生成合同失败') }
- })
}
}
},
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index c61c2ace..aeca874a 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -52,7 +52,7 @@
{{ scope.row.发票号 }}
-
+
{{ scope.row.发票金额 }}
@@ -64,7 +64,7 @@
- {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
+ {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index 4af80c9d..d7219c0d 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -1154,6 +1154,7 @@ export default {
for (let i = 0; i < val.length; i++) {
this.totalWight += val[i].到货重量
}
+ console.log(this.totalWight, 111)
this.arrest = val
},
// 选入
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index 989e6dc2..5382e7e5 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -37,11 +37,6 @@
{{ scope.row.采购合同名称 }}
-
-
- {{ scope.row.规定到货时间 }}
-
-
{{ scope.row.供应商名称 }}
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index a845c240..8670b3c0 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -165,28 +165,28 @@
{{ scope.row.姓名 }}
-
+
{{ scope.row.含税总金额 }}
-
+
{{ scope.row.已付金额 }}
-
+
{{ scope.row.申请中金额 }}
-
+
- 合计：元
+ 合计：元
确定请款