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

src/pages/contract/components/detailCard/PaymentCard/index.tsx

@@ -54,9 +54,8 @@ const PaymentCard: React.FC<Iprops> = ({
                     <div className={style.proportion}>{item.payRatio}%</div>
                     <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
                       <div className={style.Price}>¥{item.payAmount}</div>
-                      {/* IsShow && <div onClick={() => like(1, item)} style={{ cursor: 'pointer', fontSize: 12, backgroundColor: '#00B37A', color: '#fff', padding: '4px 8px' }}>请款</div> */}
                       {
-                        children
+                        children ? children : IsShow && <div onClick={() => like(1, item)} style={{ cursor: 'pointer', fontSize: 12, backgroundColor: '#00B37A', color: '#fff', padding: '4px 8px' }}>请款</div>
                       }
                     </div>
                     <div className={style.warp_List}>

src/pages/contract/contractexecution/details/PopModal.tsx

@@ -25,19 +25,23 @@ const PopModal: React.FC<Iprops> = ({
 
 }) => {
   const [form] = Form.useForm();
+  /* 选中 */
+  const [paymentId, setpaymentId] = useState<any>()
   /* 确定 */
   const onFinish = (values: any) => {
     sessionStorage.setItem('basics', JSON.stringify(basics))
     sessionStorage.setItem('list', JSON.stringify(selectRowList))
-    history.push('/memberCenter/contract/funds/addbill/Add?applyId=' + contractId + '&sourceType=' + 2)
+    let payid = paymentId ? paymentId : payType[0].id;
+    history.push('/memberCenter/contract/funds/addbill/Add?applyId=' + contractId + '&sourceType=' + 2 + '&paymentId=' + payid)
   }
   const onFinishFailed = (errorInfo: any) => {
     console.log('Failed:', errorInfo);
   };
+
   return (
     <Modal
       footer={null}
-      title="提交审核"
+      title="提交请款单"
       visible={ModalVisible}
       onOk={() => setDrawerPopModal()}
       onCancel={() => setDrawerPopModal()} >
@@ -55,6 +59,9 @@ const PopModal: React.FC<Iprops> = ({
             style={{
               width: '290px'
             }}
+            onChange={(value) => {
+              setpaymentId(value)
+            }}
           >
             {
               payType.map(item => (

src/pages/contract/contractexecution/details/index.css

@@ -159,9 +159,6 @@
   color: #00B37A;
   cursor: pointer;
 }
-.wrapper :global .ant-input-search .ant-input-group .ant-input {
-  padding: 0px !important;
-}
 .wrapper :global .ant-input-search .ant-input-group-addon .ant-input-search-button {
   background-color: #F7F8FA;
 }

src/pages/contract/contractexecution/details/index.less

@@ -188,7 +188,7 @@
   .ant-input-search {
     .ant-input-group {
       .ant-input {
-        padding: 0px !important;
+        // padding: 0px !important;
       }
     }
     .ant-input-group-addon {

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

@@ -361,9 +361,16 @@ const Details = (props: any) => {
       current: current,
       pageSize: pageSize,
     }
+    setSize(pageSize)
+
+    console.log(current, pageSize, size)
     getContracInfoList(data)
   };
-
+  const like = (sourceType, item) => {
+    console.log(sourceType, item);
+    // sessionStorage.setItem('basics', JSON.stringify(basics));
+    // history.push('/memberCenter/contract/funds/addbill/Add?applyId=' + contractId + '&sourceType=' + sourceType + '&paymentId=' + item.id)
+  }
   return (
     <div className={style.anchorWrap}>
       <Anchor
@@ -411,7 +418,9 @@ const Details = (props: any) => {
         {/* 基本信息 */}
         <BasicInfo basicInfo={basicInfo} />
         {/* 付款计划 */}
-        <PaymentCard payPlanList={payPlanList} basics={basicInfo} contractId={contractId} />
+        <PaymentCard
+          IsShow={true}
+          payPlanList={payPlanList} basics={basics} contractId={contractId} />
         {/* 执行情况 */}
         <div id='docking' className='ant-card ant-card-bordered'>
           <div className='ant-card-head'>

src/pages/contract/coordination/details/situationList.tsx

@@ -19,7 +19,7 @@ export interface Iprops extends IAntdSchemaFormProps {
 const { Text } = Typography;
 const situationList: React.FC<Iprops> = ({ contractId }) => {
   const [page, setPage] = useState(1);
-  const [size, setSize] = useState(8);
+  const [size, setSize] = useState(10);
   const [total, setTotal] = useState(0);
   const [listLoading, setListLoading] = useState(false);
   /* 单据总金额 */
@@ -226,9 +226,10 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
           columns={columns}
           dataSource={data}
           loading={listLoading}
+
           pagination={
             {
-
+              defaultPageSize: 20,
               pageSize: size,
               total,
               onChange: handlePaginationChange

src/pages/contract/funds/addbill/add.tsx

@@ -29,14 +29,13 @@ const Add: React.FC<{}> = (props: any) => {
     setid(data.selectRow.id)
     console.log(data)
   }
-  useEffect(() => {
-    // contract
-    PublicApi.getContractApplyAmountGetDetail({ applyId: paymentId }).then((res) => {
-      console.log(res)
-    }).catch((err) => {
+  // useEffect(() => {
+  //   PublicApi.getContractApplyAmountGetDetail({ applyId: paymentId }).then((res) => {
+  //     console.log(res)
+  //   }).catch((err) => {
 
-    });
-  }, [])
+  //   });
+  // }, [])
   const TabList = [
     {
       name: '基本信息', components:

src/pages/contract/funds/addbill/components/info.tsx

@@ -129,19 +129,19 @@ const AddInfo = (props: any) => {
       const info = Info;
       if (res.code == 1000) {
         if (res.data.payPlanList.length != 0) {
-          res.data.payPlanList.map((item, index) => {
-            console.log(index)
-            if (item.id == paymentId) {
-              const expectPayTime = new Date(item.expectPayTime).getTime();
-              basicsData.payPlanId = item.id;
-              basicsData.payRatio = item.payRatio;
+          for (let i = 0; i < res.data.payPlanList.length; i++) {
+            if (res.data.payPlanList[i].id == paymentId) {
+              console.log(1232131);
+              const expectPayTime = new Date(res.data.payPlanList[i].expectPayTime).getTime();
+              basicsData.payPlanId = res.data.payPlanList[i].id;
+              basicsData.payRatio = res.data.payPlanList[i].payRatio;
               basicsData.expectPayTime = moment(expectPayTime);
-              basicsData.payWay = item.payWay;
-              basicsData.payParam = item.payParam;
-              basicsData.applyAmount = item.payAmount;
-              setapplyAmount(item.payAmount)
-              setIndex(index + 1)
-              return;
+              basicsData.payWay = res.data.payPlanList[i].payWay;
+              basicsData.payParam = res.data.payPlanList[i].payParam;
+              basicsData.applyAmount = res.data.payPlanList[i].payAmount;
+              setapplyAmount(res.data.payPlanList[i].payAmount)
+              setIndex(i + 1)
+              break;
             } else {
               const expectPayTime = new Date(res.data.payPlanList[0].expectPayTime).getTime();
               basicsData.payPlanId = res.data.payPlanList[0].id;
@@ -152,7 +152,7 @@ const AddInfo = (props: any) => {
               basicsData.applyAmount = res.data.payPlanList[0].payAmount;
               setapplyAmount(res.data.payPlanList[0].payAmount)
             }
-          })
+          }
         }
 
         basicsData.contractNo = selectRow.contractNo;
@@ -183,6 +183,7 @@ const AddInfo = (props: any) => {
         const auth = JSON.parse(localStorage.getItem('auth'));
         setaccount(auth.account);
         setBasics(basicsData)
+        console.log(basicsData, 'basicsData')
         attrValueForm.setFieldsValue(basicsData);
       }
     })

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

@@ -33,9 +33,7 @@ const BillDetails = (props: any) => {
   const [reason, setDatareason] = useState('');
   const [status, setstatus] = useState<any>()
   const [ExamineFlag, setExamineFlag] = useState<boolean>(false);
-  useEffect(() => {
-    setTargetOffset(window.innerHeight / 6);
-  }, []);
+
   const handleAnchorClick = (e) => {
     e.preventDefault()
   }
@@ -54,6 +52,7 @@ const BillDetails = (props: any) => {
   })
   /* 获取详情的数据 */
   const getDetail = () => {
+    console.log(applyId, 'applyId')
     PublicApi.getContractApplyAmountGetDetail({ applyId }).then(res => {
       if (res.code === 1000) {
         let { basics, taskStepList } = res.data
@@ -134,7 +133,7 @@ const BillDetails = (props: any) => {
     setIsModalVisible(!isModalVisible);
   };
   useEffect(() => {
-    setTargetOffset(window.innerHeight / 6);
+    setTargetOffset(window.innerHeight / 4);
     getDetail()
   }, []);
 

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

@@ -12,13 +12,14 @@ import moment from 'moment';
 const FormList = (props: any) => {
   console.log(props)
   const { fromData, currentRef, fetchdata } = props;
+  const [keys, setkeys] = useState<any>(); // 记录上次删除的
   const [options, setoptions] = useState<any>([
     {
       value: 1,
       disabled: true
     }
   ])
-  const [id, setId] = useState<any>(''); // 记录上次的id
+
   const [PlanList, setPlanList] = useState<any>([
     {
       payNum: '1',
@@ -30,6 +31,7 @@ const FormList = (props: any) => {
       payParam: '',
       id: 0,
       rowId: 1,
+      disabled: true
     },
   ]);
 
@@ -130,9 +132,14 @@ const FormList = (props: any) => {
   /* 添加 */
   const addtable = () => {
     const data = [...PlanList];
+
+    if (keys) {
+      data.push(keys);
+      setkeys('');
+    } else {
       data.push(
         {
-        payNum: '',
+          payNum: data.length + 1,
           payStage: '',
           expectPayTime: '',
           payRatio: '',
@@ -141,25 +148,27 @@ const FormList = (props: any) => {
           payParam: '',
           id: 0,
           rowId: data.length + 1,
+          disabled: false,
         },
       )
-    let optionsData = [];
-    data.map((item, index) => {
-      console.log(item.payNum, index + 1)
-      optionsData.push({
-        value: index + 1,
+    }
+    let optionsData = data.map((item, index) => {
+      return {
+        value: item.payNum ? item.payNum : index + 1,
         disabled: item.payNum ? true : false,
+        rowId: item.rowId,
+      }
     })
-    })
-    console.log(optionsData, 'optionsDataadd', options)
+
+    console.log('optionsDataadd', data, optionsData, 'optionsList')
     setPlanList(data)
     setoptions(optionsData)
+
   };
   /* 删除 */
   const Delete = (elm, idx) => {
     const dataSource = [...PlanList];
     let List = dataSource.filter((item, index) => index !== idx);
-    setPlanList(List)
     let optionsData = options.map((keys => {
       if (elm.payNum == keys.value) {
         keys.disabled = false;
@@ -168,7 +177,8 @@ const FormList = (props: any) => {
         ...keys
       }
     }))
-    console.log(optionsData, 'del')
+    setkeys(elm);
+    setPlanList(List)
     setoptions(optionsData)
   };
 
@@ -181,7 +191,7 @@ const FormList = (props: any) => {
         break;
       case 'payNum':
         item[idx].payNum = e;
-        setId(e);
+
         break;
       case 'expectPayTime':
         item[idx].expectPayTime = moment(e).format('YYYY-MM-DD HH:mm:ss');
@@ -199,30 +209,7 @@ const FormList = (props: any) => {
         item[idx].payParam = e;
         break;
     }
-    let optionsData = [];
-    if (id) {
-      optionsData = options.map((keys => {
-        if (id == keys.value) {
-          keys.disabled = false;
-        }
-        if (keys.value == e) {
-          keys.disabled = true;
-        }
-        return {
-          ...keys
-        }
-      }))
-    } else {
-      optionsData = options.map((keys => {
-        if (keys.value == e) {
-          keys.disabled = true;
-        }
-        return {
-          ...keys
-        }
-      }))
-    }
-    setoptions(optionsData)
+
     setPlanList(item)
   }
   useEffect(() => {

src/pages/contract/manage/editing/components/FormList.tsx

@@ -11,6 +11,7 @@ const FormList = (props: any) => {
   const { currentRef, purchaseMaterielList } = props;
   const [dataList, setData] = useState([])
 
+
   const columnsTab: any = [
     {
       title: '物料编号/名称', dataIndex: 'materielName', align: 'center',

src/pages/contract/manage/editing/components/fromtable.tsx

@@ -10,7 +10,16 @@ const { Option } = Select;
 import moment from 'moment';
 const FormList = (props: any) => {
   const { currentRef, payPlanList } = props;
-  const [payNumArr, setpayNumArr] = useState<any>([1,])
+  // const [payNumArr, setpayNumArr] = useState<any>([1,])
+  const [keys, setkeys] = useState<any>(); // 记录上次删除的
+  const [options, setoptions] = useState<any>([
+    {
+      value: 1,
+      disabled: true
+    }
+  ])
+
+
   const [PlanList, setPlanList] = useState<any>([
   ]);
   /* 显示模态框 */
@@ -18,14 +27,6 @@ const FormList = (props: any) => {
     {
       title: '付款次数', dataIndex: 'payNum', align: 'center',
       render: (_, item, index) => {
-        const options = [];
-        for (let i = 0; i < PlanList.length; i++) {
-          let Index = payNumArr.indexOf(i + 1);
-          options.push({
-            value: i + 1,
-            disabled: Index == -1 ? false : true
-          });
-        }
         return (
           <Select
             style={{ width: 200 }}
@@ -119,38 +120,61 @@ const FormList = (props: any) => {
   /* 添加 */
   const addtable = () => {
     const data = [...PlanList];
+
+    if (keys) {
+      data.push(keys);
+      setkeys('');
+    } else {
       data.push(
         {
-        payNum: '',
+          payNum: data.length + 1,
           payStage: '',
           expectPayTime: '',
           payRatio: '',
           payAmount: '',
           payWay: '1',
-        payParam: '1',
+          payParam: '',
           id: 0,
           rowId: data.length + 1,
+          disabled: false,
         },
       )
-    console.log(data)
+    }
+
+    let optionsData = data.map((item, index) => {
+      return {
+        value: item.payNum ? item.payNum : index + 1,
+        disabled: item.payNum ? true : false,
+        rowId: item.rowId,
+      }
+    })
+
+    console.log('optionsDataadd', data, optionsData, 'optionsList')
     setPlanList(data)
+    setoptions(optionsData)
   };
   /* 删除 */
   const Delete = (elm, idx) => {
     const dataSource = [...PlanList];
-    const arr = [...payNumArr]
     let List = dataSource.filter((item, index) => index !== idx);
-    let numberArr = arr.filter((item, index) => elm.payNum !== item);
-    console.log(numberArr);
-    setpayNumArr(numberArr)
+    let optionsData = options.map((keys => {
+      if (elm.payNum == keys.value) {
+        keys.disabled = false;
+      }
+      return {
+        ...keys
+      }
+    }))
+    setkeys(elm);
     setPlanList(List)
+    setoptions(optionsData)
   };
 
   /* 选中设置值 */
   const onSelectChange = (e, name, idx) => {
     console.log(e, name, idx)
     let item = [...PlanList];
-    let NumArr = [...payNumArr]
+
     console.log(item, '哈哈');
     // return;
     switch (name) {
@@ -159,7 +183,7 @@ const FormList = (props: any) => {
         break;
       case 'payNum':
         item[idx].payNum = e;
-        NumArr.push(e);
+
         break;
       case 'expectPayTime':
         item[idx].expectPayTime = moment(e).format('YYYY-MM-DD HH:mm:ss');
@@ -177,8 +201,7 @@ const FormList = (props: any) => {
         item[idx].payParam = e;
         break;
     }
-    NumArr = Array.from(new Set(NumArr))
-    setpayNumArr(NumArr)
+
     setPlanList(item)
   }
   useEffect(() => {

src/pages/transaction/purchaseAbility/onlineBid/detail/index.tsx

@@ -32,8 +32,8 @@ const transforType = {
 
 const TABLINK = [
   { id: 'progressLayout', title: '流转进度' },
-    { id: 'winBidMsgLayout', title: '中标通知' },
-    { id: 'winBidResultLayout', title: '中标结果' },
+  { id: 'winBidMsgLayout', title: '中标通知', except: ['readySignUp', 'readyBid'] },
+  { id: 'winBidResultLayout', title: '中标结果', except: ['readySignUp', 'readyBid'] },
   { id: 'basicLayout', title: '基本信息' },
   { id: 'materialLayout', title: '采购物料' },
   { id: 'bidRulesLayout', title: '竞价规则' },
@@ -50,7 +50,10 @@ const SearchDetail = () => {
       id,
       number
     },
+    pathname
   } = history.location;
+  const [pathPci] = useState(pathname.split('/')[pathname.split('/').length - 2]);
+
   // 竞价过程
   const [progressVisible, setProgressVisible] = useState<boolean>(false);
   const [progressData, setProgressData] = useState<any>([]);
@@ -71,6 +74,16 @@ const SearchDetail = () => {
   // 感谢函
   const [thankVisAble, seTthankVisAble] = useState<boolean>(false);
 
+  const _tabs = useMemo(() => {
+    let _list = [];
+    TABLINK.forEach((item) => {
+      if (!item.except || !item.except.includes(pathPci)) {
+        _list.push(item);
+      }
+    })
+    return _list;
+  }, [pathPci])
+
 
   const handleProgressEffect = (data: any) => {
     let _list = [
@@ -225,12 +238,23 @@ const SearchDetail = () => {
   }, [])
 
   const _returnWinBidMsgLayout = useMemo(() => {
+    switch (pathPci) {
+      case 'readySignUp':
+      case 'readyBid':
+        return null;
+      default:
         return (
           <BidCommonLayout layoutId="winBidMsgLayout" title="中标通知" effect={resultEffect} />
         )
-    }, [resultEffect])
+    }
+  }, [pathPci, resultEffect])
 
   const _returnWinBidResultLayout = useMemo(() => {
+    switch (pathPci) {
+      case 'readySignUp':
+      case 'readyBid':
+        return null;
+      default:
         return (
           <TableCommonLayout
             layoutId='winBidResultLayout'
@@ -240,7 +264,8 @@ const SearchDetail = () => {
             fetch={PublicApi.getPurchaseOnlineBiddingAwardResultsBidding}
           />
         )
-    }, [id, number])
+    }
+  }, [id, number, pathPci])
 
   const _returnMaterialLayout = useMemo(() => {
     return (
@@ -298,7 +323,7 @@ const SearchDetail = () => {
     <Context.Provider value={dataSource}>
       <PeripheralLayout
         no={dataSource.biddingNo}
-                tabLink={TABLINK}
+        tabLink={_tabs}
         components={
           <Fragment>
             <ProgressLayout effect={progressEffect} />

src/pages/transaction/purchaseAbility/onlineBid/readySignUp/schema/index.ts

@@ -96,7 +96,8 @@ export const formSchema: ISchema = {
                   "x-component": 'daterange',
                   "x-component-props": {
                     showTime: true,
-                    style: { width: "100%" }
+                    style: { width: "100%" },
+                    separator: ' 至 '
                   },
                   readOnly: true,
                 },

src/pages/transaction/purchaseAbility/onlineBid/readySignUp/signUp.tsx

@@ -38,6 +38,13 @@ const SignUpForm = () => {
   const getCountryCodeId = async () => {
     const res = await PublicApi.getManageCountryAreaGetTelCode()
     if (res.code === 1000) {
+      let _value = ''
+      for (let i = 0; i < res.data.length; i++) {
+        if (res.data[i] === '86') {
+          _value = res.data[i];
+          break
+        }
+      }
       return { telPrefix: res.data }
     }
     return {}
@@ -104,6 +111,7 @@ const SignUpForm = () => {
         member: name,
         startSignUp: formatTimeString(data.startSignUp),
         endSignUp: formatTimeString(data.endSignUp),
+        telPrefix: '86'
       });
     })
   }