liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220613-将PUT和DELETE请求更改成POST请求

Browse Source
This commit is contained in:
jl-zhoujl2
2022-07-26 15:08:55 +08:00
parent 9b3fabfbc9 541b685651
commit 002de3e410
162 changed files with 6179 additions and 1956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/ZZhaoMu/Bid/BiddingAnnouncement/components/BiddingAnnouncement.tsx
View File

@ -519,7 +519,7 @@ const BiddingAnnouncement: React.FC<BiddingAnnouncementProps> = (props) => {
name="attDatasetId"
extra="单个附件最大30MB"
>
{UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} bid={UploadID} /> : null}
{UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} maxCount={3} bid={UploadID} /> : null}
</Form.Item>
{/* 发布媒体 */}
<Medias

2
src/pages/ZZhaoMu/Bid/BiddingAnnouncement/components/BiddingAnnouncement4Change.tsx
View File

@ -477,7 +477,7 @@ const BiddingAnnouncement: React.FC<BiddingAnnouncementProps> = (props) => {
name="attDatasetId"
extra="单个附件最大30MB"
>
{UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} bid={UploadID} /> : null}
{UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} maxCount={3} bid={UploadID} /> : null}
</Form.Item>
<Collapse defaultActiveKey={["1", "2"]} ghost expandIcon={() => <BarsOutlined />}>

70
src/pages/ZZhaoMu/Calibration/BidPublicityResult/components/BidPublicityResults.tsx
View File

