BUG修复

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

@@ -77,8 +77,9 @@ const Details = (props: any) => {
               keyId: index + 1,
             }
           })
-          console.log(list)
           setdata(list)
+        } else {
+          setdata([]);
         }
         setTotal(res.data.totalCount)
         setunApplyAmount(unApplyAmount)
@@ -294,6 +295,7 @@ const Details = (props: any) => {
       setSelectRow(selectedRows)
     }
   };
+  const [values, setvalues] = useState('');
   /* 搜素 */
   const onSearch = (values) => {
     const data = {
@@ -305,6 +307,21 @@ const Details = (props: any) => {
       current: 1,
       pageSize: 5,
     }
+    setvalues(values)
+    getContracInfoList(data)
+  }
+  /* 重置 */
+  const Reset = () => {
+    setvalues('');
+    const data = {
+      contractId,
+      orderNo: '',
+      orderAbstract: '',
+      startTime: "",
+      endTime: "",
+      current: 1,
+      pageSize: 5,
+    }
     getContracInfoList(data)
   }
   /* 查看付款明细回调 */
@@ -328,11 +345,7 @@ const Details = (props: any) => {
     console.log(data)
     getContracInfoList(data)
   };
-  /* 非手工单进入请款 */
-  const like = (sourceType) => {
-    sessionStorage.setItem('basics', JSON.stringify(basics));
-    history.push('/memberCenter/contract/funds/addbill/Add?applyId=' + contractId + '&sourceType=' + sourceType)
-  }
+
   return (
     <div className={style.anchorWrap}>
       <Anchor
@@ -398,8 +411,10 @@ const Details = (props: any) => {
                   placeholder="搜素"
                   allowClear
                   onSearch={onSearch}
+                  value={values}
+                  onChange={e => setvalues(e.target.value)}
                 />
-                <Button style={{ paddingLeft: 10, paddingRight: 10, marginLeft: 10, marginRight: 10 }}> 重置 </Button>
+                <Button style={{ paddingLeft: 10, paddingRight: 10, marginLeft: 10, marginRight: 10 }} onClick={Reset}> 重置 </Button>
                 <Button type="primary" onClick={() => onselect()}>批量请款</Button>
               </div>
             </div>

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

@@ -74,7 +74,7 @@ const table = (props: any) => {
       dataIndex: 'orderAmount', align: 'center',
       render: (text, record) =>
         <div>
-          <div>￥{text}</div>
+          <div>￥{record.orderType == 2 ? `-${text}` : ''}</div>
         </div>
     },
 

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

@@ -24,11 +24,12 @@ const BiddingList = () => {
   const columns: ColumnType<any>[] = [{
     title: '招标编号/项目',
     dataIndex: 'inviteBidNO',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         <EyePreview
-          type="button"
+          url={`/memberCenter/procurementAbility/callForBids/tenderSearch/detail?id=${record.bidId}`}
+        // type=""
         >
           {text}
         </EyePreview>
@@ -37,17 +38,17 @@ const BiddingList = () => {
   }, {
     title: '投标编号',
     dataIndex: 'bidNo',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '中标会员',
     dataIndex: 'bidWinnerName',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '中标通知时间',
     dataIndex: 'bidWinnerNoticeTime',
-    align: 'center',
+    align: 'left',
     sorter: {
       compare: (a, b) => a.bidWinnerNoticeTime - b.bidWinnerNoticeTime,
       multiple: 1,
@@ -56,7 +57,7 @@ const BiddingList = () => {
   {
     title: '中标金额',
     dataIndex: 'bidWinnerAmount',
-    align: 'center',
+    align: 'left',
     sorter: {
       compare: (a, b) => a.bidWinnerAmount - b.bidWinnerAmount,
       multiple: 1,
@@ -65,7 +66,7 @@ const BiddingList = () => {
   {
     title: '外部状态',
     dataIndex: 'outerStatus',
-    align: 'center',
+    align: 'left',
     render: (text) => {
 
       return (
@@ -76,7 +77,7 @@ const BiddingList = () => {
   {
     title: '内部状态',
     dataIndex: 'innerStatus',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <div>
@@ -88,7 +89,7 @@ const BiddingList = () => {
   }, {
     title: '操作',
     dataIndex: 'state',
-    align: 'center',
+    align: 'left',
     render: (_, record) => {
       return (
         <div>

src/pages/contract/manage/schema/index.ts

 import { ISchema } from '@formily/antd';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants/order';
-import moment from 'moment';
-
 /**
  * 除了订单必填字段, 默认
  */
@@ -114,7 +112,7 @@ export const BidListSchema: any = {
         "inviteBidAbstract": {
           type: 'string',
           "x-component-props": {
-            placeholder: '请输入招标摘要'
+            placeholder: '请输入项目'
           }
         },
         "bidNo": {
@@ -128,9 +126,6 @@ export const BidListSchema: any = {
           "x-component": 'DateRangePickerUnix',
           'x-component-props': {
             placeholder: ['开始时间', '结束时间'],
-            disabledDate: current => {
-              return current && current < moment().startOf('day')
-            }
           },
         },
         "bidWinnerName": {
@@ -185,9 +180,9 @@ export const ViePriceListSchema: any = {
           "x-component": 'DateRangePickerUnix',
           'x-component-props': {
             placeholder: ['开始时间', '结束时间'],
-            disabledDate: current => {
-              return current && current < moment().startOf('day')
-            }
+            // disabledDate: current => {
+            //   return current && current < moment().startOf('day')
+            // }
           },
         },
         "awardName": {