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
shenshaokai
jinfa-platform
Commits
c2c73462
Commit
c2c73462
authored
Jan 10, 2023
by
shenshaokai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-20221102' into 'jinfa-20221102'
fix: [37824] 物料查询和请购单查询-补充查询参数 See merge request project/jinfa-platform!506
parents
5ab3f7f6
91c17b87
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
package.json
package.json
+1
-1
index.tsx
src/pages/commodity/material/materialQuery/index.tsx
+12
-12
index.tsx
src/pages/transaction/purchaseRequisition/index.tsx
+1
-1
No files found.
package.json
View file @
c2c73462
...
...
@@ -9,7 +9,7 @@
"start:dev"
:
"cross-env NODE_OPTIONS=--max_old_space_size=4096 umi dev"
,
"start:analyze"
:
"ANALYZE=1 umi dev"
,
"clean"
:
"rimraf node_modules"
,
"start"
:
"yarn scripts:build && cross-env NODE_OPTIONS=--max_old_space_size=8192 UMI_ENV=local umi dev"
,
"start"
:
"yarn
api && yarn
scripts:build && cross-env NODE_OPTIONS=--max_old_space_size=8192 UMI_ENV=local umi dev"
,
"start-noApi"
:
"yarn scripts:build && cross-env NODE_OPTIONS=--max_old_space_size=8192 UMI_ENV=local umi dev"
,
"start-fast"
:
"cross-env NODE_OPTIONS=--max_old_space_size=8192 UMI_ENV=local umi dev"
,
"build"
:
"yarn && yarn api && yarn scripts:build && yarn build:clean"
,
...
...
src/pages/commodity/material/materialQuery/index.tsx
View file @
c2c73462
...
...
@@ -9,9 +9,9 @@ import { Button, Card, Space, Cascader, message, Menu, Dropdown, Modal } from 'a
import
{
getColumn
}
from
'../common/columns'
;
import
{
createFormActions
,
useFormEffects
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
;
import
{
getProductCommodityGoodsUsing
,
getProductGoodsGetMaterialList
,
getProductGoodsExport
,
GetProductGoodsGetMaterialListRequest
,
postProductGoodsFreezeOrEnableGoods
,
postProductGoodsFreezeOrEnableGoodsBatch
,
postProductCustomerGetMemberCustomerCategoryAttribute
}
from
'@/services/ProductV2Api'
;
import
{
getProductCommodityGoodsUsing
,
getProductGoodsGetMaterialList
,
getProductGoodsExport
,
GetProductGoodsGetMaterialListRequest
,
postProductGoodsFreezeOrEnableGoods
,
postProductGoodsFreezeOrEnableGoodsBatch
,
postProductCustomerGetMemberCustomerCategoryAttribute
}
from
'@/services/ProductV2Api'
;
import
{
useAsyncSelect
}
from
'@/formSchema/effects/useAsyncSelect'
;
import
{
useAsyncCascader
,
fetchBrand
,
fetchStatus
,
fetchCategoryData
,
fetchTreeData
,
EMPTY
,
fetchExternalState
}
from
'../common/useGetTableSearchData'
;
import
{
useAsyncCascader
,
fetchBrand
,
fetchStatus
,
fetchCategoryData
,
fetchTreeData
,
EMPTY
,
fetchExternalState
}
from
'../common/useGetTableSearchData'
;
import
{
Link
}
from
'umi'
;
import
{
DownOutlined
}
from
'@ant-design/icons'
;
import
FrozonMadal
from
'../components/frozonMadal'
;
...
...
@@ -158,7 +158,7 @@ const MaterialQuery = () => {
const
[
visible
,
setVisible
]
=
useState
<
boolean
>
(
false
);
const
[
activeItem
,
setActiveItem
]
=
useState
(
null
)
const
[
isBatch
,
setIsBatch
]
=
useState
(
false
);
const
[
exportLoading
,
setExportLoading
]
=
useState
(
false
);
const
[
exportLoading
,
setExportLoading
]
=
useState
(
false
);
const
[
querySchema
,
setQuerySchema
]
=
useState
<
any
>
();
const
[
customerCategoryId
,
setCustomerCategoryId
]
=
useState
<
any
>
();
const
[
customerCategoryValues
,
setCustomerCategoryValues
]
=
useState
<
any
>
();
...
...
@@ -337,9 +337,9 @@ const MaterialQuery = () => {
</
Button
>
</
AuthButton
>
<
Button
onClick=
{
exportFile
}
loading=
{
exportLoading
}
>
导出
</
Button
>
onClick=
{
exportFile
}
loading=
{
exportLoading
}
>
导出
</
Button
>
</
Space
>
)
}
...
...
@@ -437,13 +437,13 @@ const MaterialQuery = () => {
}
}
result
[
'customerAttributeValueIdList'
]
=
_customerAttributeValueIdList
.
length
>
0
?
_customerAttributeValueIdList
.
join
(
','
)
:
undefined
;
result
[
'customerAttributeValueList'
]
=
_customerAttributeValueList
.
length
>
0
?
_customerAttributeValueList
.
join
(
','
)
:
undefined
;
result
[
'customerAttributeValueList'
]
=
_customerAttributeValueList
.
length
>
0
?
_customerAttributeValueList
.
join
(
','
)
:
undefined
;
ref
.
current
.
reload
(
result
)
};
const
fetchListData
=
async
(
params
:
GetProductGoodsGetMaterialListRequest
)
=>
{
try
{
const
{
data
,
code
}
=
await
getProductGoodsGetMaterialList
(
params
);
const
{
data
,
code
}
=
await
getProductGoodsGetMaterialList
(
{
...
params
,
all
:
true
}
);
if
(
code
===
1000
)
{
return
data
;
}
...
...
@@ -469,14 +469,14 @@ const MaterialQuery = () => {
// })
// })
const
exportFile
=
async
()
=>
{
const
exportFile
=
async
()
=>
{
if
(
selectRowFns
.
selectedRowKeys
.
length
===
0
)
{
message
.
info
(
'请选择你要导出的物料'
)
return
;
}
setExportLoading
(
true
)
const
res
=
await
getProductGoodsExport
({
ids
:
selectRowFns
.
selectedRowKeys
.
join
(
','
),
const
res
=
await
getProductGoodsExport
({
ids
:
selectRowFns
.
selectedRowKeys
.
join
(
','
),
},
{
responseType
:
'blob'
,
requestType
:
'json'
,
...
...
@@ -486,7 +486,7 @@ const MaterialQuery = () => {
const
downloadElement
=
document
.
createElement
(
'a'
);
const
href
=
window
.
URL
.
createObjectURL
(
blob
);
//创建下载的链接
downloadElement
.
href
=
href
;
downloadElement
.
download
=
'物料查询导出'
+
moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
);
// 下载后文件名
downloadElement
.
download
=
'物料查询导出'
+
moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
);
// 下载后文件名
document
.
body
.
appendChild
(
downloadElement
);
downloadElement
.
click
();
// 点击下载
document
.
body
.
removeChild
(
downloadElement
);
// 下载完成移除元素
...
...
src/pages/transaction/purchaseRequisition/index.tsx
View file @
c2c73462
...
...
@@ -29,7 +29,7 @@ export interface RequestBillProps { }
const
fetchTableData
=
(
parmas
)
=>
{
return
new
Promise
(
reolve
=>
{
getPurchaseRequisitionPage
({
...
parmas
}).
then
(
res
=>
{
getPurchaseRequisitionPage
({
...
parmas
,
all
:
true
}).
then
(
res
=>
{
reolve
(
res
.
data
)
})
})
...
...
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