修改新建物流公司没传id， 询价报价内外序号问题

src/pages/logistics/list/addCompany.tsx

@@ -10,14 +10,6 @@ import ModalTable from '@/components/ModalTable'
 import { PublicApi } from '@/services/api'
 import { PageStatus } from '@/hooks/usePageStatus'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-import { ISchema } from '@formily/antd';
-export interface companyProps {
-
-}
-
-export interface companyState {
-
-}
 interface Item {
   key: string;
 }
@@ -76,12 +68,9 @@ const company: React.FC<parmas> = (props) => {
   const [productRowSelection, productRowCtl] = useRowSelectionTable({ type: 'radio', customKey: 'memberId' })
   const [menuForm] = Form.useForm();
   const [headerTitle, setHeaderTitle] = useState('新建物流公司')
-  const [Code, setCode] = useState('')
   const [loading, setLoading] = useState<boolean>(false)
-  const [roleList, setroleList] = useState([])
-  const [codeDisabled, setCodeDisabled] = useState(false)
   const [companyType, setCompanyType] = useState<number>(null)
-  const [memberId, setMemberId] = useState<number>(null)
+  const [memberInfon, setMemberInfo] = useState<any>({});
   const [visible, setsVisible] = useState(false) //state hook写法
   const [selectRow, setSelectRow] = useState<Item[]>([]) // 模态框选择的行数据
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
@@ -101,10 +90,14 @@ const company: React.FC<parmas> = (props) => {
 
   const handleSubmitAllSetting = () => {
     menuForm.validateFields().then((values: any) => {
+      const query = {
+        ...values,
+        ...memberInfon,
+      }
       if (id) {
-        values.id = id
+        query.id = id
         setLoading(true)
-        PublicApi.postLogisticsCompanyUpdate(values).then(res => {
+        PublicApi.postLogisticsCompanyUpdate(query).then(res => {
           if (res.code === 1000) {
             menuForm.resetFields()
             setLoading(false)
@@ -113,7 +106,7 @@ const company: React.FC<parmas> = (props) => {
         })
       } else {
         setLoading(true)
-        PublicApi.postLogisticsCompanyAdd(values).then(res => {
+        PublicApi.postLogisticsCompanyAdd(query).then(res => {
           if (res.code === 1000) {
             setLoading(false)
             menuForm.resetFields()
@@ -133,23 +126,14 @@ const company: React.FC<parmas> = (props) => {
     setsVisible(true)
   }
 
-  //改变code
-  const onCodeChange = (e: any) => {
-    const value = e.target.value
-    setCode(value)
-    console.log(value);
-  }
-
   const onChangeType = (value: any) => {
     setCompanyType(value)
     if (value == 2) {
-      setCodeDisabled(true)
       menuForm.setFieldsValue({
         companyMemberId: '',
         name: ''
       })
     } else {
-      setCodeDisabled(false)
       PublicApi.getLogisticsSelectListMemberCompanySelected().then(res => {
         if (res.code === 1000) {
           setExcludeList(res.data)
@@ -168,6 +152,10 @@ const company: React.FC<parmas> = (props) => {
         companyRoleId: roleId,
         name: name
       })
+      setMemberInfo({
+        companyMemberId: memberId,
+        companyRoleId: roleId,
+      })
       setsVisible(false)
     }
   }

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

@@ -102,9 +102,9 @@ const Details: React.FC<parmas> = (props) => {
   // 模拟数据
   const [data, setdata] = useState<any>({});
   // 询价商品
-  const handleJump = (data:any) => {
+  const handleJump = (data: any) => {
     console.log(data)
-    history.push(`/shop/commodity/detail?id=${data.productId}&shopId=${btoa(JSON.stringify({ roleId: data.memberRoleId, memberId: data.memberId }))}`)
+    window.open(`/shop/commodity/detail?id=${data.productId}&type=2&shopId=${btoa(JSON.stringify({ roleId: data.memberRoleId, memberId: data.memberId }))}`)
   }
   const inquiryGoods: ColumnType<any>[] = [{
     title: 'ID',
@@ -183,6 +183,7 @@ const Details: React.FC<parmas> = (props) => {
       title: '序号',
       key: 'inquiryListId',
       dataIndex: 'inquiryListId',
+      render: (text: any, record: any, index: number) => <>{index + 1}</>
     }, {
       title: '操作角色',
       key: 'roleName',
@@ -207,9 +208,10 @@ const Details: React.FC<parmas> = (props) => {
       dataIndex: 'auditOpinion',
     }],
     interior: [{
-      title: '流转记录',
+      title: '序号',
       key: 'id',
       dataIndex: 'id',
+      render: (text: any, record: any, index: number) => <>{index + 1}</>
     }, {
       title: '操作人',
       key: 'roleName',
@@ -403,13 +405,32 @@ const Details: React.FC<parmas> = (props) => {
             Object.keys(data).length > 0 &&
             <>
               {type === 'quote' ?
+                <>
                   <TabPane tab="外部流转" key="1">
                     <Steps
                       style={{ padding: '20px 0' }}
                       progressDot
                       current={data.externalState - 1}
                     >
-                    {Object.keys(data).length > 0 && data.externalQuotationStateResponses.map((item, index) => {
+                      {(Object.keys(data).length > 0 && data.externalQuotationStateResponses) && data.externalQuotationStateResponses.map((item, index) => {
+                        return (
+                          <Step
+                            key={index}
+                            title={item.roleName}
+                            description={item.operationalProcess}
+                            status={item.isExecute ? 'finish' : 'wait'}
+                          />
+                        );
+                      })}
+                    </Steps>
+                  </TabPane>
+                  <TabPane tab="内部流转" key="2">
+                    <Steps
+                      style={{ padding: '20px 0' }}
+                      progressDot
+                      current={data.externalState - 1}
+                    >
+                      {(Object.keys(data).length > 0 && data.interiorQuotationStateResponses) && data.interiorQuotationStateResponses.map((item, index) => {
                         return (
                           <Step
                             key={index}
@@ -421,6 +442,7 @@ const Details: React.FC<parmas> = (props) => {
                       })}
                     </Steps>
                   </TabPane>
+                </>
                 :
                 <>
                   <TabPane tab="外部流转" key="1">
@@ -447,7 +469,7 @@ const Details: React.FC<parmas> = (props) => {
                       progressDot
                       current={Number(data.interiorState - 1)}
                     >
-                      {(Object.keys(data).length > 0 && data.interiorRequisitionFormStateResponses ) && data.interiorRequisitionFormStateResponses.map((item, index) => {
+                      {(Object.keys(data).length > 0 && data.interiorRequisitionFormStateResponses) && data.interiorRequisitionFormStateResponses.map((item, index) => {
                         return (
                           <Step
                             key={index}
@@ -546,20 +568,12 @@ const Details: React.FC<parmas> = (props) => {
       </div>
       <div className={style.item_wrap}>
         <Tabs>
-          {
-            type === 'quote' ?
-              <TabPane tab="外部流转记录" key="1">
-                <Table columns={flowRecord.external} rowKey='id' pagination={false} dataSource={view === 2 ? data.externalRequisitionFormResponses : data.externalInquiryListLogResponses} />
-              </TabPane> :
-              <>
           <TabPane tab="外部流转记录" key="1">
             <Table columns={flowRecord.external} rowKey='id' pagination={false} dataSource={view === 2 ? data.externalRequisitionFormResponses : data.externalInquiryListLogResponses} />
           </TabPane>
           <TabPane tab="内部流转记录" key="2">
             <Table columns={flowRecord.interior} rowKey='id' pagination={false} dataSource={view === 2 ? data.interiorQuotationLogResponses : data.interiorInquiryListLogResponses} />
           </TabPane>
-              </>
-          }
         </Tabs>
       </div>
       <AuditModal

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

@@ -124,6 +124,7 @@ const Details: React.FC<parmas> = (props) => {
       title: '序号',
       key: 'inquiryListId',
       dataIndex: 'inquiryListId',
+      render: (text: any, record: any, index: number) => <>{index + 1}</>
     }, {
       title: '操作角色',
       key: 'roleName',
@@ -148,9 +149,10 @@ const Details: React.FC<parmas> = (props) => {
       dataIndex: 'auditOpinion',
     }],
     interior: [{
-      title: '流转记录',
+      title: '序号',
       key: 'inquiryListId',
       dataIndex: 'inquiryListId',
+      render: (text: any, record: any, index: number) => <>{index + 1}</>
     }, {
       title: '操作人',
       key: 'roleName',

src/pages/transaction/inquiryQuote/addInquiryOrder/addForm.tsx

@@ -26,7 +26,8 @@ const AddQuotes: React.FC<parmas> = (props) => {
   const tradingConditionsRef = useRef<any>({});
   const [editData, setEditData] = useState<any>({});
   const [loading, setloading] = useState<boolean>(false);
-
+  const { pathname } = history.location;
+  const pathType = pathname.split('/')[pathname.split('/').length - 1];
   useEffect(() => {
     if (id && type === 2) {
       PublicApi.getOrderProductQuotationDetails({ id }).then(res => {
@@ -145,12 +146,12 @@ const AddQuotes: React.FC<parmas> = (props) => {
           <TabPane tab="其他说明" key="3" forceRender>
             <TradingConditions
               currentRef={tradingConditionsRef}
-              editData={editData}
+              editData={pathType !== 'quote' ? editData : {}}
             />
           </TabPane>
           <TabPane tab="附件" key="4" forceRender>
             <Attached
-              editData={editData}
+              editData={pathType !== 'quote' ? editData : {}}
               handleGetEnclosureUrls={handleGetEnclosureUrls}
             />
           </TabPane>

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

@@ -134,7 +134,7 @@ const Details: React.FC<parmas> = (props) => {
   // 询价商品
   const handleJump = (data:any) => {
     console.log(data)
-    history.push(`/shop/commodity/detail?id=${data.productId}&shopId=${btoa(JSON.stringify({ roleId: data.memberRoleId, memberId: data.memberId }))}`)
+    window.open(`/shop/commodity/detail?id=${data.productId}&type=2&shopId=${btoa(JSON.stringify({ roleId: data.memberRoleId, memberId: data.memberId }))}`)
   }
   const inquiryGoods: ColumnType<any>[] = [{
     title: 'ID',
@@ -205,6 +205,7 @@ const Details: React.FC<parmas> = (props) => {
       title: '序号',
       key: 'id',
       dataIndex: 'id',
+      render: (text: any, record: any, index: number) => <>{index + 1}</>
     }, {
       title: '操作角色',
       key: 'roleName',
@@ -229,9 +230,10 @@ const Details: React.FC<parmas> = (props) => {
       dataIndex: 'auditOpinion',
     }],
     interior: [{
-      title: '流转记录',
+      title: '序号',
       key: 'id',
       dataIndex: 'id',
+      render: (text: any, record: any, index: number) => <>{index + 1}</>
     }, {
       title: '操作人',
       key: 'roleName',