Merge branch 'dev-srm' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev-srm

src/pages/contract/manage/QueryList/index.tsx

@@ -124,14 +124,12 @@ const QueryList = () => {
       return (
         <div>
           {
-            record.outerStatus != 7 ? <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} onClick={() => invalid(record.id)}>作废</span> : <span> </span>
+            record.outerStatus != 7 || record.outerStatus != 9 ? <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} onClick={() => invalid(record.id)}>作废</span> : <span> </span>
           }
           {
             record.outerStatus == 6 ? <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} onClick={() => like(record)}>合同变更</span> : <span> </span>
           }
-          {/* {
-            record.outerStatus == 9 ? <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} >合同已到期</span> : <span> </span>
-          } */}
+
         </div>
       )
     }

src/pages/contract/manage/add/addList.tsx

@@ -76,11 +76,7 @@ const addList = () => {
     dataIndex: 'sourceNo',
     align: 'left',
     render: (text, record) => {
-      let sourceTypeList = [
-        "",
-        "采购询价",
-        "采购招标"
-      ]
+
       return (
         <div>
           {
@@ -91,7 +87,7 @@ const addList = () => {
               {text}
             </EyePreview>
           }
-          <p>{sourceTypeList[record.sourceType]}</p>
+          <p>{record.sourceTypeName}</p>
         </div>
       )
     }

src/pages/contract/manage/add/components/information.tsx

@@ -97,11 +97,13 @@ const Information = (props: any) => {
   }, [])
   /* 获取传入组建的值 */
   useEffect(() => {
+    console.log(Row.sourceId)
     basicsVO.contractNo = basicsVO.contractNo ? basicsVO.contractNo : '';
     basicsVO.sourceType = Row.sourceType ? Row.sourceType + '' : '1';
     basicsVO.contractId = Row.contractId ? Row.contractId : 0;
     basicsVO.partyBName = Row.partyBName ? Row.partyBName : '';
     basicsVO.sourceNo = Row.sourceNo ? Row.sourceNo : '';
+    basicsVO.sourceId = Row.sourceId ? Row.sourceId : '';
     basicsVO.totalAmount = Row.totalAmount ? Row.totalAmount : '';
     basicsVO.partyBMemberId = sourceType === '1' ? Row.awardRoleId ? Row.awardMemberId : '' : Row.partyBMemberId;
     basicsVO.partyBRoleId = sourceType === '1' ? Row.awardRoleId ? Row.awardRoleId : '' : Row.partyBRoleId;

src/pages/contract/manage/details/index.tsx

 
 import React, { useEffect, useState, useRef } from 'react';
-import { Anchor, Radio, Steps, Row, Col, Form, Input, Table, message, Space, Typography, Button, Modal } from 'antd';
+import { Anchor, Radio, Steps, Row, Form, Input, Table, message, Space, Typography, Button, Modal } from 'antd';
 import style from './index.less';
 import { ArrowLeftOutlined } from '@ant-design/icons';
 import { StandardTable } from 'god';
-import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 import { history } from 'umi'
 import Basic from '../../components/detailCard/basic'
+import ExamineFrom from '../../components/examine'
 
 import {
   FileWordFilled
@@ -22,6 +22,7 @@ const activeAnchorClassName = 'ant-anchor-link-active'
 const Details = (props: any) => {
   /* 合同id */
   const { location: { query: { contractId, type } } } = props;
+  console.log(type);
   const ref = useRef({});
   const [currLink, setCurrLink] = useState(activeAnchorClassName)
   const [form] = Form.useForm();
@@ -58,6 +59,7 @@ const Details = (props: any) => {
   const [associatedCategory, setassociatedCategory] = useState<string>('')
   const [targetOffset, setTargetOffset] = useState<number | undefined>(undefined);
   const [contractAbstract, setcontractAbstract] = useState('');
+  const [signatureLogId, setsignatureLogId] = useState<any>('') // 签署地址id
   /* 总金额 */
   const [tobidCount, settobidCount] = useState<number>(0);
   const [bidAmount, setbidAmount] = useState<number>(0);
@@ -76,6 +78,7 @@ const Details = (props: any) => {
       if (res.code === 1000) {
         let { basics, outerTaskStepList, innerTaskStepList, payPlanList, contractText } = res.data
         let contractAbstract = res.data.basics.contractAbstract;
+        setsignatureLogId(basics.signatureLogId ? basics.signatureLogId : '')
         const basicInfo = {
           col1: [
             { label: '合同编号：', extra: basics.contractNo ? basics.contractNo : '' },
@@ -251,37 +254,28 @@ const Details = (props: any) => {
     { title: '操作时间', dataIndex: 'operateTime', align: 'center', },
     { title: '审核意见', dataIndex: 'opinion', align: 'center', },
   ]
-  /* 提交 */
-  const onFinish = (values: any) => {
-    let fn;
-    switch (type) {
-      case 'examine':
-        fn = PublicApi.postContractManageSubmitExamine
-        break;
+  /* 提交审核的回调 */
+  const getfetchData = (data) => {
+    console.log(data)
+    setIsModalVisible(data.ExamineFlag)
+    if (data.code === 1000) {
+      ref.current.reload()
     }
-    values.contractId = contractId;
-    const msg = message.loading({
-      content: '正在操作',
-      duration: 0,
-    });
-    console.log('Success:', values);
-    fn(values).then(res => {
-      console.log(res);
-      if (res.code === 1000) {
-        history.goBack()
-        setIsModalVisible(!Visible)
+  }
+  /* 提交表单 */
+  const submitExamine = async () => {
+
+    if (type === 'Signacontract' && contractText.isUseElectronicContract == 1) {
+      let res = await PublicApi.getContractSignatureGetHandSignatureUrl({ signatureLogId: 98 });
+      if (res.code == 1000) {
+        console.log(res);
+        window.open(res.data.url)
       }
-    }).finally(() => {
-      msg();
-    });
-  };
-  /* 选中的值 */
-  const handleIsAllMemberChange = (v: any) => {
-    setIsAllMember(v.target.value)
+    } else {
+      setIsModalVisible(!Visible)
+    }
+
   }
-  const onFinishFailed = (errorInfo: any) => {
-    console.log('Failed:', errorInfo);
-  };
   return (
     <div className={style.anchorWrap}>
       <Anchor
@@ -328,7 +322,28 @@ const Details = (props: any) => {
         </div>
         <div>
           {
-            type && <Button type="primary" style={{ width: 80, marginRight: 16 }} onClick={() => setIsModalVisible(!Visible)}>审核 </Button>
+            type === 'ManageSubmitExamine' &&
+            <div className="btn" style={{ marginRight: "20px" }}>
+              <Button type="primary" onClick={() => submitExamine()}>审核</Button>
+            </div>
+          }
+          {
+            type === 'ManageExamineStepOne' &&
+            <div className="btn" style={{ marginRight: "20px" }}>
+              <Button type="primary" onClick={() => submitExamine()}>审核</Button>
+            </div>
+          }
+          {
+            type === 'PageToBeExamineStepTwo' &&
+            <div className="btn" style={{ marginRight: "20px" }}>
+              <Button type="primary" onClick={() => submitExamine()}>审核</Button>
+            </div>
+          }
+          {
+            type === 'Signacontract' &&
+            <div className="btn" style={{ marginRight: "20px" }}>
+              <Button type="primary" onClick={() => submitExamine()}>签订合同</Button>
+            </div>
           }
 
         </div>
@@ -480,32 +495,14 @@ const Details = (props: any) => {
           </div>
         </div>
       </div>
-      <Modal footer={null} title="提交审核" visible={Visible} onOk={() => setIsModalVisible(!Visible)} onCancel={() => setIsModalVisible(!Visible)}>
-        <Form
-          name="basic"
-          form={form}
-          initialValues={{ remember: true }}
-          onFinish={onFinish}
-          onFinishFailed={onFinishFailed}
-        >
-          <Form.Item name="isPass" label="" rules={[{ required: true, message: '请选择作废日期' }]} initialValue={isPass} >
-            <Radio.Group onChange={handleIsAllMemberChange}>
-              <Radio value={1}>通过</Radio>
-              <Radio value={0}>不通过</Radio>
-            </Radio.Group>
-          </Form.Item>
-          <Form.Item label={isPass ? '审核通过原因' : '审不核通过原因'} rules={[{ required: true, message: '请选择作废日期' }]}>
-
-          </Form.Item>
-          <Form.Item label='' name="opinion" rules={[{ required: true, message: '审核通过意见' }]}>
-            <TextArea placeholder="在此输入你的原因，最多60个汉字" maxLength={120} />
-          </Form.Item>
-          <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-            <Button onClick={() => setIsModalVisible(!Visible)} style={{ marginRight: 10 }}>取消</Button>
-            <Button type="primary" htmlType="submit">保存</Button>
-          </div>
-        </Form>
-      </Modal>
+      <ExamineFrom
+        ExamineFlag={Visible}
+        getfetchData={getfetchData}
+        applyId={contractId}
+        type={type}
+        agreeText={type == 'Signacontract' ? "同意签订" : '通过'}
+        disagree={type == 'Signacontract' ? '不同意签订' : '通过'}
+      />
     </div>
   )
 }

src/pages/contract/manage/examine/index.tsx

@@ -16,6 +16,7 @@ import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePicke
 import { PublicApi } from '@/services/api';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons'
 import ExamineFrom from '../../components/examine'
+import moment from 'moment';
 const Examine = () => {
   const ref = useRef<any>({});
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
@@ -34,7 +35,7 @@ const Examine = () => {
     render: (text, record) =>
       <div>
         <EyePreview
-          url={`/memberCenter/contract/manage/examine/details?contractId=${record.id}&type=examine`}
+          url={`/memberCenter/contract/manage/examine/details?contractId=${record.id}&type=ManageSubmitExamine`}
         >
           {text}
         </EyePreview>
@@ -76,11 +77,6 @@ const Examine = () => {
     dataIndex: 'sourceNo',
     align: 'left',
     render: (text, record) => {
-      let sourceTypeList = [
-        "",
-        "采购询价",
-        "采购招标"
-      ]
       return (
         <div>
           {
@@ -92,8 +88,7 @@ const Examine = () => {
               {text}
             </EyePreview>
           }
-
-          <p>{sourceTypeList[record.sourceType]}</p>
+          <p>{record.sourceTypeName}</p>
         </div>
       )
     }

src/pages/contract/manage/levelexamine/index.tsx

@@ -15,6 +15,7 @@ import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePicke
 import { PublicApi } from '@/services/api';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons'
 import ExamineFrom from '../../components/examine'
+import moment from 'moment';
 
 
 const Levelexamine = () => {
@@ -35,7 +36,7 @@ const Levelexamine = () => {
     render: (text, record) =>
       <div>
         <EyePreview
-          url={`/memberCenter/contract/manage/levelexamine/details?contractId=${record.id}&type=levelexamine`}
+          url={`/memberCenter/contract/manage/levelexamine/details?contractId=${record.id}&type=ManageExamineStepOne`}
         >
           {text}
         </EyePreview>
@@ -77,11 +78,6 @@ const Levelexamine = () => {
     dataIndex: 'sourceNo',
     align: 'left',
     render: (text, record) => {
-      let sourceTypeList = [
-        "",
-        "采购询价",
-        "采购招标"
-      ]
       return (
         <div>
           {
@@ -92,7 +88,7 @@ const Levelexamine = () => {
               {text}
             </EyePreview>
           }
-          <p>{sourceTypeList[record.sourceType]}</p>
+          <p>{record.sourceTypeName}</p>
         </div>
       )
     }

src/pages/contract/manage/secondaryexamine/index.tsx

@@ -14,6 +14,7 @@ import Submit from '@/components/NiceForm/components/Submit'
 import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
 import { PublicApi } from '@/services/api';
 import ExamineFrom from '../../components/examine'
+import moment from 'moment';
 
 const Secondaryexamine = () => {
   const ref = useRef<any>({});
@@ -29,7 +30,7 @@ const Secondaryexamine = () => {
     render: (text, record) =>
       <div>
         <EyePreview
-          url={`/memberCenter/contract/manage/QueryList/QueryListdetails?contractId=${record.id}`}
+          url={`/memberCenter/contract/manage/secondaryexamine/details?contractId=${record.id}&type=PageToBeExamineStepTwo`}
         >
           {text}
         </EyePreview>
@@ -71,23 +72,18 @@ const Secondaryexamine = () => {
     dataIndex: 'sourceNo',
     align: 'left',
     render: (text, record) => {
-      let sourceTypeList = [
-        "",
-        "采购询价",
-        "采购招标"
-      ]
+
       return (
         <div>
           {
             text &&
             <EyePreview
               type="button"
-            // url={`/memberCenter/contract/manage/QueryList/QueryListdetails`}
             >
               {text}
             </EyePreview>
           }
-          <p>{sourceTypeList[record.sourceType]}</p>
+          <p>{record.sourceTypeName}</p>
         </div>
       )
     }
@@ -123,7 +119,6 @@ const Secondaryexamine = () => {
       return (
         <div>
           <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => submitExamine(record.id)}>提交审核</span>
-          <span style={{ color: '#00B37A', cursor: 'pointer', }}>查看</span>
         </div>
       )
     }

src/pages/contract/manage/signacontract/index.tsx

 
 import React, { useRef, useState } from 'react'
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { Card, Space, Button, Modal, Radio, Input, Form, message } from 'antd';
+import { Card, Space, Button, Input, Form } from 'antd';
 import statuStyle from '../../common/colorTag'
 import { ColumnType } from 'antd/lib/table/interface';
 import { StandardTable } from 'god';
@@ -9,13 +9,15 @@ import EyePreview from '@/components/EyePreview'
 import { FORM_FILTER_PATH } from '@/formSchema/const'
 import { examineSchema } from '../schema'
 import StatusTag from '@/components/StatusTag';
+import { history } from 'umi';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
 import Submit from '@/components/NiceForm/components/Submit'
 import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
 import { PublicApi } from '@/services/api';
 import ExamineFrom from '../../components/examine'
+import moment from 'moment';
+
 
-const { TextArea } = Input;
 
 const Signacontract = () => {
   const ref = useRef<any>({});
@@ -23,8 +25,6 @@ const Signacontract = () => {
   const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
   const [Visible, setIsModalVisible] = useState<boolean>(false)
   const [id, setid] = useState("")
-  const [isPass, setIsAllMember] = useState()
-  const [form] = Form.useForm();
   //表头
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
@@ -33,7 +33,7 @@ const Signacontract = () => {
     render: (text, record) =>
       <div>
         <EyePreview
-          url={`/memberCenter/contract/manage/QueryList/QueryListdetails?contractId=${record.id}`}
+          url={`/memberCenter/contract/manage/signacontract/details?contractId=${record.id}&type=Signacontract`}
         >
           {text}
         </EyePreview>
@@ -76,22 +76,18 @@ const Signacontract = () => {
     align: 'left',
 
     render: (text, record) => {
-      let sourceTypeList = [
-        "",
-        "采购询价",
-        "采购招标"
-      ]
+
       return (
         <div>
           {
             text &&
             <EyePreview
-              url={`/memberCenter/contract/manage/QueryList/QueryListdetails`}
+              type="button"
             >
               {text}
             </EyePreview>
           }
-          <p>{sourceTypeList[record.sourceType]}</p>
+          <p>{record.sourceTypeName}</p>
         </div>
       )
     }
@@ -128,7 +124,7 @@ const Signacontract = () => {
     render: (text, record) => {
       return (
         <div>
-          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => submitExamine(record.id)}>签订合同</span>
+          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => history.push(`/memberCenter/contract/manage/signacontract/details?contractId=${record.id}&type=Signacontract`)}>签订合同</span>
         </div>
       )
     }
@@ -154,12 +150,6 @@ const Signacontract = () => {
       setSelectRow(selectedRows)
     }
   };
-  /* 提交表单 */
-  const submitExamine = (id) => {
-    setid(id)
-    setIsModalVisible(!Visible)
-  }
-
   /* 提交审核的回调 */
   const getfetchData = (data) => {
     console.log(data)
@@ -201,15 +191,6 @@ const Signacontract = () => {
               span: 24
             }
           }}
-          formilyChilds={{
-            children: <Space>
-              <Button >批量提交审核</Button>
-
-            </Space>,
-            layouts: {
-              span: 8
-            }
-          }}
         />
       </Card>