时间：{item.eventTime}
diff --git a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/service.ts b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/service.ts
index 2b1cd8f..3a0521c 100644
--- a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/service.ts
+++ b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/service.ts
@@ -56,4 +56,16 @@ export async function getLookBackList(params: any) {
// return request('/api/biz-service-ebtp-evaluation/v1/eval/room/reserve/' + id, {
// method: 'GET',
// });
-// }
\ No newline at end of file
+// }
+
+/**
+ * 陌生人预警-查询全部
+ * @param params
+ * @returns
+ */
+export async function getAllStranger(params: any) {
+ return request('/api/biz-service-ebtp-evaluation/v1/eval/room/alarm/screamOfAlarm/strangerImg', {
+ method: 'GET',
+ params: params
+ });
+}
\ No newline at end of file
diff --git a/src/pages/Evaluation/BaseInf/service.ts b/src/pages/Evaluation/BaseInf/service.ts
index c3809fe..d55514c 100644
--- a/src/pages/Evaluation/BaseInf/service.ts
+++ b/src/pages/Evaluation/BaseInf/service.ts
@@ -28,7 +28,7 @@ export async function getInfList(data: any) {
*/
export async function saveLeaderId(param: any) {
return request(`/api/biz-service-ebtp-rsms/v1/jury/member/chooseLeader/?id=${param}`, {
- method: 'PUT',
+ method: 'POST',
});
}
@@ -46,7 +46,7 @@ export async function baseFinalSubmit(params: any) {
* 通过评审室id查询评审分工
* @param param
*/
- export async function getDevidedData(param: any) {
+export async function getDevidedData(param: any) {
return request(`/api/biz-service-ebtp-rsms/v1/jury/divide/findListByRoomId/` + param, {
method: 'GET',
});
diff --git a/src/pages/Evaluation/BidAbnormal/service.ts b/src/pages/Evaluation/BidAbnormal/service.ts
index dbe8484..70f44fd 100644
--- a/src/pages/Evaluation/BidAbnormal/service.ts
+++ b/src/pages/Evaluation/BidAbnormal/service.ts
@@ -38,8 +38,8 @@ export async function addQuestion(data: any) {
* @param param
*/
export async function changeResult(data: any) {
- return request('/api/biz-service-ebtp-rsms/v1/bid/eval/question', {
- method: 'put',
+ return request('/api/biz-service-ebtp-rsms/v1/bid/eval/question/update', {
+ method: 'POST',
data: data
});
}
@@ -49,8 +49,8 @@ export async function changeResult(data: any) {
* @param param
*/
export async function dellQuestion(id: any) {
- return request('/api/biz-service-ebtp-rsms/v1/bid/eval/question/'+id, {
- method: 'DELETE',
+ return request('/api/biz-service-ebtp-rsms/v1/bid/eval/question/del/' + id, {
+ method: 'POST',
});
}
@@ -59,7 +59,7 @@ export async function dellQuestion(id: any) {
* @param param
*/
export async function changeQuestion(id: any) {
- return request('/api/biz-service-ebtp-rsms/v1/bid/eval/question/'+id, {
+ return request('/api/biz-service-ebtp-rsms/v1/bid/eval/question/' + id, {
method: 'get',
});
}
diff --git a/src/pages/Evaluation/BidControl/BidControlManager/service.ts b/src/pages/Evaluation/BidControl/BidControlManager/service.ts
index e2291a4..d4233ef 100644
--- a/src/pages/Evaluation/BidControl/BidControlManager/service.ts
+++ b/src/pages/Evaluation/BidControl/BidControlManager/service.ts
@@ -3,33 +3,33 @@ import request from '@/utils/request';
export async function getList(assessRoomId: any) { // IP MAC查看
return request('/api/biz-service-ebtp-resps/v1/tfilewarning/list', {
method: 'post',
- data: {"assessRoomId": assessRoomId}
+ data: { "assessRoomId": assessRoomId }
});
}
export async function getQuoteWarning(assessRoomId: any) { //报价一致预警
return request('/api/biz-service-ebtp-resps/v1/tfilecontentdata/getQuoteWarning', {
method: 'post',
- data: {"assessRoomId": assessRoomId}
+ data: { "assessRoomId": assessRoomId }
});
}
export async function getRRQuoteWarning(assessRoomId: any) { //报价一致预警 专家通知情况
return request('/api/biz-service-ebtp-resps/v1/riskpricewarning/list', {
method: 'post',
- data: {"assessRoomId": assessRoomId}
+ data: { "assessRoomId": assessRoomId }
});
-}
+}
export async function quoteWarningToRR(params: any) { //报价一致预警 通知专家
return request('/api/biz-service-ebtp-resps/v1/riskpricewarning/', {
method: 'post',
data: params
- });
-}
+ });
+}
export async function getReviewResultList(params: any) { // 评审结果展示及预警
return request('/api/biz-service-ebtp-rsms/v1/risk/resultWarning', {
method: 'post',
- data: params
+ data: params
});
}
export async function getRRWarningtList(params: any) { // 评审结果展示及预警 专家提醒情况
@@ -42,21 +42,23 @@ export async function getRRWarningtList(params: any) { // 评审结果展示及
export async function warningtListToRR(assessRoomId: any) { // 评审结果展示及预警 提醒专家
return request('/api/biz-service-ebtp-rsms/v1/risk/sendJuryMemberConfirm', {
method: 'post',
- data: {"assessRoomId": assessRoomId,}
+ data: { "assessRoomId": assessRoomId, }
});
}
-export async function warningtListRRToYes(id: any,confirmStatus:any) { // 评审结果展示及预警 专家确认
+export async function warningtListRRToYes(id: any, confirmStatus: any) { // 评审结果展示及预警 专家确认
return request('/api/biz-service-ebtp-rsms/v1/riskresultwarning/updateResultWarning', {
method: 'post',
- data: {"id": id,
- "confirmStatus":confirmStatus}
+ data: {
+ "id": id,
+ "confirmStatus": confirmStatus
+ }
});
}
-export async function getBlackList(projectId:any,assessRoomId: any) { //黑名单
- return request('/api/biz-service-ebtp-bid/v1/supplier/info/getRiskShowBlacklistByRoomId?tpId='+`${projectId}`+"&roomId="+`${assessRoomId}`, {
+export async function getBlackList(projectId: any, assessRoomId: any) { //黑名单
+ return request('/api/biz-service-ebtp-bid/v1/supplier/info/getRiskShowBlacklistByRoomId?tpId=' + `${projectId}` + "&roomId=" + `${assessRoomId}`, {
method: 'get'
});
}
@@ -69,25 +71,25 @@ export async function getBidDocSmartCheckList(assessRoomId: any) { //投标文
}
export async function getDeviatedWarnList(assessRoomId: any) { // 偏离度提醒
- return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/findBidDeviatedWarnListByRoomId/'+`${assessRoomId}`, {
+ return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/findBidDeviatedWarnListByRoomId/' + `${assessRoomId}`, {
method: 'get'
});
}
export async function getDeviatedWarnListByJury(assessRoomId: any) { // 偏离度提醒 专家查询
- return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/findBidDeviatedWarnListByRoomIdAndMember/'+`${assessRoomId}`, {
+ return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/findBidDeviatedWarnListByRoomIdAndMember/' + `${assessRoomId}`, {
method: 'get',
});
}
export async function deviatedWarnListToRR(id: any) { // 偏离度提醒 通知专家
- return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/send/'+`${id}`, {
+ return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/send/' + `${id}`, {
method: 'get'
});
}
export async function deviatedWarnListJuryYes(params: any) { // 偏离度提醒 专家确认 填写说明内容上传
return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn', {
- method: 'put',
+ method: 'POST',
data: params
});
}
@@ -99,25 +101,29 @@ export async function getDeviatedAnalysisList(params?: any) { // 偏离度分析
});
}
-export async function deviatedAnalysisListToRR(assessRoomId: any,reviewTurnId:any,reviewTurnSort:any) { // 偏离度分析 发送专家确认
+export async function deviatedAnalysisListToRR(assessRoomId: any, reviewTurnId: any, reviewTurnSort: any) { // 偏离度分析 发送专家确认
return request('/api/biz-service-ebtp-rsms/v1/risk/sendDeviatedAnalysisConfirm', {
method: 'post',
- data: {"assessRoomId": assessRoomId,
- "reviewTurnId": reviewTurnId,
- "reviewTurnSort": reviewTurnSort}
+ data: {
+ "assessRoomId": assessRoomId,
+ "reviewTurnId": reviewTurnId,
+ "reviewTurnSort": reviewTurnSort
+ }
});
}
-export async function deviatedAnalysisRRYes(id: any,confirmStatus:any) { // 偏离度分析 发送专家确认
- return request('/api/biz-service-ebtp-rsms/v1/riskdeviatedanalysis', {
- method: 'put',
- data: {id: id,
- confirmStatus: confirmStatus}
+export async function deviatedAnalysisRRYes(id: any, confirmStatus: any) { // 偏离度分析 发送专家确认
+ return request('/api/biz-service-ebtp-rsms/v1/riskdeviatedanalysis/update', {
+ method: 'POST',
+ data: {
+ id: id,
+ confirmStatus: confirmStatus
+ }
});
}
-export async function replace(a: any,b: any,c: any){
- return a.replace(b,c);
+export async function replace(a: any, b: any, c: any) {
+ return a.replace(b, c);
}
//风险限定供应商
diff --git a/src/pages/Evaluation/BidControl/Jury/service.ts b/src/pages/Evaluation/BidControl/Jury/service.ts
index b4f3133..7fef192 100644
--- a/src/pages/Evaluation/BidControl/Jury/service.ts
+++ b/src/pages/Evaluation/BidControl/Jury/service.ts
@@ -3,23 +3,23 @@ import request from '@/utils/request';
export async function getList(assessRoomId: any) { // IP MAC查看
return request('/api/biz-service-ebtp-resps/v1/tfilewarning/list', {
method: 'post',
- data: {"assessRoomId": assessRoomId}
+ data: { "assessRoomId": assessRoomId }
});
}
export async function getQuoteWarning(assessRoomId: any) { //报价一致预警
return request('/api/biz-service-ebtp-resps/v1/tfilecontentdata/getQuoteWarning', {
method: 'post',
- data: {"assessRoomId": assessRoomId}
+ data: { "assessRoomId": assessRoomId }
});
}
export async function getRRQuoteWarning(assessRoomId: any) { //报价一致预警 专家通知情况
return request('/api/biz-service-ebtp-resps/v1/riskpricewarning/list', {
method: 'post',
- data: {"assessRoomId": assessRoomId}
+ data: { "assessRoomId": assessRoomId }
});
-}
+}
export async function quoteWarningToRR(params: any) { //报价一致预警 通知专家
return request('/api/biz-service-ebtp-resps/v1/riskpricewarning/', {
method: 'post',
@@ -29,7 +29,7 @@ export async function quoteWarningToRR(params: any) { //报价一致预警 通
export async function getReviewResultList(params: any) { // 评审结果展示及预警
return request('/api/biz-service-ebtp-rsms/v1/risk/resultWarning', {
method: 'post',
- data: params
+ data: params
});
}
export async function getRRWarningtList(params: any) { // 评审结果展示及预警 专家提醒情况
@@ -42,55 +42,61 @@ export async function getRRWarningtList(params: any) { // 评审结果展示及
export async function warningtListToRR(assessRoomId: any) { // 评审结果展示及预警 提醒专家
return request('/api/biz-service-ebtp-rsms/v1/risk/sendJuryMemberConfirm', {
method: 'post',
- data: {"assessRoomId": assessRoomId,}
+ data: { "assessRoomId": assessRoomId, }
});
}
-export async function warningtListRRToYes(id: any,confirmStatus:any) { // 评审结果展示及预警 专家确认
+export async function warningtListRRToYes(id: any, confirmStatus: any) { // 评审结果展示及预警 专家确认
return request('/api/biz-service-ebtp-rsms/v1/riskresultwarning/updateResultWarning', {
method: 'post',
- data: {"id": id,
- "confirmStatus":confirmStatus}
+ data: {
+ "id": id,
+ "confirmStatus": confirmStatus
+ }
});
}
-export async function getBlackList(assessRoomId: any,sf:any) { //黑名单
+export async function getBlackList(assessRoomId: any, sf: any) { //黑名单
return request('/api/biz-service-ebtp-resps/v1/tfilecontentdata/getQuoteWarning', {
method: 'post',
- data: {"assessRoomId": assessRoomId,
- "sf":sf}
+ data: {
+ "assessRoomId": assessRoomId,
+ "sf": sf
+ }
});
}
-export async function getBlackListOld(gysid: any,sf:any) { //黑名单历史
+export async function getBlackListOld(gysid: any, sf: any) { //黑名单历史
return request('/api/biz-service-ebtp-resps/v1/tfilecontentdata/getQuoteWarning', {
method: 'post',
- data: {"gysid": gysid,
- "sf":sf}
+ data: {
+ "gysid": gysid,
+ "sf": sf
+ }
});
}
export async function getDeviatedWarnList(assessRoomId: any) { // 偏离度提醒
- return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/findBidDeviatedWarnListByRoomId/'+`${assessRoomId}`, {
+ return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/findBidDeviatedWarnListByRoomId/' + `${assessRoomId}`, {
method: 'get'
});
}
export async function getDeviatedWarnListByJury(assessRoomId: any) { // 偏离度提醒 专家查询
- return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/findBidDeviatedWarnListByRoomIdAndMember/'+`${assessRoomId}`, {
+ return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/findBidDeviatedWarnListByRoomIdAndMember/' + `${assessRoomId}`, {
method: 'get',
});
}
export async function deviatedWarnListToRR(id: any) { // 偏离度提醒 通知专家
- return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/send/'+`${id}`, {
+ return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn/send/' + `${id}`, {
method: 'get'
});
}
export async function deviatedWarnListJuryYes(params: any) { // 偏离度提醒 专家确认 填写说明内容上传
return request('/api/biz-service-ebtp-rsms/v1/bid/deviated/warn', {
- method: 'put',
+ method: 'POST',
data: params
});
}
@@ -102,25 +108,29 @@ export async function getDeviatedAnalysisList(params?: any) { // 偏离度分析
});
}
-export async function deviatedAnalysisListToRR(assessRoomId: any,reviewTurnId:any,reviewTurnSort:any) { // 偏离度分析 发送专家确认
+export async function deviatedAnalysisListToRR(assessRoomId: any, reviewTurnId: any, reviewTurnSort: any) { // 偏离度分析 发送专家确认
return request('/api/biz-service-ebtp-rsms/v1/risk/sendDeviatedAnalysisConfirm', {
method: 'post',
- data: {"assessRoomId": assessRoomId,
- "reviewTurnId": reviewTurnId,
- "reviewTurnSort": reviewTurnSort}
- });
-}
-
-export async function deviatedAnalysisRRYes(id: any,confirmStatus:any) { // 偏离度分析 发送专家确认
- return request('/api/biz-service-ebtp-rsms/v1/riskdeviatedanalysis', {
- method: 'put',
- data: {id: id,
- confirmStatus: confirmStatus}
+ data: {
+ "assessRoomId": assessRoomId,
+ "reviewTurnId": reviewTurnId,
+ "reviewTurnSort": reviewTurnSort
+ }
});
}
-export async function replace(a: any,b: any,c: any){
- return a.replace(b,c);
+export async function deviatedAnalysisRRYes(id: any, confirmStatus: any) { // 偏离度分析 发送专家确认
+ return request('/api/biz-service-ebtp-rsms/v1/riskdeviatedanalysis/update', {
+ method: 'POST',
+ data: {
+ id: id,
+ confirmStatus: confirmStatus
+ }
+ });
+}
+
+export async function replace(a: any, b: any, c: any) {
+ return a.replace(b, c);
}
diff --git a/src/pages/Evaluation/BidDetailed/BidDetailedManager/service.ts b/src/pages/Evaluation/BidDetailed/BidDetailedManager/service.ts
index a98cfa6..012a4e7 100644
--- a/src/pages/Evaluation/BidDetailed/BidDetailedManager/service.ts
+++ b/src/pages/Evaluation/BidDetailed/BidDetailedManager/service.ts
@@ -71,7 +71,7 @@ export async function getJuryDetailScoreData(params: any) {
*/
export function updateReviewStatus(params: any) {
return request('/api/biz-service-ebtp-rsms/v1/bid/eval/updateReviewStatus', {
- method: 'put',
+ method: 'POST',
params
});
}
@@ -99,10 +99,10 @@ export function findPriceScoreRecord(params: any) {
* 根据评审室id获取评审室信息
* @param params
*/
- export async function getRoomDataById(params: any) {
+export async function getRoomDataById(params: any) {
return request(`/api/biz-service-ebtp-process/v1/bizassessroom/${params}`, {
- method: 'GET',
+ method: 'GET',
});
- }
-
+}
+
diff --git a/src/pages/Evaluation/BidEnd/BidEndAdjust/index.tsx b/src/pages/Evaluation/BidEnd/BidEndAdjust/index.tsx
index b1ad56f..0d3c781 100644
--- a/src/pages/Evaluation/BidEnd/BidEndAdjust/index.tsx
+++ b/src/pages/Evaluation/BidEnd/BidEndAdjust/index.tsx
@@ -3,7 +3,7 @@ import { Table, Button, Space, Form, Radio, Select, Input, InputNumber, Upload,
import { TableListItem } from './data';
import ExtendUpload from "@/utils/ExtendUpload";
import '@/assets/ld_style.less';
-import {findArithmeticError, getList,getRoomType,savePrice} from './service';
+import { findArithmeticError, getList, getRoomType, savePrice } from './service';
import { getProMethod, getRoomId, getSessionRoleData, getSessionUserData } from '@/utils/session';
import ProTable from '@ant-design/pro-table';
@@ -15,36 +15,36 @@ const formItemLayout = {
wrapperCol: { span: 14 },
};
-function wayValue(key:any){
+function wayValue(key: any) {
let name = "";
//0-调整价 1-最终价格
- if(key==="0"){
+ if (key === "0") {
name = "调整价";
- }else if(key==="1"){
+ } else if (key === "1") {
name = "最终价格";
}
return name;
}
-function typeValue(key:any){
+function typeValue(key: any) {
let name = "";
//0-小微、1-缺项、2-单价和总价不一致、3-手动输入
- if(key===0){
+ if (key === 0) {
name = "小微";
- }else if(key===1){
+ } else if (key === 1) {
name = "缺项";
- }else if(key===2){
+ } else if (key === 2) {
name = "单价和总价不一致";
- }else if(key===3){
+ } else if (key === 3) {
name = "手动输入";
}
return name;
}
const Index: React.FC<{}> = () => {
- let roomId=getRoomId();//sessionStorage.getItem('roomId');//sessionStorage.getItem('roomId')
+ let roomId = getRoomId();//sessionStorage.getItem('roomId');//sessionStorage.getItem('roomId')
var roleId = getSessionUserData().roleIds;//操作员角色
- const [dateList,setDateList] = useState([]);
+ const [dateList, setDateList] = useState([]);
const [adjustForm] = Form.useForm();
const [whetherReadonly, setWhetherReadonly] = useState
(false);
const [editState, setEditState] = useState(false);
@@ -54,116 +54,119 @@ const Index: React.FC<{}> = () => {
const [spin, setSpin] = useState(true);
//附件bid
const [bid, setBid] = useState('');
-
+
var roleId = getSessionRoleData().roleCode;
//采购方式
const proMethod = getProMethod();
let showNameT: any = { tbr: '', pb: '', tb: '' }//投标人供应商
if (proMethod === 'procurement_mode_1' || proMethod === 'procurement_mode_2') {//招标
- showNameT = { tbr: '投标人', pb: '评标', tb: '投标' };
+ showNameT = { tbr: '投标人', pb: '评标', tb: '投标' };
} else {
- showNameT = { tbr: '供应商', pb: '评审', tb: '应答' }
+ showNameT = { tbr: '供应商', pb: '评审', tb: '应答' }
}
const columns: any[] = [ // 列表数据
{ title: `${showNameT.tbr}名称`, dataIndex: 'tendererName', key: 'tendererName' },
{ title: '最新不含税总价', dataIndex: 'evaluatingContent', key: 'evaluatingContent' },
- { title: '调整类别', dataIndex: 'type', key: 'type' ,render: (text: any, record: any, index: any) => {
- let a = "";
- if(record.tfileTendererprice!==null){
- a = typeValue(record.tfileTendererprice.type);
- }
- return a;
+ {
+ title: '调整类别', dataIndex: 'type', key: 'type', render: (text: any, record: any, index: any) => {
+ let a = "";
+ if (record.tfileTendererprice !== null) {
+ a = typeValue(record.tfileTendererprice.type);
+ }
+ return a;
}
},
- { title: '调价说明', dataIndex: 'memo', key: 'memo',render: (text: any, record: any, index: any) => {
- var memo = "";
- if(record.tfileTendererprice!==null){
- memo = record.tfileTendererprice.memo;
+ {
+ title: '调价说明', dataIndex: 'memo', key: 'memo', render: (text: any, record: any, index: any) => {
+ var memo = "";
+ if (record.tfileTendererprice !== null) {
+ memo = record.tfileTendererprice.memo;
+ }
+ return memo;
}
- return memo;
- }
},
- { title: '调价附件', dataIndex: 'fileId', key: 'fileId' ,render: (text: any, record: any, index: any) => {
- var dev = "";
- if(record.tfileTendererprice!==null){
- dev =
+ {
+ title: '调价附件', dataIndex: 'fileId', key: 'fileId', render: (text: any, record: any, index: any) => {
+ var dev = "";
+ if (record.tfileTendererprice !== null) {
+ dev =
+ }
+ return dev;
}
- return dev;
- }
},
];
useEffect(() => {
getWarningList();
setSpin(false);
- if(roleId!=="ebtp-expert"){
+ if (roleId !== "ebtp-expert") {
setEditState(false);
setHaveData(false);
}
- },[]);
+ }, []);
- const getWarningList = async() => {
- setSaveButtonState(false);
- let radioBoolean = false;
- await findArithmeticError(roomId).then((res) => {
- if (res.success ==true) {
- if(res.data!==1){
- radioBoolean = false;
- setIsRadio(false)
- }else{
- radioBoolean = true;
- }
+ const getWarningList = async () => {
+ setSaveButtonState(false);
+ let radioBoolean = false;
+ await findArithmeticError(roomId).then((res) => {
+ if (res.success == true) {
+ if (res.data !== 1) {
+ radioBoolean = false;
+ setIsRadio(false)
+ } else {
+ radioBoolean = true;
}
- })
+ }
+ })
- await getList(roomId).then((res) => {
- if (res.success ==true) {
- var list = res.data;
- for(var i = 0 ; i < list.length ; i++){
- list[i]["key"] = i;
- }
- setDateList(list);
- setSelectChange(list);
- if(list===null||list.length===0){//
+ await getList(roomId).then((res) => {
+ if (res.success == true) {
+ var list = res.data;
+ for (var i = 0; i < list.length; i++) {
+ list[i]["key"] = i;
+ }
+ setDateList(list);
+ setSelectChange(list);
+ if (list === null || list.length === 0) {//
+ setEditState(false);
+ setHaveData(false);
+ setIsRadio(false)
+ } else {
+ if (radioBoolean) {
+ setEditState(true);
+ setIsRadio(true)
+ } else {
setEditState(false);
- setHaveData(false);
setIsRadio(false)
- }else{
- if(radioBoolean){
- setEditState(true);
- setIsRadio(true)
- }else{
- setEditState(false);
- setIsRadio(false)
- }
-
}
+
}
- })
+ }
+ })
}
const setSelectChange = async (list: any) => {
const fieldsValue = await adjustForm.validateFields();
- if(fieldsValue!==null){
-
- for(var i = 0 ; i < list.length ; i ++){
- var data = list[i];
-
- if(data.id===fieldsValue.contentDataId){
+ if (fieldsValue !== null) {
+
+ for (var i = 0; i < list.length; i++) {
+ var data = list[i];
+
+ if (data.id === fieldsValue.contentDataId) {
adjustForm.setFieldsValue({
- id:data.tfileTendererprice!==null
- &&data.tfileTendererprice!==undefined?data.tfileTendererprice.id:null,
- contentDataId:data.id,
- way: data.tfileTendererprice!==null
- &&data.tfileTendererprice!==undefined?parseInt(data.tfileTendererprice.way):1,
- type: data.tfileTendererprice!==null
- &&data.tfileTendererprice!==undefined?parseInt(data.tfileTendererprice.type):0,
+ id: data.tfileTendererprice !== null
+ && data.tfileTendererprice !== undefined ? data.tfileTendererprice.id : null,
+ contentDataId: data.id,
+ way: data.tfileTendererprice !== null
+ && data.tfileTendererprice !== undefined ? parseInt(data.tfileTendererprice.way) : 1,
+ type: data.tfileTendererprice !== null
+ && data.tfileTendererprice !== undefined ? parseInt(data.tfileTendererprice.type) : 0,
price: data.evaluating,
newPrice: '',
- memo:data.tfileTendererprice!==null
- &&data.tfileTendererprice!==undefined?data.tfileTendererprice.memo:null,
- fileId:data.tfileTendererprice!==null
- &&data.tfileTendererprice!==undefined?data.tfileTendererprice.fileId:null
+ memo: data.tfileTendererprice !== null
+ && data.tfileTendererprice !== undefined ? data.tfileTendererprice.memo : null,
+ fileId: data.tfileTendererprice !== null
+ && data.tfileTendererprice !== undefined ? data.tfileTendererprice.fileId : null
});
}
}
@@ -174,27 +177,27 @@ const Index: React.FC<{}> = () => {
setEditState(true);
var data = direction[0];
//data.tfileTendererprice.id;
- adjustForm.setFieldsValue({
- id:data.tfileTendererprice!==null
- &&data.tfileTendererprice!==undefined?data.tfileTendererprice.id:null,
- contentDataId:data.id,
- way: data.tfileTendererprice!==null
- &&data.tfileTendererprice!==undefined?parseInt(data.tfileTendererprice.way):1,
- type: data.tfileTendererprice!==null
- &&data.tfileTendererprice!==undefined?parseInt(data.tfileTendererprice.type):0,
- price: data.evaluating,
- newPrice: '',
- memo:data.tfileTendererprice!==null
- &&data.tfileTendererprice!==undefined?data.tfileTendererprice.memo:null,
- fileId:data.tfileTendererprice!==null
- &&data.tfileTendererprice!==undefined?data.tfileTendererprice.fileId:null
- });
+ adjustForm.setFieldsValue({
+ id: data.tfileTendererprice !== null
+ && data.tfileTendererprice !== undefined ? data.tfileTendererprice.id : null,
+ contentDataId: data.id,
+ way: data.tfileTendererprice !== null
+ && data.tfileTendererprice !== undefined ? parseInt(data.tfileTendererprice.way) : 1,
+ type: data.tfileTendererprice !== null
+ && data.tfileTendererprice !== undefined ? parseInt(data.tfileTendererprice.type) : 0,
+ price: data.evaluating,
+ newPrice: '',
+ memo: data.tfileTendererprice !== null
+ && data.tfileTendererprice !== undefined ? data.tfileTendererprice.memo : null,
+ fileId: data.tfileTendererprice !== null
+ && data.tfileTendererprice !== undefined ? data.tfileTendererprice.fileId : null
+ });
+
+ setBid(data.tfileTendererprice !== null
+ && data.tfileTendererprice !== undefined
+ && data.tfileTendererprice.fileId !== null
+ ? data.tfileTendererprice.fileId : "-1");
- setBid(data.tfileTendererprice!==null
- &&data.tfileTendererprice!==undefined
- &&data.tfileTendererprice.fileId!==null
- ?data.tfileTendererprice.fileId:"-1");
-
}
const formOnFinish = (data: any) => {
@@ -208,23 +211,23 @@ const Index: React.FC<{}> = () => {
}
const saveUpdate = async () => {
const fieldsValue = await adjustForm.validateFields();
- if(fieldsValue.contentDataId===null||fieldsValue.contentDataId===""||fieldsValue.contentDataId===undefined){
+ if (fieldsValue.contentDataId === null || fieldsValue.contentDataId === "" || fieldsValue.contentDataId === undefined) {
message.error(`请选择需要调整的供应商`);
return;
}
var params = {
- "id":fieldsValue.id,
- "contentDataId":fieldsValue.contentDataId,
- "newPrice":fieldsValue.newPrice,
- "way":fieldsValue.way,
- "type":fieldsValue.type,
- "memo":fieldsValue.memo,
- "fileId":fieldsValue.fileId
+ "id": fieldsValue.id,
+ "contentDataId": fieldsValue.contentDataId,
+ "newPrice": fieldsValue.newPrice,
+ "way": fieldsValue.way,
+ "type": fieldsValue.type,
+ "memo": fieldsValue.memo,
+ "fileId": fieldsValue.fileId
}
setSaveButtonState(true);
//保存
savePrice(params).then((res) => {
- if (res.success ==true) {
+ if (res.success == true) {
message.success(`保存成功`);
getWarningList();//刷新
}
@@ -233,94 +236,94 @@ const Index: React.FC<{}> = () => {
return (
<>
-
-
-
- {showNameT.tbr}最新报价列表
- {!haveData?（无报价数据）:null}
-
-
-
-
- {isRadio?
- :}
-
- {editState?
-
- 算数错误调整
-
:null
- }
- {editState?
-
- :null}
+
+
+
+ {showNameT.tbr}最新报价列表
+ {!haveData ? （无报价数据） : null}
+
+
+
+
+ {isRadio ?
+ : }
+
+ {editState ?
+
+ 算数错误调整
+
: null
+ }
+ {editState ?
+
+ : null}
专家申请基本信息
+ 关联{showName.bb}
+ 预约评标室
+
+ 专家申请基本信息
+
)
}
- const tab2 = () => {//cqtab2
+ // const tab2 = () => {//cqtab2
+ // return (
+ // <>
+ //
+ //
抽取条件
+ //
+ //
+ //
+ //
+ //
回避单位信息
+ //
+ //
+ //
+ //
+ //
回避专家信息
+ //
+ //
+ //
+ //
-
抽取条件
-
-
-
-
- {/* */}
-
}
@@ -1811,8 +1952,11 @@ const JudgingPanel: React.FC<{}> = () => {
// form.resetFields();
reset();
setSelectEvalData(null);
+ setInitEvalTime(null);
sectionCountSet(sectionCount + 1);
- disabledSet(false); readOnlySet(false);
+ disabledSet(false);
+ setIsReserve("0");
+ // readOnlySet(false);
}}>
创建评审小组
@@ -1846,7 +1990,7 @@ const JudgingPanel: React.FC<{}> = () => {
data={riskData}
/>}
{/**电子评标室-评标室预约选择 */}
- setSelectEvalVisible(false)} onSubmit={(value: any) => returnEvalData(value)} values={selectEvalData} type={appoType} reload={() => actionRef.current?.reload()} />
+ setSelectEvalVisible(false)} onSubmit={(value: any) => returnEvalData(value)} values={selectEvalData} initValue={initEvalTime} type={appoType} reload={() => actionRef.current?.reload()} />
)
}
diff --git a/src/pages/Tender/ProjectManager/JudgingPanel/List/service.ts b/src/pages/Tender/ProjectManager/JudgingPanel/List/service.ts
index 80abcb9..c5a1eaa 100644
--- a/src/pages/Tender/ProjectManager/JudgingPanel/List/service.ts
+++ b/src/pages/Tender/ProjectManager/JudgingPanel/List/service.ts
@@ -17,7 +17,7 @@ export async function getSecs(params?: any) {
//删除
export async function delOne(params?: any) {
return request(`/api/biz-service-ebtp-rsms/v1/jury/info/${params.id}`, {
- method: 'DELETE'
+ method: 'POST'
});
}
//创建评审小组
@@ -54,7 +54,7 @@ export async function queryVoList(params?: any) {
//更换专家
export async function changeMember(params?: any) {
return request(`/api/biz-service-ebtp-rsms/v1/jury/change/member`, {
- method: 'PUT',
+ method: 'POST',
data: {
...params
}
diff --git a/src/pages/Tender/supplier/SupplierQuestionsOrObjections/service.ts b/src/pages/Tender/supplier/SupplierQuestionsOrObjections/service.ts
index e4e1308..69868b9 100644
--- a/src/pages/Tender/supplier/SupplierQuestionsOrObjections/service.ts
+++ b/src/pages/Tender/supplier/SupplierQuestionsOrObjections/service.ts
@@ -60,6 +60,6 @@ export function getSections(projectId: any) {
*/
export function changeSupStatus(dissentId: any) {
return request('/api/biz-service-ebtp-tender/v1/clarifydissent/checkReply/' + dissentId, {
- method: 'PUT',
+ method: 'POST',
});
}
diff --git a/src/pages/ZBiXuan/EvaluationRoom/Config/Offer/service.ts b/src/pages/ZBiXuan/EvaluationRoom/Config/Offer/service.ts
index 170b1ca..448e8db 100644
--- a/src/pages/ZBiXuan/EvaluationRoom/Config/Offer/service.ts
+++ b/src/pages/ZBiXuan/EvaluationRoom/Config/Offer/service.ts
@@ -75,19 +75,19 @@ export async function saveTem(params: any) {
//删除单项
export async function delDetail(params?: any) {
return request(`/api/biz-service-ebtp-rsms/v1/review/config/detail/${params.id}`, {
- method: 'DELETE'
+ method: 'POST'
});
};
//删除类别
export async function delCategory(params?: any) {
- return request(`/api/biz-service-ebtp-rsms/v1/review/config/category/${params.id}`, {
- method: 'DELETE'
+ return request(`/api/biz-service-ebtp-rsms/v1/review/config/category/del/${params.id}`, {
+ method: 'POST'
});
};
//删除打分最小项细则
export async function delStandard(params?: any) {
return request(`/api/biz-service-ebtp-rsms/v1/review/config/standard/${params.id}`, {
- method: 'DELETE'
+ method: 'POST'
});
};
diff --git a/src/pages/ZBiXuan/EvaluationRoom/View/BidDetailedManager/service.ts b/src/pages/ZBiXuan/EvaluationRoom/View/BidDetailedManager/service.ts
index 66fe009..2435d97 100644
--- a/src/pages/ZBiXuan/EvaluationRoom/View/BidDetailedManager/service.ts
+++ b/src/pages/ZBiXuan/EvaluationRoom/View/BidDetailedManager/service.ts
@@ -71,7 +71,7 @@ export async function getJuryDetailScoreData(params: any) {
*/
export function updateReviewStatus(params: any) {
return request('/api/biz-service-ebtp-rsms/v1/bid/eval/updateReviewStatus', {
- method: 'put',
+ method: 'POST',
params
});
}
@@ -100,9 +100,9 @@ export function findPriceScoreRecord(params: any) {
* 根据评审室id获取评审室信息
* @param params
*/
- export async function getRoomDataById(params: any) {
+export async function getRoomDataById(params: any) {
return request(`/api/biz-service-ebtp-process/v1/bizassessroom/${params}`, {
- method: 'GET',
+ method: 'GET',
});
- }
+}
diff --git a/src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/service.ts b/src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/service.ts
index b221323..1c51c20 100644
--- a/src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/service.ts
+++ b/src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/service.ts
@@ -71,7 +71,7 @@ export async function getJuryDetailScoreData(params: any) {
*/
export function updateReviewStatus(params: any) {
return request('/api/biz-service-ebtp-rsms/v1/bid/eval/updateReviewStatus', {
- method: 'put',
+ method: 'POST',
params
});
}
@@ -100,19 +100,19 @@ export function findPriceScoreRecord(params: any) {
* 公开比选多阶段(个人初审表)
* @param params
*/
-export function getFindScoreRecord (params:any) {
+export function getFindScoreRecord(params: any) {
return request('/api/biz-service-ebtp-rsms/v1/bxmulti/eval/record/findScoreRecord', {
- method:"post",
- data:params
+ method: "post",
+ data: params
})
- }
+}
/**
* 根据评审室id获取评审室信息
* @param params
*/
- export async function getRoomDataById(params: any) {
+export async function getRoomDataById(params: any) {
return request(`/api/biz-service-ebtp-process/v1/bizassessroom/${params}`, {
- method: 'GET',
+ method: 'GET',
});
- }
+}
diff --git a/src/pages/ZTanPan/RoomConfig/Config/Offer/service.ts b/src/pages/ZTanPan/RoomConfig/Config/Offer/service.ts
index 4de83c0..d9f7568 100644
--- a/src/pages/ZTanPan/RoomConfig/Config/Offer/service.ts
+++ b/src/pages/ZTanPan/RoomConfig/Config/Offer/service.ts
@@ -29,8 +29,8 @@ export async function toInsertOpenList(params: any) {
* @param params
*/
export async function toUpdateOpenList(params: any) {
- return request('/api/biz-service-ebtp-resps/v1/tdoccatalogcontent', {
- method: 'PUT',
+ return request('/api/biz-service-ebtp-resps/v1/tdoccatalogcontent/update', {
+ method: 'POST',
data: params,
});
}
@@ -40,8 +40,8 @@ export async function toUpdateOpenList(params: any) {
* @param params
*/
export async function deleteItemizedQuotation(params: any) {
- return request(`/api/biz-service-ebtp-resps/v1/tdoccatalogcontent/${params}`, {
- method: 'DELETE',
+ return request(`/api/biz-service-ebtp-resps/v1/tdoccatalogcontent/delete/${params}`, {
+ method: 'POST',
});
}
@@ -117,7 +117,7 @@ export async function comfirmItemizedSeleTemplate(params: any) {
*/
export async function deleteItemizedTemplate(params: any) {
return request(`/api/biz-service-ebtp-resps/v1/tdoctemplate/deleteContentTable/${params}`, {
- method: 'DELETE',
+ method: 'POST',
});
}
@@ -136,7 +136,7 @@ export async function getLastConf(params: any) {
* 查询报价附件
* @param params
*/
- export async function getQuotationAttachment(params: any) {
+export async function getQuotationAttachment(params: any) {
return request(`/api/biz-service-ebtp-resps/v1/tdoc/getCatalogContent`, {
method: 'POST',
data: params,
@@ -147,7 +147,7 @@ export async function getLastConf(params: any) {
* 保存报价附件
* @param params
*/
- export async function saveQuotationAttachment(params: any) {
+export async function saveQuotationAttachment(params: any) {
return request(`/api/biz-service-ebtp-resps/v1/tdoc/insertQuoteFile`, {
method: 'POST',
data: params,
@@ -158,8 +158,8 @@ export async function getLastConf(params: any) {
* 删除树数据
* @param params
*/
- export async function deleteMenuList(params: any) {
- return request(`/api/biz-service-ebtp-resps/v1/tdoccatalog/${params}`, {
- method: 'DELETE',
+export async function deleteMenuList(params: any) {
+ return request(`/api/biz-service-ebtp-resps/v1/tdoccatalog/delete/${params}`, {
+ method: 'POST',
});
}
\ No newline at end of file
diff --git a/src/pages/ZTanPan/RoomConfig/Config/Other/service.ts b/src/pages/ZTanPan/RoomConfig/Config/Other/service.ts
index 612dddc..ba9eab7 100644
--- a/src/pages/ZTanPan/RoomConfig/Config/Other/service.ts
+++ b/src/pages/ZTanPan/RoomConfig/Config/Other/service.ts
@@ -29,8 +29,8 @@ export async function toInsertOpenList(params: any) {
* @param params
*/
export async function toUpdateOpenList(params: any) {
- return request('/api/biz-service-ebtp-resps/v1/tdoccatalogcontent', {
- method: 'PUT',
+ return request('/api/biz-service-ebtp-resps/v1/tdoccatalogcontent/update', {
+ method: 'POST',
data: params,
});
}
@@ -40,8 +40,8 @@ export async function toUpdateOpenList(params: any) {
* @param params
*/
export async function deleteItemizedQuotation(params: any) {
- return request(`/api/biz-service-ebtp-resps/v1/tdoccatalogcontent/${params}`, {
- method: 'DELETE',
+ return request(`/api/biz-service-ebtp-resps/v1/tdoccatalogcontent/delete/${params}`, {
+ method: 'POST',
});
}
@@ -72,8 +72,8 @@ export async function addMenuList(params: any) {
* @param params
*/
export async function deleteMenuList(params: any) {
- return request(`/api/biz-service-ebtp-resps/v1/tdoccatalog/${params}`, {
- method: 'DELETE',
+ return request(`/api/biz-service-ebtp-resps/v1/tdoccatalog/delete/${params}`, {
+ method: 'POST',
});
}
@@ -82,8 +82,8 @@ export async function deleteMenuList(params: any) {
* @param params
*/
export async function updateMenuList(params: any) {
- return request('/api/biz-service-ebtp-resps/v1/tdoccatalog', {
- method: 'PUT',
+ return request('/api/biz-service-ebtp-resps/v1/tdoccatalog/update', {
+ method: 'POST',
data: params,
});
}
@@ -224,8 +224,8 @@ export async function comfirmSeleTemplate(params: any) {
* @param params
*/
export async function deleteTemplate(params: any) {
- return request(`/api/biz-service-ebtp-resps/v1/tdoctemplate/${params}`, {
- method: 'DELETE',
+ return request(`/api/biz-service-ebtp-resps/v1/tdoctemplate/delete/${params}`, {
+ method: 'POST',
});
}
diff --git a/src/pages/ZTanPan/RoomConfig/Config/PriceAllocation/service.ts b/src/pages/ZTanPan/RoomConfig/Config/PriceAllocation/service.ts
index ea5e703..ea97df2 100644
--- a/src/pages/ZTanPan/RoomConfig/Config/PriceAllocation/service.ts
+++ b/src/pages/ZTanPan/RoomConfig/Config/PriceAllocation/service.ts
@@ -11,20 +11,20 @@ import request from "@/utils/request";
/**
* 保存
*/
-export function singingPricePreservation (data:any) {
+export function singingPricePreservation(data: any) {
return request('/api/biz-service-ebtp-opening/v1/bizbidsingconfigure/saveSingConfigure', {
- method:'put',
- data:data
+ method: 'POST',
+ data: data
});
}
/**
* 查询
*/
-export function getConfigure (turnId:any) {
+export function getConfigure(turnId: any) {
return request('/api/biz-service-ebtp-opening/v1/bizbidsingconfigure/getProcessConfigure', {
- method:'post',
- data:{
- turnId:turnId
+ method: 'post',
+ data: {
+ turnId: turnId
}
});
}
@@ -32,9 +32,9 @@ export function getConfigure (turnId:any) {
* 继承上次唱价配置
* @param data
*/
-export function inheritSingConfigure (data:any) {
+export function inheritSingConfigure(data: any) {
return request("/api/biz-service-ebtp-opening/v1/bizbidsingconfigure/inheritSingConfigure", {
- method:'post',
+ method: 'post',
data: data
})
}
@@ -45,6 +45,6 @@ export function inheritSingConfigure (data:any) {
* @param turnSort
* @returns
*/
- export function getIsInherit (assessRoomId: string, turnSort: number) {
+export function getIsInherit(assessRoomId: string, turnSort: number) {
return request('/api/biz-service-ebtp-opening/v1/bizbidsingconfigure/getIsInherit?assessRoomId=' + assessRoomId + '&turnSort=' + turnSort);
}
diff --git a/src/pages/ZTanPan/RoomConfig/View/Manager/Sing/service.ts b/src/pages/ZTanPan/RoomConfig/View/Manager/Sing/service.ts
index aabf643..4320c17 100644
--- a/src/pages/ZTanPan/RoomConfig/View/Manager/Sing/service.ts
+++ b/src/pages/ZTanPan/RoomConfig/View/Manager/Sing/service.ts
@@ -4,12 +4,12 @@ import { getSessionRoleData } from '@/utils/session';
//获取列表
export async function getList(params?: any) {
let url = '/api/biz-service-ebtp-resps/v1/tfile/getOpenTenderList';
- if(getSessionRoleData().roleCode === 'ebtp-supplier'){//ebtp-agency-project-manager 代理 ebtp-supplier 供应商
+ if (getSessionRoleData().roleCode === 'ebtp-supplier') {//ebtp-agency-project-manager 代理 ebtp-supplier 供应商
url = '/api/biz-service-ebtp-resps/v1/tfile/getOpenTenderListBySupplier'
}
- return request(url,{
- method:'POST',
- data:{
+ return request(url, {
+ method: 'POST',
+ data: {
...params
}
});
@@ -26,7 +26,7 @@ export async function getOpenDt(params?: any) {
//唱价
export async function singBid(params?: any) {
return request(`/api/biz-service-ebtp-opening/v1/bizbidsingconfigure/updateSingConfigure`, {
- method: 'PUT',
+ method: 'POST',
data: {
...params
}
@@ -86,6 +86,6 @@ export async function queryFx(params?: any) {
});
}
//供应商确认报价
-export async function confirmOffer(reviewTurnId?: any,tdocId?: any) {
+export async function confirmOffer(reviewTurnId?: any, tdocId?: any) {
return request(`/api/biz-service-ebtp-tender/v1/supplier_register/update/sign/${reviewTurnId}?tdocId=${tdocId}`);
}
\ No newline at end of file
diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/service.ts b/src/pages/ZYuShen/Bid/BiddingAnnouncement/service.ts
index ffaf07c..f9f9298 100644
--- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/service.ts
+++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/service.ts
@@ -13,8 +13,8 @@ export async function GetNoticeList(params?: any) {
}
/*当前公告可用包请求*/
-export async function GetNoticeUsablePackage(params?: any,annoId?:any) {
- return request('/api/biz-service-ebtp-bid/v1/anno/tobs/' + params+"?roomType=1&annoId="+annoId)
+export async function GetNoticeUsablePackage(params?: any, annoId?: any) {
+ return request('/api/biz-service-ebtp-bid/v1/anno/tobs/' + params + "?roomType=1&annoId=" + annoId)
}
/*公告信息查询*/
@@ -24,11 +24,11 @@ export async function GetNoticeMsg(params?: any) {
/*创建公告*/
export async function creatNotice(type: any, params?: any) {
- let method = "post";
+ let url = "/api/biz-service-ebtp-bid/v1/anno";
if (type == "edit" || type == "change")
- method = "put";
- return request('/api/biz-service-ebtp-bid/v1/anno', {
- method: method,
+ url = "/api/biz-service-ebtp-bid/v1/anno/updateById";
+ return request(url, {
+ method: "POST",
data: {
...params
},
@@ -37,8 +37,8 @@ export async function creatNotice(type: any, params?: any) {
/*删除公告*/
export async function removeNotice(params?: any) {
- let method = "delete";
- return request('/api/biz-service-ebtp-bid/v1/anno/' + params, {method: method})
+ let method = "POST";
+ return request('/api/biz-service-ebtp-bid/v1/anno/delete/' + params, { method: method })
}
/*发布公告 type=0 正常发布*/
@@ -91,8 +91,8 @@ export async function GetfileList(params?: any) {
})
}
-export async function GetfileUsablePackage(params?: any,annoId?:any) {
- return request('/api/biz-service-ebtp-bid/v1/document/tobs/getSectionList/' + params+"?roomType=1&documentId="+annoId)
+export async function GetfileUsablePackage(params?: any, annoId?: any) {
+ return request('/api/biz-service-ebtp-bid/v1/document/tobs/getSectionList/' + params + "?roomType=1&documentId=" + annoId)
}
export async function GetfileMsg(params?: any) {
@@ -100,11 +100,11 @@ export async function GetfileMsg(params?: any) {
}
export async function creatfile(type: any, params?: any) {
- let method = "post";
+ let url = "/api/biz-service-ebtp-bid/v1/document";
if (type == "edit" || type == "change")
- method = "put";
- return request('/api/biz-service-ebtp-bid/v1/document', {
- method: method,
+ url = "/api/biz-service-ebtp-bid/v1/document/update";
+ return request(url, {
+ method: "POST",
data: {
...params
},
@@ -112,14 +112,14 @@ export async function creatfile(type: any, params?: any) {
}
export async function removefile(params?: any) {
- let method = "delete";
- return request('/api/biz-service-ebtp-bid/v1/document/' + params, {method: method})
+ let method = "POST";
+ return request('/api/biz-service-ebtp-bid/v1/document/delete/' + params, { method: method })
}
/*开标大厅选择*/
export async function getChooseRoom(params?: any) {
let method = "get";
- return request('/api/biz-service-ebtp-opening/v1/bizbidopenhall/list?openDate=' + params, {method: method})
+ return request('/api/biz-service-ebtp-opening/v1/bizbidopenhall/list?openDate=' + params, { method: method })
}
@@ -145,15 +145,15 @@ export async function chooseSupplier(params: any) {
/*邀请函 删除供应商 后端付庆吉*/
export async function deleteSupplier(params?: any) {
- return request('/api/biz-service-ebtp-bid/v1/resp/' + params, {
- method: "delete",
+ return request('/api/biz-service-ebtp-bid/v1/resp/delete/' + params, {
+ method: "POST",
})
}
/*邀请函 供应商 更新联系人*/
export async function updateSupplierUser(id?: any, userId?: any, params?: any) {
return request('/api/biz-service-ebtp-bid/v1/resp/' + id + "/" + userId, {
- method: "put",
+ method: "POST",
data: {
...params
}
@@ -165,8 +165,8 @@ export async function updateSupplierUser(id?: any, userId?: any, params?: any) {
* @param id
* @returns
*/
- export async function getApprovalFor(id?:any){
- return request(`/api/biz-service-ebtp-bid/v1/anno/approve/trace/${id}`,{
- method:"POST",
+export async function getApprovalFor(id?: any) {
+ return request(`/api/biz-service-ebtp-bid/v1/anno/approve/trace/${id}`, {
+ method: "POST",
})
}
\ No newline at end of file
diff --git a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/service.ts b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/service.ts
index 52db7d4..1d4e609 100644
--- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/service.ts
+++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/service.ts
@@ -24,11 +24,11 @@ export async function GetNoticeMsg(params?: any) {
/*创建公告*/
export async function creatNotice(type: any, params?: any) {
- let method = "post";
+ let url = "/api/biz-service-ebtp-bid/v1/anno";
if (type == "edit" || type == "change")
- method = "put";
- return request('/api/biz-service-ebtp-bid/v1/anno', {
- method: method,
+ url = "/api/biz-service-ebtp-bid/v1/anno/updateById";
+ return request(url, {
+ method: "POST",
data: {
...params
},
@@ -37,8 +37,8 @@ export async function creatNotice(type: any, params?: any) {
/*删除公告*/
export async function removeNotice(params?: any) {
- let method = "delete";
- return request('/api/biz-service-ebtp-bid/v1/anno/' + params, {method: method})
+ let method = "POST";
+ return request('/api/biz-service-ebtp-bid/v1/anno/delete/' + params, { method: method })
}
/*发布公告 type=0 正常发布*/
@@ -95,7 +95,7 @@ export async function GetfileList(params?: any) {
/*开标大厅选择*/
export async function getChooseRoom(params?: any) {
let method = "get";
- return request('/api/biz-service-ebtp-opening/v1/bizbidopenhall/list?openDate=' + params, {method: method})
+ return request('/api/biz-service-ebtp-opening/v1/bizbidopenhall/list?openDate=' + params, { method: method })
}
/*公告历史列表查询*/
@@ -104,7 +104,7 @@ export async function GetHistoryNoticeList(params?: any) {
return request('/api/biz-service-ebtp-bid/v1/anno/record/pageList',
{
method: method,
- data:{
+ data: {
...params
}
}
@@ -116,9 +116,9 @@ export async function GetHistoryNoticeList(params?: any) {
* @param id
* @returns
*/
- export async function getApprovalFor(id?:any){
- return request(`/api/biz-service-ebtp-bid/v1/anno/approve/trace/${id}`,{
- method:"POST",
+export async function getApprovalFor(id?: any) {
+ return request(`/api/biz-service-ebtp-bid/v1/anno/approve/trace/${id}`, {
+ method: "POST",
})
}
diff --git a/src/pages/ZZhaoMu/Bid/ResponseFormat/service.ts b/src/pages/ZZhaoMu/Bid/ResponseFormat/service.ts
index 3a69f58..89af458 100644
--- a/src/pages/ZZhaoMu/Bid/ResponseFormat/service.ts
+++ b/src/pages/ZZhaoMu/Bid/ResponseFormat/service.ts
@@ -62,8 +62,8 @@ export async function editSection(params: any) {
* @param params
*/
export async function deleteProcess(params: any) {
- return request(`/api/biz-service-ebtp-resps/v1/tdoc/${params.tdocId}`, {
- method: 'DELETE',
+ return request(`/api/biz-service-ebtp-resps/v1/tdoc/delete/${params.tdocId}`, {
+ method: 'POST',
});
}
@@ -106,8 +106,8 @@ export async function toInsertOpenList(params: any) {
* @param params
*/
export async function toUpdateOpenList(params: any) {
- return request('/api/biz-service-ebtp-resps/v1/tdoccatalogcontent', {
- method: 'PUT',
+ return request('/api/biz-service-ebtp-resps/v1/tdoccatalogcontent/update', {
+ method: 'POST',
data: params,
});
}
@@ -117,8 +117,8 @@ export async function toUpdateOpenList(params: any) {
* @param params
*/
export async function deleteItemizedQuotation(params: any) {
- return request(`/api/biz-service-ebtp-resps/v1/tdoccatalogcontent/${params}`, {
- method: 'DELETE',
+ return request(`/api/biz-service-ebtp-resps/v1/tdoccatalogcontent/delete/${params}`, {
+ method: 'POST',
});
}
@@ -149,8 +149,8 @@ export async function addMenuList(params: any) {
* @param params
*/
export async function deleteMenuList(params: any) {
- return request(`/api/biz-service-ebtp-resps/v1/tdoccatalog/${params}`, {
- method: 'DELETE',
+ return request(`/api/biz-service-ebtp-resps/v1/tdoccatalog/delete/${params}`, {
+ method: 'POST',
});
}
@@ -159,8 +159,8 @@ export async function deleteMenuList(params: any) {
* @param params
*/
export async function updateMenuList(params: any) {
- return request('/api/biz-service-ebtp-resps/v1/tdoccatalog', {
- method: 'PUT',
+ return request('/api/biz-service-ebtp-resps/v1/tdoccatalog/update', {
+ method: 'POST',
data: params,
});
}
@@ -279,7 +279,7 @@ export async function comfirmSeleTemplate(params: any) {
* @param params
*/
export async function deleteTemplate(params: any) {
- return request(`/api/biz-service-ebtp-resps/v1/tdoctemplate/${params}`, {
- method: 'DELETE',
+ return request(`/api/biz-service-ebtp-resps/v1/tdoctemplate/delete/${params}`, {
+ method: 'POST',
});
}
diff --git a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/service.ts b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/service.ts
index 5d95c81..7e9388f 100644
--- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/service.ts
+++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/service.ts
@@ -3,7 +3,7 @@ import request from '@/utils/request';
/*公告列表请求*/
-export async function GetNoticeList(params?:any){
+export async function GetNoticeList(params?: any) {
return request('/api/biz-service-ebtp-bid/v1/anno/pageList', {
method: 'post',
data: {
@@ -12,15 +12,15 @@ export async function GetNoticeList(params?:any){
})
}
/*当前公告可用包请求*/
-export async function GetNoticeUsablePackage(params?:any){
- return request('/api/biz-service-ebtp-bid/v1/anno/tobs/'+params)
+export async function GetNoticeUsablePackage(params?: any) {
+ return request('/api/biz-service-ebtp-bid/v1/anno/tobs/' + params)
}
/*公告信息查询*/
-export async function GetNoticeMsg(params?:any){
- return request('/api/biz-service-ebtp-bid/v1/anno/'+params)
+export async function GetNoticeMsg(params?: any) {
+ return request('/api/biz-service-ebtp-bid/v1/anno/' + params)
}
/*创建公告*/
-export async function creatNotice(type:any,params?:any){
+export async function creatNotice(type: any, params?: any) {
return request('/api/biz-service-ebtp-bid/v1/anno/zmMultiPub', {
method: "post",
data: {
@@ -29,40 +29,40 @@ export async function creatNotice(type:any,params?:any){
})
}
// export async function creatNotice(type:any,params?:any){
-// let method="post";
+// let url="/api/biz-service-ebtp-bid/v1/anno";
// if(type=="edit")
-// method="put";
-// return request('/api/biz-service-ebtp-bid/v1/anno', {
-// method: method,
+// url="/api/biz-service-ebtp-bid/v1/anno/updateById";
+// return request(url, {
+// method: "POST",
// data: {
// ...params
// },
// })
// }
/*删除公告*/
-export async function removeNotice(params?:any){
- let method="delete";
- return request('/api/biz-service-ebtp-bid/v1/anno/'+params,{method:method})
+export async function removeNotice(params?: any) {
+ let method = "POST";
+ return request('/api/biz-service-ebtp-bid/v1/anno/delete/' + params, { method: method })
}
/*发布公告 type=0 正常发布*/
-export async function releaseNotice(params?:any){
- let method="post";
- return request('/api/biz-service-ebtp-bid/v1/anno/publish/'+params+"/0",{
- method:method,
+export async function releaseNotice(params?: any) {
+ let method = "post";
+ return request('/api/biz-service-ebtp-bid/v1/anno/publish/' + params + "/0", {
+ method: method,
})
}
/*发布公告 type=1 线下发布*/
-export async function releaseNoticeOffline(params?:any){
- let method="post";
- return request('/api/biz-service-ebtp-bid/v1/anno/publish/'+params+"/1",{
- method:method,
+export async function releaseNoticeOffline(params?: any) {
+ let method = "post";
+ return request('/api/biz-service-ebtp-bid/v1/anno/publish/' + params + "/1", {
+ method: method,
data: {
...params
},
})
}
/*再次发布公告*/
-export async function releaseNoticeAgain(params?:any) {
+export async function releaseNoticeAgain(params?: any) {
let method = "post";
return request('/api/biz-service-ebtp-bid/v1/anno/republish/' + params, {
method: method,
@@ -72,7 +72,7 @@ export async function releaseNoticeAgain(params?:any) {
})
}
/*公告发起审批*/
-export async function ApprovalNotice(params?:any) {
+export async function ApprovalNotice(params?: any) {
let method = "post";
return request('/api/biz-service-ebtp-bid/v1/anno/approval/' + params, {
method: method,
@@ -91,43 +91,43 @@ export async function GetfileList(params?: any) {
})
}
export async function GetfileUsablePackage(params?: any) {
- return request('/api/biz-service-ebtp-bid/v1/document/tobs/getSectionList/'+params)
+ return request('/api/biz-service-ebtp-bid/v1/document/tobs/getSectionList/' + params)
}
export async function GetfileMsg(params?: any) {
- return request('/api/biz-service-ebtp-bid/v1/document/'+params)
+ return request('/api/biz-service-ebtp-bid/v1/document/' + params)
}
-export async function creatfile(type:any,params?:any){
- let method="post";
- if(type=="edit")
- method="put";
- return request('/api/biz-service-ebtp-bid/v1/document', {
- method: method,
+export async function creatfile(type: any, params?: any) {
+ let url = "/api/biz-service-ebtp-bid/v1/document";
+ if (type == "edit")
+ url = "/api/biz-service-ebtp-bid/v1/document/update";
+ return request(url, {
+ method: "POST",
data: {
...params
},
})
}
-export async function removefile(params?:any){
- let method="delete";
- return request('/api/biz-service-ebtp-bid/v1/document/'+params,{method:method})
+export async function removefile(params?: any) {
+ let method = "POST";
+ return request('/api/biz-service-ebtp-bid/v1/document/delete/' + params, { method: method })
}
/*开标大厅选择*/
-export async function getChooseRoom(params?:any){
- let method="get";
- return request('/api/biz-service-ebtp-bid/v1/bizbidopenhall/list?opendate'+params,{method:method})
+export async function getChooseRoom(params?: any) {
+ let method = "get";
+ return request('/api/biz-service-ebtp-bid/v1/bizbidopenhall/list?opendate' + params, { method: method })
}
/*当前公示可用包请求*/
-export async function GetPublicityUsablePackage(params?:any,annoId?:any){
- return request('/api/biz-service-ebtp-bid/v1/anno/tobs/pub/'+params +"?annoId="+annoId);
+export async function GetPublicityUsablePackage(params?: any, annoId?: any) {
+ return request('/api/biz-service-ebtp-bid/v1/anno/tobs/pub/' + params + "?annoId=" + annoId);
}
/**
* 审批单链接查询（公告，变更公告，失败公告，邀请函，公示）
* @param id
* @returns
*/
- export async function getApprovalFor(id?:any){
- return request(`/api/biz-service-ebtp-bid/v1/anno/approve/trace/${id}`,{
- method:"POST",
+export async function getApprovalFor(id?: any) {
+ return request(`/api/biz-service-ebtp-bid/v1/anno/approve/trace/${id}`, {
+ method: "POST",
})
}
diff --git a/src/pages/ZZhaoMu/JudgingPanel/index.tsx b/src/pages/ZZhaoMu/JudgingPanel/index.tsx
index e1bd925..61f7a22 100644
--- a/src/pages/ZZhaoMu/JudgingPanel/index.tsx
+++ b/src/pages/ZZhaoMu/JudgingPanel/index.tsx
@@ -1,10 +1,9 @@
import React, { useEffect, useRef, useState } from 'react';
-import { Button, Checkbox, Col, Collapse, DatePicker, Drawer, Form, Input, message, Modal, Popconfirm, Row, Select, Spin, Tabs, Upload, Image } from 'antd'
+import { Button, Checkbox, Col, Collapse, DatePicker, Drawer, Form, Input, message, Modal, Popconfirm, Row, Select, Spin, Upload, Image, RadioChangeEvent, Radio } from 'antd'
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
import { getList, saveGroup, delOne, saveMember, changeEx, queryVoList, changeMember, applyFor, roomStatus, juryTem, rePassWord } from './service';
import moment from 'moment';
-import { getProId, getProMethod, getDefId, getSessionProjectData, getRoomReturnURL } from '@/utils/session';
-import { getURLInformation } from '@/utils/CommonUtils';
+import { getProId, getProMethod, getDefId, getSessionProjectData, getRoomReturnURL, getSessionUserData } from '@/utils/session';
import './judgList.less';
import '@/assets/xsy_style.less';
import FileDown from '@/utils/Download';
@@ -12,24 +11,25 @@ import { UploadOutlined } from '@ant-design/icons';
import { btnAuthority } from '@/utils/authority';
import RiskPrevention from '@/utils/RiskPrevention';
import { history } from 'umi';
-import { downloadFile, downloadPath } from '@/utils/DownloadUtils';
+import { downloadPath } from '@/utils/DownloadUtils';
import ExpertPhotoUpload from '@/components/ElecBidEvaluation/ExpertPhotoUpload';
import { getUserPhoto } from '@/pages/Tender/ProjectManager/JudgingPanel/List/service';
import BidEvalAppointment from '@/components/ElecBidEvaluation/BidEvalAppointment';
-const JudgingPanel: React.FC<{}> = () => {
+const JudgingPanel: React.FC<{}> = (props: any) => {
const modalHeight = window.innerHeight * 96 / 100;
const proId = getProId();
- const roomType = getURLInformation('roomType');
- const roomId = getURLInformation('roomId');
- const sectionId = getURLInformation('secId');
+ const roomType = "2";
+ const roomId = props.location?.state?.roomId;
+ const sectionId = props.location?.state?.secId;
+ const openTime = props.location?.state?.openTime;//开始评审时间
const formLayout = { labelCol: { span: 8 }, wrapperCol: { span: 16 }, };
const FormItem = Form.Item;
const [form] = Form.useForm();
const { Option } = Select;
const { Panel } = Collapse;
const { TextArea } = Input;
- const { TabPane } = Tabs;
+ // const { TabPane } = Tabs;
const actionRef = useRef();
const [spin, spinSet] = useState(false);
const [loading, loadingSet] = useState(false);
@@ -39,26 +39,28 @@ const JudgingPanel: React.FC<{}> = () => {
const [open, openSet] = useState(false);//评委会里是否有开启评审的评审室 true有开启的 false无
const [allEnd, allEndSet] = useState(true);//评委会关联标段的评审室是否都关闭了
// const [yushen, yushenSet] = useState(false);//是否预审
- const [readOnly, readOnlySet] = useState(true);//只读
+ // const [readOnly, readOnlySet] = useState(true);//只读
const [disabled, disabledSet] = useState(true);//禁用
- const [manNum, manNumSet] = useState(5);//人数
+ // const [manNum, manNumSet] = useState(5);//人数
const [riskVisible, setRiskVisible] = useState(false);//风控弹窗 2021.9.7 zhoujianlong
const [riskData, setRiskData] = useState([]);//风控数据 2021.9.7 zhoujianlong
const [selectEvalVisible, setSelectEvalVisible] = useState(false);//电子评标室-评标室预约选择 2022.8.26 zhoujianlong
- const [selectEvalDisabled, setSelectEvalDisabled] = useState(true);//电子评标室-评标室预约选择不可选状态控制 true-不可填写 false-可填写 2022.8.26 zhoujianlong
const [selectEvalData, setSelectEvalData] = useState();//电子评标室-评标室预约选择-数据 2022.8.26 zhoujianlong
+ const [initEvalTime, setInitEvalTime] = useState();//电子评标室-时间输入框默认时间（跟随标段） 2022.9.27 zhoujianlong
// const [userPhotoId, setUserPhotoId] = useState("");//电子评标室-录入外部专家-相片id 2022.8.29 zhoujianlong
const [appoType, setAppoType] = useState("0");//电子评标室-预约框状态 2022.8.29 zhoujianlong
- function getShouName() {
- const method = getDefId();
- let num = 3;
- if (method === 'procurement_mode_1' || method === 'procurement_mode_2' || method === 'procurement_mode_3') {//招标
- num = 5;
- }
- manNumSet(num);
- }
+ const [isReserve, setIsReserve] = useState("0");//电子评标室-是否预约评标室 2022.9.23 zhoujianlong 0-不预约 1-预约
+ const userData = getSessionUserData();//当前登录人用户信息
+ // function getShouName() {
+ // const method = getDefId();
+ // let num = 3;
+ // if (method === 'procurement_mode_1' || method === 'procurement_mode_2' || method === 'procurement_mode_3') {//招标
+ // num = 5;
+ // }
+ // manNumSet(num);
+ // }
//创建控制
- const [activeKey, activeKeySet] = useState('1');
+ // const [activeKey, activeKeySet] = useState('1');
//创建评委会小组
const saveG = async (fields: any) => {
@@ -161,7 +163,7 @@ const JudgingPanel: React.FC<{}> = () => {
];
useEffect(() => {
getPage();
- getShouName();//人数判断
+ // getShouName();//人数判断
}, [])
async function getPage() {
spinSet(true);
@@ -192,7 +194,8 @@ const JudgingPanel: React.FC<{}> = () => {
cqDataSet(list);
setModalVis(true);
disabledSet(check);
- readOnlySet(check);
+ // readOnlySet(check);
+ setSelectEvalData(record.elecEvalRoomReserve);
}}>{check ? '查看' : '修改'}
)
}
@@ -258,9 +261,8 @@ const JudgingPanel: React.FC<{}> = () => {
}
useEffect(() => {//给表单赋值
- if (updateData?.reserveStatus == 1) {
- setSelectEvalDisabled(false);
- }
+ updateData && setIsReserve(String(updateData?.reserveStatus));//赋值给是否预约评标室
+ updateData && String(updateData?.reserveStatus) == "1" && getEarliestTime(openTime, String(updateData?.reserveStatus));//初始化赋值数据
form.setFieldsValue({
juryType: updateData != undefined ? updateData.juryType : null,
representativeNumber: updateData != undefined ? updateData.representativeNumber : null,
@@ -289,12 +291,12 @@ const JudgingPanel: React.FC<{}> = () => {
onCancel={() => {
setModalVis(false);
updateDataSet({});
- cqDataSet([]);
- updateKeySet(-1);
- activeKeySet('1');
+ // cqDataSet([]);
+ // updateKeySet(-1);
+ // activeKeySet('1');
}}
>
-
+ {/*
{tab1()}
@@ -302,18 +304,19 @@ const JudgingPanel: React.FC<{}> = () => {
{tab2()}
- {cqDrawer()}
+ {cqDrawer()} */}
+ {tab1()}
)
}
- function changeTabs(key: any) {
- if (key == 1) {
- activeKeySet(key);
- } else {
- nextStep()
- }
- }
+ // function changeTabs(key: any) {
+ // if (key == 1) {
+ // activeKeySet(key);
+ // } else {
+ // nextStep()
+ // }
+ // }
//人数校验
function checkMan(count: number, expCon: any) {
let res = true;
@@ -323,7 +326,7 @@ const JudgingPanel: React.FC<{}> = () => {
let manNumT = 5;
if (method === 'procurement_mode_1' || method === 'procurement_mode_2') {
- if (roomType == '1' && yushenType == 'open_tender_form_2') {//资格预审 自愿招标为3
+ if (false && yushenType == 'open_tender_form_2') {//资格预审 自愿招标为3
manNumT = 3;
}
if (expCon < count * 2 / 3) {
@@ -364,254 +367,268 @@ const JudgingPanel: React.FC<{}> = () => {
}
return res
}
- async function nextStep() {//下一步
- const formVals = form.getFieldsValue();
- let verify = false;
- await form.validateFields().then(() => {
- let juryRoomListTem: any = [];
- juryRoomListTem.push({ roomId: roomId, sectionId: sectionId, roomType: roomType });
- verify = true;
- juryRoomListSet(juryRoomListTem);
- //采购人数需要大于5 需要取项目类型
- const count = parseInt(formVals.representativeNumber) + parseInt(formVals.expertNumber);
+ // async function nextStep() {//下一步
+ // const formVals = form.getFieldsValue();
+ // let verify = false;
+ // await form.validateFields().then(() => {
+ // let juryRoomListTem: any = [];
+ // juryRoomListTem.push({ roomId: roomId, sectionId: sectionId, roomType: roomType });
+ // verify = true;
+ // juryRoomListSet(juryRoomListTem);
+ // //采购人数需要大于5 需要取项目类型
+ // const count = parseInt(formVals.representativeNumber) + parseInt(formVals.expertNumber);
- if (verify) {
- verify = checkMan(count, parseInt(formVals.expertNumber));
- }
- const st = moment(formVals.startTime).format('yyyy-MM-DD HH:mm:ss');
- const et = moment(formVals.endTime).format('yyyy-MM-DD HH:mm:ss');
- if (st > et || st == et) {//校验时间
- verify = false;
- message.error("预计开始时间应早于预计结束时间")
- }
- if (selectEvalData?.reserveStatus == "1") {//预约了评标室
- const selectStartTime = moment(selectEvalData.reserveStartDate).format('yyyy-MM-DD HH:mm:ss');
- const selectEndTime = moment(selectEvalData.reserveEndDate).format('yyyy-MM-DD HH:mm:ss');
- if (selectStartTime != st || selectEndTime != et) {
- verify = false;
- message.error("预约时间需与选择评标室中的预约时间相等");
- }
- }
- if (verify) {
- activeKeySet('2');
- }
- })
- }
+ // if (verify) {
+ // verify = checkMan(count, parseInt(formVals.expertNumber));
+ // }
+ // const st = moment(formVals.startTime).format('yyyy-MM-DD HH:mm:ss');
+ // const et = moment(formVals.endTime).format('yyyy-MM-DD HH:mm:ss');
+ // if (st > et || st == et) {//校验时间
+ // verify = false;
+ // message.error("预计开始时间应早于预计结束时间")
+ // }
+ // if (selectEvalData?.reserveStatus == "1") {//预约了评标室
+ // const selectStartTime = moment(selectEvalData.reserveStartDate).format('yyyy-MM-DD HH:mm:ss');
+ // const selectEndTime = moment(selectEvalData.reserveEndDate).format('yyyy-MM-DD HH:mm:ss');
+ // if (selectStartTime != st || selectEndTime != et) {
+ // verify = false;
+ // message.error("预约时间需与选择评标室中的预约时间相等");
+ // }
+ // }
+ // if (verify) {
+ // activeKeySet('2');
+ // }
+ // })
+ // }
//添加抽取drawer
const formLayoutDrawer = { labelCol: { span: 8 }, wrapperCol: { span: 16 }, };
const tailLayoutDrawer = { wrapperCol: { offset: 8, span: 20 }, };
- const [juryRoomList, juryRoomListSet] = useState([]);
+ // const [juryRoomList, juryRoomListSet] = useState([]);
const [cqData, cqDataSet] = useState([]);//抽取表格，提交时需要
- const [addCq, addCqSet] = useState(false);//添加抽取抽屉显示控制
- const [updateKey, updateKeySet] = useState(-1);//触发修改存key
- const [formCq] = Form.useForm();
- const [display, displaySet] = useState(true);
- const columnsCq: ProColumns[] = [//抽取表格
- { title: '序号', valueType: 'index', width: 50, },
- {
- title: '专家分类', dataIndex: 'subCategory',
- valueEnum: {
- '1': { text: '技术', },
- '2': { text: '商务', },
- '3': { text: '法律', },
- '4': { text: '其它', },
- }
- },
- { title: '需抽数量', dataIndex: 'extractNumber', },
- {
- title: '抽取方式', dataIndex: 'extractMethod',
- valueEnum: {
- '1': { text: '外部录入', },
- '2': { text: '随机抽取', },
- }
- },
- { title: '抽取规则要求', dataIndex: 'cqRude', },
- {
- title: '操作', dataIndex: 'option', width: 100,
- valueType: 'option',
- render: (_, record) => {
- return (
- <>
- {
- !disabled ?
- <>
-
- {
- let dataTem = [...cqData];
- dataTem.map((item: any, index: any) => {
- if (item.key == record.key) {
- dataTem.splice(index, 1)
- }
- });
- cqDataSet(dataTem);
- }}
- okText="确定"
- cancelText="取消"
- >
-
-
-
- : <>
- }
+ // const [addCq, addCqSet] = useState(false);//添加抽取抽屉显示控制
+ // const [updateKey, updateKeySet] = useState(-1);//触发修改存key
+ // const [formCq] = Form.useForm();
+ // const [display, displaySet] = useState(true);
+ // const columnsCq: ProColumns[] = [//抽取表格
+ // { title: '序号', valueType: 'index', width: 50, },
+ // {
+ // title: '专家分类', dataIndex: 'subCategory',
+ // valueEnum: {
+ // '1': { text: '技术', },
+ // '2': { text: '商务', },
+ // '3': { text: '法律', },
+ // '4': { text: '其它', },
+ // }
+ // },
+ // { title: '需抽数量', dataIndex: 'extractNumber', },
+ // {
+ // title: '抽取方式', dataIndex: 'extractMethod',
+ // valueEnum: {
+ // '1': { text: '外部录入', },
+ // '2': { text: '随机抽取', },
+ // }
+ // },
+ // { title: '抽取规则要求', dataIndex: 'cqRude', },
+ // {
+ // title: '操作', dataIndex: 'option', width: 100,
+ // valueType: 'option',
+ // render: (_, record) => {
+ // return (
+ // <>
+ // {
+ // !disabled ?
+ // <>
+ //
+ // {
+ // let dataTem = [...cqData];
+ // dataTem.map((item: any, index: any) => {
+ // if (item.key == record.key) {
+ // dataTem.splice(index, 1)
+ // }
+ // });
+ // cqDataSet(dataTem);
+ // }}
+ // okText="确定"
+ // cancelText="取消"
+ // >
+ //
+ //
+ //
+ // : <>
+ // }
-
- );
- }
- },
- ];
- const cqDrawer = () => {//添加抽取条件、修改
- return (
- <>
- { addCqSet(false); updateKeySet(-1); formCq.resetFields(); }}
- visible={addCq}
- getContainer={false}
- style={{ position: 'absolute' }}
- >
-
-
-
- )
- }
+ //
+ // );
+ // }
+ // },
+ // ];
+ // const cqDrawer = () => {//添加抽取条件、修改
+ // return (
+ // <>
+ // { addCqSet(false); updateKeySet(-1); formCq.resetFields(); }}
+ // visible={addCq}
+ // getContainer={false}
+ // style={{ position: 'absolute' }}
+ // >
+ //
+ //
+ //
+ // )
+ // }
const tab1 = () => {//cqtab1
return (
<>
+ 预约评标室
+
专家申请基本信息
)
}
- const tab2 = () => {//cqtab2
+ // const tab2 = () => {//cqtab2
+ // return (
+ // <>
+ //
+ //
抽取条件
+ //
+ //
+ //
+ //
+ //
回避单位信息
+ //
+ //
+ //
+ //
+ //
回避专家信息
+ //
+ //
+ //
+ //
-
抽取条件
-
-
-
-
@@ -1672,7 +1807,11 @@ const JudgingPanel: React.FC<{}> = () => {
// form.resetFields();
reset();
setSelectEvalData(null);
- disabledSet(false); readOnlySet(false);
+ setInitEvalTime(null);
+ disabledSet(false);
+ setIsReserve("0");
+ getEarliestTime(openTime, "0");
+ // readOnlySet(false);
}}>创建评审小组
@@ -1734,7 +1873,7 @@ const JudgingPanel: React.FC<{}> = () => {
data={riskData}
/>}
{/**电子评标室-评标室预约选择 */}
- setSelectEvalVisible(false)} onSubmit={(value: any) => returnEvalData(value)} values={selectEvalData} type={appoType} reload={() => actionRef.current?.reload()} />
+ setSelectEvalVisible(false)} onSubmit={(value: any) => returnEvalData(value)} values={selectEvalData} initValue={initEvalTime} type={appoType} reload={() => getPage()} />
)
}
diff --git a/src/pages/ZZhaoMu/JudgingPanel/service.ts b/src/pages/ZZhaoMu/JudgingPanel/service.ts
index 465d04a..a660b19 100644
--- a/src/pages/ZZhaoMu/JudgingPanel/service.ts
+++ b/src/pages/ZZhaoMu/JudgingPanel/service.ts
@@ -3,45 +3,45 @@ import { message } from 'antd';
//列表查询
export async function getList(roomId?: any) {
- return request(`/api/biz-service-ebtp-rsms/v1/jury/zmmulti/list?roomId=${roomId}`,{
- method:'GET',
+ return request(`/api/biz-service-ebtp-rsms/v1/jury/zmmulti/list?roomId=${roomId}`, {
+ method: 'GET',
});
}
//查询标包
export async function getSecs(params?: any) {
- return request(`/api/biz-service-ebtp-rsms/v1/jury/section/list/${params.tpId}`,{
+ return request(`/api/biz-service-ebtp-rsms/v1/jury/section/list/${params.tpId}`, {
params,
});
}
//删除
export async function delOne(params?: any) {
- return request(`/api/biz-service-ebtp-rsms/v1/jury/info/${params.id}`,{
- method:'DELETE'
+ return request(`/api/biz-service-ebtp-rsms/v1/jury/info/${params.id}`, {
+ method: 'POST'
});
}
//创建评审小组
export async function saveGroup(params?: any) {
- return request(`/api/biz-service-ebtp-rsms/v1/jury/info/save`,{
- method:'POST',
- data:{
+ return request(`/api/biz-service-ebtp-rsms/v1/jury/info/save`, {
+ method: 'POST',
+ data: {
...params,
},
});
}
//添加成员
export async function saveMember(params?: any) {
- return request(`/api/biz-service-ebtp-rsms/v1/jury/member/save`,{
- method:'POST',
- data:{
+ return request(`/api/biz-service-ebtp-rsms/v1/jury/member/save`, {
+ method: 'POST',
+ data: {
...params,
},
});
}
//更换专家
export async function changeEx(params?: any) {
- return request(`/api/biz-service-ebtp-rsms/v1/jury/change/apply/save`,{
- method:'POST',
- data:{
+ return request(`/api/biz-service-ebtp-rsms/v1/jury/change/apply/save`, {
+ method: 'POST',
+ data: {
...params,
},
});
@@ -52,9 +52,9 @@ export async function queryVoList(params?: any) {
}
//更换专家
export async function changeMember(params?: any) {
- return request(`/api/biz-service-ebtp-rsms/v1/jury/change/member`,{
- method:'PUT',
- data:{
+ return request(`/api/biz-service-ebtp-rsms/v1/jury/change/member`, {
+ method: 'POST',
+ data: {
...params
}
});
@@ -62,8 +62,8 @@ export async function changeMember(params?: any) {
//提交申请
export async function applyFor(params?: any) {
- return request(`/api/biz-service-ebtp-rsms/v1/jury/extract/apply/${params.id}`,{
- method:'POST',
+ return request(`/api/biz-service-ebtp-rsms/v1/jury/extract/apply/${params.id}`, {
+ method: 'POST',
});
}
//查是否开启评标
diff --git a/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts b/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts
index 77f7470..520903f 100644
--- a/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts
+++ b/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts
@@ -50,7 +50,7 @@ export async function getById(id: any) {
*/
export async function deleteClarify(id: any) {
return request('/api/biz-service-ebtp-tender/v1/recruit/clarifydissent/delete_clarify/' + id, {
- method: 'put',
+ method: 'POST',
});
}
/**
@@ -59,7 +59,7 @@ export async function deleteClarify(id: any) {
*/
export async function releaseClarify(id: any) {
return request('/api/biz-service-ebtp-tender/v1/recruit/clarifydissent/release_clarify/' + id, {
- method: 'put',
+ method: 'POST',
});
}
/**
@@ -100,7 +100,7 @@ export async function clarifyReply(id: any) {
*/
export function getSections(projectId: any, roomType: any) {
return request('/api/biz-service-ebtp-tender/v1/recruit/clarifydissent/packages/' + projectId + '?roomType=' + roomType, {
- method: 'put'
+ method: 'POST'
});
}
/**
diff --git a/src/pages/ZZhaoMu/Tender/supplier/IParticipate/components/IParticipate.tsx b/src/pages/ZZhaoMu/Tender/supplier/IParticipate/components/IParticipate.tsx
index 94a04c3..88c6c66 100644
--- a/src/pages/ZZhaoMu/Tender/supplier/IParticipate/components/IParticipate.tsx
+++ b/src/pages/ZZhaoMu/Tender/supplier/IParticipate/components/IParticipate.tsx
@@ -20,6 +20,7 @@ const orderState = {
0: '未支付',
1: '支付中',
2: '已支付',
+ 4: '确认到账',
}
const IParticipate: React.FC = () => {
diff --git a/src/pages/usercloud/login/index.tsx b/src/pages/usercloud/login/index.tsx
index 112ac20..2928fa1 100644
--- a/src/pages/usercloud/login/index.tsx
+++ b/src/pages/usercloud/login/index.tsx
@@ -37,7 +37,7 @@ const Login: React.FC