3.10 工程代码同步master

2022-03-10 14:24:13 +08:00
parent 41ab55a4ac
commit 62f6b07ee2
914 changed files with 143121 additions and 29110 deletions
--- a/src/pages/Tender/ProjectsInvolved/data.d.ts
+++ b/src/pages/Tender/ProjectsInvolved/data.d.ts
@ -1,18 +0,0 @@
-//需要包含筛选里的字段 筛选才能生效
-export interface projectListItem {
-  key?: string;
-  mode?: string;
-  projectName?: string;
-  projectNum?: string;
-  purchase?: string;
-  time?: string;
-  type?: string;
-  area?: string;
-}
-
-export interface personListItem {
-  name?: string;
-  loginNum?: string;
-  phone?: string;
-  email?: string;
-}
--- a/src/pages/Tender/ProjectsInvolved/index.tsx
+++ b/src/pages/Tender/ProjectsInvolved/index.tsx
@ -1,16 +1,17 @@
 import React, { useState, useRef } from 'react';
-import { Button, Tabs, Form, Input, Modal, Space, Checkbox, message, PageHeader } from 'antd';
-import ProTable, { ActionType } from '@ant-design/pro-table';
-import { queryingPagingData } from '@/utils/PageUtils';
-import { personListItem } from './data';
-import { getSection, exitProject, changePerson, getProject, getOther } from './service';
+import { Button, Tabs, Form, Input, Modal, Space, Checkbox, message, PageHeader, Popconfirm, Progress, Tag, 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 '@/assets/ld_style.less';
-import { Link } from 'umi';
-import { getDicData } from '@/utils/session';
-import { proTableValueEnum } from '@/utils/CommonUtils';
+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';

 const { TabPane } = Tabs;
-const { Search } = Input;
 const { TextArea } = Input;
 const CheckboxGroup = Checkbox.Group;

@ -19,35 +20,13 @@ const formItemLayout = {
  wrapperCol: { span: 14 },
 };

-const personData: personListItem[] = [
-  {
-    name: '刘德华',
-    loginNum: 'sfsddfd',
-    phone: '13625141412',
-    email: 'sdsf@123.com',
-  }, {
-    name: '刘德华',
-    loginNum: 'sfsddfd',
-    phone: '13625141412',
-    email: 'sdsf@123.com',
-  }, {
-    name: '刘德华',
-    loginNum: 'sfsddfd',
-    phone: '13625141412',
-    email: 'sdsf@123.com',
-  }, {
-    name: '刘德华',
-    loginNum: 'sfsddfd',
-    phone: '13625141412',
-    email: 'sdsf@123.com',
-  },
-]
-
 const plainOptions: any[] = [];
 const defaultCheckedList: any[] = [];

 const Index: React.FC<{}> = () => {
-  const [personList] = useState<any>([personData]); // 负责人列表
+  const { confirm } = Modal;
+  const checkRelationRef = useRef<ActionType>(); //操作数据后刷新列表
+  const [personList, setPersonList] = useState<any>([]); // 负责人列表
  const [plainList, setPlainList] = useState(plainOptions); // 选择标段
  const [quitVisible, setQuitVisible] = useState<boolean>(false); // 退出项目弹窗按钮
  const [personVisible, setPersonVisible] = useState<boolean>(false); // 修改负责人弹窗按钮
@ -55,93 +34,136 @@ const Index: React.FC<{}> = () => {
  const [checkAll, setCheckAll] = useState<boolean>(false); // 复选框全选
  const [checkedList, setCheckedList] = useState(defaultCheckedList); // 全选选中数组
  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;
+  //招募方式
+  const recruitmentMethodRecord = 'recruitment_method=record';
+
+  //存储当前页面项目类型
+  let proTypeCode = getProjectTypeCode();
+  // 项目列表url
+  const [projectParams, setProjectParams] = useState<string>("");
+  const projectName = getUrlParam("projectName");
+  const bidMethodDict = getURLInformation("bidMethodDict");
+  const current = getURLInformation("current");

  //获取字典
  const getDict: any = getDicData();
  const dictData = JSON.parse(getDict);

  const actionRef = useRef<ActionType>();
-  const personColumns: any[] = [  // 修改项目负责人 
+  const personColumns: ProColumns<{}>[] = [  // 修改项目负责人
    {
      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '登录号',
-      dataIndex: 'loginNum',
-      key: 'loginNum',
+      dataIndex: 'empName',
    },
    {
      title: '手机号',
-      dataIndex: 'phone',
-      key: 'phone',
+      dataIndex: 'mobile',
+      search: false,
    },
    {
-      title: '邮箱',
-      dataIndex: 'email',
-      key: 'email',
+      title: '账号',
+      dataIndex: 'userAccount',
+      search: false,
    },
    {
      title: '操作',
      dataIndex: 'action',
-      key: 'action',
+      search: false,
      align: 'center',
      render: (text: any, record: any) => (
-        <Space size="middle">
-          <Button type="link" size="middle">选择</Button>
-        </Space>
+        <Popconfirm
+          title="您确定要修改负责人吗?"
+          onConfirm={() => choosePerson(record)}
+          okText="确定"
+          cancelText="返回"
+        >
+          <Button type="link" danger size="middle">选择</Button>
+        </Popconfirm>
      ),
    },
  ];
-  const columns: any[] = [  // 我参与的项目
+  const columns: any = [  // 我参与的项目
    {
      title: '序号',
      dataIndex: 'index',
      valueType: 'index',
-      search: false
+      search: false,
+      width: 50,
    },
    {
-      title: '采购方式',
+      title: proTypeCode.indexOf("procurement_mode_4") !== -1 ? '招募方式' : '采购方式',
      dataIndex: 'bidMethodDict',
-      search: false,
-      valueEnum: proTableValueEnum(dictData['procurement_mode=entrust'])
+      search: proTypeCode?.length > 1 ? null : false,
+      initialValue: bidMethodDict ? bidMethodDict : void 0,
+      valueEnum: proTableValueEnumOther(dictData['procurement_mode=entrust'], proTypeCode),
+      width: '10%',
+      render: (_: any, record: any) => {
+        if (proTypeCode.indexOf("procurement_mode_4") !== -1) {
+          const recruitmentMethod = getDictName(dictData[recruitmentMethodRecord], record.examinationMethodDict)
+          if (recruitmentMethod == '一次评审') {
+            return "公开招募"
+          } else {
+            return "公开招募(多轮评审)"
+          }
+        } else {
+          return _
+        }
+      }
    },
    {
      title: '项目名称',
      dataIndex: 'projectName',
+      initialValue: projectName ? projectName : void 0,
    },
    {
-      title: '项目编号',
-      dataIndex: 'projectBizNum',
-      search: false
+      title: proTypeCode.indexOf("procurement_mode_4") !== -1 ? '招募人' : '采购人',
+      dataIndex: 'tendereeOrgName',
+      search: false,
+      width: '10%'
    },
    {
-      title: '采购人',
-      dataIndex: 'ownerContactName',
-      search: false
+      title: '代理机构',
+      dataIndex: 'tenderAgencyName',
+      search: false,
+      width: '15%'
    },
    {
-      title: '采购类型',
+      title: '项目分类',
      dataIndex: 'procurementType',
-      valueEnum: proTableValueEnum(dictData['procurement_type=entrust'])
+      valueEnum: proTableValueEnum(dictData['procurement_type=entrust']),
+      search: false,
+      width: '8%'
    },
    {
      title: '所属区域',
      dataIndex: 'regionDictName',
-      search: false
+      search: false,
+      width: '10%'
    },
    {
      title: '操作',
-      width: 100,
-      render: (text: any, record: any) => (
-        <Space>
-          <Button type="link" onClick={() => saveProject(record)} danger><Link to={`/ProjectLayout/Tender/supplier/IParticipate?id=${record.id}`}>项目跟进</Link></Button>
-          <Button type="link" danger onClick={() => setPersonVisible(true)} >修改负责人</Button>
-          <Button type="link" danger onClick={() => quitProject(record.id)} >退出项目</Button>
-        </Space>
-      ),
+      width: '15%',
+      search: false,
+      render: (text: any, record: any) => {
+        if (MethodDict == "procurement_mode_7") {
+          return (
+            <Button type="text" onClick={() => saveProject(record)} danger>项目跟进</Button>
+          )
+        } else {
+          return (
+            <Space>
+              <Button hidden={btnAuthority(['ebtp-supplier'])} type="text" onClick={() => saveProject(record)} danger>项目跟进</Button>
+              <Button hidden={btnAuthority(['ebtp-supplier'])} type="text" danger onClick={() => changePerson(record)} >修改负责人</Button>
+              <Button hidden={btnAuthority(['ebtp-supplier'])} type="text" danger onClick={() => quitProject(record.id)} >退出项目</Button>
+            </Space>
+          )
+        }
+      }
    },
  ];
  const otherColumns: any[] = [  // 公司其他项目
@ -149,7 +171,8 @@ const Index: React.FC<{}> = () => {
      title: '序号',
      dataIndex: 'index',
      valueType: 'index',
-      search: false
+      search: false,
+      width: 50,
    },
    {
      title: '项目名称',
@ -159,12 +182,14 @@ const Index: React.FC<{}> = () => {
      title: '采购类型',
      dataIndex: 'procurementTypeDict',
      search: false,
+      width: '8%',
      valueEnum: proTableValueEnum(dictData['procurement_type=entrust'])
    },
    {
      title: '采购方式',
      dataIndex: 'bidMethodDict',
      search: false,
+      width: '10%',
      valueEnum: proTableValueEnum(dictData['procurement_mode=entrust'])
    },
    {
@ -180,12 +205,108 @@ const Index: React.FC<{}> = () => {
    {
      title: '项目负责人',
      dataIndex: 'projectBidUser',
-      search: false
+      search: false,
+      width: '10%'
    },
  ];
+  const dataSource = [
+    '语雀的天空',
+    'Ant Design',
+    '蚂蚁金服体验科技',
+    'TechUI',
+    'TechUI 2.0',
+    'Bigfish',
+    'Umi',
+  ].map((item) => ({
+    title: item,
+    // subTitle: <Tag color="#5BD8A6">语雀专栏</Tag>,
+    actions: [
+      <a>邀请</a>,
+      <a>操作</a>,
+    ],
+    avatar: (
+      <span className="pro-type">公</span>
+    ),
+    content: (
+      <>
+        <div
+          style={{
+            flex: 1,
+          }}
+        >
+          <span>第一个包</span>
+          <span className="ml20">11</span>
+          <span
+            className="ml20"
+            style={{
+              width: 200,
+              display: "inline-block"
+            }}
+          >
+            <Progress percent={80} />
+          </span>
+        </div>
+        <div
+          style={{
+            flex: 1,
+            marginTop: 8,
+          }}
+        >
+          <span>第一个包</span>
+          <span className="ml20">11</span>
+          <span
+            className="ml20"
+            style={{
+              width: 200,
+              display: "inline-block"
+            }}
+          >
+            <Progress percent={80} />
+          </span>
+        </div>
+      </>
+    ),
+  }));

-  const saveProject = (val: any) => { // 点击项目跟进存储项目信息
-    sessionStorage.setItem('projectData', JSON.stringify(val));
+  /**
+   * 获取返回路径
+   * @returns 
+   */
+  const getReturnURL = () => {
+    let projectURLParams = JSON.parse(projectParams);
+    let params = `${'?current=' + projectURLParams.current}${isEmpty(projectURLParams.projectName) ? '' : '&projectName=' + projectURLParams.projectName}${isEmpty(projectURLParams.bidMethodDict) ? '' : '&bidMethodDict=' + projectURLParams.bidMethodDict}`;
+    return getUrlRelativePath() + params;
+  }
+
+  const saveProject = async (val: any) => { // 点击项目跟进存储项目信息
+    val.returnURL = getReturnURL()
+    await followUpAProjectSupplier(val);
+    history.push('/ProjectLayout/Supplier/HomePageSectionList')
+  }
+
+  const changePerson = (val: any) => { // 修改负责人弹窗
+    setPersonVisible(true)
+    setOrganId(val.companyId)
+    setProjectId(val.id)
+  }
+
+  const [spin, spinSet] = useState(false);
+  const choosePerson = async (val: any) => { // 确定修改负责人
+    spinSet(true);
+    let data = {
+      bidUserId: val.userAccount,
+      bidUserName: val.empName,
+      companyId: val.partnerMdmCode,
+      projectId: projectId
+    }
+    await supplierRegister(data).then((res: any) => {
+      if (res.code == 200) {
+        message.success('修改负责人成功！')
+        checkRelationRef.current?.reload();
+        setPersonVisible(false)
+      }
+    });
+    spinSet(false);
  }

  const onFinish = (val: any) => { // 校验成功确认提交
@ -201,7 +322,6 @@ const Index: React.FC<{}> = () => {
        setIndeterminate(false)
      } else {
        setQuitVisible(false)
-        message.warning(res.message)
      }
    })
  };
@ -210,14 +330,12 @@ const Index: React.FC<{}> = () => {
    setCheckedList(e.target.checked ? sectionsVal : []);
    setIndeterminate(false)
    setCheckAll(e.target.checked)
-    console.log(e.target.checked)
  };

  const onChange = (checkedList: any) => { // 多选单点
    setCheckedList(checkedList)
    setIndeterminate(!!checkedList.length && checkedList.length < sectionsVal.length)
    setCheckAll(checkedList.length === sectionsVal.length)
-    console.log(checkedList)
  };

  const quitProject = (id: any) => { // 退出项目
@ -233,15 +351,43 @@ const Index: React.FC<{}> = () => {
    })
  }

-  const submitQuit = (val: any) => { // 确定并进行校验
-    if (checkedList.length > 0) {
-      quitForm.getFieldValue().checkbox = checkedList
-    }
-    quitForm.submit()
+  const showConfirm = (date: any) => {
+    confirm({
+      title: date,
+      onOk() {
+        if (checkedList.length > 0) {
+          quitForm.getFieldValue().checkbox = checkedList
+        }
+        quitForm.submit()
+        setCheckAll(false)
+        setIndeterminate(false)
+        setCheckedList([])
+        checkRelationRef.current?.reload();
+      },
+      onCancel() {
+        setCheckAll(false)
+        setIndeterminate(false)
+        setCheckedList([])
+        setQuitVisible(false)
+      },
+    });
  }

-  const onSearch = () => { // 确认选择负责人
-    // alert(0)
+  const submitQuit = (val: any) => { // 确定并进行校验
+    exitProjectPayCheck(checkedList).then((res: any) => {
+      if(res.data && res.data != null){
+        showConfirm(res.data)
+      } else {
+        if (checkedList.length > 0) {
+          quitForm.getFieldValue().checkbox = checkedList
+        }
+        quitForm.submit()
+        setCheckAll(false)
+        setIndeterminate(false)
+        setCheckedList([])
+        checkRelationRef.current?.reload();
+      }
+    })
  }

  return (
@ -252,11 +398,33 @@ const Index: React.FC<{}> = () => {
      <div className="bidContent projectsInvolved">
        <Tabs defaultActiveKey="1">
          <TabPane tab="我参与的项目" key="1">
+
+            {/* <ProList<any>
+              className="pro-list"
+              pagination={{
+                defaultPageSize: 10,
+                showSizeChanger: true,
+              }}
+              metas={{
+                title: {},
+                subTitle: {},
+                type: {},
+                avatar: {},
+                content: {},
+                actions: {},
+              }}
+              dataSource={dataSource}
+            /> */}
+
            <ProTable
+              actionRef={checkRelationRef}
+              className="proSearch"
              columns={columns}
-              // request={params => queryingPagingData('/api/biz-service-ebtp-tender/v1/supplier_register/get_register_project', 'post', params)}
+              params={{ "procurementMode": proTypeCode }}
+              size='small'
              request={async (params) =>
-                await getProject(params).then((res) => {
+                await getProject(params, proTypeCode).then((res) => {
+                  setProjectParams(JSON.stringify(params));
                  if (res.code == 200) {
                    let data = res.data;
                    return Promise.resolve({
@ -274,34 +442,85 @@ const Index: React.FC<{}> = () => {
                  });
                })
              }
-              pagination={{ defaultPageSize: 10 }}//默认显示条数
+              search={{
+                filterType: "query",
+                optionRender: (searchConfig: any, { form }) => {
+                  return [
+                    <Button
+                      key="resetText"
+                      onClick={() => {
+                        form?.setFieldsValue({
+                          projectName: null,
+                          bidMethodDict: null,
+                          current: 1,
+                        })
+                        form?.submit();
+                      }}
+                    >
+                      {searchConfig?.resetText}
+                    </Button>,
+                    <Button
+                      key="searchText"
+                      type="primary"
+                      onClick={() => {
+                        form?.submit();
+                      }}
+                    >
+                      {searchConfig?.searchText}
+                    </Button>,
+                  ];
+                },
+              }}
+              pagination={{ defaultCurrent: isNotEmpty(current) ? Number(current) : 1, defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
              toolBarRender={false}
-              bordered
            />
+
            <Modal // 修改负责人
              title="选择负责人"
              width={800}
              visible={personVisible}
              onCancel={() => setPersonVisible(false)}
-              footer={null}
+              footer={[<Button onClick={() => setPersonVisible(false)}>关闭</Button>]}
+              centered
+              style={{ maxHeight: modalHeight }}
+              bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
            >
-              <Search
-                placeholder="请输入关键词"
-                allowClear
-                enterButton="查询"
-                size="middle"
-                onSearch={onSearch}
-                className="mb10"
-              />
-              <ProTable<any>
-                actionRef={actionRef}//action触发后更新表格
-                columns={personColumns}
-                pagination={{ defaultPageSize: 10 }}//默认显示条数
-                dataSource={personList}
-                toolBarRender={false}
-                search={false}
-                bordered
-              />
+              <Spin spinning={spin}>
+                <ProTable<any>
+                  size='small'
+                  actionRef={actionRef}//action触发后更新表格
+                  columns={personColumns}
+                  request={async (params) =>
+                    await getSupplierUser({
+                      ...params,
+                      partnerMdmCode: organId,
+                      pageNum: params.current,
+                      pageSize: params.pageSize,
+                    }).then((res) => {
+                      if (res.success) {
+                        let data = res.data;
+                        setPersonList(data.records)
+                        return Promise.resolve({
+                          data: data.records,
+                          success: res.success,
+                          total: res.data.total,
+                          current: res.data.page,
+                        });
+                      }
+                      return Promise.resolve({
+                        data: [],
+                        success: false,
+                        total: 0,
+                        current: 1,
+                      });
+                    })
+                  }
+                  pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+                  dataSource={personList}
+                  toolBarRender={false}
+                  bordered
+                />
+              </Spin>
            </Modal>
            <Modal // 退出项目
              title="退出项目"
@ -309,6 +528,7 @@ const Index: React.FC<{}> = () => {
              visible={quitVisible}
              onCancel={() => setQuitVisible(false)}
              onOk={submitQuit}
+              centered
            >
              <Form
                {...formItemLayout}
@ -320,7 +540,7 @@ const Index: React.FC<{}> = () => {
                  name="reason"
                  rules={[{ required: true, message: '请输入退出原因' }]}
                >
-                  <TextArea rows={4} />
+                  <TextArea maxLength={100} rows={4} />
                </Form.Item>
                <Form.Item
                  name="checkbox"
@ -351,8 +571,10 @@ const Index: React.FC<{}> = () => {
          </TabPane>
          <TabPane tab="公司其他项目" key="2">
            <ProTable
+              size='small'
+              className="proSearch"
              columns={otherColumns}
-              // request={params => queryingPagingData('/api/biz-service-ebtp-tender/v1/supplier_register/company_other_project', 'post', params)}
+              params={{ "procurementMode": proTypeCode }}
              request={async (params) =>
                await getOther(params).then((res) => {
                  if (res.code == 200) {
@ -372,9 +594,8 @@ const Index: React.FC<{}> = () => {
                  });
                })
              }
-              pagination={{ defaultPageSize: 10 }}//默认显示条数
+              pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
              toolBarRender={false}
-              bordered
            />
          </TabPane>
        </Tabs>
--- a/src/pages/Tender/ProjectsInvolved/service.ts
+++ b/src/pages/Tender/ProjectsInvolved/service.ts
@ -5,6 +5,11 @@ export async function getSection(id: any) { // 退出标段接口
    method: 'get',
  });
 }
+export async function getDefId(proId: any) { // 获取项目流程id
+  return request(`/api/biz-service-ebtp-process/v1/projectconfig/querydefid/${proId}`, {
+    method: 'get',
+  });
+}

 export async function exitProject(data: any) { // 退出项目
  return request('/api/biz-service-ebtp-tender/v1/supplier_register/exit', {
@ -20,14 +25,32 @@ export async function changePerson(data: any) { // 修改项目负责人
  });
 }

-export async function getProject(data: any) { // 我参与的项目
+export async function getProject(data?: any,proTypeCode?:any) { // 我参与的项目
+  let url="/api/biz-service-ebtp-tender/v1/supplier_register/get_register_project"
+  if(proTypeCode.indexOf("procurement_mode_4")>-1)
+    url="/api/biz-service-ebtp-tender/v1/recruit/register/get_register_project";
+  return request(url, {
+    method: 'post',
+    data: {
+      ...data,
+      procurementMode:data?.bidMethodDict==undefined?data?.procurementMode:[data?.bidMethodDict],
+      basePageRequest: {
+        pageNo: data?.current,
+        pageSize: data?.pageSize
+      }
+    }
+  });
+}
+//20210208 新增 招募专用
+export async function getProjectOther(data: any) { // 我参与的项目
  return request('/api/biz-service-ebtp-tender/v1/supplier_register/get_register_project', {
    method: 'post',
    data: {
      ...data,
+      procurementMode:data?.bidMethodDict==undefined?data?.procurementMode:[data?.bidMethodDict],
      basePageRequest: {
-        pageNo: data.current,
-        pageSize: data.pageSize
+        pageNo: data?.current,
+        pageSize: data?.pageSize
      }
    }
  });
@ -38,10 +61,25 @@ export async function getOther(data: any) { // 公司其他项目
    method: 'post',
    data: {
      ...data,
+      procurementMode:data?.bidMethodDict==undefined?data?.procurementMode:[data?.bidMethodDict],
      basePageRequest: {
        pageNo: data.current,
        pageSize: data.pageSize
      }
    }
  });
+}
+
+export async function supplierRegister(data: any) { // 修改项目负责人
+  return request('/api/biz-service-ebtp-tender/v1/supplier_register/update_contact', {
+    method: 'post',
+    data: data
+  });
+}
+
+export async function exitProjectPayCheck(data: any) { // 供应商退出项目校验是否购标
+  return request('/api/biz-service-ebtp-expenses/v1/bizbidshoppingcart/exitProjectPayCheck', {
+    method: 'post',
+    data: data
+  });
 }