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

9.7 同步master版本，解决冲突

Browse Source
This commit is contained in:
jl-zhoujl2
2022-09-07 14:03:12 +08:00
parent 90c5085fc8 53940f64ce
commit e0f3fd574b
36 changed files with 1410 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
src/pages/Tender/ProjectsInvolved/index.tsx
View File

@ -1,15 +1,16 @@
import React, { useState, useRef } from 'react';
import { Button, Tabs, Form, Input, Modal, Space, Checkbox, message, PageHeader, Popconfirm, Progress, Tag, Spin } from 'antd';
import React, { useState, useRef, } from 'react';
import { Button, Tabs, Form, Input, Modal, Checkbox, message, PageHeader, Popconfirm, Progress, Spin } from 'antd';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
import { getSection, exitProject, getProject, getOther, supplierRegister, exitProjectPayCheck } from './service';
import { getSupplierUser } from '@/utils/SupplierList/service'
import { getProMethod } from '@/utils/session';
import { getProMethod,getSessionUserData } from '@/utils/session';
import '@/assets/ld_style.less';
import { history } from 'umi';
import { followUpAProjectSupplier, getDicData } from '@/utils/session';
import { getDictName, getProjectTypeCode, getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnum, proTableValueEnumOther } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority';
import ProList from '@ant-design/pro-list';
import kefu from '@/assets/img/kefu.png' //智慧客服
import {submitHiddenForm, createHiddenForm} from '@/utils/CustomerService' //智慧客服
const { TabPane } = Tabs;
const { TextArea } = Input;
@ -36,6 +37,8 @@ const Index: React.FC<{}> = () => {
const [sectionsVal, setSectionsVal] = useState<any>([]); // 选中数组id
const [organId, setOrganId] = useState<any>(); // id
const [projectId, setProjectId] = useState<any>(); // id
const [quitForm] = Form.useForm();
const MethodDict = getProMethod(); //获取采购方式
const modalHeight = (innerHeight * 96) / 100;
@ -120,6 +123,13 @@ const Index: React.FC<{}> = () => {
dataIndex: 'projectName',
initialValue: projectName ? projectName : void 0,
},
{
title: '我要咨询',
dataIndex: 'consult',
render: (text: any, record: any) => (
<span onClick={()=>{saveTmpForm(record); initChatUI()}}><img style={{width:20,height:20, cursor:'pointer'}} src={kefu} alt="" /></span>
),
},
{
title: proTypeCode.indexOf("procurement_mode_4") !== -1 ? '招募人' : '采购人',
dataIndex: 'tendereeOrgName',
@ -281,6 +291,8 @@ const Index: React.FC<{}> = () => {
}
const saveProject = async (val: any) => { // 点击项目跟进存储项目信息
//创建临时表单-智慧客服
saveTmpForm(val)
val.returnURL = getReturnURL()
await followUpAProjectSupplier(val);
history.push('/ProjectLayout/Supplier/HomePageSectionList')
@ -358,7 +370,8 @@ const Index: React.FC<{}> = () => {
title: date,
onOk() {
if (checkedList.length > 0) {
quitForm.getFieldValue().checkbox = checkedList
//quitForm.getFieldValue().checkbox = checkedList 报错——林杰注释
quitForm.setFieldsValue({checkbox: checkedList})
}
quitForm.submit()
setCheckAll(false)
@ -381,7 +394,8 @@ const Index: React.FC<{}> = () => {
showConfirm(res.data)
} else {
if (checkedList.length > 0) {
quitForm.getFieldValue().checkbox = checkedList
//quitForm.getFieldValue().checkbox = checkedList 报错——林杰注释
quitForm.setFieldsValue({checkbox: checkedList})
}
quitForm.submit()
setCheckAll(false)
@ -391,7 +405,100 @@ const Index: React.FC<{}> = () => {
}
})
}
const saveTmpForm = (record:any)=>{//智慧客服-创建临时表单
let roleAuthority: any | null = sessionStorage.getItem('roleAuthority');
let data = getSessionUserData();
const inputList = [
{
label:null,
paraName:'origin',
isEncode:false,
paraVal:'eBid',
},
{
label:null,
paraName:'organizationId',
isEncode:false,
paraVal: data.organizationId,
},
{
label:'项目名称',
paraName:'projectName',
isEncode:true,
paraVal:record.projectName,
},
{
label:'项目编号',
paraName:'ebpProjectNumber',
isEncode:false,
paraVal:record.ebpProjectNumber,
},
{
label:'项目流水号',
paraName:'projectBizNum',
isEncode:false,
paraVal:record.projectBizNum,
},
{
label:null,
paraName:'tenderAgencyId',
isEncode:false,
paraVal:record.tenderAgencyId,
},
{
label:null,
paraName:'tenderAgencyName',
isEncode:true,
paraVal:record.tenderAgencyName,
},
{
label:'项目状态',
paraName:'status',
isEncode:false,
paraVal:record.status==1?'编辑中':record.status==2?'进行中':record.status==3?'已结束':record.status==9?'废止':'无效状态',
},
{
label:'采购单位',
paraName:'tendereeName',
isEncode:true,
paraVal:record.tendereeName,
},
{
label:'实施单位',
paraName:'providerName',
isEncode:true,
paraVal:record.tenderAgencyName,
},
{
label:'实施人员',
paraName:'ownerContactName',
isEncode:true,
paraVal:record.appManagerName+'-'+record.appManagerId+'-'+record.appManagerTel
},
{
label:null,
paraName:'roleAuthority',
isEncode:false,
paraVal:JSON.parse(roleAuthority)[0],
},
{
label:null,
paraName:'module',
isEncode:false,
paraVal:'10',
},
{
label:null,
paraName:'custType',
isEncode:false,
paraVal:'2',
},
]
createHiddenForm(inputList, window.location.pathname)
}
const initChatUI = ()=>{ //打开客服界面
submitHiddenForm()
}
return (
<>
<PageHeader

98
src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx
View File

@ -6,13 +6,16 @@ import { lookingForBussinessResp, participationSave } from '../service';
import '@/utils/lq.style.less';
import { downloadAttachmentPath } from '@/utils/DownloadUtils';
import { getNoticeInfo } from '../../LookingForBusinessOpportunities/service';
import { getDicData } from '@/utils/session';
import { getDicData,getSessionUserData } from '@/utils/session';
import { getBidMethodDictTypeCode, getProjectTypeCode, getURLInformation, isNotEmpty, proTableValueEnum, proTableValueEnumOther } from '@/utils/CommonUtils';
import Weboffice from "@/pages/webOffice/weboffice";
import { queryingPagingData } from '@/utils/PageUtils';
import ExtendUpload from '@/utils/ExtendUpload';
import { btnAuthority } from '@/utils/authority';
import BraftText from '@/components/richText/wang';
import kefu from '@/assets/img/kefu.png' //智慧客服
import {windowOpenChatUI} from '@/utils/CustomerService' //智慧客服
const { TabPane } = Tabs;
const modalHeight = innerHeight * 96 / 100;
//标的类型
@ -85,7 +88,91 @@ const LookingForBusinessOpportunitiesList: React.FC = () => {
//获取当前页是哪种采购方式
const proTypeCode = getProjectTypeCode();
const initChatUI = (record:any)=>{//智慧客服-创建临时表单
let roleAuthority: any | null = sessionStorage.getItem('roleAuthority');
let data = getSessionUserData();
const inputList = [
{
label:null,
paraName:'origin',
isEncode:false,
paraVal:'eBid',
},
{
label:null,
paraName:'organizationId',
isEncode:false,
paraVal: data.organizationId,
},
{
label:'项目名称',
paraName:'projectName',
isEncode:true,
paraVal:record.projectName,
},
{
label:'采购方式',
paraName:'bidMethodDict',
isEncode:true,
paraVal:record.bidMethodDict=='procurement_mode_1'?'公开招标':record.bidMethodDict=='procurement_mode_2'?'邀请招标':record.bidMethodDict=='procurement_mode_3'?'公开比选':record.bidMethodDict=='procurement_mode_4'?'公开招募':record.bidMethodDict=='procurement_mode_5'?'竞争性谈判':record.bidMethodDict=='procurement_mode_6'?'单一来源':record.bidMethodDict=='procurement_mode_7'?'公开询价':record.bidMethodDict=='procurement_mode_8'?'竞拍':record.bidMethodDict=='procurement_mode_9'?'单一来源简化流程':'-',
},
{
label:'采购人',
paraName:'tendereeOrgName',
isEncode:true,
paraVal:record.tendereeOrgName,
},
{
label:'代理机构',
paraName:'tenderAgencyName',
isEncode:true,
paraVal:record.tenderAgencyName,
},
{
label:null,
paraName:'tenderAgencyId',
isEncode:false,
paraVal:record.tenderAgencyId,
},
{
label:null,
paraName:'tenderAgencyName',
isEncode:true,
paraVal:record.tenderAgencyName,
},
{
label:'项目分类',
paraName:'procurementType',
isEncode:false,
paraVal:record.procurementType=='procurement_type_1'?'货物':record.procurementType=='procurement_type_2'?'工程':record.procurementType=='procurement_type_3'?'服务':record.procurementType=='procurement_type_4'?'其他':'-',
},
{
label:'所属区域',
paraName:'regionDictName',
isEncode:true,
paraVal:record.regionDictName,
},
{
label:null,
paraName:'roleAuthority',
isEncode:false,
paraVal:JSON.parse(roleAuthority)[0],
},
{
label:null,
paraName:'module',
isEncode:false,
paraVal:'10',
},
{
label:null,
paraName:'custType',
isEncode:false,
paraVal:'2',
},
]
windowOpenChatUI(inputList, window.location.pathname)
}
useEffect(() => {
setTableLoading(true);
lookingForBussinessResp({ procurementMode: proTypeCode }).then((res: any) => {
@ -113,6 +200,13 @@ const LookingForBusinessOpportunitiesList: React.FC = () => {
title: '项目名称',
dataIndex: 'projectName',
},
{
title: '我要咨询',
dataIndex: 'consult',
render: (text: any, record: any) => (
<span onClick={()=>{initChatUI(record)}}><img style={{width:20,height:20, cursor:'pointer'}} src={kefu} alt="" /></span>
),
},
{
title: '采购人',
dataIndex: 'tendereeOrgName',

104
src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx
View File

@ -11,13 +11,14 @@ import {
} from '../service';
import '@/utils/lq.style.less';
import { downloadAttachmentPath } from '@/utils/DownloadUtils';
import { getDicData } from '@/utils/session';
import { getDicData,getSessionUserData } from '@/utils/session';
import { proTableValueEnum, getURLInformation, isNotEmpty, proTableValueEnumOther, getProjectTypeCode, getBidMethodDictTypeCode, getDictName } from '@/utils/CommonUtils';
import Weboffice from "@/pages/webOffice/weboffice";
import { queryingPagingData } from '@/utils/PageUtils';
import ExtendUpload from '@/utils/ExtendUpload';
import { btnAuthority } from '@/utils/authority';
import kefu from '@/assets/img/kefu.png' //智慧客服
import {windowOpenChatUI} from '@/utils/CustomerService' //智慧客服
const { TabPane } = Tabs;
//标的类型
@ -107,6 +108,98 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => {
}
return '标段';
}
const initChatUI = (record:any)=>{//智慧客服-创建临时表单
let roleAuthority: any | null = sessionStorage.getItem('roleAuthority');
let data = getSessionUserData();
const inputList = [
{
label:null,
paraName:'origin',
isEncode:false,
paraVal:'eBid',
},
{
label:null,
paraName:'organizationId',
isEncode:false,
paraVal: data.organizationId,
},
{
label:'项目名称',
paraName:'projectName',
isEncode:true,
paraVal:record.projectName,
},
{
label:'项目编号',
paraName:'ebpProjectNumber',
isEncode:false,
paraVal:record.ebpProjectNumber,
},
{
label:'项目流水号',
paraName:'projectBizNum',
isEncode:false,
paraVal:record.projectBizNum,
},
{
label:null,
paraName:'tenderAgencyId',
isEncode:false,
paraVal:record.tenderAgencyId,
},
{
label:null,
paraName:'tenderAgencyName',
isEncode:true,
paraVal:record.tenderAgencyName,
},
{
label:'项目状态',
paraName:'status',
isEncode:false,
paraVal:record.status==1?'编辑中':record.status==2?'进行中':record.status==3?'已结束':record.status==9?'废止':'无效状态',
},
{
label:'采购单位',
paraName:'tendereeName',
isEncode:true,
paraVal:record.tendereeName,
},
{
label:'实施单位',
paraName:'providerName',
isEncode:true,
paraVal:record.tenderAgencyName,
},
{
label:'实施人员',
paraName:'ownerContactName',
isEncode:true,
paraVal:record.appManagerName+'-'+record.appManagerId+'-'+record.appManagerTel
},
{
label:null,
paraName:'roleAuthority',
isEncode:false,
paraVal:JSON.parse(roleAuthority)[0],
},
{
label:null,
paraName:'module',
isEncode:false,
paraVal:'10',
},
{
label:null,
paraName:'custType',
isEncode:false,
paraVal:'2',
},
]
windowOpenChatUI(inputList, window.location.pathname)
}
useEffect(() => {
setTableLoading(true);
if (bidMethodDict.indexOf("procurement_mode_4") > -1) {
@ -155,6 +248,13 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => {
title: '项目名称',
dataIndex: 'projectName',
},
{
title: '我要咨询',
dataIndex: 'consult',
render: (text: any, record: any) => (
<span onClick={()=>{initChatUI(record)}}><img style={{width:20,height:20, cursor:'pointer'}} src={kefu} alt="" /></span>
),
},
{
title: bidMethodDict.indexOf("procurement_mode_4") !== -1 ? '招募人' : '采购人',
dataIndex: 'tendereeOrgName',