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

src/pages/transaction/goodsOffer/addEnquiryOrder/add.tsx

@@ -12,18 +12,24 @@ import { PublicApi } from '@/services/api'
 
 const { TabPane } = Tabs;
 const AddQuotes: React.FC<{}> = () => {
-  const [memberList, setmemberList] = useState([]);
+  const [memberList, setmemberList] = useState([]); //存放用户信息
+  const [goodsList, setgoodsList] = useState([]); //存放商品
   const basicInfoRef = useRef<any>({});
   const tradingConditionsRef = useRef<any>({});
   /************* 页面的一些操作start *************/
   const onSumbit = async (params: any) => {
     const basicInfo = await basicInfoRef.current.validateFields();
     const tradingConditions = await tradingConditionsRef.current.validateFields();
-    console.log(tradingConditions, basicInfo)
+    console.log(tradingConditions, basicInfo, goodsList, memberList)
   }
+  // 获取到会员信息
   const getMemberList = (list: any) => {
     setmemberList(list);
   }
+  // 获取添加的商品列表
+  const getGoodsList = (list:any) => {
+    setgoodsList(list)
+  }
   /************* 页面的一些操作end *************/
   return (
     <PageHeaderWrapper
@@ -45,6 +51,7 @@ const AddQuotes: React.FC<{}> = () => {
           <TabPane tab="询价商品" key="2">
             <EnquiryGoods
               memberList={memberList}
+              getGoodsList={getGoodsList}
             />
           </TabPane>
           <TabPane tab="交易条件" key="3">

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

 import React, { useState, useEffect } from 'react';
 import styles from './index.less';
-import { Button, message, Input,Table } from 'antd';
+import { Button, message, Input, Table, Form } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PlusOutlined } from '@ant-design/icons';
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
@@ -15,86 +15,34 @@ import Submit from '@/components/NiceForm/components/Submit'
 
 interface queryProps extends ModalTableProps {
   memberList?: any,
-  schemaAction?: ISchemaFormActions | ISchemaFormAsyncActions
+  schemaAction?: ISchemaFormActions | ISchemaFormAsyncActions,
+  getGoodsList: Function
 }
 
-// 只能输入数字的输入框
-const NumericInput = (props) => {
-  const onChange = (e) => {
-    const { value } = e.target;
-    const reg = /^-?\d*(\.\d*)?$/;
-    if ((!isNaN(value) && reg.test(value)) || value === "" || value === "-") {
-      props.onChange(value);
-    }
-  };
-  const onBlur = () => {
-    const { value, onBlur, onChange } = props;
-    let valueTemp = value;
-    if (value.charAt(value.length - 1) === "." || value === "-") {
-      valueTemp = value.slice(0, -1);
-    }
-    onChange(valueTemp.replace(/0*(\d+)/, "$1"));
-    if (onBlur) {
-      onBlur();
-    }
-  };
-  return (
-    <Input
-      {...props}
-      onChange={onChange}
-      onBlur={onBlur}
-      maxLength={25}
-    />
-  );
-};
-
 const EnquiryGoods: React.FC<queryProps> = (props) => {
-  const { memberList, schemaAction, ...restProps } = props
+  const { memberList, schemaAction, getGoodsList, ...restProps } = props
   const [value, setValue] = useState<any>('')
   const productFormActions = createAsyncFormActions()
   const onChange = (value) => {
     setValue(value);
   };
-  const columns: ColumnType<any>[] = [{
-    title: '序号',
-    dataIndex: 'productId',
-  }, {
-    title: '商品名称',
-    dataIndex: 'productName',
-  }, {
-    title: '品类',
-    dataIndex: 'inquiryListNo',
-  }, {
-    title: '品牌',
-    dataIndex: 'brand',
-  }, {
-    title: '单位',
-    dataIndex: 'nuit',
-  }, {
-    title: '采购数量',
-    dataIndex: 'purchaseQuantity',
-    render:(text:any, record: any) => (
-      <NumericInput value={value} onChange={onChange} />
-    )
-  }, {
-    title: '操作',
-    dataIndex: 'operation',
-    render:(text:any, record: any) => <Button type='link' onClick={() => handleDelete(record)}>删除</Button>
-  }]
   // 会员添加弹窗控制
   const [visibleChannelMember, setVisibleChannelMember] = useState(false);
   const [goodsList, setgoodsList] = useState([]);
   const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'commodityId' });
+ 
   const handleOkAddMember = () => {
     setVisibleChannelMember(false);
-    const arr : any[] = []
+    const arr: any[] = []
     memberRowCtl.selectRow.forEach((v, i) => {
       arr.push({
         productId: v.commodityId,
         productName: v.name,
         inquiryListNo: v.customerCategoryName,
         brand: v.brandName,
-        nuit: v.unitName
+        nuit: v.unitName,
+        purchaseQuantity: 0
+
       })
       setgoodsList(arr)
     })
@@ -175,7 +123,51 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
       }
     }
   }
+  /**输入框输入 */
+  const inputOnchange = (id, e) => {
+    const {value} = e.target
+    goodsList.forEach(v => {
+      if(v.productId === id) {
+        v.purchaseQuantity = value
+      }
+    })
+    getGoodsList(goodsList) // 返回给父级
+    setgoodsList(goodsList)
+  }
 
