Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄庭坚
jinfa-platform
Commits
0ca614cc
Commit
0ca614cc
authored
Jul 30, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2
parents
1f7ceecb
94cd3f55
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
21 deletions
+21
-21
fromtable.tsx
src/pages/contract/manage/editing/components/fromtable.tsx
+1
-1
index.tsx
src/pages/transaction/components/orderDeleveRecord/index.tsx
+5
-5
index.tsx
src/pages/transaction/components/orderHandDeleved/index.tsx
+1
-1
useProductTable.tsx
...ion/components/orderHandDeleved/model/useProductTable.tsx
+3
-3
index.tsx
src/pages/transaction/components/orderProductTable/index.tsx
+3
-3
index.tsx
src/pages/transaction/components/orderSaleRecord/index.tsx
+5
-5
index.tsx
...es/transaction/components/saleOrderProductTable/index.tsx
+3
-3
No files found.
src/pages/contract/manage/editing/components/fromtable.tsx
View file @
0ca614cc
...
...
@@ -50,7 +50,7 @@ const FormList = (props: any) => {
render
:
(
_
,
item
,
index
)
=>
<
DatePicker
style=
{
{
width
:
'100%'
}
}
format=
"YYYY-MM-DD"
v
alue=
{
item
.
expectPayTime
}
defaultV
alue=
{
item
.
expectPayTime
}
onChange=
{
(
e
)
=>
onSelectChange
(
e
,
'expectPayTime'
,
index
)
}
/>
},
...
...
src/pages/transaction/components/orderDeleveRecord/index.tsx
View file @
0ca614cc
...
...
@@ -31,9 +31,9 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
const
outOrderCols
:
any
[]
=
[
{
title
:
'商品ID'
,
dataIndex
:
'
product
Id'
,
dataIndex
:
'
sku
Id'
,
align
:
'center'
,
key
:
'
product
Id'
key
:
'
sku
Id'
},
{
title
:
'商品名称'
,
...
...
@@ -114,9 +114,9 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
const
sideChildrenCols
:
any
[]
=
[
{
title
:
'商品ID'
,
dataIndex
:
'
product
Id'
,
dataIndex
:
'
sku
Id'
,
align
:
'center'
,
key
:
'
product
Id'
,
key
:
'
sku
Id'
,
},
{
title
:
'商品名称'
,
...
...
@@ -278,7 +278,7 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
columns=
{
outOrderCols
}
dataSource=
{
deliveries
}
pagination=
{
false
}
rowKey=
"
product
Id"
rowKey=
"
sku
Id"
/>
</
Tabs
.
TabPane
>
}
...
...
src/pages/transaction/components/orderHandDeleved/index.tsx
View file @
0ca614cc
...
...
@@ -95,7 +95,7 @@ const schema: ISchema = {
type
:
'array'
,
"x-component"
:
'MultTable'
,
"x-component-props"
:
{
rowKey
:
'
product
Id'
,
rowKey
:
'
sku
Id'
,
columns
:
"{{productColumns}}"
,
components
:
"{{productComponents}}"
,
// expandable: "{{productChildren}}",
...
...
src/pages/transaction/components/orderHandDeleved/model/useProductTable.tsx
View file @
0ca614cc
...
...
@@ -6,9 +6,9 @@ import ProductTableCell, { ProductEditableRow } from '../components/productTable
const
productColumns
:
any
=
[
{
title
:
'商品ID'
,
dataIndex
:
'
product
Id'
,
dataIndex
:
'
sku
Id'
,
align
:
'center'
,
key
:
'
product
Id'
key
:
'
sku
Id'
},
{
title
:
'商品名称'
,
...
...
@@ -109,7 +109,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
const
handleSave
=
row
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
const
newData
=
[...
ctx
.
getFieldValue
(
'products'
)];
const
index
=
newData
.
findIndex
(
item
=>
row
.
productId
===
item
.
product
Id
);
const
index
=
newData
.
findIndex
(
item
=>
row
.
skuId
===
item
.
sku
Id
);
const
item
=
newData
[
index
];
newData
.
splice
(
index
,
1
,
{
...
item
,
...
...
src/pages/transaction/components/orderProductTable/index.tsx
View file @
0ca614cc
...
...
@@ -218,9 +218,9 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
const
productInfoColumns
:
any
[]
=
[
{
title
:
'ID'
,
dataIndex
:
'
product
Id'
,
dataIndex
:
'
sku
Id'
,
align
:
'center'
,
key
:
'
product
Id'
,
key
:
'
sku
Id'
,
},
{
title
:
'商品名称'
,
...
...
@@ -417,7 +417,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
columns=
{
contractOrder
?
materialInfo
:
productInfoColumns
}
dataSource=
{
product
.
products
}
components=
{
productComponents
}
rowKey=
'
i
d'
rowKey=
'
skuI
d'
pagination=
{
false
}
/>
<
MoneyTotalBox
dataSource=
{
data
}
preview=
{
preview
}
/>
...
...
src/pages/transaction/components/orderSaleRecord/index.tsx
View file @
0ca614cc
...
...
@@ -35,9 +35,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
const
outOrderCols
:
any
[]
=
[
{
title
:
'商品ID'
,
dataIndex
:
'
product
Id'
,
dataIndex
:
'
sku
Id'
,
align
:
'center'
,
key
:
'
product
Id'
key
:
'
sku
Id'
},
{
title
:
'商品名称'
,
...
...
@@ -118,9 +118,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
const
sideChildrenCols
:
any
[]
=
[
{
title
:
'商品ID'
,
dataIndex
:
'
product
Id'
,
dataIndex
:
'
sku
Id'
,
align
:
'center'
,
key
:
'
product
Id'
,
key
:
'
sku
Id'
,
},
{
title
:
'商品名称'
,
...
...
@@ -343,7 +343,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
columns=
{
outOrderCols
}
dataSource=
{
deliveries
}
pagination=
{
false
}
rowKey=
"
product
Id"
rowKey=
"
sku
Id"
/>
</
Tabs
.
TabPane
>
}
...
...
src/pages/transaction/components/saleOrderProductTable/index.tsx
View file @
0ca614cc
...
...
@@ -379,9 +379,9 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
const
productInfoColumns
:
any
[]
=
[
{
title
:
'ID'
,
dataIndex
:
'
product
Id'
,
dataIndex
:
'
sku
Id'
,
align
:
'center'
,
key
:
'
product
Id'
,
key
:
'
sku
Id'
,
},
{
title
:
'商品名称'
,
...
...
@@ -588,7 +588,7 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
columns=
{
contractOrder
?
materialInfo
:
columns
}
dataSource=
{
product
.
products
}
components=
{
productComponents
}
rowKey=
'
i
d'
rowKey=
'
skuI
d'
pagination=
{
false
}
/>
<
MoneyTotalBox
dataSource=
{
data
}
isEditData=
{
isEditData
}
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment