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
006fdab7
Commit
006fdab7
authored
Jul 06, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 取消新增投标导入货品功能,处理未发送中标公示显示系统默认文字
parent
cba402d5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
11 deletions
+22
-11
index.tsx
src/pages/procurement/callForBids/addNewBid/index.tsx
+5
-0
index.ts
src/pages/procurement/callForBids/addNewBid/schema/index.ts
+4
-4
modal.ts
src/pages/procurement/callForBids/addNewBid/schema/modal.ts
+2
-2
index.tsx
src/pages/procurement/components/descriptionsInfo/index.tsx
+9
-5
index.tsx
...tender/addTender/components/relateProductDrawer/index.tsx
+2
-0
No files found.
src/pages/procurement/callForBids/addNewBid/index.tsx
View file @
006fdab7
...
...
@@ -18,6 +18,7 @@ import MemberModal from './components/memberModal'
import
{
useAttachmentChangeForEdit
}
from
'./effects'
import
{
useAsyncSelect
}
from
'@/formSchema/effects/useAsyncSelect'
import
{
INVITE_BID
,
PUBLIC_BID
,
SYSTEM_BID
}
from
'@/constants/procurement'
import
moment
from
'moment'
export
interface
AddNewBidProps
{}
...
...
@@ -130,6 +131,10 @@ const AddNewBid:React.FC<AddNewBidProps> = (props) => {
setBtnLoading
(
false
)
return
message
.
error
(
'请选择招标物料'
)
}
// if(!(params.registerStartTime < moment().format())) {
// setBtnLoading(false)
// return message.error('报名开始时间大于当前时间')
// }
if
(
id
)
{
params
[
'id'
]
=
id
...
...
src/pages/procurement/callForBids/addNewBid/schema/index.ts
View file @
006fdab7
...
...
@@ -214,10 +214,10 @@ const bidMaterial: ISchema = {
label
:
'选择货品生成'
,
value
:
1
},
{
label
:
'导入货品生成'
,
value
:
2
}
//
{
//
label: '导入货品生成',
//
value: 2
//
}
],
default
:
1
},
...
...
src/pages/procurement/callForBids/addNewBid/schema/modal.ts
View file @
006fdab7
...
...
@@ -55,14 +55,14 @@ export const goodFormSchema: ISchema = {
full
:
true
},
"x-component-props"
:
{
//
disabled: true,
disabled
:
true
,
addonAfter
:
"{{connectGood}}"
,
placeholder
:
'最长20个字符'
},
"x-rules"
:
[
{
required
:
true
,
message
:
'请
填写或
选择货号'
message
:
'请选择货号'
},
{
pattern
:
/^
(?=
.*
\d)(?=
.*
[
a-z_A-Z
])(?=
.*
[
~!@#$%^&*-_
])[\d
a-zA-Z~!@#$%^&*-_
]{1,20}
$/
,
...
...
src/pages/procurement/components/descriptionsInfo/index.tsx
View file @
006fdab7
...
...
@@ -78,7 +78,7 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
}
</
p
>
{
data
.
length
>
3
&&
data
[
'inviteTenderAreaList'
][
'length'
]
>
3
&&
<
p
onClick=
{
toogleMore
}
style=
{
{
cursor
:
'pointer'
}
}
className=
"commonPickColor"
>
展开
{
showMore
?
<
CaretDownOutlined
/>
:
<
CaretUpOutlined
/>
}
</
p
>
...
...
@@ -132,7 +132,7 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
}
</
p
>
{
data
.
length
>
3
&&
data
[
'inviteTenderAreaList'
][
'length'
]
>
3
&&
<
p
onClick=
{
toogleMore
}
style=
{
{
cursor
:
'pointer'
}
}
className=
"commonPickColor"
>
展开
{
showMore
?
<
CaretDownOutlined
/>
:
<
CaretUpOutlined
/>
}
</
p
>
...
...
@@ -531,9 +531,13 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
<
div
className=
{
style
.
thankLetter
}
>
<
h2
>
感谢函
</
h2
>
<
h4
>
THANKS LETTER
</
h4
>
<
p
className=
{
style
.
name
}
>
尊敬的
{
_data
.
memberName
}
</
p
>
<
p
>
贵公司参与了我公司《
{
data
.
projectName
}
》竞标。在我公司综合各投标单位的基本情况,并进行充分技术交流后,经评标委员会综合评定,贵公司未能中标。我公司对贵公司的积极参与和支持深表感谢!希望下次合作成功。
</
p
>
<
p
className=
{
style
.
company
}
>
{
data
.
memberName
}
</
p
>
{
_data
[
'isSend'
]
?
<>
<
p
className=
{
style
.
name
}
>
尊敬的
{
_data
.
memberName
}
</
p
>
<
p
>
贵公司参与了我公司《
{
data
.
projectName
}
》竞标。在我公司综合各投标单位的基本情况,并进行充分技术交流后,经评标委员会综合评定,贵公司未能中标。我公司对贵公司的积极参与和支持深表感谢!希望下次合作成功。
</
p
>
<
p
className=
{
style
.
company
}
>
{
data
.
memberName
}
</
p
>
</>
:
<
p
>
贵公司此次未中标!非常感谢贵公司的积极参与,希望下次合作成功!
</
p
>
}
<
p
className=
{
style
.
time
}
>
{
moment
().
format
(
'YYYY-MM-DD'
)
}
</
p
>
</
div
>
</
Modal
>
...
...
src/pages/procurement/tender/addTender/components/relateProductDrawer/index.tsx
View file @
006fdab7
...
...
@@ -84,6 +84,8 @@ export const RelevanceTenderProduct: React.FC<RelateProductDrawerProps> = ({
properties
:
{
"Text_0"
:
tempSchema
[
'properties'
][
'Text_0'
],
"Text_99"
:
tempSchema
[
'properties'
][
'Text_99'
]
}
}
})
setSelectRow
([])
setSelectedRowKeys
([])
}
},
[
visible
])
...
...
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