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

src/pages/transaction/goodsOffer/addEnquiryOrder/components/enquiryGoods.tsx

@@ -48,6 +48,7 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
 
       })
       setgoodsList(arr)
+      getGoodsList(arr)
     })
   }
   const handleCancelAddMember = () => {

src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx

@@ -76,7 +76,7 @@ const PendingSubmit: React.FC<{}> = () => {
     title: '操作',
     key: 'options',
     dataIndex: 'options',
-    render: (text: any, record: any) => <Button type='link' disabled={record.interiorState !== 1 || record.interiorState !== 3} onClick={() => { setId(record.id); setvisible(true)}}>提交报价单</Button>
+    render: (text: any, record: any) => <Button type='link' disabled={record.externalState !== 2 && record.interiorState !== 4} onClick={() => { setId(record.id); setvisible(true)}}>提交报价单</Button>
   }]
   const format = (text) => {
     return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>

src/utils/index.tsx

@@ -28,72 +28,72 @@ export function timeRange(val: number) {
         moment()
           .startOf('days')
           .format('YYYY-MM-DD HH:mm:ss'),
-      ).unix();
+      ).valueOf();
       et = moment(
         moment()
           .endOf('days')
           .format('YYYY-MM-DD HH:mm:ss'),
-      ).unix();
+      ).valueOf();
       break;
     case 2:
       st = moment(
         moment()
           .subtract(7, 'days')
           .format('YYYY-MM-DD') + ' 00:00:00',
-      ).unix();
+      ).valueOf();
       et = moment(
         moment()
           .endOf('days')
           .format('YYYY-MM-DD HH:mm:ss'),
-      ).unix();
+      ).valueOf();
       break;
     case 3:
       st = moment(
         moment()
           .subtract(29, 'days')
           .format('YYYY-MM-DD') + ' 00:00:00',
-      ).unix();
+      ).valueOf();
       et = moment(
         moment()
           .endOf('days')
           .format('YYYY-MM-DD HH:mm:ss'),
-      ).unix();
+      ).valueOf();
       break;
     case 4:
       st = moment(
         moment()
           .subtract(89, 'days')
           .format('YYYY-MM-DD') + ' 00:00:00',
-      ).unix();
+      ).valueOf();
       et = moment(
         moment()
           .endOf('days')
           .format('YYYY-MM-DD HH:mm:ss'),
-      ).unix();
+      ).valueOf();
       break;
     case 5:
       st = moment(
         moment()
           .subtract(179, 'days')
           .format('YYYY-MM-DD') + ' 00:00:00',
-      ).unix();
+      ).valueOf();
       et = moment(
         moment()
           .endOf('days')
           .format('YYYY-MM-DD HH:mm:ss'),
-      ).unix();
+      ).valueOf();
       break;
     case 6:
       st = moment(
         moment()
           .subtract(364, 'days')
           .format('YYYY-MM-DD') + ' 00:00:00',
-      ).unix();
+      ).valueOf();
       et = moment(
         moment()
           .endOf('days')
           .format('YYYY-MM-DD HH:mm:ss'),
-      ).unix();
+      ).valueOf();
       break;
     case 7:
       st = moment(
@@ -101,13 +101,13 @@ export function timeRange(val: number) {
           .year(moment().year() - 1)
           .startOf('year')
           .format('YYYY-MM-DD HH:mm:ss'),
-      ).unix();
+      ).valueOf();
       et = moment(
         moment()
           .year(moment().year() - 1)
           .endOf('year')
           .format('YYYY-MM-DD HH:mm:ss'),
-      ).unix();
+      ).valueOf();
       break;
   }
   return { st, et }