diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx index fc23162..526a988 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx +++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx @@ -18,6 +18,7 @@ import { history } from "umi"; import { btnAuthority } from "@/utils/authority"; import { getApprProcessList } from "@/utils/SeleApprovalProcess/service" import SeleApprovalProcess from "@/utils/SeleApprovalProcess" +import { isEmpty } from "@/utils/CommonUtils" /* * 招标公告开始 @@ -157,6 +158,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> + ); @@ -166,6 +168,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn3 = ( @@ -175,6 +178,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn4 = ( @@ -184,6 +188,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); @@ -193,6 +198,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); @@ -204,6 +210,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); @@ -271,6 +278,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> + ); @@ -280,6 +288,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn3 = ( @@ -289,6 +298,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn4 = ( @@ -298,6 +308,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); @@ -307,6 +318,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn6 = ( @@ -316,6 +328,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); diff --git a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx index 062435b..cb5c29f 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx +++ b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx @@ -5,9 +5,10 @@ import './style.less'; import { Anchor, BackTop, Button, Collapse, Descriptions, Form, Input, message, PageHeader, Space, Spin, Typography } from 'antd'; import { btnAuthority } from '@/utils/authority'; import { ArrowUpOutlined, CaretRightOutlined } from '@ant-design/icons'; -import { isNotEmpty } from '@/utils/CommonUtils'; +import { getURLInformation, isNotEmpty, returnDictVal } from '@/utils/CommonUtils'; import ExtendUpload from '@/utils/ExtendUpload'; import { getPublicData, savePublicData } from '../service'; +import { getDicData } from '@/utils/session'; const layout = { labelCol: { @@ -33,6 +34,11 @@ const PublicPlatform: React.FC<{}> = () => { const [readOnly, setReadOnly] = useState(true); //公示or公告 true-公示 false-公告 const [annoType, setAnnoType] = useState(false); + //annoId + const annoId = getURLInformation("id"); + //获取字典 + const getDict: any = getDicData(); + const dictData = JSON.parse(getDict); const { TextArea } = Input; const { Panel } = Collapse; @@ -89,7 +95,7 @@ const PublicPlatform: React.FC<{}> = () => { rules={rules} extra={extra} > - + ) } @@ -142,13 +148,20 @@ const PublicPlatform: React.FC<{}> = () => { return null; } //项目信息 - const projectRender = (project: any, tenderer: any, readonly: boolean) => { - if (isNotEmpty(project) && isNotEmpty(tenderer)) { + const projectRender = (project: any, tenderer: any, agency: any, projectRecord: any, readonly: boolean) => { + if (isNotEmpty(project) && isNotEmpty(tenderer) && isNotEmpty(agency) && isNotEmpty(projectRecord)) { const rel: boolean = readonly || project.readonly; return ( <> - {returnInput("name", "纳税人名称", rel, tenderer.name, [{ required: !rel }], "纳税人名称")} - {returnInput("code", "纳税人识别号", rel, tenderer.code, [{ required: !rel }], "纳税人识别号")} + {returnInput("tenderProjectCode", "项目编号", true, project.tenderProjectCode)} + {returnArea("projectName", "项目名称", true, projectRecord.projectName)} + {returnInput("agencyCode", "招标代理机构代码", true, agency.code)} + {returnInput("agencyCompanyName", "招标代理机构名称", true, agency.companyName)} + {returnInput("bidOrgDict", "招标组织形式", true, returnDictVal(dictData['organization=entrust'], projectRecord.bidOrgDict))} + {returnInput("constant", "招标代理机构联系人", true, agency.constant)} + {returnInput("tel", "招标代理机构联系电话", true, agency.tel)} + {returnInput("name", "招标人名称", rel, tenderer.name, [{ required: !rel }], "招标人名称")} + {returnInput("code", "招标人代码", rel, tenderer.code, [{ required: !rel }], "统一社会信用代码")} {returnArea("projectScale", "项目规模", rel, project.projectScale, [{ required: !rel }], "项目规模")} {returnArea("tenderContent", "招标内容与范围及招标方案说明", rel, project.tenderContent, [{ required: !rel }], "招标内容与范围及招标方案说明")} @@ -228,20 +241,24 @@ const PublicPlatform: React.FC<{}> = () => { }; useEffect(() => { - setLoading(true); - //获取公共服务平台数据 - getPublicData('1516966126268026880').then(res => { - if (res?.code == 200) { - const data = res?.data; - setInitialData(data); - if (isNotEmpty(data.anno)) { - setAnnoType(data.anno.annoNature === 201); - setReadOnly(data.anno.status != 1 && data.anno.status != 4); + if (isNotEmpty(annoId)) { + setLoading(true); + //获取公共服务平台数据 + getPublicData(annoId).then(res => { + if (res?.code == 200) { + const data = res?.data; + setInitialData(data); + if (isNotEmpty(data.anno)) { + setAnnoType(data.anno.annoNature === 201); + setReadOnly(data.anno.status != 1 && data.anno.status != 4); + } } - } - }).finally(() => { - setLoading(false); - }) + }).finally(() => { + setLoading(false); + }) + } else { + message.error('获取公共服务平台数据失败,请联系管理员'); + } }, []); return ( @@ -278,7 +295,7 @@ const PublicPlatform: React.FC<{}> = () => { id="panel1" key="1" > - {projectRender(initialData?.project, initialData?.tenderer, readOnly)} + {projectRender(initialData?.project, initialData?.tenderer, initialData?.agency, initialData?.projectRecord, readOnly)} {annoType && 中标候选人信息} diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx index 9e957d4..26f5c62 100644 --- a/src/pages/Calibration/BidPublicityResult/index.tsx +++ b/src/pages/Calibration/BidPublicityResult/index.tsx @@ -18,6 +18,7 @@ import { btnAuthority } from "@/utils/authority"; import { getApprProcessList } from "@/utils/SeleApprovalProcess/service" import SeleApprovalProcess from "@/utils/SeleApprovalProcess" import { releaseNoticeOffline } from "@/pages/Bid/BiddingAnnouncement/service" +import { isEmpty } from "@/utils/CommonUtils" /* * 招标公示开始 @@ -156,6 +157,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { <>       + ); @@ -165,6 +167,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { + ); let btn3 = ( @@ -174,6 +177,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { + ); let btn4 = ( @@ -183,6 +187,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { + ); @@ -192,6 +197,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { + { @@ -218,6 +224,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { + ); diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx index 0417a9f..852317e 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx @@ -1,4 +1,5 @@ import { btnAuthority } from '@/utils/authority'; +import { isEmpty } from '@/utils/CommonUtils'; import SeleApprovalProcess from '@/utils/SeleApprovalProcess'; import { getApprProcessList } from '@/utils/SeleApprovalProcess/service'; import { getDicData, getProId } from '@/utils/session'; @@ -67,17 +68,17 @@ const ExceptionHandling: React.FC = (props) => { methodDict == 'procurement_mode_1' || methodDict == 'procurement_mode_2' ? '标段' : methodDict == 'procurement_mode_4' - ? '包件' - : '采购包'; + ? '包件' + : '采购包'; useEffect(() => { - if(drawerVisible) { + if (drawerVisible) { //初始化字典 const data: any = getDicData(); setDictData(JSON.parse(data)); //存储项目数据 setProjectData(values); } - }, [values?.id,drawerVisible]); + }, [values?.id, drawerVisible]); const getSectionList = async (param: any, id: any) => { let params = { @@ -193,15 +194,15 @@ const ExceptionHandling: React.FC = (props) => { }; //公告提交审批 const toApproval = async (param: any) => { - if(param.sendMessageId == null) { + if (param.sendMessageId == null) { message.info("请先编辑失败公告") } else { setLoading(true); //获取流程列表 getApprProcessList(param.sendMessageId).then(res => { - if(res?.code == 200) { + if (res?.code == 200) { const data = res?.data - if(data?.approval == true) {//打开选择流程界面 + if (data?.approval == true) {//打开选择流程界面 setRecordData(param) setApprovalData(data?.list) setApprovalVisible(true) @@ -237,7 +238,7 @@ const ExceptionHandling: React.FC = (props) => { const toApprovalFor = async (record: any) => { setLoading(true) await getApprovalFor(record.sendMessageId).then(res => { - if(res?.code == 200 || res?.success == true) { + if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; let d = data?.traceDetailUrl?.replace(durl, '/'); @@ -309,10 +310,10 @@ const ExceptionHandling: React.FC = (props) => { //按钮逻辑判断 record.status == 0 && record.sendMessageStatus == 7 ? ( //草稿-无需发布 <> - - = (props) => { okText="确定" cancelText="取消" > - @@ -334,10 +335,10 @@ const ExceptionHandling: React.FC = (props) => { (record.sendMessageStatus == 0 || record.sendMessageStatus == 1) ? ( //草稿-公告未编辑-公告已编辑 <> - - = (props) => { okText="确定" cancelText="取消" > - + toDelete(record)} okText="确定" cancelText="取消" > - ) : record.status == 0 && record.sendMessageStatus == 2 ? ( //草稿-公告已提交 <> - + toDelete(record)} okText="确定" cancelText="取消" > - ) : record.status == 0 && record.sendMessageStatus == 3 ? ( //草稿-公告已审批通过 <> - + toDelete(record)} okText="确定" cancelText="取消" > - ) : record.status == 0 && record.sendMessageStatus == 4 ? ( //草稿-审批不通过 - <> - - - + + - toApproval(record)} - okText="确定" - cancelText="取消" - > - - - toDelete(record)} - okText="确定" - cancelText="取消" - > - - - - ) : record.status == 0 && record.sendMessageStatus == 5 ? ( //草稿-公告已发布 + toApproval(record)} + okText="确定" + cancelText="取消" + > + + + + toDelete(record)} + okText="确定" + cancelText="取消" + > + + + + ) : record.status == 0 && record.sendMessageStatus == 5 ? ( //草稿-公告已发布 <> - + ) : record.status == 0 && record.sendMessageStatus == 6 ? ( //草稿-公告发布失败 <> @@ -479,17 +485,18 @@ const ExceptionHandling: React.FC = (props) => { okText="确定" cancelText="取消" > - + toDelete(record)} okText="确定" cancelText="取消" > - @@ -505,6 +512,7 @@ const ExceptionHandling: React.FC = (props) => { + ) : null, }, @@ -538,7 +546,7 @@ const ExceptionHandling: React.FC = (props) => { style={{ marginBottom: 12, zIndex: 99 }} onClick={() => toAdd()} loading={addLoading} - hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])} + hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])} > 创建异常处理 @@ -560,7 +568,7 @@ const ExceptionHandling: React.FC = (props) => { total: res.data.total, current: res.data.current, }; - }) : {data: [],success: false} + }) : { data: [], success: false } } rowKey="id" pagination={{ @@ -634,13 +642,13 @@ const ExceptionHandling: React.FC = (props) => { projectData={values} />} {approvalVisible ? ( - { - setApprovalVisible(false) - setApprovalData([]) - setRecordData({}) - actionRef.current?.reload?.(); - }} data={approvalData} annoId={recordData?.sendMessageId} /> - ) : null} + { + setApprovalVisible(false) + setApprovalData([]) + setRecordData({}) + actionRef.current?.reload?.(); + }} data={approvalData} annoId={recordData?.sendMessageId} /> + ) : null} ); }; diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx index 07d3987..eb63abc 100644 --- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx +++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx @@ -1,7 +1,7 @@ -import {UnorderedListOutlined} from "@ant-design/icons" -import ProTable, {ActionType, ProColumns} from "@ant-design/pro-table" -import {Button, Card, Divider, Drawer, message, Modal, Spin, Table} from "antd" -import React, {useEffect, useRef, useState} from "react" +import { UnorderedListOutlined } from "@ant-design/icons" +import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table" +import { Button, Card, Divider, Drawer, message, Modal, Spin, Table } from "antd" +import React, { useEffect, useRef, useState } from "react" import BiddingAnnouncement from "./components/BiddingAnnouncement" import BiddingAnnouncement4Change from "./components/BiddingAnnouncement4Change" import { @@ -14,11 +14,12 @@ import { GetNoticeUsablePackage, releaseNoticeOffline, getApprovalFor } from "./service" -import {getProId, getProMethod} from "@/utils/session"; -import {checkConflict} from "@/pages/Bid/BiddingAnnouncement/service"; -import {btnAuthority} from "@/utils/authority"; +import { getProId, getProMethod } from "@/utils/session"; +import { checkConflict } from "@/pages/Bid/BiddingAnnouncement/service"; +import { btnAuthority } from "@/utils/authority"; import { getApprProcessList } from "@/utils/SeleApprovalProcess/service" import SeleApprovalProcess from "@/utils/SeleApprovalProcess" +import { isEmpty } from "@/utils/CommonUtils" /* * 资审公告开始 @@ -124,36 +125,40 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { render: (_: any, record: any) => { let btn1 = ( <> - - - + + + + ); let btn2 = ( <> - - - - ); - let btn3 = ( - <> - + + + ); + let btn3 = ( + <> + + + + ); let btn4 = ( <> - - + + - + + ); let btn5 = ( @@ -162,17 +167,19 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { - + + ); let btn6 = ( <> - - - + + + + ); @@ -201,12 +208,12 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { }, ]; - const ChangeNoticeListcolumns:any = [ + const ChangeNoticeListcolumns: any = [ { title: '公告标题', dataIndex: 'annoTitle', align: 'left', - valueType:"text" + valueType: "text" }, { title: '起草时间', @@ -222,13 +229,13 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { key: "status", align: 'left', valueEnum: { - 1: {text: '起草', status: '一'}, - 2: {text: '已提交', status: ''}, - 3: {text: '已审批', status: ''}, - 4: {text: '已拒绝', status: ''}, - 5: {text: '已发布', status: ''}, - 6: {text: '发布失败', status: ''}, - 9: {text: '异常处理', status: ''}, + 1: { text: '起草', status: '一' }, + 2: { text: '已提交', status: '' }, + 3: { text: '已审批', status: '' }, + 4: { text: '已拒绝', status: '' }, + 5: { text: '已发布', status: '' }, + 6: { text: '发布失败', status: '' }, + 9: { text: '异常处理', status: '' }, }, }, { @@ -238,9 +245,10 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { render: (_: any, record: any) => { let btn1 = ( <> - - - + + + + ); let btn2 = ( @@ -249,25 +257,28 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn3 = ( <> - + + ); let btn4 = ( <> - - + + - + + ); let btn5 = ( @@ -276,15 +287,17 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn6 = ( <> - - + + + ); @@ -328,7 +341,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { "pageSize": dataSourceNum, "source": 11, "tpId": tpId, - "roomType":"1", + "roomType": "1", }).then(res => { if (res.code == 200) { setdataSource(res.data.records); @@ -346,7 +359,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { "pageSize": 100, "source": 11, "tpId": tpId, - "roomType":"1", + "roomType": "1", }).then(res => { if (res.message == "success" && res.data != null) { setChangeNoticeListdataSource(res.data.records); @@ -365,7 +378,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { /*新增资审公告*/ const toEditAdd = async (props: any) => { - await checkConflict(tpId).then(resp=>{ + await checkConflict(tpId).then(resp => { if (resp?.code == 200) { if (!resp?.data) { GetNoticeUsablePackage(tpId).then(res => { @@ -479,7 +492,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { } } setRefresh(Math.random() + 1); - }).finally(()=>setPageloading(false)); + }).finally(() => setPageloading(false)); }; /** * 再次发布 @@ -526,9 +539,9 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { setPageloading(true); //获取流程列表 getApprProcessList(record.id).then(res => { - if(res?.code == 200) { + if (res?.code == 200) { const data = res?.data - if(data?.approval == true) {//打开选择流程界面 + if (data?.approval == true) {//打开选择流程界面 setRecordData(record) setApprovalData(data?.list) setApprovalVisible(true) @@ -549,10 +562,10 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { }) }; - //公告审批单&变更公告审批单 - const toApprovalFor = async (record: any) => { + //公告审批单&变更公告审批单 + const toApprovalFor = async (record: any) => { await getApprovalFor(record.id).then(res => { - if(res?.code == 200 || res?.success == true) { + if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; let d = data?.traceDetailUrl?.replace(durl, '/'); @@ -564,13 +577,13 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { return ( -
+
[ - , - , + , ]} @@ -605,47 +618,47 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { centered closable={false} // bodyStyle={{margin:0,padding:0}} - footer={[ ]} + footer={[]} > [ - , + , ]} size={"small"} search={false} options={false} columns={ChangeNoticeListcolumns} dataSource={ChangeNoticeListdataSource} - pagination={{hideOnSinglePage: true, pageSize: 50}} + pagination={{ hideOnSinglePage: true, pageSize: 50 }} loading={pageloading} /> ) : null} - {updateVisible ? ( - setRefresh(Math.random() + 1)} titleName={updateChange} - pkId={pkId} type={type} tpId={tpId} - onCancel={() => setUpdateVisible(false)} modalVisible={updateVisible} FpkId={FpkId} - ChangeSX={() => GetList(FpkId)}/> - ) : null} - {updateVisible4Change ? ( - setRefresh(Math.random() + 1)} - titleName={updateChange} pkId={pkId} type={type} tpId={tpId} - onCancel={() => setUpdateVisible4Change(false)} - modalVisible={updateVisible4Change} FpkId={FpkId} - ChangeSX={() => GetList(FpkId)}/> - ) : null} - {approvalVisible ? ( - { - setApprovalVisible(false) - setApprovalData([]) - setRecordData({}) - if (type == "change" || type == "changeNew") { - GetList(FpkId); - } else { - setRefresh(Math.random() + 1) - } - }} data={approvalData} annoId={recordData?.id} /> - ) : null} + {updateVisible ? ( + setRefresh(Math.random() + 1)} titleName={updateChange} + pkId={pkId} type={type} tpId={tpId} + onCancel={() => setUpdateVisible(false)} modalVisible={updateVisible} FpkId={FpkId} + ChangeSX={() => GetList(FpkId)} /> + ) : null} + {updateVisible4Change ? ( + setRefresh(Math.random() + 1)} + titleName={updateChange} pkId={pkId} type={type} tpId={tpId} + onCancel={() => setUpdateVisible4Change(false)} + modalVisible={updateVisible4Change} FpkId={FpkId} + ChangeSX={() => GetList(FpkId)} /> + ) : null} + {approvalVisible ? ( + { + setApprovalVisible(false) + setApprovalData([]) + setRecordData({}) + if (type == "change" || type == "changeNew") { + GetList(FpkId); + } else { + setRefresh(Math.random() + 1) + } + }} data={approvalData} annoId={recordData?.id} /> + ) : null}
) } diff --git a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx index 865bc6c..3e76da1 100644 --- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx +++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx @@ -19,6 +19,7 @@ import { checkConflict } from "@/pages/Bid/BiddingAnnouncement/service"; import { btnAuthority } from "@/utils/authority"; import { getApprProcessList } from "@/utils/SeleApprovalProcess/service" import SeleApprovalProcess from "@/utils/SeleApprovalProcess" +import { isEmpty } from "@/utils/CommonUtils" /* * 招标公告开始 @@ -117,6 +118,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> + ); @@ -126,6 +128,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn3 = ( @@ -135,6 +138,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn4 = ( @@ -144,6 +148,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); @@ -153,6 +158,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + {getProMethod() == "procurement_mode_4" ? : null} @@ -166,6 +172,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); @@ -254,6 +261,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> + ); @@ -263,6 +271,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn3 = ( @@ -272,6 +281,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn4 = ( @@ -281,6 +291,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); @@ -290,6 +301,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); let btn6 = ( @@ -299,6 +311,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { + ); @@ -527,13 +540,13 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { /** * 发起审批 * */ - const handleApproval = async (record: any) => { + const handleApproval = async (record: any) => { setPageloading(true); //获取流程列表 getApprProcessList(record.id).then(res => { - if(res?.code == 200) { + if (res?.code == 200) { const data = res?.data - if(data?.approval == true) {//打开选择流程界面 + if (data?.approval == true) {//打开选择流程界面 setRecordData(record) setApprovalData(data?.list) setApprovalVisible(true) diff --git a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx index fd4e4c1..b22ece3 100644 --- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx +++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx @@ -17,6 +17,7 @@ import { getProId } from "@/utils/session"; import { btnAuthority } from "@/utils/authority"; import { getApprProcessList } from "@/utils/SeleApprovalProcess/service" import SeleApprovalProcess from "@/utils/SeleApprovalProcess" +import { isEmpty } from "@/utils/CommonUtils" /* * 招标公示开始 @@ -69,15 +70,15 @@ const BidPublicityResult: React.FC<{}> = (props) => { title: '起草时间', dataIndex: 'createDate', // dataIndex: 'annoStartTime', - key:"annoStartTime", - align:'left', + key: "annoStartTime", + align: 'left', valueType: 'dateTime', }, { title: '公示状态', dataIndex: 'status', - key:"status", - align:'left', + key: "status", + align: 'left', // valueEnum: { // 1: { text: '起草', status: '' }, // 2: { text: '已提交', status: '' }, @@ -110,6 +111,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { <>       + ); @@ -119,6 +121,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { + ); let btn3 = ( @@ -128,6 +131,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { + ); let btn4 = ( @@ -137,6 +141,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { + ); @@ -146,6 +151,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { + ); let btn6 = ( @@ -155,6 +161,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { + ); @@ -317,9 +324,9 @@ const BidPublicityResult: React.FC<{}> = (props) => { setPageloading(true); //获取流程列表 getApprProcessList(record.id).then(res => { - if(res?.code == 200) { + if (res?.code == 200) { const data = res?.data - if(data?.approval == true) {//打开选择流程界面 + if (data?.approval == true) {//打开选择流程界面 setRecordData(record) setApprovalData(data?.list) setApprovalVisible(true)