From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/module/invoice/index.jsx | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/module/invoice/index.jsx b/src/menu/components/module/invoice/index.jsx
index 0dc2570..b553ab7 100644
--- a/src/menu/components/module/invoice/index.jsx
+++ b/src/menu/components/module/invoice/index.jsx
@@ -109,8 +109,8 @@
['灏忚妯＄撼绋庝汉寰佹敹鐜�', 'small_tax_rate', 'Decimal(18,2)'],
['鏄惁浜彈浼樻儬鏀跨瓥', 'free_tax_mark'],
['浼樻儬鏀跨瓥绫诲瀷', 'vat_special_management'],
- ['tax_item', 'tax_item'],
- ['tax_method', 'tax_method'],
+ ['寰佺◣椤圭洰', 'tax_item'],
+ ['璁＄◣鏂规硶', 'tax_method'],
]
details.forEach((cell, index) => {
@@ -156,8 +156,12 @@
['绋庨', 'tax_amount', 'Decimal(18,2)'],
['鏄惁浜彈浼樻儬鏀跨瓥', 'free_tax_mark'],
['浼樻儬鏀跨瓥绫诲瀷', 'vat_special_management'],
- ['tax_item', 'tax_item'],
- ['tax_method', 'tax_method'],
+ ['寰佺◣椤圭洰', 'tax_item'],
+ ['璁＄◣鏂规硶', 'tax_method'],
+ ['鍙戠エ鍙风爜', 'invoice_no'],
+ ['鍙戠エ浠ｇ爜', 'invoice_code'],
+ ['寮�绁ㄦ棩鏈�', 'invoice_date'],
+ ['鍙(true)', 'read_only'],
]
cols.forEach((cell, index) => {
@@ -205,6 +209,8 @@
card.$c_ds = card.wrap.datatype === 'dynamic'
card.errors = checkComponent(card)
+
+ delete card.$c_ds
if (card.errors.length === 0) {
if (card.buyer.setting.interType === 'system' && card.buyer.setting.execute !== 'false' && !card.buyer.setting.dataresource) {
@@ -300,6 +306,7 @@
</Popover>
<div className="inv-action">
{card.wrap.backBtn === 'show' ? <Button className="mk-back"><LeftOutlined />杩斿洖</Button> : null}
+ <Button className="mk-addinv">鏂板鍙戠エ</Button>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<EditOutlined style={{color: '#1890ff'}} onClick={() => this.setState({btn: card.billSaveBtn})} title="缂栬緫"/>
--
Gitblit v1.8.0