diff --git a/klp-ui/src/views/crm/contract/components/ContractList.vue b/klp-ui/src/views/crm/contract/components/ContractList.vue index aba7786d..9e2c1a1a 100644 --- a/klp-ui/src/views/crm/contract/components/ContractList.vue +++ b/klp-ui/src/views/crm/contract/components/ContractList.vue @@ -367,12 +367,13 @@ export default { 产品名称:${productData.productName || ''} 生产厂家:嘉祥科伦普重工有限公司 - ${headerCells} + ${headerCells} ${bodyRows} ${totalCells} 合计人民币(大写):${totalAmountInWords} + ${productData.remark ? `备注:${productData.remark}` : ''} `; return html; }, @@ -429,7 +430,7 @@ export default { .section-title { font-size: 13px; font-weight: bold; margin-bottom: 4px; margin-top: 8px; } table { width: 100%; border-collapse: collapse; } th, td { border: 1px solid #000; padding: 3px 4px; text-align: center; font-size: 11px; } - th { background-color: #f5f5f5; font-weight: bold; } + th { font-weight: bold; } .sign-section { margin-top: 24px; font-size: 12px; line-height: 2.2; } .sign-section .col { width: 48%; } .sign-row { display: flex; justify-content: space-between; } @@ -437,13 +438,13 @@ export default {
- +
嘉祥科伦普重工有限公司
-
+
产 品 销 售 合 同
-
合同编号:${row.contractCode || ''}
+
合同编号:${row.contractCode || ''}
@@ -543,9 +544,9 @@ export default {
嘉祥科伦普重工有限公司
-
+
产 品 销 售 合 同
-
合同编号:${row.contractCode || ''}
+
合同编号:${row.contractCode || ''}
diff --git a/klp-ui/src/views/crm/contract/components/ProductContent.vue b/klp-ui/src/views/crm/contract/components/ProductContent.vue index 693444bf..97775884 100644 --- a/klp-ui/src/views/crm/contract/components/ProductContent.vue +++ b/klp-ui/src/views/crm/contract/components/ProductContent.vue @@ -63,23 +63,21 @@
+ size="small" />
+ size="small" />
- +
+ size="small" />
- +
@@ -260,26 +258,7 @@ export default { onTaxPriceChange(item) { Object.assign(item, calculateProductFields(item, 'taxPrice')); }, - // 税率除数变更 - onTaxDivisorChange(item) { - Object.assign(item, calculateProductFields(item, 'taxDivisor')); - }, - // 无税单价变更 - onNoTaxPriceChange(item) { - Object.assign(item, calculateProductFields(item, 'noTaxPrice')); - }, - // 含税总额变更 - onTaxTotalChange(item) { - Object.assign(item, calculateProductFields(item, 'taxTotal')); - }, - // 无税总额变更 - onNoTaxTotalChange(item) { - Object.assign(item, calculateProductFields(item, 'noTaxTotal')); - }, - // 税额变更 - onTaxAmountChange(item) { - Object.assign(item, calculateProductFields(item, 'taxAmount')); - }, + // 计算金额 calculateTotals() { this.products.forEach(item => {