@ -37,7 +37,7 @@ const layout = {
var objDeepCopy = function (source: any) {
var sourceCopy = source instanceof Array ? [] : {};
for (var item in source) {
sourceCopy[item] = typeof source[item] === 'object' ? objDeepCopy(source[item]) : source[item];
sourceCopy[item] = typeof source[item] === 'object' ? objDeepCopy(source[item]) : source[item];
}
return sourceCopy;
}
@ -83,18 +83,18 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
dataIndex: 'rooms',
render: (text: any, record: any) => {
let defaultValue: any = []
record.rooms.map((item: any)=>{
if(item.select == 1){
defaultValue.push(record.bsId+'&'+item.assessRoomId+'-'+item.assessRoomSort)
record.rooms.map((item: any) => {
if (item.select == 1) {
defaultValue.push(record.bsId + '&' + item.assessRoomId + '-' + item.assessRoomSort)
}
})
return (
<>
<Checkbox.Group
<Checkbox.Group
disabled={editInformation}
options={record.rooms}
value={defaultValue}
onChange={(e) => { onCheckChange(e, record) }}
value={defaultValue}
onChange={(e) => { onCheckChange(e, record) }}
/>
</>
)
@ -159,7 +159,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
val.value = item.bsId + '&' + val.assessRoomId + '-' + val.assessRoomSort
val.label = '轮次' + val.assessRoomSort
val.select = 1
bags+=1
bags += 1
})
})
setRoundsTotal(bags) // 轮次数量
@ -192,19 +192,19 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
const data = res.data
setBagsTotal(data?.sections.length) // 包数量
let bags: any = 0
data?.sections.map((item: any)=>{
item.rooms.map((val: any)=>{
bags+=1
data?.sections.map((item: any) => {
item.rooms.map((val: any) => {
bags += 1
})
})
setRoundsTotal(bags) // 轮次数量
editVal.map((item: any)=>{
data?.sections.map((val: any)=>{
if(item.bsId == val.bsId){
editVal.map((item: any) => {
data?.sections.map((val: any) => {
if (item.bsId == val.bsId) {
item.bag = 1
item.rooms.map((val1: any)=>{
val.rooms.map((val2: any)=>{
if(val1.assessRoomSort == val2.assessRoomSort){
item.rooms.map((val1: any) => {
val.rooms.map((val2: any) => {
if (val1.assessRoomSort == val2.assessRoomSort) {
val1.select = 1
}
})
@ -232,12 +232,12 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
const roundsOk = () => { // 选中标段轮次确定
let bags: any = 0
let rounds: any = 0
columnsData.map((item: any)=>{
if(item.bag && item.bag == 1 && item.rooms.length > 0){
bags+=1
item.rooms.map((val: any)=>{
if(val.select == 1){
rounds+=1
columnsData.map((item: any) => {
if (item.bag && item.bag == 1 && item.rooms.length > 0) {
bags += 1
item.rooms.map((val: any) => {
if (val.select == 1) {
rounds += 1
}
})
}
@ -245,10 +245,10 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
setOldColumnsData(objDeepCopy(columnsData))
setBagsTotal(bags)
setRoundsTotal(rounds)
if(bags != 0 && rounds != 0){
form.setFieldsValue({"sectionIds": '已选'+bags+'个包，'+rounds+'轮'})
if (bags != 0 && rounds != 0) {
form.setFieldsValue({ "sectionIds": '已选' + bags + '个包，' + rounds + '轮' })
} else {
form.setFieldsValue({"sectionIds": ''})
form.setFieldsValue({ "sectionIds": '' })
}
setRoundsVisible(false)
}
@ -266,7 +266,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
columnsData.map((item: any) => {
if (item.bsId == record.bsId) {
item.rooms.map((val1: any) => {
if(e.length > 0){
if (e.length > 0) {
item.bag = 1
val1.select = 0
e.map((val: any) => {
@ -309,7 +309,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
}
setSping(true);
creatNotice(type, fromData).then(res => {
if(res?.code == 4004 && res?.success == false) { //2021.9.7 zhoujianlong 新增和修改招募公示增加风控
if (res?.code == 4004 && res?.success == false) { //2021.9.7 zhoujianlong 新增和修改招募公示增加风控
const data = res?.data?.result == undefined ? [] : res?.data?.result
setRiskData(data)
setRiskVisible(true)
@ -449,7 +449,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
]}
>
{
bagsTotal > 0 ? <Input value={'已选'+bagsTotal+'个包，'+roundsTotal+'轮'} style={{ width: '70%' }} disabled /> : <Input style={{ width: '70%' }} disabled />
bagsTotal > 0 ? <Input value={'已选' + bagsTotal + '个包，' + roundsTotal + '轮'} style={{ width: '70%' }} disabled /> : <Input style={{ width: '70%' }} disabled />
}
<Button type="primary" style={{ float: 'right' }} onClick={() => chooseRounds()}>选择</Button>
</Form.Item>
@ -458,7 +458,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
name="attDatasetId"
extra="单个附件最大30MB"
>
{UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} bid={UploadID} /> : null}
{UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} maxCount={3} bid={UploadID} /> : null}
</Form.Item>
{/* 发布媒体 */}
<Medias
@ -474,7 +474,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
<BraftText braftRef={braftRef} echo={echo} disabled={editInformation} />
</Form>
{/**风控组件 */}
{riskVisible && <RiskPrevention
{riskVisible && <RiskPrevention
modalVisible={riskVisible}
onCancel={() => {
setRiskVisible(false)
@ -497,10 +497,10 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
style={{ maxHeight: modalHeight }}
bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
footer={[
editInformation ?
<Button onClick={()=> setRoundsVisible(false)}>关闭</Button> :
<><Button onClick={chooseCancel}>取消</Button>,
<Button onClick={roundsOk} type="primary">确定</Button></>
editInformation ?
<Button onClick={() => setRoundsVisible(false)}>关闭</Button> :
<><Button onClick={chooseCancel}>取消</Button>,
<Button onClick={roundsOk} type="primary">确定</Button></>
]}
centered
width={800}

4
src/pages/ZZhaoMu/Tender/supplier/DownloadPurchasingDocuments/components/DownloadPurchasingDocuments.tsx
View File

@ -213,8 +213,8 @@ const DownloadPurchasingDocuments: React.FC<{}> = () => {
} else {
Modal.warning({
title: <>
<p style={{ color: "#b30000" }}>下载失败，缺少必需的【供应商营业执照编号】</p>
<p>为确保制作应答文件环节顺利进行，请您提前维护好供应商库信息，具体操作步骤可参照系统菜单-【我的工作台】-【共享文档下载】-【招标采购中心引用供应商信息库信息操作手册】</p>
<p style={{ color: "#b30000" }}>下载失败，缺少必需的【供应商营业执照编号、组织机构代码、税务登记号】</p>
<p>请您提前在合作方维护好供应商公司信息，具体操作步骤可参考：登陆合作方门户-合作方管理应用-基础信息管理-公司信息维护</p>
</>,
onOk() {
reject('下载失败');