diff --git a/src/pages/ElecEvaluation/Monitor/Exception/index.tsx b/src/pages/ElecEvaluation/Monitor/Exception/index.tsx
index 95ed88e..196bf55 100644
--- a/src/pages/ElecEvaluation/Monitor/Exception/index.tsx
+++ b/src/pages/ElecEvaluation/Monitor/Exception/index.tsx
@@ -282,7 +282,7 @@ const MonitorException: React.FC<{}> = () => {
width: '25%',
onCell,
onHeaderCell,
- // render: (_: any, record: any) => isNotEmpty(record.budgetAmount) ? record.budgetAmount.toFixed(2) : 0,
+ render: (_: any, record: any) => isNotEmpty(record.bidSectContractPrice) ? record.bidSectContractPrice.toFixed(2) : 0,
},
{
title: '采购经理',
@@ -345,7 +345,7 @@ const MonitorException: React.FC<{}> = () => {
width: '25%',
onCell,
onHeaderCell,
- // render: (_: any, record: any) => isNotEmpty(record.bidSectContractPrice) ? record.bidSectContractPrice.toFixed(2) : 0,
+ render: (_: any, record: any) => isNotEmpty(record.bidSectContractPrice) ? record.bidSectContractPrice.toFixed(2) : 0,
},
{
title: '采购经理',
@@ -471,7 +471,7 @@ const MonitorException: React.FC<{}> = () => {
width: '25%',
onCell,
onHeaderCell,
- // render: (_: any, record: any) => isNotEmpty(record.budgetAmount) ? record.budgetAmount.toFixed(2) : 0,
+ render: (_: any, record: any) => isNotEmpty(record.bidSectContractPrice) ? record.bidSectContractPrice.toFixed(2) : 0,
},
{
title: '采购经理',
diff --git a/src/pages/ElecEvaluation/Monitor/Home/index.tsx b/src/pages/ElecEvaluation/Monitor/Home/index.tsx
index 430a9de..dd79bc6 100644
--- a/src/pages/ElecEvaluation/Monitor/Home/index.tsx
+++ b/src/pages/ElecEvaluation/Monitor/Home/index.tsx
@@ -459,8 +459,8 @@ export const StageCard = (props: { percentage: string | number, total: string |
)
}
//滚动列表
-export const ScrollTable = (props: { dataSource: any[], columns: any[], rollTime?: number, rollNum?: number, ynum?: number, rowKey?: string, selectKey?: number }) => {
- const { dataSource, columns, rollTime = 10, rollNum = 5, ynum = 300, rowKey = "id", selectKey = -1 } = props;
+export const ScrollTable = (props: { dataSource: any[], columns: any[], ynum?: number, rowKey?: string, selectKey?: number, onDoubleClick?: (record: any) => void }) => {
+ const { dataSource, columns, ynum = 300, rowKey = "id", selectKey = -1, onDoubleClick = () => { } } = props;
return (
{
return {
- onClick: () => { },
+ onDoubleClick: () => { onDoubleClick(record) },
}
}}
/>
@@ -491,8 +491,8 @@ export const ScrollTable = (props: { dataSource: any[], columns: any[], rollTime
)
}
//统计列表
-export const StatisticTable = (props: { dataSource: any[], columns: any[], rollTime?: number, rollNum?: number, ynum?: number, rowKey?: string }) => {
- const { dataSource, columns, rollTime = 50, rollNum = 5, ynum = 300, rowKey = "id" } = props;
+export const StatisticTable = (props: { dataSource: any[], columns: any[], ynum?: number, rowKey?: string }) => {
+ const { dataSource, columns, ynum = 300, rowKey = "id" } = props;
return (
{
}
//modal大弹窗
-export const ModalList = (props: { modalVisible: boolean, onCancel: () => void, exceptionType?: string, exceptionData: any[] }) => {
- const { modalVisible, onCancel, exceptionType, exceptionData } = props;
+export const ModalList = (props: { modalVisible: boolean, onCancel: () => void, exceptionType?: string, exceptionData: any[], title?: string | null }) => {
+ const { modalVisible, onCancel, exceptionType, exceptionData, title } = props;
const modalHeight = window.innerHeight * 96 / 100;
const labelStyle = { color: "#29F0F9", fontWeight: "bold", width: "100px" };
const contentStyle = { color: "#fff", paddingLeft: "14px" };
@@ -603,23 +603,30 @@ export const ModalList = (props: { modalVisible: boolean, onCancel: () => void,
centered
footer={null}
>
- 重点监测异常明细单
+ {isNotEmpty(title) ? title : "重点监测异常明细单"}
{exceptionData.length > 0 ? exceptionData.map((item, index) => {
return (
1 ? 'modal-list-block' : 'modal-list-block modal-list-block-border0'}>
-
{item?.projectName}
-
{item?.bidSectName || item?.sectionName}
+
+
{item?.projectName}
+
{item?.bidSectName || item?.sectionName}
+
+ {isEmpty(title) &&
+
+ 采购方式:{changeDict(dicData['procurement_mode=entrust'], item?.bidMethodDict)}
+
+
}
- {isNotEmpty(exceptionType) ? exceptionType : item?.exType}
+ {isNotEmpty(title) ? changeDict(dicData['procurement_mode=entrust'], item?.bidMethodDict) : isNotEmpty(exceptionType) ? exceptionType : item?.exType}
{item?.openTime || item?.recruitStartTime || item?.openingTime}
- {isNotEmpty(item?.budgetAmount) ? Number(item?.budgetAmount).toFixed(2) : isNotEmpty(item?.bidSectContractPrice) ? Number(item?.bidSectContractPrice).toFixed(2) : "0"}元
+ {isNotEmpty(item?.budgetAmount) ? Number(item?.budgetAmount).toFixed(2) : isNotEmpty(item?.bidSectContractPrice) ? typeof item?.bidSectContractPrice == "number" ? Number(item?.bidSectContractPrice).toFixed(2) : item?.bidSectContractPrice : "0"}元
{item?.provinceName || item?.regionDictName || item?.province}
{item?.ownerContactName}
{item?.ownerContactTel}
- {(item?.state || item?.sectionState || item?.sectionStatus) == 9 ? "异常处理" : changeDict(item?.bidMethodDict ? dicData[`business_module=${item?.bidMethodDict}`] : [], item?.businessModule)}
+ {(item?.sectionState || item?.sectionStatus || item?.state) == 9 ? "异常处理" : changeDict(item?.bidMethodDict ? dicData[`business_module=${item?.bidMethodDict}`] : [], item?.businessModule)}
{item?.appManagerName}
{item?.appManagerTel}
diff --git a/src/pages/ElecEvaluation/Monitor/OpenToday/index.tsx b/src/pages/ElecEvaluation/Monitor/OpenToday/index.tsx
index 8dbd3e2..cfbf2bc 100644
--- a/src/pages/ElecEvaluation/Monitor/OpenToday/index.tsx
+++ b/src/pages/ElecEvaluation/Monitor/OpenToday/index.tsx
@@ -35,6 +35,8 @@ const OpenToday: React.FC<{}> = () => {
const [exceptionType, setExceptionType] = useState
();
//selectKey
const [selectKey, setSelectKey] = useState(-1);
+ //modal title
+ const [modalTitle, setModalTitle] = useState(null);
//权限校验
const auth = useRef(authCheck());
//定时器描述
@@ -294,9 +296,9 @@ const OpenToday: React.FC<{}> = () => {
-
{ }} rightClick={() => { setExceptionType("解密异常"); setModalListData(isNotEmpty(decryptSuccessRateTodayData?.decryptFailProjectList) ? decryptSuccessRateTodayData?.decryptFailProjectList : []); setModalListVisible(true); }} />
- { setExceptionType("2小时未开标"); setModalListData(noOpenListTwo); setModalListVisible(true); }} rightClick={() => { setExceptionType("5小时未开标"); setModalListData(noOpenListFive); setModalListVisible(true); }} />
- { setExceptionType("6小时未评标"); setModalListData(unopenSixData); setModalListVisible(true); }} rightClick={() => { setExceptionType("10小时未评标"); setModalListData(unopenTenData); setModalListVisible(true); }} />
+ { }} rightClick={() => { setExceptionType("解密异常"); setModalTitle(null); setModalListData(isNotEmpty(decryptSuccessRateTodayData?.decryptFailProjectList) ? decryptSuccessRateTodayData?.decryptFailProjectList : []); setModalListVisible(true); }} />
+ { setExceptionType("2小时未开标"); setModalTitle(null); setModalListData(noOpenListTwo); setModalListVisible(true); }} rightClick={() => { setExceptionType("5小时未开标"); setModalTitle(null); setModalListData(noOpenListFive); setModalListVisible(true); }} />
+ { setExceptionType("6小时未评标"); setModalTitle(null); setModalListData(unopenSixData); setModalListVisible(true); }} rightClick={() => { setExceptionType("10小时未评标"); setModalTitle(null); setModalListData(unopenTenData); setModalListVisible(true); }} />
@@ -313,17 +315,17 @@ const OpenToday: React.FC<{}> = () => {
-
+ { setModalTitle("今日开标明细"); setModalListData([record]); setModalListVisible(true); }} />
-
+ { setModalTitle("重保项目明细"); setModalListData([record]); setModalListVisible(true); }} />
-
{ setModalListVisible(false); setModalListData([]); }} exceptionData={modalListData} exceptionType={exceptionType} />
+ { setModalListVisible(false); setModalListData([]); }} exceptionData={modalListData} exceptionType={exceptionType} title={modalTitle} />
);
};
diff --git a/src/pages/ElecEvaluation/Monitor/style.less b/src/pages/ElecEvaluation/Monitor/style.less
index 138085c..00d1aef 100644
--- a/src/pages/ElecEvaluation/Monitor/style.less
+++ b/src/pages/ElecEvaluation/Monitor/style.less
@@ -1143,22 +1143,48 @@
}
.modal-list-pname {
- &>span {
- font-size: 16px;
- font-weight: normal;
- line-height: 38px;
- letter-spacing: 0px;
- color: #FFFFFF;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .modal-list-left {
+ &>span {
+ font-size: 16px;
+ font-weight: normal;
+ line-height: 38px;
+ letter-spacing: 0px;
+ color: #FFFFFF;
+ }
+
+ &>img {
+ position: relative;
+ top: -2px;
+ }
+
+ &>div {
+ padding-left: 28px;
+ color: #FFFFFF;
+ }
}
- &>img {
- position: relative;
- top: -2px;
- }
+ .modal-list-right {
+ .modal-list-proc {
+ align-items: center;
+ padding: 2px 12px;
+ background: rgba(25, 198, 255, 0.17);
+ box-sizing: border-box;
+ border: 1px solid #29F0F9;
+ border-radius: 3px;
- &>div {
- padding-left: 28px;
- color: #FFFFFF;
+ &>span {
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 20px;
+ letter-spacing: 0px;
+ color: #29F0F9;
+ z-index: 0;
+ }
+ }
}
}