From 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:37:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/module/invoice/index.jsx | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/module/invoice/index.jsx b/src/menu/components/module/invoice/index.jsx
index 48d84b3..8a17449 100644
--- a/src/menu/components/module/invoice/index.jsx
+++ b/src/menu/components/module/invoice/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Popover, Button, Modal } from 'antd'
-import { EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined, EllipsisOutlined, SettingOutlined } from '@ant-design/icons'
+import { EditOutlined, ToolOutlined, DeleteOutlined, LeftOutlined, FontColorsOutlined, EllipsisOutlined, SettingOutlined } from '@ant-design/icons'
import moment from 'moment'
import Utils from '@/utils/utils.js'
@@ -37,12 +37,13 @@
let _card = {
uuid: card.uuid,
type: card.type,
- format: 'object', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
+ format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
width: card.width || 24,
name: '鍙戠エ',
subtype: card.subtype,
+ fixedCol: true,
wrap: { name: '鍙戠エ', width: card.width || 24, datatype: 'static' },
style: { paddingLeft: '20px', paddingRight: '20px', paddingTop: '10px', paddingBottom: '10px' },
setting: { interType: 'system', primaryKey: 'ID' },
@@ -51,6 +52,7 @@
buyer: {
pageable: true,
format: 'array',
+ fixedCol: true,
subtype: 'invTable',
setting: { interType: 'system' },
columns: [],
@@ -63,6 +65,7 @@
detail: {
pageable: true,
format: 'array',
+ fixedCol: true,
subtype: 'invTable',
setting: { interType: 'system' },
columns: [],
@@ -72,8 +75,8 @@
{field: 'productcode', label: '鍟嗗搧缂栫爜', initval: '', type: 'text', match: 'like', uuid: Utils.getuuid()},
],
},
- billSaveBtn: {type: 'billsave', intertype: 'system', label: '淇濆瓨鍗曟嵁'},
- billOutBtn: {type: 'billout', intertype: 'custom', label: '鎻愪氦寮�绁�', procMode: 'system'},
+ billSaveBtn: {type: 'billsave', parId: card.uuid, intertype: 'system', label: '淇濆瓨鍗曟嵁'},
+ billOutBtn: {type: 'billout', parId: card.uuid, intertype: 'custom', label: '鎻愪氦寮�绁�', procMode: 'system'},
}
let buys = [
@@ -102,11 +105,12 @@
['鍗曚环', 'unitprice', 'Decimal(18,10)'],
['绋庡姟鍒嗙被缂栫爜', 'tax_classify_code'],
['绋庡姟鍒嗙被鍚嶇О', 'tax_classify_name'],
- // ['绋庣巼', 'tax_rate', 'Decimal(18,2)'],
['涓�鑸撼绋庝汉绋庣巼', 'general_tax_rate', 'Decimal(18,2)'],
['灏忚妯＄撼绋庝汉寰佹敹鐜�', 'small_tax_rate', 'Decimal(18,2)'],
['鏄惁浜彈浼樻儬鏀跨瓥', 'free_tax_mark'],
['浼樻儬鏀跨瓥绫诲瀷', 'vat_special_management'],
+ ['寰佺◣椤圭洰', 'tax_item'],
+ ['璁＄◣鏂规硶', 'tax_method'],
]
details.forEach((cell, index) => {
@@ -117,6 +121,7 @@
['ID', 'ID'],
['寮�绁ㄧ敵璇峰崟鍙�', 'io'],
['鍙戠エ绉嶇被', 'invoice_type'],
+ ['寮�绁ㄧ被鍨�', 'business_type', 'Nvarchar(20)'],
['璐拱鏂瑰悕绉�', 'from_to_name'],
['璐拱鏂圭◣鍙�', 'from_to_tax_no'],
['璐拱鏂瑰湴鍧�', 'from_to_addr', 'Nvarchar(100)'],
@@ -136,6 +141,7 @@
['鏀舵浜�', 'payee'],
['澶嶆牳浜�', 'reviewer'],
['寮�绁ㄤ汉', 'drawer'],
+ ['jskey', 'jskey'],
['琛屽彿', 'invoice_lp'],
['鍟嗗搧缂栫爜', 'productcode'],
['鍟嗗搧鍚嶇О', 'productname'],
@@ -148,6 +154,14 @@
['绋庡姟鍒嗙被鍚嶇О', 'tax_classify_name'],
['绋庣巼', 'tax_rate', 'Decimal(18,2)'],
['绋庨', 'tax_amount', 'Decimal(18,2)'],
+ ['鏄惁浜彈浼樻儬鏀跨瓥', 'free_tax_mark'],
+ ['浼樻儬鏀跨瓥绫诲瀷', 'vat_special_management'],
+ ['寰佺◣椤圭洰', 'tax_item'],
+ ['璁＄◣鏂规硶', 'tax_method'],
+ ['鍙戠エ鍙风爜', 'invoice_no'],
+ ['鍙戠エ浠ｇ爜', 'invoice_code'],
+ ['寮�绁ㄦ棩鏈�', 'invoice_date'],
+ ['鍙(true)', 'read_only'],
]
cols.forEach((cell, index) => {
@@ -289,6 +303,8 @@
<ToolOutlined />
</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