diff --git a/src/userComponents/others/GoodsChosen.js b/src/userComponents/others/GoodsChosen.js
index 2aad5e5a2f7e9804fca3e60c1aa02f9ebbb47f00..9eaab3b92f005510ec28b70f43867e4f2507f329 100644
--- a/src/userComponents/others/GoodsChosen.js
+++ b/src/userComponents/others/GoodsChosen.js
@@ -23,7 +23,7 @@ class GoodsChosen extends React.Component {
                   return true
                 }
               }}
-              onSelect={(value,key)=>{const { onChange } = this.props;onChange(value,key);console.log(value,key.props.key);}}
+              onSelect={(value)=>{const { onChange } = this.props;onChange(value);console.log(value);}}
               defaultActiveFirstOption={false}
               placeholder="货物名称-货物编号"
               size="small"
diff --git a/src/userComponents/userLogin/UserLogin.jsx b/src/userComponents/userLogin/UserLogin.jsx
index 236a4c2e33baa9c2ffcd26b44fe44db72f8bcd4c..98a06308e1864376ea3a32eb7285e9390ee1acfd 100644
--- a/src/userComponents/userLogin/UserLogin.jsx
+++ b/src/userComponents/userLogin/UserLogin.jsx
@@ -21,18 +21,18 @@ class UserInput extends React.Component{
     constructor(props){
         super(props);
         this.state={
-            userUserName:'',
+            username:'',
             password:'',
             inVCode:'',
             rightVCode:'',
             imgCode:"",
             result:'',
-            code:'',
 
             isInfoRight:false,
         }
         this.infoChange=this.infoChange.bind(this);
         this.psChange=this.psChange.bind(this);
+        this.codeChange=this.codeChange.bind(this);
         //this.vcChange=this.vcChange.bind(this);
         this.infoRight=this.infoRight.bind(this);
         this.infoFalse=this.infoFalse.bind(this);
@@ -47,7 +47,7 @@ class UserInput extends React.Component{
 
         axios({
             method: 'get',
-            url: 'http://10.128.137.205:8088/passport/generate-code',
+            url: 'http://10.255.14.225:8088/passport/generate-code',
             
           })
           .then(response=> {
@@ -73,7 +73,7 @@ class UserInput extends React.Component{
     //修改用户信息和密码
     infoChange(event){
         this.setState({
-            userUserName:event.target.value,
+            username:event.target.value,
         });
     }
     psChange(event){
@@ -81,9 +81,14 @@ class UserInput extends React.Component{
             password:event.target.value,
         });
     }
+    codeChange(event){
+        this.setState({
+            inVCode:event.target.value,
+        });
+    }
 
     getCode(event){
-        axios.get("http://10.128.137.205:8088/passport/generate-code",{withCredentials:true}).then(res=>{
+        axios.get("http://10.255.14.225:8088/passport/generate-code",{withCredentials:true}).then(res=>{
             this.setState({
                 imgCode : res.data
             })
@@ -136,10 +141,25 @@ class UserInput extends React.Component{
 
     //登录按钮功能
     loginBtn(event){
-        const userUserName=this.state.userUserName;
-        const password=this.state.password;
-        const inVCode=this.state.inVCode;
+        console.log(this.state.inVCode);
+        axios({
+            method: 'post',
+            url: 'http://10.255.14.225:8088/passport/userlogin',
+            params:{
+                code:this.state.inVCode,
+                password:this.state.password,
+                userName:this.state.username,
+            }
+        })
+        .then(response=> {
+            console.log(response);
+            alert(response.data.message);
+        })
+        .catch(function (error) {
+              console.log(error.config);
+        });
 
+        /*
         if(userUserName==123&&password==123){
             this.setState({
                 isInfoRight:true,
@@ -158,6 +178,7 @@ class UserInput extends React.Component{
             }) 
          
         })
+        */
         event.preventDefault();
     }
 
@@ -180,7 +201,7 @@ class UserInput extends React.Component{
                     
                     <div className='container mx-auto'>
                         <div >
-                            <Input type="text" v-model={this.state.code} placeholder=' 请输入验证码' prefix={<AiOutlineCheck />} className='relative inset-x-0 h-9 w-96 rounded-md' />
+                            <Input type="text" value={this.state.inVCode} onChange={this.codeChange} placeholder=' 请输入验证码' prefix={<AiOutlineCheck />} className='relative inset-x-0 h-9 w-96 rounded-md' />
                             {/** 输入验证码：<input type="text" v-model="code" /> */}
                            
                         </div>
diff --git a/src/userComponents/userLogin/UserRegister.js b/src/userComponents/userLogin/UserRegister.js
index 2b656a3546a17f3b9fea8b54bb7334749f05a448..7d7b580e391bc651926cf3fc43799b83e85e3bb0 100644
--- a/src/userComponents/userLogin/UserRegister.js
+++ b/src/userComponents/userLogin/UserRegister.js
@@ -99,7 +99,7 @@ class UserRegister extends React.Component{
         if(this.state.password==this.state.passagain&&this.state.userName!=null&&this.state.userUsername!=null&&this.state.password!=null&&this.state.userPhonenum!=null){
             axios({
                 method: 'post',
-                url: 'http://10.128.137.205:8088/passport/registry',
+                url: 'http://10.255.14.225:8088/passport/registry',
                 data:{
                     userName:this.state.userName,
                     userUsername:this.state.userUsername,
@@ -110,7 +110,7 @@ class UserRegister extends React.Component{
             })
             .then(response=> {
                 console.log(response);
-                alert('注册成功！');
+                alert(response.data.message);
             })
             .catch(function (error) {
                   console.log(error.config);
@@ -139,9 +139,9 @@ class UserRegister extends React.Component{
                     <br /><br />
                     <Input type="text" placeholder=' 请输入您的电话' prefix={<AiOutlinePhone />} className='relative inset-x-0 h-9 w-96 rounded-md' value={this.state.userPhonenum} onChange={this.phonenumChange} />
                     <br /><br />
-                    <Select  defaultValue="1" onChange={this.sexChange} className='relative inset-x-0 h-9 w-96 rounded-md'>
-                        <option value="1">{<IoIosMale className='float-left relative inset-y-2' />} 男</option>
-                        <option value="0">{<IoIosFemale className='float-left relative inset-y-2' />}女</option>
+                    <Select  defaultValue={1} onChange={this.sexChange} className='relative inset-x-0 h-9 w-96 rounded-md'>
+                        <option value={1}>{<IoIosMale className='float-left relative inset-y-2' />} 男</option>
+                        <option value={0}>{<IoIosFemale className='float-left relative inset-y-2' />}女</option>
                     </Select>
                     <br /><br />
                     <button className='relative inset-x-0 rounded-md h-10 w-96 bg-[#38bdf8] text-xl text-white  font-sans' onClick={this.registerBtn}>注册</button>
diff --git a/src/userComponents/userManageCenter/homeIn/CreateInApplication.js b/src/userComponents/userManageCenter/homeIn/CreateInApplication.js
index d9384b029fbe1a27699571ba8120dbc0c0e0ff25..d0248e33bb94c1c7f9123513b05d0a0bc65e2c78 100644
--- a/src/userComponents/userManageCenter/homeIn/CreateInApplication.js
+++ b/src/userComponents/userManageCenter/homeIn/CreateInApplication.js
@@ -77,7 +77,7 @@ class CreateInApplication extends React.Component{
                                 
                                 <input className='rounded-md outline outline-1 outline-gray-700 relative  w-44' placeholder="请输入货物名称" />
                             </Form.Item>
-                            <label className='text-xl relative inset-x-52  font-bold '>货物数量：</label>
+                            {/** <label className='text-xl relative inset-x-52  font-bold '>货物数量：</label>
                             <Form.Item className='relative inset-x-[12.5rem] w-44'
                                 {...restField}
                                 name={[name, 'amount']}
@@ -89,8 +89,9 @@ class CreateInApplication extends React.Component{
                                 ]}
                             >
                                 <input type="number" className='rounded-md outline outline-1 outline-gray-700 relative  w-44' placeholder="请输入货物数量" />
-                            </Form.Item>
-                            <MinusCircleOutlined className='relative inset-x-56 w-10 h-10' onClick={() => remove(name)} />
+                            </Form.Item>*/}
+                            
+                            <MinusCircleOutlined className='relative inset-x-1 w-10 h-10' onClick={() => remove(name)} />
                         </Space>
                         ))}
                         <Form.Item>
diff --git a/src/userComponents/userManageCenter/homeOut/CreateOutApplication.js b/src/userComponents/userManageCenter/homeOut/CreateOutApplication.js
index 23d81f49a48e50fdd89f1f57261d023208224086..34fd19c37c22f1c88b85fbd5dcee6beb5a79584f 100644
--- a/src/userComponents/userManageCenter/homeOut/CreateOutApplication.js
+++ b/src/userComponents/userManageCenter/homeOut/CreateOutApplication.js
@@ -1,107 +1,111 @@
 //申请提货的面板label
 //还要加仓库：仓库号+仓位；货物最大数量;信息只留IC
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import ReactDOM from 'react-dom/client';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
-import { Button, Form, Input, Space, Typography } from 'antd';
+import { Button, Form, Input, Space, Typography, Select } from 'antd';
 import axios from "axios";
+import { CgRemove } from "react-icons/cg";
+import { nanoid } from "nanoid";
 import { StorgeChosen, DateSelect, GoodsChosen } from '../../index';
 
-class CreateOutApplication extends React.Component{
-    constructor(props){
-        super(props);
-        this.state={
-            idKey:"",
-            productVOList:[],
-            allData:[
-                {
-                  "inventoryOwner": "ICb4e2ad2c",
-                  "inventoryRepository": 1,
-                  "inventoryPosition": 3,
-                  "inventoryProduct": 148,
-                  "inventoryProductName": "冰红茶",
-                  "inventoryNum": 0,
-                  "inventoryIn": 10,
-                  "inventoryOut": 10,
-                  "inventoryRecent": 10,
-                  "inventoryCreatetime": null,
-                  "inventoryId": 15
-                },
-                {
-                  "inventoryOwner": "ICb4e2ad2c",
-                  "inventoryRepository": 1,
-                  "inventoryPosition": 2,
-                  "inventoryProduct": 149,
-                  "inventoryProductName": "荔枝",
-                  "inventoryNum": 10,
-                  "inventoryIn": 80,
-                  "inventoryOut": 70,
-                  "inventoryRecent": 5,
-                  "inventoryCreatetime": null,
-                  "inventoryId": 17
-                },
-                {
-                  "inventoryOwner": "ICb4e2ad2c",
-                  "inventoryRepository": 1,
-                  "inventoryPosition": 3,
-                  "inventoryProduct": 149,
-                  "inventoryProductName": "荔枝",
-                  "inventoryNum": 10,
-                  "inventoryIn": 20,
-                  "inventoryOut": 10,
-                  "inventoryRecent": 20,
-                  "inventoryCreatetime": null,
-                  "inventoryId": 18
-                },
-                {
-                  "inventoryOwner": "ICb4e2ad2c",
-                  "inventoryRepository": 1,
-                  "inventoryPosition": 1,
-                  "inventoryProduct": 150,
-                  "inventoryProductName": "水",
-                  "inventoryNum": 10,
-                  "inventoryIn": 50,
-                  "inventoryOut": 40,
-                  "inventoryRecent": 50,
-                  "inventoryCreatetime": "2022-07-14T18:31:30",
-                  "inventoryId": 19
-                },
-                {
-                  "inventoryOwner": "ICb4e2ad2c",
-                  "inventoryRepository": 1,
-                  "inventoryPosition": 3,
-                  "inventoryProduct": 150,
-                  "inventoryProductName": "水",
-                  "inventoryNum": 30,
-                  "inventoryIn": 50,
-                  "inventoryOut": 20,
-                  "inventoryRecent": 0,
-                  "inventoryCreatetime": "2022-07-14T18:31:30",
-                  "inventoryId": 21
-                }
-              ]
-        }
-        this.addForm=this.addForm.bind(this);
-        this.onFinish=this.onFinish.bind(this);
-        this.onSubmit=this.onSubmit.bind(this);
-        this.onSelect=this.onSelect.bind(this);
+
+const allData=[
+    {
+      "inventoryOwner": "ICb4e2ad2c",
+      "inventoryRepository": 1,
+      "inventoryPosition": 3,
+      "inventoryProduct": 148,
+      "inventoryProductName": "冰红茶",
+      "inventoryNum": 0,
+      "inventoryIn": 10,
+      "inventoryOut": 10,
+      "inventoryRecent": 10,
+      "inventoryCreatetime": null,
+      "inventoryId": 15
+    },
+    {
+      "inventoryOwner": "ICb4e2ad2c",
+      "inventoryRepository": 1,
+      "inventoryPosition": 2,
+      "inventoryProduct": 149,
+      "inventoryProductName": "荔枝",
+      "inventoryNum": 10,
+      "inventoryIn": 80,
+      "inventoryOut": 70,
+      "inventoryRecent": 5,
+      "inventoryCreatetime": null,
+      "inventoryId": 17
+    },
+    {
+      "inventoryOwner": "ICb4e2ad2c",
+      "inventoryRepository": 1,
+      "inventoryPosition": 3,
+      "inventoryProduct": 149,
+      "inventoryProductName": "荔枝",
+      "inventoryNum": 10,
+      "inventoryIn": 20,
+      "inventoryOut": 10,
+      "inventoryRecent": 20,
+      "inventoryCreatetime": null,
+      "inventoryId": 18
+    },
+    {
+      "inventoryOwner": "ICb4e2ad2c",
+      "inventoryRepository": 1,
+      "inventoryPosition": 1,
+      "inventoryProduct": 150,
+      "inventoryProductName": "水",
+      "inventoryNum": 10,
+      "inventoryIn": 50,
+      "inventoryOut": 40,
+      "inventoryRecent": 50,
+      "inventoryCreatetime": "2022-07-14T18:31:30",
+      "inventoryId": 19
+    },
+    {
+      "inventoryOwner": "ICb4e2ad2c",
+      "inventoryRepository": 1,
+      "inventoryPosition": 3,
+      "inventoryProduct": 150,
+      "inventoryProductName": "水",
+      "inventoryNum": 30,
+      "inventoryIn": 50,
+      "inventoryOut": 20,
+      "inventoryRecent": 0,
+      "inventoryCreatetime": "2022-07-14T18:31:30",
+      "inventoryId": 21
     }
+  ]
 
-    onFinish(values){
-        this.setState({
-            productVOList:values.productInfo,
-        },()=>{console.log(this.state.productVOList)}
-        )
-        console.log('Received values of form:', values);
-      };
 
-      onSubmit(event){
-        var time=new Date().toLocaleTimeString();
-        console.log(this.state.productVOList);
+const { Option } = Select;
+const CreateOutApplication=()=>{
+    const [productVOList, setProductVOList] = useState([]);
+    const [userIc, setUserIc] = useState(null);
+
+    const addGoodsItem = () => {
+        setProductVOList([
+          ...productVOList,
+          { inventoryNum: null, inventoryId: null, inventoryProductName: null  },
+        ]);
+      };
+    
+      const removeGoodsItem = (e, index) => {
+        e.stopPropagation();
+        let newList = [...productVOList];
+        newList.splice(index, 1);
+        setProductVOList([...newList]);
+      };
+      
+      
+      const onSubmit=(event)=>{
+        console.log(productVOList);
+        
         axios({
             method: 'post',
-            url: 'http://10.128.137.205:8088/user/userhome/manage/outstorage/order',
-            data:this.state.productVOList,
+            url: 'http://10.133.131.187:8088/user/userhome/manage/outstorage/order',
+            data:productVOList,
             
                 //orderCreatetime: "2022-07-14T07:47:57.850Z",
                 //orderCreatetime:time,
@@ -117,99 +121,11 @@ class CreateOutApplication extends React.Component{
             console.log(error.config);
             console.log("2");
           });
+          
     }
 
-    /*
-    formRef = React.createRef();
-    
-*/
-    onSelect = (value,key) => {
-        this.formRef.current.setFieldsValue({
-            inventoryId: key.props.key,
-        });
-    };
-
-    formRef = React.createRef();
-    addForm(){
-        return(
-            <Form name="dynamic_form_nest_item" ref={this.formRef} onFinish={this.onFinish} autoComplete="off">
-                <Form.List name="productInfo">
-                    {(fields, { add, remove }) => (
-                        <>
-                        {fields.map(({ key, name, ...restField }) => (
-                        <Space
-                            key={key}
-                            style={{
-                            display: 'flex',
-                            marginBottom: 8,
-                            }}
-                            align="baseline"
-                        >
-                            <label className='text-xl relative  font-bold '>货物名称：</label>
-                            
-                            <Form.Item className='relative -inset-x-1  w-44'
-                                {...restField}
-                                name={[name, 'inventoryProductName']}
-                                rules={[
-                                {
-                                    required: true,
-                                    message: '请选择货物',
-                                },
-                                ]}
-                                
-                            >
-                                <GoodsChosen items={this.state.allData}  />
-                                
-                            </Form.Item>
-                            <Form.Item className='relative -inset-x-1  w-44'
-                                {...restField}
-                                name={[name, 'inventoryId']}
-                                dependencies={['inventoryProductName']}
-                                
-                            >
-                            {({ setFieldsValue }) =>setFieldsValue(1)}
-                            </Form.Item>
-                            <label className='text-xl relative inset-x-52  font-bold '>货物数量：</label>
-                            <Form.Item className='relative inset-x-[12.5rem] w-44'
-                                {...restField}
-                                name={[name, 'inventoryNum']}
-                                rules={[
-                                {
-                                required: true,
-                                message: '请输入数量',
-                                },
-                                ]}
-                            >
-                                <input type="number" className='rounded-md outline outline-1 outline-gray-700 relative w-44' placeholder="请输入货物数量" />
-                            </Form.Item>
-                            
-                            <label>max:</label>
-                            <MinusCircleOutlined className='relative inset-x-56 w-10 h-10' onClick={() => remove(name)} />
-                        </Space>
-                        ))}
-                        <Form.Item>
-                            <Button type="dashed" onClick={() => add()} block icon={<PlusOutlined />}>
-                            添加货物
-                            </Button>
-                        </Form.Item>
-                        </>
-                    )}
-                </Form.List>
-                <Form.Item>
-                    <Button  type="primary" htmlType="submit">
-                        确定货物
-                    </Button>
-                </Form.Item> 
-                
-            </Form>
-        )
-    }
-
-
-
-    render(){
-        return(
-            <div className='bg-white rounded-md relative w-[76rem] h-[42rem] overflow-y-auto overflow-x-hidden'>
+    return(
+        <div className='bg-white rounded-md relative w-[76rem] h-[42rem] overflow-y-auto overflow-x-hidden'>
                 
 
                 <div className='relative inset-y-6'>
@@ -231,30 +147,92 @@ class CreateOutApplication extends React.Component{
                     <label className='text-xl relative inset-x-6  font-bold'>货物信息</label>
                     <hr className='relative w-64'></hr>
                     <br/>
-                    {/** <form className=' relative  inset-x-32 w-[73rem]'>
-                        <label className=' font-bold '>货物名称：</label>
-                        <div className='rounded-md outline outline-1 outline-gray-700 relative inset-x-1 w-44 inline-block'>{<GoodsChosen/>}</div>
-                        <label className=' font-bold relative inset-x-56 '>货物数量：</label>
-                        <input className='rounded-md outline outline-1 outline-gray-700 relative inset-x-56 w-44 '></input>
-                        <br/><br/>
-                        <label className=' font-bold relative  '>出库时间：</label>
-                        <div className='rounded-md outline outline-1 outline-gray-700 relative  w-44 inline-block'>{<DateSelect/>}</div>
-                    </form>*/}
                     <div className='relative inset-x-32 w-[45rem]'>
-                        <this.addForm/>
-                        </div>
-                        <br/><br/>
+                    {productVOList.map((item, index) => (
+                    <form className=' relative  w-[73rem]  inset-y-2'>
+                    <label className=' float-left font-bold inline-block '>货物名称：</label>
+                    
+                    <div className='inline-block rounded-md outline outline-1 outline-gray-700 relative inset-x-1 w-44'>
+                        <Select
+                        allowClear
+                        showSearch
+                        filterOption={(input, option) => {
+                        if (option && option.title) {
+                            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                        } else {
+                            return true
+                        }
+                        }}
+                        value={item.inventoryProductName!=null?item.inventoryProductName+"--"+item.inventoryId+"--"+item.inventoryPosition:"名称--货物编号--仓库"}
+                        onSelect={(value,key) => {
+                        let newList = [...productVOList];
+                        newList[index].inventoryProductName = value;
+                        newList[index].inventoryId = key.key;
+                        setProductVOList([...newList]);
+                        }}
+                        defaultActiveFirstOption={false}
+                        size="small"
+                        style={{
+                            width: 176
+                        }}
+                        bordered={false}
+                        >
+                        {allData?.map((item) => {
+                        return (
+                            <Option value={item.inventoryProductName} key={item.inventoryId} title={item.inventoryProductName}>
+                            {item.inventoryProductName+"--"+item.inventoryId+"--"+item.inventoryPosition}
+                            </Option>
+                        );
+                        })}
+		            </Select>
+                    </div>
+                    
+                    <label className='inline-block relative inset-x-56  font-bold '>货物数量：</label>
+                    <input type="number" className='inline-block rounded-md outline outline-1 outline-gray-700 relative inset-x-56 w-44' 
+                    value={item.inventoryNum!=null?item.inventoryNum:"请输入数量"}
+                    onChange={(e) => {
+                      let newList = [...productVOList];
+                      newList[index].inventoryNum = e.target.value;
+                      setProductVOList([...newList]);
+                    }}
+                    placeholder="请输入货物数量"
+                    />
+
+                    {index !== 0 && (
+                    <div
+                      className='inline-block relative inset-x-60 w-2 h-2'
+                      onClick={(e) => removeGoodsItem(e, index)}
+                    >
+                      <CgRemove />
+                    </div>
+                    )}
+                    <br/>
+                    <br/>
+                    </form>
+          ))}
+          <br/>
+          <button
+          type="button"
+          onClick={addGoodsItem}
+          className="relative w-[45rem] px-10 py-1 border-dashed border-2 border-blue-300 text-[#40A9FF]"
+        >
+          + 添加货物
+        </button>
+
+
+                    
+                    </div>
+                    <br/><br/>
                     
                 </div>
                 <br/><br/>
                 <div className='relative inset-x-[27rem]'>
-                    <button onClick={this.onSubmit} className='rounded-md outline outline-1 outline-gray-300 relative inset-x-5 inset-y-3 w-20 h-8 font-bold'>提交申请</button>
+                    <button onClick={onSubmit} className='rounded-md outline outline-1 outline-gray-300 relative inset-x-5 inset-y-3 w-20 h-8 font-bold'>提交申请</button>
                 </div>
                 <br/><br/><br/>
             </div>
-        )
-        
-    }
+    )
 }
 
+
 export default CreateOutApplication;
\ No newline at end of file
diff --git a/src/userComponents/userManageCenter/homeTrading/CreateTradingApplication.js b/src/userComponents/userManageCenter/homeTrading/CreateTradingApplication.js
index ebb7e3bc88a05723ee84f2aefbd709585c4842c3..a446889fc4944242e11176f8b025f2a0fbc6dad6 100644
--- a/src/userComponents/userManageCenter/homeTrading/CreateTradingApplication.js
+++ b/src/userComponents/userManageCenter/homeTrading/CreateTradingApplication.js
@@ -1,41 +1,113 @@
-//申请提货的面板label
-
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import ReactDOM from 'react-dom/client';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
-import { Button, Form, Input, Space } from 'antd';
+import { Button, Form, Input, Space, Typography, Select } from 'antd';
 import axios from "axios";
-import { StorgeChosen, DateSelect, GoodsChosen,  } from '../../index';
+import { CgRemove } from "react-icons/cg";
+import { nanoid } from "nanoid";
+import { StorgeChosen, DateSelect, GoodsChosen } from '../../index';
+
 
-class CreateTradingApplication extends React.Component{
-    constructor(props){
-        super(props);
-        this.state={
-            productVOList:[],
-        }
-        this.addForm=this.addForm.bind(this);
-        this.onFinish=this.onFinish.bind(this);
-        this.onSubmit=this.onSubmit.bind(this);
+const allData=[
+    {
+      "inventoryOwner": "ICb4e2ad2c",
+      "inventoryRepository": 1,
+      "inventoryPosition": 3,
+      "inventoryProduct": 148,
+      "inventoryProductName": "冰红茶",
+      "inventoryNum": 0,
+      "inventoryIn": 10,
+      "inventoryOut": 10,
+      "inventoryRecent": 10,
+      "inventoryCreatetime": null,
+      "inventoryId": 15
+    },
+    {
+      "inventoryOwner": "ICb4e2ad2c",
+      "inventoryRepository": 1,
+      "inventoryPosition": 2,
+      "inventoryProduct": 149,
+      "inventoryProductName": "荔枝",
+      "inventoryNum": 10,
+      "inventoryIn": 80,
+      "inventoryOut": 70,
+      "inventoryRecent": 5,
+      "inventoryCreatetime": null,
+      "inventoryId": 17
+    },
+    {
+      "inventoryOwner": "ICb4e2ad2c",
+      "inventoryRepository": 1,
+      "inventoryPosition": 3,
+      "inventoryProduct": 149,
+      "inventoryProductName": "荔枝",
+      "inventoryNum": 10,
+      "inventoryIn": 20,
+      "inventoryOut": 10,
+      "inventoryRecent": 20,
+      "inventoryCreatetime": null,
+      "inventoryId": 18
+    },
+    {
+      "inventoryOwner": "ICb4e2ad2c",
+      "inventoryRepository": 1,
+      "inventoryPosition": 1,
+      "inventoryProduct": 150,
+      "inventoryProductName": "水",
+      "inventoryNum": 10,
+      "inventoryIn": 50,
+      "inventoryOut": 40,
+      "inventoryRecent": 50,
+      "inventoryCreatetime": "2022-07-14T18:31:30",
+      "inventoryId": 19
+    },
+    {
+      "inventoryOwner": "ICb4e2ad2c",
+      "inventoryRepository": 1,
+      "inventoryPosition": 3,
+      "inventoryProduct": 150,
+      "inventoryProductName": "水",
+      "inventoryNum": 30,
+      "inventoryIn": 50,
+      "inventoryOut": 20,
+      "inventoryRecent": 0,
+      "inventoryCreatetime": "2022-07-14T18:31:30",
+      "inventoryId": 21
     }
+  ]
+  const { Option } = Select;
+const CreateTradingApplication=()=>{
+    const [productVOList, setProductVOList] = useState([[]]);
+    const [userIc, setUserIc] = useState(null);
 
-    onFinish(values){
-        this.setState({
-            productVOList:values.productInfo,
-        },()=>{console.log(this.state.productVOList)}
-        )
-        console.log('Received values of form:', values);
+    const addGoodsItem = () => {
+        setProductVOList([
+          ...productVOList,
+          { inventoryNum: null, inventoryId: null, inventoryProductName: null  },
+        ]);
+      };
+    
+      const removeGoodsItem = (e, index) => {
+        e.stopPropagation();
+        let newList = [...productVOList];
+        newList.splice(index, 1);
+        setProductVOList([...newList]);
       };
 
-      onSubmit(event){
-        var time=new Date().toLocaleTimeString();
+      const onSubmit=(event)=>{
+        console.log(productVOList);
+        console.log(userIc);
+        
         axios({
             method: 'post',
             url: 'http://10.128.137.205:8088/user/userhome/manage/trading/order',
-            data:{
+            data:productVOList,
+            
                 //orderCreatetime: "2022-07-14T07:47:57.850Z",
                 //orderCreatetime:time,
-                productVOList:this.state.productVOList,
-            }
+                
+                //inventoryList:this.state.productVOList,
+           
           })
           .then(response=> {
             console.log(response);
@@ -45,78 +117,11 @@ class CreateTradingApplication extends React.Component{
             console.log(error.config);
             console.log("2");
           });
+          
     }
 
-      
-    addForm(){
-        return(
-            <Form name="dynamic_form_nest_item" onFinish={this.onFinish} autoComplete="off">
-                <Form.List name="productInfo">
-                    {(fields, { add, remove }) => (
-                        <>
-                        {fields.map(({ key, name, ...restField }) => (
-                        <Space
-                            key={key}
-                            style={{
-                            display: 'flex',
-                            marginBottom: 8,
-                            }}
-                            align="baseline"
-                        >
-                            <label className='text-xl relative  font-bold '>货物名称：</label>
-                            <Form.Item className='relative -inset-x-1  w-44'
-                                {...restField}
-                                name={[name, 'productName']}
-                                rules={[
-                                {
-                                    required: true,
-                                    message: 'Missing productName',
-                                },
-                                ]}
-                            >
-
-                                {/**<input className='rounded-md outline outline-1 outline-gray-700 relative -inset-x-1  w-44' placeholder="请输入货物名称" /> */}
-                                <div className='rounded-md outline outline-1 outline-gray-700 relative w-44'><GoodsChosen/></div>
-                            </Form.Item>
-                            <label className='text-xl relative inset-x-52  font-bold '>货物数量：</label>
-                            <Form.Item className='relative inset-x-[12.5rem] w-44'
-                                {...restField}
-                                name={[name, 'amount']}
-                                rules={[
-                                {
-                                required: true,
-                                message: 'Missing Amount',
-                                },
-                                ]}
-                            >
-                                <input type="number" className='rounded-md outline outline-1 outline-gray-700 relative w-44' placeholder="请输入货物数量" />
-                            </Form.Item>
-                            <MinusCircleOutlined className='relative inset-x-56 w-10 h-10' onClick={() => remove(name)} />
-                        </Space>
-                        ))}
-                        <Form.Item>
-                            <Button type="dashed" onClick={() => add()} block icon={<PlusOutlined />}>
-                            添加货物
-                            </Button>
-                        </Form.Item>
-                        </>
-                    )}
-                </Form.List>
-                <Form.Item>
-                    <Button  type="primary" htmlType="submit">
-                        确定货物
-                    </Button>
-                </Form.Item> 
-                
-            </Form>
-        )
-    }
-
-
-
-    render(){
-        return(
-            <div className='bg-white rounded-md relative w-[76rem] h-[42rem] overflow-y-auto overflow-x-hidden'>
+    return(
+        <div className='bg-white rounded-md relative w-[76rem] h-[42rem] overflow-y-auto overflow-x-hidden'>
                 
 
                 <div className='relative inset-y-6'>
@@ -138,33 +143,95 @@ class CreateTradingApplication extends React.Component{
                     <label className='text-xl relative inset-x-6  font-bold'>货物信息</label>
                     <hr className='relative w-64'></hr>
                     <br/>
-                    {/** <form className=' relative  inset-x-32 w-[73rem]'>
-                        <label className=' font-bold '>货物名称：</label>
-                        <div className='rounded-md outline outline-1 outline-gray-700 relative inset-x-1 w-44 inline-block'>{<GoodsChosen/>}</div>
-                        <label className=' font-bold relative inset-x-56 '>货物数量：</label>
-                        <input className='rounded-md outline outline-1 outline-gray-700 relative inset-x-56 w-44 '></input>
-                        <br/><br/>
-                        <label className=' font-bold relative  '>出库时间：</label>
-                        <div className='rounded-md outline outline-1 outline-gray-700 relative  w-44 inline-block'>{<DateSelect/>}</div>
-                    </form>*/}
-                    <label className=' font-bold relative inset-x-32 '>买家IC卡：</label>
-                    <input className='rounded-md outline outline-1 outline-gray-700 relative inset-x-[8.25rem] w-44'></input>
-                    <br/><br/>
+                    
                     <div className='relative inset-x-32 w-[45rem]'>
-                        <this.addForm/>
+                    <label className='relative   font-bold '>买家IC卡：</label>
+                    <input onChange={(e)=>{setUserIc(e.target.value)}} className='rounded-md outline outline-1 outline-gray-700 relative inset-x-1 w-44'></input>
+                    <br/><br/>
+                    {productVOList.map((item, index) => (
+                    <form className=' relative  w-[73rem]  inset-y-2'>
+                    <label className=' float-left font-bold inline-block '>货物名称：</label>
+                    
+                    <div className='inline-block rounded-md outline outline-1 outline-gray-700 relative inset-x-1 w-44'>
+                        <Select
+                        allowClear
+                        showSearch
+                        filterOption={(input, option) => {
+                        if (option && option.title) {
+                            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                        } else {
+                            return true
+                        }
+                        }}
+                        value={item.inventoryProductName!=null?item.inventoryProductName+"--"+item.inventoryId+"--"+item.inventoryPosition:"名称--货物编号--仓库"}
+                        onSelect={(value,key) => {
+                        let newList = [...productVOList];
+                        newList[index].inventoryProductName = value;
+                        newList[index].inventoryId = key.key;
+                        setProductVOList([...newList]);
+                        }}
+                        defaultActiveFirstOption={false}
+                        size="small"
+                        style={{
+                            width: 176
+                        }}
+                        bordered={false}
+                        >
+                        {allData?.map((item) => {
+                        return (
+                            <Option value={item.inventoryProductName} key={item.inventoryId} title={item.inventoryProductName}>
+                            {item.inventoryProductName+"--"+item.inventoryId+"--"+item.inventoryPosition}
+                            </Option>
+                        );
+                        })}
+		            </Select>
                     </div>
-                        <br/><br/>
+                    
+                    <label className='inline-block relative inset-x-56  font-bold '>货物数量：</label>
+                    <input type="number" className='inline-block rounded-md outline outline-1 outline-gray-700 relative inset-x-56 w-44' 
+                    value={item.inventoryNum!=null?item.inventoryNum:"请输入数量"}
+                    onChange={(e) => {
+                      let newList = [...productVOList];
+                      newList[index].inventoryNum = e.target.value;
+                      setProductVOList([...newList]);
+                    }}
+                    placeholder="请输入货物数量"
+                    />
+
+                    {index !== 0 && (
+                    <div
+                      className='inline-block relative inset-x-60 w-2 h-2'
+                      onClick={(e) => removeGoodsItem(e, index)}
+                    >
+                      <CgRemove />
+                    </div>
+                    )}
+                    <br/>
+                    <br/>
+                    </form>
+          ))}
+          <br/>
+          <button
+          type="button"
+          onClick={addGoodsItem}
+          className="relative w-[45rem] px-10 py-1 border-dashed border-2 border-blue-300 text-[#40A9FF]"
+        >
+          + 添加货物
+        </button>
+
+
+                    
+                    </div>
+                    <br/><br/>
                     
                 </div>
                 <br/><br/>
                 <div className='relative inset-x-[27rem]'>
-                    <button onClick={this.onSubmit} className='rounded-md outline outline-1 outline-gray-300 relative inset-x-5 inset-y-3 w-20 h-8 font-bold'>提交申请</button>
+                    <button onClick={onSubmit} className='rounded-md outline outline-1 outline-gray-300 relative inset-x-5 inset-y-3 w-20 h-8 font-bold'>提交申请</button>
                 </div>
                 <br/><br/><br/>
             </div>
-        )
-        
-    }
+    )
 }
 
 export default CreateTradingApplication;
\ No newline at end of file