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
0c07eee7
Commit
0c07eee7
authored
Apr 20, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
parent
d5d98f86
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
44 additions
and
37 deletions
+44
-37
config.ts
config/config.ts
+0
-28
index.tsx
src/pages/procurement/callForBids/addNewBid/index.tsx
+1
-0
useMaterialTable.tsx
...curement/callForBids/addNewBid/model/useMaterialTable.tsx
+4
-1
index.ts
...procurement/callForBids/callForBidsSearch/schema/index.ts
+1
-1
index.tsx
src/pages/procurement/callForBids/readyAddBid/index.tsx
+1
-0
index.tsx
...s/procurement/callForBids/readySubmitBid/detail/index.tsx
+13
-5
useSelfTable.tsx
...urement/callForBids/readySubmitBid/model/useSelfTable.tsx
+1
-1
index.tsx
src/pages/procurement/tender/addTender/constant/index.tsx
+6
-0
index.tsx
src/pages/procurement/tender/addTender/index.tsx
+6
-1
index.tsx
...procurement/tender/readyQualifityChecked/detail/index.tsx
+4
-0
index.tsx
...transaction/purchaseOrder/orderCollect/constant/index.tsx
+7
-0
No files found.
config/config.ts
View file @
0c07eee7
...
...
@@ -2,7 +2,6 @@ import { defineConfig } from 'umi';
import
routes
from
'./router'
;
import
proxy
from
'./proxy'
;
import
theme
from
'./lingxi.theme.config'
;
const
HardSourceWebpackPlugin
=
require
(
'hard-source-webpack-plugin'
);
const
OPEN_THEME_BUILD
=
process
.
env
.
NODE_ENV
===
'production'
?
true
:
false
;
// 是否开启动态主题
const
isProduction
=
process
.
env
.
NODE_ENV
===
'production'
?
true
:
false
;
...
...
@@ -114,33 +113,6 @@ const config: any = {
},
},
});
// config.plugin('hardSource').use(HardSourceWebpackPlugin)
config
.
plugin
(
'hardSource'
).
use
(
new
HardSourceWebpackPlugin
({
cacheDirectory
:
'node_modules/.cache/hard-source/[confighash]'
,
configHash
:
function
(
webpackConfig
)
{
return
require
(
'node-object-hash'
)({
sort
:
false
}).
hash
(
webpackConfig
,
);
},
}),
);
// 使用中间缓存步骤扩展提升二次编译速度
// 对下面配置的 module 不进行缓存
config
.
plugin
(
'hardSourceExcludeModule'
)
.
use
(
HardSourceWebpackPlugin
.
ExcludeModulePlugin
,
[
[
{
test
:
/mini-css-extract-plugin
[\\/]
dist
[\\/]
loader/
,
},
// {
// test: /eslint-loader/,
// },
// {
// test: /.*\.DS_Store/,
// },
],
]);
},
cssLoader
:
{
localsConvention
:
'camelCase'
,
// 将style中的class由 .foo-body 转化为fooBody调用
...
...
src/pages/procurement/callForBids/addNewBid/index.tsx
View file @
0c07eee7
...
...
@@ -201,6 +201,7 @@ const AddNewBid:React.FC<AddNewBidProps> = (props) => {
if
(
state
.
value
===
PUBLIC_BID
)
{
if
(
pageStatus
===
PageStatus
.
EDIT
&&
!
publicFlag
.
current
)
{
publicRef
.
current
.
setVisible
(
false
)
publicFlag
.
current
=
true
}
else
{
publicRef
.
current
.
setVisible
(
true
)
}
...
...
src/pages/procurement/callForBids/addNewBid/model/useMaterialTable.tsx
View file @
0c07eee7
...
...
@@ -61,7 +61,10 @@ export const useMaterialTable = (ctx: ISchemaFormActions | ISchemaFormAsyncActio
await
drawerSchemaAction
.
setFieldValue
(
'unitName'
,
record
[
'unitName'
])
await
drawerSchemaAction
.
setFieldValue
(
'count'
,
record
[
'count'
])
await
drawerSchemaAction
.
setFieldValue
(
'has'
,
record
[
'has'
])
await
drawerSchemaAction
.
setFieldState
(
'code'
,
state
=>
state
.
props
[
"x-component-props"
].
disabled
=
true
)
await
drawerSchemaAction
.
setFieldState
(
'code'
,
state
=>
{
state
.
props
[
"x-component-props"
].
disabled
=
true
state
.
props
[
"x-component-props"
].
addonAfter
=
''
})
},
200
)
if
(
pageStatus
===
PageStatus
.
EDIT
)
{
await
drawerSchemaAction
.
setFieldValue
(
'file'
,
record
[
'file'
])
...
...
src/pages/procurement/callForBids/callForBidsSearch/schema/index.ts
View file @
0c07eee7
...
...
@@ -69,7 +69,7 @@ export const tableListSchema: ISchema = {
value
:
item
,
}))
},
"[
checkStartTime,c
heckEndTime]"
:
{
"[
preCheckStartTime,preC
heckEndTime]"
:
{
type
:
'array'
,
"x-component"
:
'DateRangePickerUnix'
,
'x-component-props'
:
{
...
...
src/pages/procurement/callForBids/readyAddBid/index.tsx
View file @
0c07eee7
...
...
@@ -58,6 +58,7 @@ const ReadyAddBid:React.FC<ReadyAddBidProps> = (props) => {
// 批量审核
const
handleBitchPush
=
async
()
=>
{
const
canDelete
=
!
rowSelectionCtl
.
selectRow
.
some
(
v
=>
v
.
inviteTenderInStatus
!==
BidInsideWorkState
.
Not_Submitted_Check_Invite_Tender
)
if
(
!
rowSelectionCtl
.
selectedRowKeys
.
length
)
{
return
message
.
error
(
'请先选择招标'
)
}
if
(
canDelete
)
{
const
{
code
}
=
await
submitRun
({
idList
:
rowSelectionCtl
.
selectedRowKeys
})
if
(
code
===
1000
)
{
...
...
src/pages/procurement/callForBids/readySubmitBid/detail/index.tsx
View file @
0c07eee7
...
...
@@ -21,8 +21,17 @@ const ReadySubmitBidDetail: React.FC = () => {
const
{
run
,
loading
}
=
useHttpRequest
(
PublicApi
.
postPurchaseInviteTenderSubmittedInviteTender
)
const
handleClick
=
useCallback
(()
=>
{
approvedRef
.
current
.
setVisible
(
true
)
const
handleClick
=
useCallback
(
async
()
=>
{
// approvedRef.current.setVisible(true)
const
params
=
{
idList
:
[
Number
(
id
)],
}
const
result
=
await
run
(
params
)
if
(
result
.
code
===
1000
)
{
approvedRef
.
current
.
setVisible
(
false
)
history
.
goBack
()
}
},
[])
// 提交审核表单
...
...
@@ -35,7 +44,6 @@ const ReadySubmitBidDetail: React.FC = () => {
const
result
=
await
run
(
params
)
if
(
result
.
code
===
1000
)
{
approvedRef
.
current
.
setVisible
(
false
)
history
.
goBack
()
}
})
...
...
@@ -73,12 +81,12 @@ const ReadySubmitBidDetail: React.FC = () => {
</
OrderDetailWrapper
>
{
/* 点击审核触发的弹窗集合 */
}
<
ApprovedModal
{
/*
<ApprovedModal
currentRef={approvedRef}
onConfirm={handleSubmit}
loading={loading}
title="单据审核"
/>
/>
*/
}
</
BidDetailContext
.
Provider
>
</
div
>
...
...
src/pages/procurement/callForBids/readySubmitBid/model/useSelfTable.tsx
View file @
0c07eee7
...
...
@@ -18,7 +18,7 @@ export const useSelfTable = () => {
align
:
'center'
,
dataIndex
:
'ctl'
,
key
:
'ctl'
,
render
:
(
text
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleSubmit
(
record
)
}
>
审核
</
Button
>
render
:
(
text
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleSubmit
(
record
)
}
>
提交
</
Button
>
}
])
...
...
src/pages/procurement/tender/addTender/constant/index.tsx
View file @
0c07eee7
...
...
@@ -112,6 +112,12 @@ export const productInfoColumns: any[] = [
render
:
(
t
,
r
)
=>
<><
div
>
{
t
}
</
div
><
div
>
{
r
.
name
}
</
div
></>
},
{
title
:
'规格'
,
dataIndex
:
'type'
,
align
:
'center'
,
key
:
'type'
,
},
{
title
:
'品类'
,
dataIndex
:
'categoryName'
,
align
:
'center'
,
...
...
src/pages/procurement/tender/addTender/index.tsx
View file @
0c07eee7
...
...
@@ -95,7 +95,7 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
file
:
value
[
'file'
],
remark
:
value
[
'remark'
],
submitTenderMateriel
:
value
[
'submitTenderMateriel'
].
map
(
item
=>
{
if
(
!
value
?.
id
)
{
if
(
!
value
?.
id
&&
item
?.
file
?.
lengt
)
{
item
.
file
=
item
.
file
.
map
(
_
=>
{
delete
_
.
id
return
_
...
...
@@ -109,6 +109,11 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
return
param
})
}
// 校验是否关联商品
if
(
!
params
.
submitTenderMateriel
.
some
(
v
=>
v
.
productId
&&
v
.
commodityId
))
{
setBtnLoading
(
false
)
return
message
.
error
(
'请先关联投标商品'
)
}
if
(
value
?.
id
)
params
.
id
=
value
.
id
const
res
=
await
PublicApi
.
postPurchaseSubmitTenderSaveSubmitTender
(
params
)
if
(
res
.
code
===
1000
)
{
...
...
src/pages/procurement/tender/readyQualifityChecked/detail/index.tsx
View file @
0c07eee7
...
...
@@ -88,6 +88,10 @@ const ReadyQualifityCheckedDetail: React.FC = () => {
}
},
beforeUpload
(
file
)
{
if
(
file
.
name
.
length
>
100
)
{
message
.
warning
(
'文件名过长'
);
return
Promise
.
reject
();
}
if
(
file
.
size
/
1024
/
1024
>
20
)
{
message
.
warning
(
'附件大小超过20M'
);
return
Promise
.
reject
();
...
...
src/pages/transaction/purchaseOrder/orderCollect/constant/index.tsx
View file @
0c07eee7
...
...
@@ -42,6 +42,13 @@ export const procurementProcessField = (value) => {
deliveryType
:
item
.
logistics
.
deliveryType
,
// @todo 后端暂无返回 写死1
minOrder
:
1
,
// 物料信息
materialId
:
item
.
id
,
materialCode
:
item
.
code
,
materialName
:
item
.
name
,
materialType
:
item
.
type
,
materialCategory
:
item
.
category
,
materialBrand
:
item
.
brand
,
}
})
return
value
...
...
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