+  const columns: ColumnType<any>[] = [{
+    title: '序号',
+    dataIndex: 'productId',
+  }, {
+    title: '商品名称',
+    dataIndex: 'productName',
+  }, {
+    title: '品类',
+    dataIndex: 'inquiryListNo',
+  }, {
+    title: '品牌',
+    dataIndex: 'brand',
+  }, {
+    title: '单位',
+    dataIndex: 'nuit',
+  }, {
+    title: '采购数量',
+    dataIndex: 'purchaseQuantity',
+    render: (text: any, record: any) => (
+      <Form.Item name={record.productId} noStyle initialValue={record.purchaseQuantity}>
+        <Input
+          onBlur={(e) => inputOnchange(record.productId, e)}
+          type='number'
+          maxLength={25}
+        />
+      </Form.Item>
+    )
+  }, {
+    title: '操作',
+    dataIndex: 'operation',
+    render: (text: any, record: any) => <Button type='link' onClick={() => handleDelete(record)}>删除</Button>
+  }]
+  
   // 模拟数据
   const data = [{
     commodityId: 1,
@@ -184,26 +176,26 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
     brandName: 'PELLE',
     unitName: '个',
 
-  },{
+  }, {
     commodityId: 2,
     name: '进口头层黄牛皮荔枝纹/红色/XXL',
     customerCategoryName: '牛皮',
     brandName: 'PELLE',
     unitName: '个',
-  },{
+  }, {
     commodityId: 3,
     name: '进口头层黄牛皮荔枝纹/红色/XXL',
     customerCategoryName: '牛皮',
     brandName: 'PELLE',
     unitName: '个',
 
-  },{
+  }, {
     commodityId: 4,
     name: '进口头层黄牛皮荔枝纹/红色/XXL',
     customerCategoryName: '牛皮',
     brandName: 'PELLE',
     unitName: '个',
-  },{
+  }, {
     commodityId: 5,
     name: '进口头层黄牛皮荔枝纹/红色/XXL',
     customerCategoryName: '牛皮',
@@ -233,7 +225,7 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
   }, [memberList])
   // 添加商品
   const addGoods = () => {
-    if(memberList.length > 0 && memberList[0].memberId) {
+    if (memberList.length > 0 && memberList[0].memberId) {
       setVisibleChannelMember(true);
     } else {
       message.error('请选择被询价会员')
@@ -254,14 +246,17 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
   return (
     <div className={styles.revise_style}>
       <Button block type='dashed' onClick={addGoods}><PlusOutlined />添加商品</Button>
-      <Table rowKey={'productId'} style={{marginTop: '16px'}} columns={columns} dataSource={goodsList} pagination={false} />
+      <Form>
+        <Table rowKey={'productId'} style={{ marginTop: '16px' }} columns={columns} dataSource={goodsList} pagination={false} />
+      </Form>
       {/* 选择商品弹框 */}
+
       <ModalTable
         modalTitle='选择商品'
         confirm={handleOkAddMember}
         cancel={handleCancelAddMember}
         visible={visibleChannelMember}
-        resetModal={{destroyOnClose: true, forceRender: true}}
+        resetModal={{ destroyOnClose: true, forceRender: true }}
         columns={columnsSetMember}
         rowSelection={memberRowSelection}
         fetchTableData={params => fetchGoodsList(params)}
@@ -287,6 +282,7 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
         }}
         {...restProps}
       />
+
     </div>
   )
 }

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

-import React, { useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import styles from './index.less';
 import moment from 'moment';
 import { Form, Input, Select, Row, Col, DatePicker } from 'antd';
+import { PublicApi } from '@/services/api';
 
 interface queryProps {
   currentRef?: any
@@ -16,6 +17,7 @@ const layout: any = {
 const TradingConditions: React.FC<queryProps> = (props) => {
   const { currentRef } = props;
   const [TradingConditionsForm] = Form.useForm();
+  const [address, setAddress] = useState<any>([]);
   const hadnleValidateFields = () => {
     return new Promise((resolve) => {
       TradingConditionsForm.validateFields().then(values => {
@@ -49,6 +51,13 @@ const TradingConditions: React.FC<queryProps> = (props) => {
         currentRef.current = userAction;
       }
     }
+
+    // 获取交付地址
+    PublicApi.getLogisticsSelectListReceiverAddress().then(res => {
+      setAddress(res.data)
+      console.log(res.data)
+    })
+
   }, [])
   return (
     <Form
@@ -61,9 +70,11 @@ const TradingConditions: React.FC<queryProps> = (props) => {
           <Form.Item label='交付日期' name='deliveryTime' rules={[{ required: true, message: '请选择交付日期' }]}>
             <DatePicker format="YYYY-MM-DD HH:mm:ss" />
           </Form.Item>
-          <Form.Item label='交付地址' name='' rules={[{ required: true, message: '请选择交付地址' }]}>
+          <Form.Item label='交付地址' name='fullAddress' rules={[{ required: true, message: '请选择交付地址' }]}>
             <Select>
-              <Select.Option value="demo">Demo</Select.Option>
+              {address.lengtn > 0 && address.map(v => (
+                <Select.Option key={v.id} value={v.id}>{v.fullAddress}</Select.Option>
+              ))}
             </Select>
           </Form.Item>
           <Form.Item label='报价截止时间' name='quotationAsTime' rules={[{ required: true, message: '请选择报价截止时间' }]}>