merge

src/components/NiceForm/index.tsx

@@ -120,12 +120,11 @@ const NiceForm: React.FC<NiceFormProps> = props => {
 
   useEffect(() => {
     let paginationInfo: currentStateType = getCurrentState();
-    if (paginationInfo) {
+    if(paginationInfo?.queryParams) {
       reset.actions.setFormState(
         state => (state.values = paginationInfo.queryParams),
       );
     }
-
   }, [])
 
   return (

src/components/ReturnEle/index.tsx

@@ -11,9 +11,27 @@ interface IProps {
 const ReutrnEle: React.FC<IProps> = (props) => {
   const { description, logoSrc } = props
 
+  const bubbles = (e: any) => {
+    let ev = e || window.event;
+    if(ev && ev.stopPropagation) {
+      ev.stopPropagation();
+    } else {
+      ev.cancelBubble = true;
+    }
+  }
+
   return <>
-    <span style={{ fontSize: 12, color: '#909399FF' }}><ArrowLeftOutlined /> {logoSrc ? <img src={logoSrc} style={{ width: 48, height: 48, margin: '0 0 0 14px' }} /> : description}</span>
+    <span style={{ fontSize: 12, color: '#909399FF' }}>
+      <ArrowLeftOutlined />
+      {
+        logoSrc
+        ?
+        <img src={logoSrc} style={{ width: 48, height: 48, margin: '0 0 0 14px', cursor: 'default' }} onClick={bubbles} />
+        :
+        description
+      }
+    </span>
   </>
 }
 
-export default ReutrnEle 
\ No newline at end of file
+export default ReutrnEle

src/pages/logistics/components/confirmModal.tsx

 import React, { Component, useState, useEffect } from 'react';
-import { Modal, Button, Form } from 'antd'
+import { Modal, Button, Form, message } from 'antd'
 import {
   SchemaForm, SchemaMarkupField as Field,
   createFormActions,
@@ -28,6 +28,10 @@ const comfirmDialog: React.FC<Params> = (props) => {
     if(props.freightPrice) {
       value.freightPrice = props.freightPrice
     }
+    if (value.status === 4 && !props.freightPrice) {
+      message.warning('请关闭弹框,输入运费')
+      return
+    }
     PublicApi.postLogisticsOrderWaitConfirmConfirm(value).then(res => {
       if (res.code === 1000) {
         props.onOK()

src/pages/repositories/adjustRepository.tsx

@@ -218,7 +218,7 @@ const AddRepository:React.FC<{}> = (props) => {
           <Tabs.TabPane key='tab1' tab='仓位设置'>
             <PositionSetting onFieldChange={onPublicFieldChange} addSchemaAction={addSchemaAction} schema={repositTabOneSchema} formSubmit={formSubmit}/>
           </Tabs.TabPane>
-          <Tabs.TabPane key='tab2' tab='库存调入\调拨'>
+          <Tabs.TabPane key='tab2' tab='库存调入\调出'>
             <Tabs defaultActiveKey='tab2-1' tabPosition='left'>
               <Tabs.TabPane tab='库存调入' key="tab2-1">
                 {/* 使用formProvider 共享两个表单中的值 */}

src/pages/transaction/confirmInquiryQuote/components/details.tsx

@@ -106,7 +106,7 @@ const Details: React.FC<parmas> = (props) => {
     console.log(data)
     window.open(`/shop/commodity/detail?id=${data.commodityId}&shopId=${btoa(JSON.stringify({ roleId: data.memberRoleId, memberId: data.memberId }))}`)
   }
-  const inquiryGoods: ColumnType<any>[] = [{
+  const column: ColumnType<any>[] = [{
     title: 'ID',
     key: 'productId',
     dataIndex: 'productId',
@@ -131,14 +131,52 @@ const Details: React.FC<parmas> = (props) => {
     title: '采购数量',
     key: 'purchaseCount',
     dataIndex: 'purchaseCount',
+  }]
+  const inquiryGoods: ColumnType<any>[] = [{
+    title: 'ID',
+    key: 'productId',
+    dataIndex: 'productId',
+  }, {
+    title: '报价商品名称',
+    key: 'productName',
+    dataIndex: 'productName',
+    render: (text: any, record: any) => <EyePreview type='button' handleClick={() => handleJump(record)}>{text}</EyePreview>
   }, {
+    title: '品类',
+    key: 'category',
+    dataIndex: 'category',
+  }, {
+    title: '品牌',
+    key: 'brand',
+    dataIndex: 'brand',
+  }, {
+    title: '单位',
+    key: 'unit',
+    dataIndex: 'unit',
+  }, {
+    title: '采购数量',
+    key: 'purchaseCount',
+    dataIndex: 'purchaseCount',
+  },
+  {
     title: '报价单价',
     key: 'price',
     dataIndex: 'price',
-  }, {
+    render: (text:any) => (
+      <>
+        { text ? `￥${text.toFixed(2)}` :  `￥0`}
+      </>
+    )
+  },
+  {
     title: '金额',
     key: 'money',
     dataIndex: 'money',
+    render: (text:any) => (
+      <>
+        { text ? `￥${text.toFixed(2)}` :  `￥0`}
+      </>
+    )
   }]
   // 条件交易&其他报价说明
   const infoTem = {
@@ -488,8 +526,8 @@ const Details: React.FC<parmas> = (props) => {
         </Tabs>
       </div>
       <div className={style.item_wrap}>
-        <div className={style.mainCol_title} style={view === 2 ? { paddingBottom: '0px' } : { paddingBottom: '24px' }}>询价商品</div>
-        {view === 1 && <Table columns={inquiryGoods} pagination={false} rowKey='id' dataSource={data.inquiryListProductRequests} />}
+        <div className={style.mainCol_title} style={view === 2 ? { paddingBottom: '0px' } : { paddingBottom: '24px' }}>{view === 1 ? '商品询价' : '商品报价'}</div>
+        {view === 1 && <Table columns={column} pagination={false} rowKey='id' dataSource={data.inquiryListProductRequests} />}
         {view === 2 &&
           <StandardTable
             currentRef={ref}

src/pages/transaction/inquiryQuote/addInquiryOrder/components/basicInfo.tsx

@@ -33,7 +33,6 @@ const BasicInfo: React.FC<queryProps> = (props) => {
   const handleOkAddMember = () => {
     if (inquiryRowCtl.selectRow.length > 0) {
       setVisibleChannelMember(false)
-      console.log(inquiryRowCtl.selectRow[0])
       setinquiryNo(inquiryRowCtl.selectRow[0]);
       getMemberList(inquiryRowCtl.selectRow[0]); // 回传给父级
     }
@@ -145,8 +144,8 @@ const BasicInfo: React.FC<queryProps> = (props) => {
         <Form.Item label='报价单号' name='quotationNo'>
           <span>{Object.keys(editData).length > 0 ? editData.quotationNo : '-'}</span>
         </Form.Item>
-        <Form.Item label='询价会员' name='memberName'>
-          <span>{Object.keys(editData).length > 0 ? editData.memberName : '-'}</span>
+        <Form.Item label='询价会员' name='inquiryListMemberName'>
+          <span>{Object.keys(editData).length > 0 ? (editData.inquiryListMemberName || editData.memberName ) : '-'}</span>
         </Form.Item>
         <Form.Item label='报价截止时间' name='quotationAsTime'>
           <span>{Object.keys(editData).length > 0 ? format(editData.quotationAsTime) : '-'}</span>

src/pages/transaction/inquiryQuote/components/details.tsx

@@ -136,6 +136,32 @@ const Details: React.FC<parmas> = (props) => {
     console.log(data)
     window.open(`/shop/commodity/detail?id=${data.productId}&type=2&shopId=${btoa(JSON.stringify({ roleId: data.memberRoleId, memberId: data.memberId }))}`)
   }
+  const column: ColumnType<any>[] = [{
+    title: 'ID',
+    key: 'productId',
+    dataIndex: 'productId',
+  }, {
+    title: '报价商品名称',
+    key: 'productName',
+    dataIndex: 'productName',
+    render: (text: any, record: any) => <EyePreview type='button' handleClick={() => handleJump(record)}>{text}</EyePreview>
+  }, {
+    title: '品类',
+    key: 'category',
+    dataIndex: 'category',
+  }, {
+    title: '品牌',
+    key: 'brand',
+    dataIndex: 'brand',
+  }, {
+    title: '单位',
+    key: 'unit',
+    dataIndex: 'unit',
+  }, {
+    title: '采购数量',
+    key: 'purchaseCount',
+    dataIndex: 'purchaseCount',
+  }]
   const inquiryGoods: ColumnType<any>[] = [{
     title: 'ID',
     key: 'productId',
@@ -161,6 +187,26 @@ const Details: React.FC<parmas> = (props) => {
     title: '采购数量',
     key: 'purchaseCount',
     dataIndex: 'purchaseCount',
+  },
+  {
+    title: '报价单价',
+    key: 'price',
+    dataIndex: 'price',
+    render: (text:any) => (
+      <>
+        { text ? `￥${text.toFixed(2)}` :  `￥0`}
+      </>
+    )
+  },
+  {
+    title: '金额',
+    key: 'money',
+    dataIndex: 'money',
+    render: (text:any) => (
+      <>
+        { text ? `￥${text.toFixed(2)}` :  `￥0`}
+      </>
+    )
   }]
   // 条件交易&其他报价说明
   const infoTem = {
@@ -532,8 +578,8 @@ const Details: React.FC<parmas> = (props) => {
         </Tabs>
       </div>
       <div className={style.item_wrap}>
-        <div className={style.mainCol_title}>询价商品</div>
-        {view === 1 && <Table columns={inquiryGoods} pagination={false} rowKey='id' dataSource={data.inquiryListProductRequests} />}
+        <div className={style.mainCol_title}>{view === 1 ? '商品询价' : '商品报价'}</div>
+        {view === 1 && <Table columns={column} pagination={false} rowKey='id' dataSource={data.inquiryListProductRequests} />}
         {view === 2 &&
           <StandardTable
             currentRef={ref}